Merge pull request #60 from ppavlovic/release-2.x

Using g4/zf1-future-zend-db instead of the zf1/zend-db.

Author: ppavlovic

.gitignore

@@ -17,6 +17,7 @@ vendor
 
 tests/unit/coverage/*
 tests/integration/coverage/*
+tests/unit/.phpunit.result.cache
 .vagrant/
 .bash_history
 .cache/motd.legal-displayed

composer.json

@@ -32,30 +32,33 @@
             "G4\\DataMapper\\Test\\Integration\\": "tests/integration"
         }
     },
+    "include-path": [
+        "vendor/g4/zf1-future-zend-db/library/"
+    ],
     "require-dev": {
-        "phpunit/phpunit"           : "5.*",
-        "phpunit/php-code-coverage" : "^3",
+        "phpunit/phpunit"           : "9.6.*",
+        "phpunit/php-code-coverage" : "9.2.*",
         "squizlabs/php_codesniffer" : "3.*",
         "g4/code-coverage"          : "1.*"
     },
     "require": {
-        "php"             : ">=5.6",
+        "php"             : ">=7.3",
         "ext-curl"        : "*",
         "ext-json"        : "*",
         "g4/factory"      : "1.*",
         "g4/profiler"     : ">=1.11.0",
         "g4/value-object" : ">=3.6.0",
-        "zf1/zend-db"     : "1.12.*"
+        "g4/zf1-future-zend-db" : "1.23.*"
     },
     "scripts": {
         "unit-test": [
-            "vendor/bin/phpunit -c tests/unit/phpunit.xml --colors=always --coverage-html tests/unit/coverage"
+            "XDEBUG_MODE=coverage vendor/bin/phpunit -c tests/unit/phpunit.xml --colors=always --coverage-html tests/unit/coverage"
         ],
         "test-coverage": [
-            "./vendor/bin/phpunit --colors=always -c tests/unit/phpunit.xml --coverage-text"
+            "XDEBUG_MODE=coverage ./vendor/bin/phpunit --colors=always -c tests/unit/phpunit.xml --coverage-text"
         ],
         "test-report": [
-            "./vendor/bin/phpunit --colors=always -c tests/unit/phpunit.xml --coverage-clover=tests/unit/coverage/code-coverage.xml"
+            ".XDEBUG_MODE=coverage /vendor/bin/phpunit --colors=always -c tests/unit/phpunit.xml --coverage-clover=tests/unit/coverage/code-coverage.xml"
         ],
         "code-coverage": [
             "./vendor/bin/code-coverage -p 90 -f tests/unit/coverage/code-coverage.xml"

src/Engine/Elasticsearch/ElasticsearchClient.php

@@ -307,7 +307,7 @@ private function throwCurlException($code, $message, $url, $body, $response)
     {
         throw new ClientException(
             sprintf(
-                "Unexpected response code:%s from ES has been returned on submit. More info: %s. Url: %s. Body: %s. Response: %s",
+                "Unexpected response code:%s from ES has been returned on submit. More info: %s. Url: %s. Body: %s. Response: %s", // phpcs:ignore
                 $code,
                 json_encode($message),
                 (string) $url,

src/Engine/Elasticsearch/Operators/ConsistentRandomKey.php

@@ -27,4 +27,4 @@ public function format()
             ]
         ];
     }
-}
+}

src/Engine/Elasticsearch/Operators/ExistsOperator.php

@@ -20,6 +20,6 @@ public function __construct($name, SingleValue $value)
 
     public function format()
     {
-       return [QueryConnector::EXISTS => ['field' => $this->name]];
+        return [QueryConnector::EXISTS => ['field' => $this->name]];
     }
 }

src/Engine/Elasticsearch/Operators/LikeCIOperator.php

@@ -29,7 +29,9 @@ public function format()
     {
         return [
             QueryConnector::NAME_QUERY_STRING => [
-                QueryConnector::NAME_QUERY_STRING_QUERY => $this->name . ":" . QueryConnector::ROUND_BRACKET_OPEN . QueryConnector::WILDCARD . $this->value . QueryConnector::WILDCARD . QueryConnector::ROUND_BRACKET_CLOSE
+                QueryConnector::NAME_QUERY_STRING_QUERY =>
+                    $this->name . QueryConnector::COLON . QueryConnector::ROUND_BRACKET_OPEN . QueryConnector::WILDCARD
+                    . $this->value . QueryConnector::WILDCARD . QueryConnector::ROUND_BRACKET_CLOSE
             ]
         ];
     }

src/Engine/Elasticsearch/Version7/Operators/ConsistentRandomKey.php

@@ -29,4 +29,4 @@ public function format()
             ]
         ];
     }
-}
+}

src/Engine/Elasticsearch/Version7/Operators/LikeCIOperator.php

@@ -29,7 +29,8 @@ public function format()
     {
         return [
             QueryConnector::NAME_QUERY_STRING => [
-                QueryConnector::NAME_QUERY_STRING_QUERY => $this->name . ":" . QueryConnector::WILDCARD . strtolower($this->value) . QueryConnector::WILDCARD
+                QueryConnector::NAME_QUERY_STRING_QUERY =>
+                    $this->name . ":" . QueryConnector::WILDCARD . strtolower($this->value) . QueryConnector::WILDCARD
             ]
         ];
     }

src/Engine/Http/HttpPath.php

@@ -20,7 +20,7 @@ class HttpPath implements CollectionNameInterface
      * HttpPath constructor.
      * @param array ...$parts string
      */
