summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json27
-rw-r--r--php-laminas-servicemanager.spec39
2 files changed, 38 insertions, 28 deletions
diff --git a/composer.json b/composer.json
index d910c3e..e53eecc 100644
--- a/composer.json
+++ b/composer.json
@@ -21,18 +21,25 @@
"forum": "https://discourse.laminas.dev"
},
"config": {
- "sort-packages": true
+ "platform": {
+ "php": "7.4.99"
+ },
+ "sort-packages": true,
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true,
+ "composer/package-versions-deprecated": true,
+ "laminas/laminas-dependency-plugin": true
+ }
},
"require": {
"php": "~7.4.0 || ~8.0.0 || ~8.1.0",
- "container-interop/container-interop": "^1.2",
"laminas/laminas-stdlib": "^3.2.1",
"psr/container": "^1.0"
},
"require-dev": {
"composer/package-versions-deprecated": "^1.0",
- "laminas/laminas-coding-standard": "~2.2.1",
- "laminas/laminas-container-config-test": "^0.3",
+ "laminas/laminas-coding-standard": "~2.3.0",
+ "laminas/laminas-container-config-test": "^0.6",
"laminas/laminas-dependency-plugin": "^2.1.2",
"mikey179/vfsstream": "^1.6.10@alpha",
"ocramius/proxy-manager": "^2.11",
@@ -43,13 +50,13 @@
"vimeo/psalm": "^4.8"
},
"provide": {
- "container-interop/container-interop-implementation": "^1.2",
"psr/container-implementation": "^1.0"
},
"conflict": {
+ "ext-psr": "*",
+ "laminas/laminas-code": "<3.3.1",
"zendframework/zend-code": "<3.3.1",
- "zendframework/zend-servicemanager": "*",
- "laminas/laminas-code": "<3.3.1"
+ "zendframework/zend-servicemanager": "*"
},
"suggest": {
"ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services"
@@ -57,7 +64,8 @@
"autoload": {
"psr-4": {
"Laminas\\ServiceManager\\": "src/"
- }
+ },
+ "files": ["src/autoload.php"]
},
"autoload-dev": {
"files": [
@@ -83,5 +91,8 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"static-analysis" : "psalm --shepherd --stats"
+ },
+ "replace": {
+ "container-interop/container-interop": "^1.2.0"
}
}
diff --git a/php-laminas-servicemanager.spec b/php-laminas-servicemanager.spec
index d63ee4e..15f4c4e 100644
--- a/php-laminas-servicemanager.spec
+++ b/php-laminas-servicemanager.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit e52b985909e0940bf22d34f322eb3f48bbef6bd1
+%global gh_commit 05ac4b1fb1fe9333313eeafced9b6c7946589487
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-servicemanager
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 3.10.0
+Version: 3.12.0
Release: 1%{?dist}
Summary: Laminas Framework %{library} component
@@ -38,17 +38,13 @@ BuildRequires: php(language) >= 7.
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2)
-BuildRequires: (php-composer(container-interop/container-interop) >= 1.2 with php-composer(container-interop/container-interop) < 2)
BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
-# remirepo:8
+# remirepo:5
%else
BuildRequires: php-laminas-stdlib >= 3.2.1
BuildRequires: php-laminas-zendframework-bridge
-BuildRequires: php-composer(container-interop/container-interop) < 2
-BuildRequires: php-composer(container-interop/container-interop) >= 1.2
-BuildRequires: php-composer(psr/container) < 2
-BuildRequires: php-composer(psr/container) >= 1.0
+BuildRequires: php-psr-container
%endif
BuildRequires: php-reflection
BuildRequires: php-date
@@ -56,8 +52,8 @@ BuildRequires: php-json
BuildRequires: php-spl
# From composer, "require-dev": {
# "composer/package-versions-deprecated": "^1.0",
-# "laminas/laminas-coding-standard": "~2.2.",
-# "laminas/laminas-container-config-test": "^0.3",
+# "laminas/laminas-coding-standard": "~2.3.0",
+# "laminas/laminas-container-config-test": "^0.6",
# "laminas/laminas-dependency-plugin": "^2.1.2",
# "mikey179/vfsstream": "^1.6.10@alpha",
# "ocramius/proxy-manager": "^2.11",
@@ -87,24 +83,19 @@ BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
# "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
-# "container-interop/container-interop": "^1.2",
# "laminas/laminas-stdlib": "^3.2.1",
# "psr/container": "^1.0"
Requires: php(language) >= 7.4
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(container-interop/container-interop) >= 1.2 with php-composer(container-interop/container-interop) < 2)
Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
Requires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2)
Requires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2)
-# remirepo:8
+# remirepo:5
%else
-Requires: php-composer(container-interop/container-interop) >= 1.2
-Requires: php-composer(container-interop/container-interop) < 2
Requires: php-laminas-stdlib >= 3.2.1
Requires: php-laminas-zendframework-bridge
-Requires: php-composer(psr/container) >= 1.0
-Requires: php-composer(psr/container) < 2
+Requires: php-psr-container
%endif
# From phpcompatinfo report for version 3.4.0
Requires: php-reflection
@@ -121,6 +112,10 @@ Suggests: php-composer(ocramius/proxy-manager)
# Autoloader
Requires: php-composer(fedora/autoloader)
%endif
+# From composer, "conflict": {
+# "ext-psr": "*",
+Conflicts: php-pecl-psr
+#endif
# remirepo:2
Obsoletes: php-ZendFramework2-%{library} < 2.5
@@ -132,7 +127,6 @@ Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
Provides: php-composer(zendframework/%{zf_name}) = %{version}
Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
Provides: php-autoloader(zendframework/%{zf_name}) = %{version}
-Provides: php-composer(container-interop/container-interop-implementation) = 1.2
Provides: php-composer(psr/container-implementation) = 1.0
@@ -146,7 +140,7 @@ Documentation: https://docs.laminas.dev/%{gh_project}/
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-
+mv src/autoload.php src/_autoload.php
mv LICENSE.md LICENSE
@@ -155,9 +149,9 @@ mv LICENSE.md LICENSE
phpab --template fedora --output src/autoload.php src
cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/Interop/Container/autoload.php',
'%{php_home}/Psr/Container/autoload.php',
'%{php_home}/%{namespace}/Stdlib/autoload.php',
+ __DIR__ . '/_autoload.php',
]);
\Fedora\Autoloader\Dependencies::optional([
'%{php_home}/ProxyManager/autoload.php',
@@ -231,6 +225,11 @@ exit $ret
%changelog
+* Thu Jun 16 2022 Remi Collet <remi@remirepo.net> - 3.12.0-1
+- update to 3.12.0
+- drop dependency on container-interop/container-interop
+- conflict with psr extension
+
* Fri Dec 3 2021 Remi Collet <remi@remirepo.net> - 3.10.0-1
- update to 3.10.0
- keep compatibility using laminas-zendframework-bridge
generated by cgit (git 2.34.1) at 2024-11-24 19:32:16 +0000