update to 4.0.4

provides the full framework as php-cakephp4

2 files changed, 52 insertions, 40 deletions

diff --git a/php-cakephp4.spec b/php-cakephp4.spec
index cd7b5d4..1093a24 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    94435ab211196ce92014a83ec7bab4e385bf8ba3
+%global gh_commit    0be143baa8592a110489406905ca3e074993efa5
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     cakephp
 %global gh_project   cakephp
@@ -27,8 +27,8 @@
 %global chronos_version 2.0.2
 
 Name:           php-%{pk_vendor}%{major}
-Version:        4.0.3
-Release:        4%{?dist}
+Version:        4.0.4
+Release:        1%{?dist}
 Summary:        The CakePHP framework
 
 License:        MIT
@@ -63,20 +63,30 @@ BuildRequires:  php-spl
 #        "phpunit/phpunit": "~8.5.0"
 BuildRequires:  phpunit8 >= 8.5.0
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(composer/ca-bundle)                >= 1.2   with php-composer(composer/ca-bundle)                < 6)
 BuildRequires: (php-composer(mikey179/vfsstream)                >= 1.6   with php-composer(mikey179/vfsstream)                < 6)
-BuildRequires: (php-composer(laminas/laminas-diactoros)         >= 2.2.2 with php-composer(laminas/laminas-diactoros)         < 3)
-BuildRequires: (php-composer(laminas/laminas-httphandlerrunner) >= 1.1   with php-composer(laminas/laminas-httphandlerrunner) < 2)
-BuildRequires: (php-composer(psr/http-server-middleware)        >= 1.0   with php-composer(psr/http-server-middleware)        < 2)
 BuildRequires:  glibc-langpack-fr
 %else
-BuildRequires:  php-composer-ca-bundle           >= 1.2
 BuildRequires:  php-mikey179-vfsstream           >= 1.6
-BuildRequires:  php-laminas-diactoros2           >= 2.2.2
-BuildRequires:  php-laminas-httphandlerrunner    >= 1.1
-BuildRequires:  php-psr-http-server-middleware
 %endif
 %endif
+# Full framework installation
+Requires:       php-composer(%{pk_vendor}/cache)      = %{version}
+Requires:       php-composer(%{pk_vendor}/chronos)    = %{chronos_version}
+Requires:       php-composer(%{pk_vendor}/collection) = %{version}
+Requires:       php-composer(%{pk_vendor}/console)    = %{version}
+Requires:       php-composer(%{pk_vendor}/core)       = %{version}
+Requires:       php-composer(%{pk_vendor}/database)   = %{version}
+Requires:       php-composer(%{pk_vendor}/datasource) = %{version}
+Requires:       php-composer(%{pk_vendor}/event)      = %{version}
+Requires:       php-composer(%{pk_vendor}/filesystem) = %{version}
+Requires:       php-composer(%{pk_vendor}/form)       = %{version}
+Requires:       php-composer(%{pk_vendor}/http)       = %{version}
+Requires:       php-composer(%{pk_vendor}/i18n)       = %{version}
+Requires:       php-composer(%{pk_vendor}/log)        = %{version}
+Requires:       php-composer(%{pk_vendor}/orm)        = %{version}
+Requires:       php-composer(%{pk_vendor}/utility)    = %{version}
+Requires:       php-composer(%{pk_vendor}/validation) = %{version}
+
 
 
 %description
@@ -378,8 +388,8 @@ Summary:        CakePHP Http Library
 #        "psr/http-client": "^1.0",
 #        "psr/http-server-handler": "^1.0",
 #        "psr/http-server-middleware": "^1.0",
-#        "zendframework/zend-diactoros": "^2.1",
-#        "zendframework/zend-httphandlerrunner": "^1.0"
+#        "laminas/laminas-diactoros": "^2.1",
+#        "laminas/laminas-httphandlerrunner": "^1.0"
 Requires:       php(language) >= 7.2
 Requires:       php-composer(%{pk_vendor}/core)    = %{version}
 Requires:       php-composer(%{pk_vendor}/event)   = %{version}
