compatibility with php-7.4 + add minimal version requirements for php…

…unit/mockery
ltb-project · Apr 24, 2024 · bd4259e · bd4259e
1 parent b9e97e8
commit bd4259e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "phpmailer/phpmailer": "^6.5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
-        "mockery/mockery": "*"
+        "phpunit/phpunit": ">=8",
+        "mockery/mockery": ">=1.4"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -5,7 +5,6 @@
       <directory suffix="Test.php">tests/Ltb</directory>
     </testsuite>
   </testsuites>
-  <logging/>
   <source>
     <include>
       <directory suffix=".php">src</directory>

diff --git a/src/Ltb/Ldap.php b/src/Ltb/Ldap.php
@@ -236,7 +236,7 @@ function sorted_search($ldap_base, $ldap_filter, $attributes, $sortby, $ldap_siz
      * @param string $pwdattribute the Attribute that contains the password
      * @return string|false the first value of the password taken from ldap_get_values
      */
-    function get_password_value($dn, $pwdattribute): string|false {
+    function get_password_value($dn, $pwdattribute) {
         $search_userpassword = \Ltb\PhpLDAP::ldap_read($this->ldap, $dn, "(objectClass=*)", array($pwdattribute));
         if ($search_userpassword) {
             $password_values = \Ltb\PhpLDAP::ldap_get_values($this->ldap, \Ltb\PhpLDAP::ldap_first_entry($this->ldap, $search_userpassword), $pwdattribute);