Skip to content

Commit 4903860

Browse files
committed
add phpopenldaper as a submodule
1 parent 2ace549 commit 4903860

File tree

6 files changed

+15
-3
lines changed

6 files changed

+15
-3
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ resources/custom_user_mappings/*.csv
99
**/.rnd
1010

1111
# don't track vendor files from composer
12-
vendor
12+
vendor/**
13+
!vendor/hakasapl/
14+
!vendor/hakasapl/phpopenldaper/
15+
!vendor/hakasapl/phpopenldaper/**
1316
composer.lock
1417

1518
# don't track site configs

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "vendor/hakasapl/phpopenldaper"]
2+
path = vendor/hakasapl/phpopenldaper
3+
url = [email protected]:hakasapl/phpopenldaper.git

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"require": {
33
"psr/log": "1.1.4",
44
"phpseclib/phpseclib": "3.0.43",
5-
"phpmailer/phpmailer": "6.6.4",
6-
"hakasapl/phpopenldaper": "1.0.6"
5+
"phpmailer/phpmailer": "6.6.4"
76
},
87
"require-dev": {
98
"phpunit/phpunit": "<12.1"

resources/autoload.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
// Load Composer Libs
88
require_once __DIR__ . "/../vendor/autoload.php";
9+
// submodule
10+
require_once __DIR__ . "/../vendor/hakasapl/phpopenldaper/src/PHPOpenLDAPer/LDAPEntry.php";
11+
require_once __DIR__ . "/../vendor/hakasapl/phpopenldaper/src/PHPOpenLDAPer/LDAPConn.php";
912

1013
// load libs
1114
require_once __DIR__ . "/lib/UnityLDAP.php";

test/phpunit-bootstrap.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?php
22

33
require_once __DIR__ . "/../vendor/autoload.php";
4+
// submodule
5+
require_once __DIR__ . "/../vendor/hakasapl/phpopenldaper/src/PHPOpenLDAPer/LDAPEntry.php";
6+
require_once __DIR__ . "/../vendor/hakasapl/phpopenldaper/src/PHPOpenLDAPer/LDAPConn.php";
47

58
require_once __DIR__ . "/../resources/lib/UnityLDAP.php";
69
require_once __DIR__ . "/../resources/lib/UnityUser.php";

vendor/hakasapl/phpopenldaper

Submodule phpopenldaper added at 41a769d

0 commit comments

Comments
 (0)