Merge pull request #18 from samsonasik/php81

PHP 8.1 Support
laminas · Jan 5, 2022 · 8c795ed · 8c795ed
2 parents 30a1840 + 90582a4
commit 8c795ed
Show file tree

Hide file tree

Showing 22 changed files with 1,578 additions and 983 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,11 @@
+.phpcs-cache
+.phpunit.result.cache
 /clover.xml
 /coveralls-upload.json
 /docs/html/
 /laminas-mkdoc-theme.tgz
 /laminas-mkdoc-theme/
 /phpunit.xml
+/polyfill/Filter/File/*.php
+/polyfill/Validator/File/*.php
 /vendor/
-.phpunit.result.cache
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -0,0 +1,6 @@
+{
+    "ignore_php_platform_requirements": {
+        "8.0": false,
+        "8.1": false
+    }
+}
diff --git a/composer.json b/composer.json
@@ -16,30 +16,33 @@
         "forum": "https://discourse.laminas.dev"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "extra": {
         "laminas": {
             "component": "Laminas\\Mvc\\Plugin\\FilePrg"
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-filter": "^2.6.1",
-        "laminas/laminas-form": "^2.7",
-        "laminas/laminas-inputfilter": "^2.8.1",
-        "laminas/laminas-mvc": "^3.0",
-        "laminas/laminas-session": "^2.8.5",
-        "laminas/laminas-stdlib": "^3.3",
-        "laminas/laminas-validator": "^2.6",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "laminas/laminas-filter": "^2.13.1",
+        "laminas/laminas-form": "^3.1",
+        "laminas/laminas-inputfilter": "^2.13",
+        "laminas/laminas-mvc": "^3.3",
+        "laminas/laminas-session": "^2.12",
+        "laminas/laminas-stdlib": "^3.6.2",
+        "laminas/laminas-validator": "^2.15.1"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~1.0.0",
-        "phpunit/phpunit": "^9.3"
+        "laminas/laminas-coding-standard": "~2.3.0",
+        "phpunit/phpunit": "^9.5.11"
     },
     "conflict": {
-        "laminas/laminas-mvc": "<3.0.0"
+        "laminas/laminas-mvc": "<3.0.0",
+        "zendframework/zend-mvc-plugin-fileprg": "*"
     },
     "autoload": {
         "psr-4": {
@@ -48,6 +51,8 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "Laminas\\Filter\\File\\": "polyfill/Filter/File/",
+            "Laminas\\Validator\\File\\": "polyfill/Validator/File/",
             "LaminasTest\\Mvc\\Plugin\\FilePrg\\": "test/"
         }
     },
@@ -60,8 +65,5 @@
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    },
-    "replace": {
-        "zendframework/zend-mvc-plugin-fileprg": "^1.1.0"
     }
 }