diff options
| -rw-r--r-- | composer.json | 27 | ||||
| -rw-r--r-- | php-laminas-modulemanager.spec | 61 |
2 files changed, 38 insertions, 50 deletions
diff --git a/composer.json b/composer.json index 5edd1bd..2900460 100644 --- a/composer.json +++ b/composer.json @@ -21,22 +21,19 @@ "extra": { }, "require": { - "php": "^7.3 || ^8.0", + "php": "^7.3 || ~8.0.0 || ~8.1.0", "brick/varexporter": "^0.3.2", - "laminas/laminas-config": "^3.4", - "laminas/laminas-eventmanager": "^3.3", - "laminas/laminas-stdlib": "^3.3", - "laminas/laminas-zendframework-bridge": "^1.1", + "laminas/laminas-config": "^3.7", + "laminas/laminas-eventmanager": "^3.4", + "laminas/laminas-stdlib": "^3.6", "webimpress/safe-writer": "^1.0.2 || ^2.1" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-console": "^2.8", - "laminas/laminas-di": "^2.6.1", - "laminas/laminas-loader": "^2.6.1", + "laminas/laminas-coding-standard": "^2.3", + "laminas/laminas-loader": "^2.8", "laminas/laminas-mvc": "^3.1.1", - "laminas/laminas-servicemanager": "^3.4.1", - "phpunit/phpunit": "^9.3.7" + "laminas/laminas-servicemanager": "^3.7", + "phpunit/phpunit": "^9.5.5" }, "suggest": { "laminas/laminas-console": "Laminas\\Console component", @@ -50,10 +47,6 @@ } }, "autoload-dev": { - "files": [ - "test/autoload.php", - "test/TestAsset/ModuleAsClass.php" - ], "psr-4": { "ListenerTestModule\\": "test/TestAsset/ListenerTestModule/", "ModuleAsClass\\": "test/TestAsset/ModuleAsClass/", @@ -70,7 +63,7 @@ "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, - "replace": { - "zendframework/zend-modulemanager": "^2.8.4" + "conflict": { + "zendframework/zend-modulemanager": "*" } } diff --git a/php-laminas-modulemanager.spec b/php-laminas-modulemanager.spec index 3d15223..a3a2e80 100644 --- a/php-laminas-modulemanager.spec +++ b/php-laminas-modulemanager.spec @@ -10,7 +10,7 @@ %bcond_with bootstrap %bcond_without tests -%global gh_commit 2068e0b300e87e139112016a6025be341ceaaf33 +%global gh_commit 6acf5991d10b0b38a2edb08729ed48981b2a5dad %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-modulemanager @@ -20,7 +20,7 @@ %global library ModuleManager Name: php-%{gh_project} -Version: 2.10.2 +Version: 2.11.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -37,27 +37,23 @@ BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(brick/varexporter) >= 0.3.2 with php-composer(brick/varexporter) < 1) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.4 with php-autoloader(%{gh_owner}/laminas-config) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.7 with php-autoloader(%{gh_owner}/laminas-config) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) BuildRequires: (php-composer(webimpress/safe-writer) >= 2.1 with php-composer(webimpress/safe-writer) < 3) # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-console": "^2.8", -# "laminas/laminas-di": "^2.6.1", -# "laminas/laminas-loader": "^2.6.1", +# "laminas/laminas-coding-standard": "^2.3", +# "laminas/laminas-loader": "^2.8", # "laminas/laminas-mvc": "^3.1.1", -# "laminas/laminas-servicemanager": "^3.4.1", -# "phpunit/phpunit": "^9.3.7" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.8 with php-autoloader(%{gh_owner}/laminas-console) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-di) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-di) < 3) +# "laminas/laminas-servicemanager": "^3.7", +# "phpunit/phpunit": "^9.5.5" BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-loader) < 3) %if %{without bootstrap} BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.1.1 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) %endif -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -# remirepo:15 +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.7 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +# remirepo:13 %else BuildRequires: php-brick-varexporter BuildRequires: php-laminas-config3 @@ -65,8 +61,6 @@ BuildRequires: php-laminas-eventmanager BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-zendframework-bridge BuildRequires: php-webimpress-safe-writer -BuildRequires: php-laminas-console -BuildRequires: php-laminas-di BuildRequires: php-laminas-loader %if %{without bootstrap} BuildRequires: php-laminas-mvc @@ -74,26 +68,25 @@ BuildRequires: php-laminas-mvc BuildRequires: php-laminas-servicemanager %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.3.7 +BuildRequires: phpunit9 >= 9.5.5 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ^8.0", +# "php": "^7.3 || ^8.0 || ~8.1.0", # "brick/varexporter": "^0.3.2", -# "laminas/laminas-config": "^3.4", -# "laminas/laminas-eventmanager": "^3.3", -# "laminas/laminas-stdlib": "^3.3", -# "laminas/laminas-zendframework-bridge": "^1.1", +# "laminas/laminas-config": "^3.7", +# "laminas/laminas-eventmanager": "^3.4", +# "laminas/laminas-stdlib": "^3.6", # "webimpress/safe-writer": "^1.0.2 || ^2.1" Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(brick/varexporter) >= 0.3.2 with php-composer(brick/varexporter) < 1) -Requires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.4 with php-autoloader(%{gh_owner}/laminas-config) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.7 with php-autoloader(%{gh_owner}/laminas-config) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) Requires: (php-composer(webimpress/safe-writer) >= 2.1 with php-composer(webimpress/safe-writer) < 3) # From composer, "suggest": { @@ -163,7 +156,6 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/Webimpress/SafeWriter/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/%{namespace}/Console/autoload.php', '%{php_home}/%{namespace}/Loader/autoload.php', '%{php_home}/%{namespace}/Mvc/autoload.php', '%{php_home}/%{namespace}/ServiceManager/autoload.php', @@ -196,14 +188,9 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; -\Fedora\Autoloader\Dependencies::required([ - '%{php_home}/%{namespace}/Di/autoload.php', -]); \Fedora\Autoloader\Autoload::addPsr4('ListenerTestModule', dirname(__DIR__) . '/test/TestAsset/ListenerTestModule'); \Fedora\Autoloader\Autoload::addPsr4('ModuleAsClass', dirname(__DIR__) . '/test/TestAsset/ModuleAsClass'); \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); -require_once __DIR__ . '/../test/autoload.php'; -require_once __DIR__ . '/../test/TestAsset/ModuleAsClass.php'; EOF : check compat autoloader @@ -214,7 +201,7 @@ exit (class_exists("\\Zend\\%{library}\\ModuleEvent") ? 0 : 1); : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -237,6 +224,14 @@ exit $ret %changelog +* Thu Oct 14 2021 Remi Collet <remi@remirepo.net> - 2.11.0-1 +- update to 2.11.0 +- keep compatibility using laminas-zendframework-bridge + as this is only used using compat autolader +- raise dependency on laminas-config 3.7 +- raise dependency on laminas-eventmanager 3.4 +- raise dependency on laminas-stdlib 3.3 + * Wed Apr 14 2021 Remi Collet <remi@remirepo.net> - 2.10.2-1 - update to 2.10.2 (no change) |