@@ -784,7 +794,6 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php';
     '%{php_home}/Psr/Http/Client/autoload.php',
     '%{php_home}/Psr/Http/Server/autoload.php',
     '%{php_home}/Psr/Http/Server/middleware-autoload.php',
-    '%{php_home}/Composer/CaBundle/autoload.php',
     '%{php_home}/Laminas/Diactoros2/autoload.php',
     '%{php_home}/Laminas/HttpHandlerRunner/autoload.php',
 ]);
@@ -862,12 +871,9 @@ EOF
 
 %install
 #: Library
-mkdir -p                %{buildroot}%{php_home}/%{ns_vendor}%{major}
-for dir in Cache Chronos Collection Console Core Database Datasource Event\
-           Filesystem Form Http I18n Log ORM Utility Validation
-do
-  cp -pr src/$dir       %{buildroot}%{php_home}/%{ns_vendor}%{major}/
-done
+mkdir -p    %{buildroot}%{php_home}
+cp -pr src  %{buildroot}%{php_home}/%{ns_vendor}%{major}/
+rm          %{buildroot}%{php_home}/%{ns_vendor}%{major}/basics.php
 
 
 %check
@@ -954,10 +960,11 @@ ret=0
 phpunit8 tests2                      --verbose || ret=1
 
 : Run cakephp test suite
-# testEmailDeep      is online
+# testEmailDeep|testConfigContext|testDataAvailable|testAddresses|testHost are online
+# testCurrency|testConfig issue with ICU version
 # CspMiddlewareTest  paragonie/csp-builder not packaged
 phpunit8 tests/TestCase \
-  --filter '^((?!(CspMiddlewareTest|testEmailDeep)).)*$' \
+  --filter '^((?!(CspMiddlewareTest|testEmailDeep|testConfigContext|testDataAvailable|testAddresses|testHost|testCurrency|testConfig)).)*$' \
   --verbose || ret=1
 
 exit $ret
@@ -966,8 +973,24 @@ exit $ret
 %endif
 
 
-%files cache
 %{!?_licensedir:%global license %%doc}
