Merge branch 'qa/8' into develop

Forward port #8
laminas · Mar 15, 2020 · 65e7b02 · 65e7b02
2 parents 89f4a65 + 914284c
commit 65e7b02
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -54,6 +54,12 @@ matrix:
     - php: 7.3
       env:
         - DEPS=latest
+    - php: 7.4
+      env:
+        - DEPS=lowest
+    - php: 7.4
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#8](https://github.com/laminas/laminas-ldap/pull/8) adds support for PHP 7.4.
 
 ### Changed
 

diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "laminas/laminas-eventmanager": "^2.6.3 || ^3.0.1",
         "laminas/laminas-stdlib": "^2.7 || ^3.0",
         "php-mock/php-mock-phpunit": "^1.1.2 || ^2.1.1",
-        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
     },
     "suggest": {
         "laminas/laminas-eventmanager": "Laminas\\EventManager component"

diff --git a/test/BindTest.php b/test/BindTest.php
@@ -29,7 +29,7 @@ class BindTest extends TestCase
     protected $altUsername;
     protected $bindRequiresDn = false;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! getenv('TESTS_LAMINAS_LDAP_ONLINE_ENABLED')) {
             $this->markTestSkipped("Laminas_Ldap online tests are not enabled");

diff --git a/test/CanonTest.php b/test/CanonTest.php
@@ -28,7 +28,7 @@ class CanonTest extends TestCase
      */
     protected $options;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! getenv('TESTS_LAMINAS_LDAP_ONLINE_ENABLED')) {
             $this->markTestSkipped("Laminas_Ldap online tests are not enabled");

diff --git a/test/ConnectTest.php b/test/ConnectTest.php
@@ -25,7 +25,7 @@ class ConnectTest extends TestCase
 {
     protected $options = null;
 
-    public function setUp()
+    protected function setUp()
     {
         if (! getenv('TESTS_LAMINAS_LDAP_ONLINE_ENABLED')) {
             $this->markTestSkipped("Laminas_Ldap online tests are not enabled");

diff --git a/test/ErrorHandlerTest.php b/test/ErrorHandlerTest.php
@@ -23,7 +23,7 @@ class ErrorHandlerTest extends TestCase
         'handleError',
     ];
 
-    public function setUp()
+    protected function setUp()
     {
         /** @todo: remove when migrate to PHP 7.1+ and PHPUnit 7+ only */
         if (class_exists(\PHPUnit_Util_ErrorHandler::class)) {

diff --git a/test/OfflineReconnectTest.php b/test/OfflineReconnectTest.php
@@ -20,7 +20,7 @@ protected function activateBindableOfflineMocks()
         BuiltinFunctionMocks::$ldap_set_option_mock->enable();
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         parent::tearDown();
         Mock::disableAll();

diff --git a/test/OfflineTest.php b/test/OfflineTest.php
@@ -37,7 +37,7 @@ class OfflineTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->ldap = new Ldap\Ldap();
     }

diff --git a/test/ReconnectTest.php b/test/ReconnectTest.php
@@ -47,7 +47,7 @@ protected static function getStandardOptions()
         return $options;
     }
 
-    public function setUp()
+    protected function setUp()
     {
         if (! getenv('TESTS_LAMINAS_LDAP_ONLINE_ENABLED')) {
             $this->markTestSkipped("Laminas_Ldap online tests are not enabled");
@@ -56,7 +56,7 @@ public function setUp()
         $this->getLDAP()->setOptions(static::getStandardOptions());
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         // Make sure we're using a non-expired connection with known settings
         // for each test.