Merge pull request #9 from MatyCZ/1.1.x

PHP 8.1 support
laminas · Jan 5, 2022 · b578d92 · b578d92
2 parents a2bfa86 + a4ee1af
commit b578d92
Show file tree

Hide file tree

Showing 11 changed files with 565 additions and 491 deletions.
diff --git a/composer.json b/composer.json
@@ -15,15 +15,15 @@
         "forum": "https://discourse.laminas.dev/"
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-db": "^2.12",
-        "laminas/laminas-paginator": "^2.10"
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "laminas/laminas-db": "^2.13.4",
+        "laminas/laminas-paginator": "^2.12.1"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~2.1.4",
-        "phpunit/phpunit": "^9.3",
-        "psalm/plugin-phpunit": "^0.15.1",
-        "vimeo/psalm": "^4.6"
+        "laminas/laminas-coding-standard": "~2.3.0",
+        "phpunit/phpunit": "^9.5.10",
+        "psalm/plugin-phpunit": "^0.15.2",
+        "vimeo/psalm": "^4.16"
     },
     "autoload": {
         "psr-4": {
@@ -42,7 +42,11 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "scripts": {
         "cs-check": "phpcs",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.6.1@e93e532e4eaad6d68c4d7b606853800eaceccc72">
+<files psalm-version="4.16.1@aa7e400908833b10c0333861f86cd48c510b60eb">
   <file src="src/DbSelect.php">
-    <DocblockTypeContradiction occurrences="1">
-      <code>$adapterOrSqlObject instanceof Sql</code>
-    </DocblockTypeContradiction>
     <MixedArgument occurrences="1">
       <code>$row</code>
     </MixedArgument>
     <MixedAssignment occurrences="1">
       <code>$row</code>
     </MixedAssignment>
-    <PropertyNotSetInConstructor occurrences="1">
-      <code>$rowCount</code>
-    </PropertyNotSetInConstructor>
-    <PropertyTypeCoercion occurrences="1">
-      <code>$resultSetPrototype ?: new ResultSet()</code>
-    </PropertyTypeCoercion>
-    <RedundantConditionGivenDocblockType occurrences="1">
-      <code>$this-&gt;rowCount !== null</code>
-    </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/DbSelectFactory.php">
     <InvalidStringClass occurrences="1"/>
@@ -31,21 +19,9 @@
     </MoreSpecificReturnType>
   </file>
   <file src="src/DbTableGateway.php">
-    <MixedArgument occurrences="1">
-      <code>$select</code>
-    </MixedArgument>
-    <MixedAssignment occurrences="1">
-      <code>$select</code>
-    </MixedAssignment>
-    <MixedMethodCall occurrences="4">
-      <code>group</code>
-      <code>having</code>
-      <code>order</code>
-      <code>where</code>
-    </MixedMethodCall>
-    <PropertyNotSetInConstructor occurrences="1">
-      <code>DbTableGateway</code>
-    </PropertyNotSetInConstructor>
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$having</code>
+    </PossiblyInvalidArgument>
   </file>
   <file src="src/DbTableGatewayFactory.php">
     <InvalidStringClass occurrences="1"/>
@@ -69,15 +45,6 @@
     <InternalMethod occurrences="1">
       <code>getArrayCopy</code>
     </InternalMethod>
-    <MissingReturnType occurrences="7">
-      <code>testCount</code>
-      <code>testCountQueryWithLowerColumnNameShouldReturnValidResult</code>
-      <code>testCountQueryWithMissingColumnNameShouldRaiseException</code>
-      <code>testCustomCount</code>
-      <code>testGetArrayCopyShouldContainSelectItems</code>
-      <code>testGetItems</code>
-      <code>testReturnValueIsArray</code>
-    </MissingReturnType>
     <MixedMethodCall occurrences="13">
       <code>method</code>
       <code>method</code>
@@ -116,13 +83,6 @@
     </PossiblyUndefinedMethod>
   </file>
   <file src="test/DbTableGatewayTest.php">
-    <MissingReturnType occurrences="5">
-      <code>testCount</code>
-      <code>testGetItems</code>
-      <code>testGetItemsWithWhereAndOrder</code>
-      <code>testGetItemsWithWhereAndOrderAndGroup</code>
-      <code>testGetItemsWithWhereAndOrderAndGroupAndHaving</code>
-    </MissingReturnType>
     <MixedMethodCall occurrences="14">
       <code>method</code>
       <code>method</code>

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\Paginator\Adapter\LaminasDb;
 
 class ConfigProvider

diff --git a/src/DbSelect.php b/src/DbSelect.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\Paginator\Adapter\LaminasDb;
 
 use Laminas\Db\Adapter\Adapter;
@@ -37,13 +39,13 @@ class DbSelect implements AdapterInterface
      */
     protected $countSelect;
 
-    /** @var ResultSet */
+    /** @var ResultSetInterface */
     protected $resultSetPrototype;
 
     /**
      * Total item count
      *
-     * @var int
+     * @var int|null
      */
     protected $rowCount;
 
@@ -161,10 +163,9 @@ public function getArrayCopy()
     }
 
     /**
-     * @return int
      * @throws MissingRowCountColumnException
      */
-    private function locateRowCount(array $row)
+    private function locateRowCount(array $row): int
     {
         if (array_key_exists(self::ROW_COUNT_COLUMN_NAME, $row)) {
             return (int) $row[self::ROW_COUNT_COLUMN_NAME];

diff --git a/src/DbSelectFactory.php b/src/DbSelectFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\Paginator\Adapter\LaminasDb;
 
 use Psr\Container\ContainerInterface;

diff --git a/src/DbTableGateway.php b/src/DbTableGateway.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\Paginator\Adapter\LaminasDb;
 
 use Closure;
@@ -12,9 +14,9 @@ class DbTableGateway extends DbSelect
     /**
      * Constructs instance.
      *
-     * @param null|Where|Closure|string|array $where
-     * @param null|string|array                 $order
-     * @param null|string|array                 $group
+     * @param null|Where|Closure|string|array  $where
+     * @param null|string|array                $order
+     * @param null|string|array                $group
      * @param null|Having|Closure|string|array $having
      */
     public function __construct(

diff --git a/src/DbTableGatewayFactory.php b/src/DbTableGatewayFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\Paginator\Adapter\LaminasDb;
 
 use Psr\Container\ContainerInterface;

diff --git a/src/Module.php b/src/Module.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\Paginator\Adapter\LaminasDb;
 
 class Module

diff --git a/test/DbSelectTest.php b/test/DbSelectTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Paginator\Adapter\LaminasDb;
 
 use Laminas\Db\Adapter\Adapter;

diff --git a/test/DbTableGatewayTest.php b/test/DbTableGatewayTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\Paginator\Adapter\LaminasDb;
 
 use Laminas\Db\Adapter\Adapter;