Merge pull request #83 from mirko-pagliai/develop

Develop

Author: mirko-pagliai

CHANGELOG.md

@@ -1,7 +1,8 @@
 # 2.x branch
 ## 2.10 branch
 ### 2.10.1
-* stable version.
+* stable version;
+* updated for `php-tools` 1.5.8.
 
 ### 2.10.0-beta1
 * now allows to configure and customize via bootstrap the executable commands to

composer.json

@@ -13,7 +13,7 @@
     "require": {
         "php": ">=7.2",
         "cakephp/cakephp": "^4.0",
-        "mirko-pagliai/php-tools": "^1.5.5"
+        "mirko-pagliai/php-tools": "^1.5.8"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^4.4",

src/Driver/Driver.php

@@ -96,7 +96,7 @@ protected function _exec(string $command): Process
      */
     protected function _getExecutable(string $type): string
     {
-        Exceptionist::inArray([$type, ['export', 'import']]);
+        Exceptionist::inArray($type, ['export', 'import']);
         $driver = strtolower($this->getDriverName());
         $replacements = [
             '{{BINARY}}' => escapeshellarg($this->getBinary(DATABASE_BACKUP_EXECUTABLES[$driver][$type])),

tests/TestCase/BackupTraitTest.php

@@ -102,8 +102,8 @@ public function testGetDriver(): void
         }
 
         //With a no existing driver
-        $connection = @$this->getMockBuilder(Connection::class)
-            ->setMethods(['getDriver'])
+        $connection = $this->getMockBuilder(Connection::class)
+            ->setMethods(['__debuginfo', 'getDriver'])
             ->disableOriginalConstructor()
             ->getMock();
         $connection->method('getDriver')->will($this->returnValue(new Sqlserver()));

tests/bootstrap.php

@@ -72,7 +72,7 @@
 /**
  * @todo Upgrade fixtures: https://book.cakephp.org/4/en/appendices/fixture-upgrade.html
  */
-Configure::write('Error.ignoredDeprecationPaths', ['*/cakephp/src/TestSuite/Fixture/FixtureInjector.php']);
+Configure::write('Error.ignoredDeprecationPaths', ['tureInjector.php', '*/cakephp/src/TestSuite/Fixture/FixtureInjector.php']);
 
 Cache::setConfig([
     '_cake_core_' => [