add phpopenldaper as a submodule

simonLeary42 · simonLeary42 · commit 490386089aa6 · 2025-04-23T14:53:41.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,10 @@ resources/custom_user_mappings/*.csv
 **/.rnd
 
 # don't track vendor files from composer
-vendor
+vendor/**
+!vendor/hakasapl/
+!vendor/hakasapl/phpopenldaper/
+!vendor/hakasapl/phpopenldaper/**
 composer.lock
 
 # don't track site configs
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vendor/hakasapl/phpopenldaper"]
+	path = vendor/hakasapl/phpopenldaper
+	url = git@github.com:hakasapl/phpopenldaper.git
diff --git a/composer.json b/composer.json
@@ -2,8 +2,7 @@
     "require": {
         "psr/log": "1.1.4",
         "phpseclib/phpseclib": "3.0.43",
-        "phpmailer/phpmailer": "6.6.4",
-        "hakasapl/phpopenldaper": "1.0.6"
+        "phpmailer/phpmailer": "6.6.4"
     },
     "require-dev": {
         "phpunit/phpunit": "<12.1"
diff --git a/resources/autoload.php b/resources/autoload.php
@@ -6,6 +6,9 @@
 
 // Load Composer Libs
 require_once __DIR__ . "/../vendor/autoload.php";
+// submodule
+require_once __DIR__ . "/../vendor/hakasapl/phpopenldaper/src/PHPOpenLDAPer/LDAPEntry.php";
+require_once __DIR__ . "/../vendor/hakasapl/phpopenldaper/src/PHPOpenLDAPer/LDAPConn.php";
 
 // load libs
 require_once __DIR__ . "/lib/UnityLDAP.php";
diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php
@@ -1,6 +1,9 @@
 <?php
 
 require_once __DIR__ . "/../vendor/autoload.php";
+// submodule
+require_once __DIR__ . "/../vendor/hakasapl/phpopenldaper/src/PHPOpenLDAPer/LDAPEntry.php";
+require_once __DIR__ . "/../vendor/hakasapl/phpopenldaper/src/PHPOpenLDAPer/LDAPConn.php";
 
 require_once __DIR__ . "/../resources/lib/UnityLDAP.php";
 require_once __DIR__ . "/../resources/lib/UnityUser.php";
diff --git a/vendor/hakasapl/phpopenldaper b/vendor/hakasapl/phpopenldaper
@@ -0,0 +1 @@
+Subproject commit 41a769d9e1b3ac79ff38af0c2a5a06cadb382ff2

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "vendor/hakasapl/phpopenldaper"]`
	`2`	`+ path = vendor/hakasapl/phpopenldaper`
	`3`	`+ url = [email protected]:hakasapl/phpopenldaper.git`