diff options
| -rw-r--r-- | composer.json | 12 | ||||
| -rw-r--r-- | php-cakephp4.spec | 37 |
2 files changed, 29 insertions, 20 deletions
diff --git a/composer.json b/composer.json index 2575cda..ef3bd4b 100644 --- a/composer.json +++ b/composer.json @@ -26,11 +26,11 @@ "ext-intl": "*", "ext-json": "*", "ext-mbstring": "*", - "cakephp/chronos": "^2.0", + "cakephp/chronos": "^2.2", "composer/ca-bundle": "^1.2", "laminas/laminas-diactoros": "^2.2.2", "laminas/laminas-httphandlerrunner": "^1.1", - "league/container": "^3.2", + "league/container": "^4.1.1", "psr/http-client": "^1.0", "psr/http-server-handler": "^1.0", "psr/http-server-middleware": "^1.0", @@ -55,8 +55,8 @@ "cakephp/validation": "self.version" }, "require-dev": { - "cakephp/cakephp-codesniffer": "^4.0", - "mikey179/vfsstream": "^1.6", + "cakephp/cakephp-codesniffer": "^4.5", + "mikey179/vfsstream": "^1.6.10", "paragonie/csp-builder": "^2.3", "phpunit/phpunit": "^8.5 || ^9.3" }, @@ -87,6 +87,7 @@ "Cake\\PHPStan\\": "tests/PHPStan/", "Cake\\Test\\": "tests/", "TestApp\\": "tests/test_app/TestApp/", + "TestApp\\Test\\": "tests/test_app/TestApp/tests/", "TestPlugin\\": "tests/test_app/Plugin/TestPlugin/src/", "TestPlugin\\Test\\": "tests/test_app/Plugin/TestPlugin/tests/", "TestPluginTwo\\": "tests/test_app/Plugin/TestPluginTwo/src/", @@ -108,7 +109,8 @@ "@phpstan", "@psalm" ], - "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:0.12.94 psalm/phar:~4.9.3 && mv composer.backup composer.json", + "stan-tests": "phpstan.phar analyze -c tests/phpstan.neon", + "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:0.12.96 psalm/phar:~4.10.0 && mv composer.backup composer.json", "test": "phpunit", "test-coverage": "phpunit --coverage-clover=clover.xml" }, diff --git a/php-cakephp4.spec b/php-cakephp4.spec index f985a51..aa840d1 100644 --- a/php-cakephp4.spec +++ b/php-cakephp4.spec @@ -12,7 +12,7 @@ # https://github.com/cakephp/cakephp/releases -%global gh_commit ea47e927083e2f4bfaed0c404756d9852b617cad +%global gh_commit fc71c2d7e1bda979da41ed1dea726d6e04240d3b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cakephp %global gh_project cakephp @@ -28,8 +28,8 @@ %global chronos_version 2.3.0 Name: php-%{pk_vendor}%{major} -Version: 4.2.10 -Release: 2%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: The CakePHP framework License: MIT @@ -57,16 +57,16 @@ BuildRequires: php-reflection BuildRequires: php-simplexml BuildRequires: php-spl # From composer.json, "require-dev": { -# "cakephp/cakephp-codesniffer": "dev-next", -# "mikey179/vfsstream": "^1.6", +# "cakephp/cakephp-codesniffer": "^4.5", +# "mikey179/vfsstream": "^1.6.10", # "paragonie/csp-builder": "^2.3", # "phpunit/phpunit": "^8.5 || ^9.3" BuildRequires: phpunit8 >= 8.5 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6 with php-composer(mikey179/vfsstream) < 6) -BuildRequires: glibc-langpack-fr +BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6.10 with php-composer(mikey179/vfsstream) < 2) +BuildRequires: glibc-langpack-en %else -BuildRequires: php-mikey179-vfsstream >= 1.6 +BuildRequires: php-mikey179-vfsstream >= 1.6.10 %endif %endif # Full framework installation @@ -216,13 +216,13 @@ Requires: php-composer(%{pk_vendor}/utility) = %{version} BuildRequires: (php-composer(psr/http-server-handler) >= 1.0.0 with php-composer(psr/http-server-handler) < 2) Requires: (php-composer(psr/http-server-handler) >= 1.0.0 with php-composer(psr/http-server-handler) < 2) # Optional for core but required by full framework -BuildRequires: (php-composer(league/container) >= 3.2.0 with php-composer(league/container) < 4) -Requires: (php-composer(league/container) >= 3.2.0 with php-composer(league/container) < 4) +BuildRequires: (php-composer(league/container) >= 4.1.1 with php-composer(league/container) < 5) +Requires: (php-composer(league/container) >= 4.1.1 with php-composer(league/container) < 5) %else BuildRequires: php-psr-http-server-handler >= 1.0.0 Requires: php-psr-http-server-handler >= 1.0.0 -BuildRequires: php-league-container >= 3.2.0 -Requires: php-league-container >= 3.2.0 +BuildRequires: php-league-container4 >= 4.1.1 +Requires: php-league-container4 >= 4.1.1 %endif # From phpcompatinfo report Requires: php-reflection @@ -627,7 +627,7 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; '%{php_home}/Psr/Http/Message/autoload.php', '%{php_home}/Psr/Http/Server/autoload.php', '%{php_home}/Psr/Http/Server/middleware-autoload.php', - '%{php_home}/League/Container/autoload.php', + '%{php_home}/League/Container4/autoload.php', '%{php_home}/Composer/CaBundle/autoload.php', '%{php_home}/Laminas/Diactoros2/autoload.php', '%{php_home}/Laminas/HttpHandlerRunner/autoload.php', @@ -643,6 +643,7 @@ require_once dirname(__DIR__) . '/src/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Cake\\Test\\', dirname(__DIR__).'/tests'); \Fedora\Autoloader\Autoload::addPsr4('Cake\\Chronos\\Test\\', dirname(__DIR__).'/tests2'); \Fedora\Autoloader\Autoload::addPsr4('TestApp\\', dirname(__DIR__).'/tests/test_app/TestApp'); +\Fedora\Autoloader\Autoload::addPsr4('TestApp\\Test\\', dirname(__DIR__).'/tests/test_app/TestApp/tests/'); \Fedora\Autoloader\Autoload::addPsr4('TestPlugin\\', dirname(__DIR__).'/tests/test_app/Plugin/TestPlugin/src'); \Fedora\Autoloader\Autoload::addPsr4('TestPlugin\\Test\\', dirname(__DIR__).'/tests/test_app/Plugin/TestPlugin/tests'); \Fedora\Autoloader\Autoload::addPsr4('TestPluginTwo\\', dirname(__DIR__).'/tests/test_app/Plugin/TestPluginTwo/src'); @@ -712,7 +713,7 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Cake\\Core\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ '%{php_home}/Psr/Http/Server/autoload.php', - '%{php_home}/League/Container/autoload.php', + '%{php_home}/League/Container4/autoload.php', dirname(__DIR__) . '/Utility/autoload.php', __DIR__ . '/functions.php', ]); @@ -948,7 +949,9 @@ sed -e 's:vendor/phpunit/phpunit/src/::' -i \ tests/TestCase/Error/Middleware/ErrorHandlerMiddlewareTest.php \ tests/TestCase/Error/ErrorHandlerTest.php -export LANG=fr_FR.UTF-8 +sed -e 's/3.25.0/3.28.0/' -i tests/TestCase/Database/Driver/SqliteTest.php + +export LANG=en_GB.UTF-8 ret=0 : Run chronos test suite %{_bindir}/phpunit8 tests2 \ @@ -1130,6 +1133,10 @@ exit $ret %changelog +* Mon Oct 25 2021 Remi Collet <remi@remirepo.net> - 4.3.0-1 +- update to 4.3.0 +- raise dependency on league/container 4.1.1 + * Mon Oct 18 2021 Remi Collet <remi@remirepo.net> - 4.2.10-2 - update chronos to 2.3.0 |