+%files
+%license LICENSE
+%doc composer.json
+%doc *.md
+%{php_home}/%{ns_vendor}%{major}/autoload.php
+%{php_home}/%{ns_vendor}%{major}/Auth
+%{php_home}/%{ns_vendor}%{major}/Command
+%{php_home}/%{ns_vendor}%{major}/Controller
+%{php_home}/%{ns_vendor}%{major}/Error
+%{php_home}/%{ns_vendor}%{major}/Mailer
+%{php_home}/%{ns_vendor}%{major}/Network
+%{php_home}/%{ns_vendor}%{major}/Routing
+%{php_home}/%{ns_vendor}%{major}/Shell
+%{php_home}/%{ns_vendor}%{major}/TestSuite
+%{php_home}/%{ns_vendor}%{major}/View
+
+%files cache
 %license LICENSE
 %doc src/Cache/composer.json
 %doc src/Cache/*md
@@ -976,7 +999,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Cache/composer.json
 
 %files chronos
-%{!?_licensedir:%global license %%doc}
 %license chronos-*/LICENSE
 %doc chronos-*/composer.json
 %doc chronos-*/*md
@@ -984,7 +1006,6 @@ exit $ret
      %{php_home}/%{ns_vendor}%{major}/Chronos
 
 %files collection
-%{!?_licensedir:%global license %%doc}
 %license src/Collection/LICENSE.txt
 %doc src/Collection/composer.json
 %doc src/Collection/*md
@@ -995,7 +1016,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Collection/LICENSE.txt
 
 %files console
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc src/Console/composer.json
 %doc src/Console/*md
@@ -1004,7 +1024,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Collection/composer.json
 
 %files core
-%{!?_licensedir:%global license %%doc}
 %license src/Core/LICENSE.txt
 %doc src/Core/composer.json
 %doc src/Core/*md
@@ -1015,7 +1034,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Core/LICENSE.txt
 
 %files database
-%{!?_licensedir:%global license %%doc}
 %license src/Database/LICENSE.txt
 %doc src/Database/composer.json
 %doc src/Database/*md
@@ -1025,7 +1043,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Database/LICENSE.txt
 
 %files datasource
-%{!?_licensedir:%global license %%doc}
 %license src/Datasource/LICENSE.txt
 %doc src/Datasource/composer.json
 %doc src/Datasource/*md
@@ -1035,7 +1052,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Datasource/LICENSE.txt
 
 %files event
-%{!?_licensedir:%global license %%doc}
 %license src/Event/LICENSE.txt
 %doc src/Event/composer.json
 %doc src/Event/*md
@@ -1045,7 +1061,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Event/LICENSE.txt
 
 %files filesystem
-%{!?_licensedir:%global license %%doc}
 %license src/Filesystem/LICENSE.txt
 %doc src/Filesystem/composer.json
 %doc src/Filesystem/*md
@@ -1055,7 +1070,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Filesystem/LICENSE.txt
 
 %files form
-%{!?_licensedir:%global license %%doc}
 %license src/Form/LICENSE.txt
 %doc src/Form/composer.json
 %doc src/Form/*md
@@ -1065,7 +1079,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Form/LICENSE.txt
 
 %files http
-%{!?_licensedir:%global license %%doc}
 %license src/Http/LICENSE.txt
 %doc src/Http/composer.json
 %doc src/Http/*md
@@ -1075,7 +1088,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Http/LICENSE.txt
 
 %files i18n
-%{!?_licensedir:%global license %%doc}
 %license src/I18n/LICENSE.txt
 %doc src/I18n/composer.json
 %doc src/I18n/*md
@@ -1085,7 +1097,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/I18n/LICENSE.txt
 
 %files log
-%{!?_licensedir:%global license %%doc}
 %license src/Log/LICENSE.txt
 %doc src/Log/composer.json
 %doc src/Log/*md
@@ -1095,7 +1106,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Log/LICENSE.txt
 
 %files orm
-%{!?_licensedir:%global license %%doc}
 %license src/ORM/LICENSE.txt
 %doc src/ORM/composer.json
 %doc src/ORM/*md
@@ -1105,7 +1115,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/ORM/LICENSE.txt
 
 %files utility
-%{!?_licensedir:%global license %%doc}
 %license src/Utility/LICENSE.txt
 %doc src/Utility/composer.json
 %doc src/Utility/*md
@@ -1115,7 +1124,6 @@ exit $ret
 %exclude %{php_home}/%{ns_vendor}%{major}/Utility/LICENSE.txt
 
 %files validation
-%{!?_licensedir:%global license %%doc}
 %license src/Validation/LICENSE.txt
 %doc src/Validation/composer.json
 %doc src/Validation/*md
@@ -1126,6 +1134,10 @@ exit $ret
 
 
 %changelog
+* Sat Feb 22 2020 Remi Collet <remi@remirepo.net> - 4.0.4-1
+- update to 4.0.4
+- provides the full framework as php-cakephp4
+
 * Mon Feb 10 2020 Remi Collet <remi@remirepo.net> - 4.0.3-4
 - run full test suite
 
diff --git a/src/Http/composer.json b/src/Http/composer.json
index e63422a..5802f3e 100644
--- a/src/Http/composer.json
+++ b/src/Http/composer.json
@@ -31,8 +31,8 @@
         "psr/http-client": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
-        "zendframework/zend-diactoros": "^2.1",
-        "zendframework/zend-httphandlerrunner": "^1.0"
+        "laminas/laminas-diactoros": "^2.1",
+        "laminas/laminas-httphandlerrunner": "^1.0"
     },
     "provide": {
         "psr/http-client-implementation": "^1.0"