-    public function __construct(... $parts)
+    public function __construct(...$parts)
     {
         $path = join(self::SLASH, $parts);
 

tests/unit/src/BuilderTest.php

@@ -1,9 +1,10 @@
 <?php
 
 use G4\DataMapper\Builder;
+use G4\DataMapper\Engine\MySQL\MySQLMapper;
 use G4\DataMapper\Engine\MySQL\MySQLTableName;
 
-class BuilderTest extends PHPUnit_Framework_TestCase
+class BuilderTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -16,8 +17,7 @@ class BuilderTest extends PHPUnit_Framework_TestCase
      */
     private $params;
 
-
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->params = [
             'host'     => 'localhost',
@@ -29,7 +29,7 @@ protected function setUp()
         $this->builder = Builder::create();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->params = null;
         $this->builder = null;
@@ -54,7 +54,7 @@ public function testBuildMapper()
         $this->builder
             ->collectionName(new MySQLTableName('profiles'))
             ->adapter($this->getMockForMySQLAdapter());
-        $this->builder->buildMapper();
+        $this->assertInstanceOf(MySQLMapper::class, $this->builder->buildMapper());
     }
 
     public function testBuildBulk()
@@ -76,7 +76,7 @@ public function testBuildWithNoAdapter()
 
     public function testBuildWithNoType()
     {
-        $this->builder->adapter($this->getMock('\G4\DataMapper\Common\AdapterInterface'));
+        $this->builder->adapter($this->createMock('\G4\DataMapper\Common\AdapterInterface'));
         $this->expectException('\Exception');
         $this->expectExceptionCode(601);
         $this->expectExceptionMessage('DataSet cannot be emty');
@@ -86,7 +86,7 @@ public function testBuildWithNoType()
     public function testBuildForUnknownEngine()
     {
         $this->builder
-            ->adapter($this->getMock('\G4\DataMapper\Common\AdapterInterface'))
+            ->adapter($this->createMock('\G4\DataMapper\Common\AdapterInterface'))
             ->collectionName(new MySQLTableName('profiles'));
         $this->expectException('\Exception');
         $this->expectExceptionCode(601);
@@ -104,12 +104,10 @@ public function testBuildTransaction()
 
     private function getMockForMySQLAdapter()
     {
-        return $this->getMock(
-            '\G4\DataMapper\Engine\MySQL\MySQLAdapter',
-            null,
-            [
-                $this->getMock('\G4\DataMapper\Engine\MySQL\MySQLClientFactory', null, [$this->params]),
-            ]
-        );
+        return $this->getMockBuilder('\G4\DataMapper\Engine\MySQL\MySQLAdapter')
+            ->setConstructorArgs([
+                $this->createMock('\G4\DataMapper\Engine\MySQL\MySQLClientFactory'),
+            ])
+            ->getMock();
     }
 }