Merge pull request #29 from weierophinney/feature/27-php-8.1-support

weierophinney · web-flow · commit a06ec97cda17 · 2022-01-17T15:32:49.000-06:00
Provide support for PHP 8.1
diff --git a/composer.json b/composer.json
@@ -15,29 +15,28 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas-api-tools/api-tools-configuration": "^1.2",
-        "laminas-api-tools/api-tools-content-negotiation": "^1.2.1",
-        "laminas-api-tools/api-tools-provider": "^1.2",
-        "laminas/laminas-inputfilter": "^2.7.2",
-        "laminas/laminas-modulemanager": "^2.7.2",
-        "laminas/laminas-mvc": "^2.7.15 || ^3.0.4",
-        "laminas/laminas-servicemanager": "^2.7.6 || ^3.1",
-        "laminas/laminas-view": "^2.11.3",
-        "laminas/laminas-zendframework-bridge": "^1.1",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "laminas-api-tools/api-tools-configuration": "^1.5",
+        "laminas-api-tools/api-tools-content-negotiation": "^1.7",
+        "laminas-api-tools/api-tools-provider": "^1.5",
+        "laminas/laminas-inputfilter": "^2.13",
+        "laminas/laminas-modulemanager": "^2.11",
+        "laminas/laminas-mvc": "^3.3",
+        "laminas/laminas-servicemanager": "^3.8",
+        "laminas/laminas-view": "^2.13",
         "michelf/php-markdown": "^1.5"
     },
-    "replace": {
-        "zfcampus/zf-apigility-documentation": "^1.3.0"
+    "conflict": {
+        "zfcampus/zf-apigility-documentation": "*"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~2.2.0",
-        "laminas/laminas-stdlib": "^2.7.8 || ^3.0.1",
-        "phpunit/phpunit": "^9.3",
+        "laminas/laminas-coding-standard": "~2.3.0",
+        "laminas/laminas-stdlib": "^3.6.4",
+        "phpunit/phpunit": "^9.5.10",
         "vimeo/psalm": "^4.7",
         "psalm/plugin-phpunit": "^0.16.0",
         "webmozart/assert": "^1.10",
-        "laminas/laminas-db": "^2.13"
+        "laminas/laminas-db": "^2.13.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -19,5 +19,7 @@
     <file>view</file>
 
     <!-- Include all rules from Laminas Coding Standard -->
-    <rule ref="LaminasCodingStandard"/>
+    <rule ref="LaminasCodingStandard">
+        <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing"/>
+    </rule>
 </ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,6 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="vendor/autoload.php"
+    convertDeprecationsToExceptions="true"
     colors="true">
     <coverage processUncoveredFiles="true">
         <include>
diff --git a/src/Api.php b/src/Api.php
@@ -4,6 +4,7 @@
 
 use ArrayIterator;
 use IteratorAggregate;
+use ReturnTypeWillChange;
 
 //use Laminas\ApiTools\ContentNegotiation\ViewModel;
 
@@ -110,6 +111,7 @@ public function toArray()
      *
      * @return ArrayIterator
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->toArray());
diff --git a/src/Field.php b/src/Field.php
@@ -4,6 +4,7 @@
 
 use ArrayIterator;
 use IteratorAggregate;
+use ReturnTypeWillChange;
 
 class Field implements IteratorAggregate
 {
@@ -146,6 +147,7 @@ public function toArray()
      *
      * @return ArrayIterator
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->toArray());
diff --git a/src/Operation.php b/src/Operation.php
@@ -4,6 +4,7 @@
 
 use ArrayIterator;
 use IteratorAggregate;
+use ReturnTypeWillChange;
 
 class Operation implements IteratorAggregate
 {
@@ -158,6 +159,7 @@ public function toArray()
      *
      * @return ArrayIterator
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->toArray());
diff --git a/src/Service.php b/src/Service.php
@@ -5,6 +5,7 @@
 use ArrayIterator;
 use IteratorAggregate;
 use Laminas\ApiTools\Documentation\Api;
+use ReturnTypeWillChange;
 
 class Service implements IteratorAggregate
 {
@@ -287,6 +288,7 @@ public function toArray()
      *
      * @return ArrayIterator
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->toArray());

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use ArrayIterator;`
`6`	`6`	`use IteratorAggregate;`
	`7`	`+use ReturnTypeWillChange;`
`7`	`8`
`8`	`9`	`//use Laminas\ApiTools\ContentNegotiation\ViewModel;`
`9`	`10`
`@@ -110,6 +111,7 @@ public function toArray()`
`110`	`111`	`*`
`111`	`112`	`* @return ArrayIterator`
`112`	`113`	`*/`
	`114`	`+ #[ReturnTypeWillChange]`
`113`	`115`	`public function getIterator()`
`114`	`116`	`{`
`115`	`117`	`return new ArrayIterator($this->toArray());`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`use ArrayIterator;`
`6`	`6`	`use IteratorAggregate;`
`7`	`7`	`use Laminas\ApiTools\Documentation\Api;`
	`8`	`+use ReturnTypeWillChange;`
`8`	`9`
`9`	`10`	`class Service implements IteratorAggregate`
`10`	`11`	`{`
`@@ -287,6 +288,7 @@ public function toArray()`
`287`	`288`	`*`
`288`	`289`	`* @return ArrayIterator`
`289`	`290`	`*/`
	`291`	`+ #[ReturnTypeWillChange]`
`290`	`292`	`public function getIterator()`
`291`	`293`	`{`
`292`	`294`	`return new ArrayIterator($this->toArray());`