update to 4.0.2

switch from Zend to Laminas

3 files changed, 27 insertions, 11 deletions

diff --git a/composer.json b/composer.json
index b16489d..675132a 100644
--- a/composer.json
+++ b/composer.json
@@ -33,14 +33,14 @@
         "ext-mbstring": "*",
         "aura/intl": "^3.0.0",
         "cakephp/chronos": "^2.0",
-        "composer/ca-bundle": "^1.0",
+        "composer/ca-bundle": "^1.2",
+        "laminas/laminas-diactoros": "^2.2.2",
+        "laminas/laminas-httphandlerrunner": "^1.1",
         "psr/http-client": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "psr/log": "^1.0.0",
-        "psr/simple-cache": "^1.0.0",
-        "zendframework/zend-diactoros": "^2.0",
-        "zendframework/zend-httphandlerrunner": "^1.0"
+        "psr/simple-cache": "^1.0.0"
     },
     "suggest": {
         "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
@@ -110,7 +110,7 @@
             "@phpstan",
             "@psalm"
         ],
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12.0 psalm/phar:^3.7 && mv composer.backup composer.json"
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 psalm/phar:~3.8.0 && mv composer.backup composer.json"
     },
     "config": {
         "sort-packages": true,
diff --git a/php-cakephp4.spec b/php-cakephp4.spec
index b6f406d..6fe03a9 100644
--- a/php-cakephp4.spec
+++ b/php-cakephp4.spec
@@ -11,7 +11,7 @@
 # Auth, Command, Controller, Error, Mailer, Network, Routing, Shell, TestSuite, View
 
 # https://github.com/cakephp/cakephp/releases
-%global gh_commit    f782537868167c6abb26971e0c834d474d069764
+%global gh_commit    a5e8c076c54343e47cd47c7888705ad9818f5e0f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     cakephp
 %global gh_project   cakephp
@@ -27,7 +27,7 @@
 %global chronos_version 2.0.1
 
 Name:           php-%{pk_vendor}%{major}
-Version:        4.0.1
+Version:        4.0.2
 Release:        1%{?dist}
 Summary:        The CakePHP framework
 
@@ -56,6 +56,10 @@ BuildRequires:  php-pdo
 BuildRequires:  php-reflection
 BuildRequires:  php-simplexml
 BuildRequires:  php-spl
+# TODO
+# "composer/ca-bundle": "^1.2": Http + Network
+# "laminas/laminas-diactoros": "^2.2.2": Routing, TestSuite, Http
+# "laminas/laminas-httphandlerrunner": "^1.1": Http
 # From composer.json, "require-dev": {
 #        "cakephp/cakephp-codesniffer": "dev-next",
 #        "mikey179/vfsstream": "^1.6",
@@ -64,11 +68,14 @@ BuildRequires:  php-spl
 BuildRequires:  phpunit8 >= 8.5.0
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(mikey179/vfsstream)           >= 1.6   with php-composer(mikey179/vfsstream)           < 6)
-BuildRequires: (php-composer(zendframework/zend-diactoros) >= 1.4.0 with php-composer(zendframework/zend-diactoros) < 2)
+# Ignore min version for now
+BuildRequires: (php-composer(laminas/laminas-diactoros)    >= 1.4.0 with php-composer(laminas/laminas-diactoros)    < 3)
+BuildRequires: (php-composer(psr/http-server-middleware)   >= 1.0   with php-composer(psr/http-server-middleware)   < 2)
 BuildRequires:  glibc-langpack-fr
 %else
 BuildRequires:  php-mikey179-vfsstream           >= 1.6
-BuildRequires:  php-zendframework-zend-diactoros >= 1.4.0
+BuildRequires:  php-laminas-diactoros            >= 1.4.0
+BuildRequires:  php-psr-http-server-middleware
 %endif
 %endif
 
@@ -499,7 +506,11 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php';
     '%{php_home}/Psr/SimpleCache/autoload.php',
     '%{php_home}/Psr/Http/Message/autoload.php',
     '%{php_home}/Psr/Http/Server/autoload.php',
-    '%{php_home}/Zend/Diactoros/autoload.php',
+    '%{php_home}/Psr/Http/Server/middleware-autoload.php',
+    [
+        '%{php_home}/Laminas/Diactoros2/autoload.php',
+        '%{php_home}/Laminas/Diactoros/autoload.php',
+    ],
     '%{php_home}/org/bovigo/vfs/autoload.php',
 ]);
 EOF
@@ -739,7 +750,7 @@ ret=0
 phpunit8 tests/TestCase/Cache        --verbose || ret=1
 phpunit8 tests2                      --verbose || ret=1
 phpunit8 tests/TestCase/Collection   --verbose || ret=1
-phpunit8 tests/TestCase/Console      --verbose || ret=1
+phpunit8 tests/TestCase/Console      --filter '^((?!(testDataAvailable)).)*$' --verbose || ret=1
 phpunit8 tests/TestCase/Core         --verbose || ret=1
 %if 0%{?rhel} == 6
 : skip suite as sqlite is too old
@@ -892,6 +903,10 @@ exit $ret
 
 
 %changelog
+* Mon Jan 13 2020 Remi Collet <remi@remirepo.net> - 4.0.2-1
+- update to 4.0.2
+- switch from Zend to Laminas
+
 * Thu Jan  2 2020 Remi Collet <remi@remirepo.net> - 4.0.1-1
 - update to 4.0.1
 
diff --git a/src/Http/composer.json b/src/Http/composer.json
index 73cdd62..e63422a 100644
--- a/src/Http/composer.json
+++ b/src/Http/composer.json
@@ -27,6 +27,7 @@
         "cakephp/core": "^4.0",
         "cakephp/event": "^4.0",
         "cakephp/utility": "^4.0",
+        "composer/ca-bundle": "^1.2",
         "psr/http-client": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",