summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json8
-rw-r--r--php-laminas-di3.spec20
2 files changed, 16 insertions, 12 deletions
diff --git a/composer.json b/composer.json
index d7c9d4d..3c5cbdd 100644
--- a/composer.json
+++ b/composer.json
@@ -35,22 +35,21 @@
"php": ">=7.4, <8.2",
"laminas/laminas-stdlib": "^3.6",
"psr/container": "^1.1.1",
- "psr/log": "^1.1.4"
+ "psr/log": "^1.1.4 || ^3.0.0"
},
"require-dev": {
- "container-interop/container-interop": "^1.2.0",
"laminas/laminas-coding-standard": "~2.3.0",
- "laminas/laminas-servicemanager": "^3.7",
+ "laminas/laminas-servicemanager": "^3.12",
"mikey179/vfsstream": "^1.6.10@alpha",
"phpbench/phpbench": "^1.2",
"phpspec/prophecy-phpunit": "^2.0",
- "phpstan/phpstan": "^0.12.64",
"phpunit/phpunit": "^9.5.5",
"squizlabs/php_codesniffer": "^3.6"
},
"conflict": {
"zendframework/zend-di": "*",
"laminas/laminas-servicemanager-di": "*",
+ "laminas/laminas-servicemanager": "<3.13.0",
"phpspec/prophecy": "<1.9.0"
},
"suggest": {
@@ -76,7 +75,6 @@
],
"cs-check": "phpcs",
"cs-fix": "phpcbf",
- "analyse": "phpstan analyse --no-progress -c phpstan.neon",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
diff --git a/php-laminas-di3.spec b/php-laminas-di3.spec
index f0e28e8..45b2cac 100644
--- a/php-laminas-di3.spec
+++ b/php-laminas-di3.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 0335b07367eb63302a57cc30d096aa1f20664dba
+%global gh_commit 9b7091c50587f7ded53519d229421a02532feb9a
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-di
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}%{major}
-Version: 3.8.0
+Version: 3.9.1
Release: 1%{?dist}
Summary: Laminas Framework %{library} component v%{major}
@@ -44,9 +44,8 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6
BuildRequires: (php-composer(psr/container) >= 1.1.1 with php-composer(psr/container) < 2)
BuildRequires: (php-composer(psr/log) >= 1.1.4 with php-composer(psr/log) < 2)
# From composer, "require-dev": {
-# "container-interop/container-interop": "^1.2.0",
# "laminas/laminas-coding-standard": "^2.3.0",
-# "laminas/laminas-servicemanager": "^3.7",
+# "laminas/laminas-servicemanager": "^3.12",
# "mikey179/vfsstream": "^1.6.10@alpha",
# "phpstan/phpstan": "^0.12",
# "phpspec/prophecy-phpunit": "^2.0",
@@ -72,7 +71,7 @@ BuildRequires: php-fedora-autoloader-devel
# "php": ">=7.4, <8.2",
# "laminas/laminas-stdlib": "^3.6",
# "psr/container": "^1.1.1",
-# "psr/log": "^1.1.4"
+# "psr/log": "^1.1.4 || ^3.0.0"
Requires: php(language) >= 7.4
%if ! %{bootstrap}
# remirepo:1
@@ -127,7 +126,10 @@ cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
'%{php_home}/%{namespace}/Stdlib/autoload.php',
'%{php_home}/Psr/Container/autoload.php',
- '%{php_home}/Psr/Log/autoload.php',
+ [
+ '%{php_home}/Psr/Log3/autoload.php',
+ '%{php_home}/Psr/Log/autoload.php',
+ ],
]);
\Fedora\Autoloader\Dependencies::optional([
'%{php_home}/%{namespace}/ServiceManager/autoload.php',
@@ -156,7 +158,7 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}%{major}/autoload.p
EOF
ret=0
-# TODO php 8.2 because of mikey179/vfsstream
+# TODO php 8.2 Use of "static" in callables is deprecated
for cmd in php php74 php80 php81; do
if which $cmd; then
$cmd %{_bindir}/phpunit9 \
@@ -181,6 +183,10 @@ exit $ret
%changelog
+* Thu Jun 30 2022 Remi Collet <remi@remirepo.net> - 3.9.1-1
+- update to 3.9.1
+- allow psr/log v3
+
* Thu Jun 30 2022 Remi Collet <remi@remirepo.net> - 3.8.0-1
- update to 3.8.0