summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json15
-rw-r--r--php-laminas-zendframework-bridge-rpm.patch25
-rw-r--r--php-laminas-zendframework-bridge.spec28
3 files changed, 38 insertions, 30 deletions
diff --git a/composer.json b/composer.json
index 3f7af11..6cbe551 100644
--- a/composer.json
+++ b/composer.json
@@ -15,13 +15,13 @@
"forum": "https://discourse.laminas.dev/"
},
"require": {
- "php": "^7.3 || ~8.0.0 || ~8.1.0"
+ "php": ">=7.4, <8.2"
},
"require-dev": {
- "phpunit/phpunit": "^9.3",
- "psalm/plugin-phpunit": "^0.15.1",
- "squizlabs/php_codesniffer": "^3.5",
- "vimeo/psalm": "^4.6"
+ "phpunit/phpunit": "^9.5.14",
+ "psalm/plugin-phpunit": "^0.15.2",
+ "squizlabs/php_codesniffer": "^3.6.2",
+ "vimeo/psalm": "^4.21.0"
},
"autoload": {
"files": [
@@ -49,7 +49,10 @@
}
},
"config": {
- "sort-packages": true
+ "sort-packages": true,
+ "platform": {
+ "php": "7.4.99"
+ }
},
"scripts": {
"cs-check": "phpcs",
diff --git a/php-laminas-zendframework-bridge-rpm.patch b/php-laminas-zendframework-bridge-rpm.patch
index 6d93f84..edc77c0 100644
--- a/php-laminas-zendframework-bridge-rpm.patch
+++ b/php-laminas-zendframework-bridge-rpm.patch
@@ -1,6 +1,6 @@
diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
---- ./src/Autoloader.php.rpm 2021-12-21 16:21:53.000000000 +0100
-+++ ./src/Autoloader.php 2021-12-21 16:27:00.348616300 +0100
+--- ./src/Autoloader.php.rpm 2022-02-23 09:04:21.000000000 +0100
++++ ./src/Autoloader.php 2022-02-23 09:07:25.289998350 +0100
@@ -3,7 +3,6 @@
namespace Laminas\ZendFrameworkBridge;
@@ -9,7 +9,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
use RuntimeException;
use function array_values;
-@@ -45,15 +44,9 @@ class Autoloader
+@@ -46,15 +45,9 @@ class Autoloader
public static function load()
{
$loaded = new ArrayObject([]);
@@ -25,7 +25,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
$loaded
), true, true);
-@@ -63,27 +56,16 @@ class Autoloader
+@@ -64,28 +57,17 @@ class Autoloader
));
}
@@ -41,21 +41,22 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
- }
-
/**
- * @return callable
+ * @param array<string,string> $namespaces
+ * @return callable(string): void
*/
- private static function createPrependAutoloader(array $namespaces, ClassLoader $classLoader, ArrayObject $loaded)
+ private static function createPrependAutoloader(array $namespaces, ArrayObject $loaded)
{
/**
- * @param string $class Class name to autoload
+ * @param string $class Class name to autoload
* @return void
*/
-- return static function ($class) use ($namespaces, $classLoader, $loaded) {
-+ return static function ($class) use ($namespaces, $loaded) {
+- return static function ($class) use ($namespaces, $classLoader, $loaded): void {
++ return static function ($class) use ($namespaces, $loaded): void {
if (isset($loaded[$class])) {
return;
}
-@@ -102,7 +84,7 @@ class Autoloader
+@@ -104,7 +86,7 @@ class Autoloader
return;
}
@@ -64,7 +65,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
$legacy = $namespaces[$check]
. strtr(substr($class, strlen($check)), [
'ApiTools' => 'Apigility',
-@@ -162,20 +144,4 @@ class Autoloader
+@@ -166,20 +148,4 @@ class Autoloader
}
};
}
@@ -86,8 +87,8 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
- }
}
diff -up ./src/Replacements.php.rpm ./src/Replacements.php
---- ./src/Replacements.php.rpm 2021-12-21 16:21:53.000000000 +0100
-+++ ./src/Replacements.php 2021-12-21 16:21:57.865043533 +0100
+--- ./src/Replacements.php.rpm 2022-02-23 09:04:21.000000000 +0100
++++ ./src/Replacements.php 2022-02-23 09:06:13.102208293 +0100
@@ -15,7 +15,7 @@ class Replacements
public function __construct(array $additionalReplacements = [])
{
diff --git a/php-laminas-zendframework-bridge.spec b/php-laminas-zendframework-bridge.spec
index b16cb08..f12b2c9 100644
--- a/php-laminas-zendframework-bridge.spec
+++ b/php-laminas-zendframework-bridge.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-laminas-zendframework-bridge
#
-# Copyright (c) 2020-2021 Remi Collet
+# Copyright (c) 2020-2022 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 88bf037259869891afce6504cacc4f8a07b24d0f
+%global gh_commit 7f049390b756d34ba5940a8fb47634fbb51f79ab
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-zendframework-bridge
@@ -21,7 +21,7 @@
%endif
Name: php-%{gh_project}
-Version: 1.4.1
+Version: 1.5.0
Release: 1%{?dist}
Summary: Alias legacy ZF class names to Laminas Project equivalents
@@ -36,22 +36,22 @@ Patch0: %{name}-rpm.patch
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 7.3
+BuildRequires: php(language) >= 7.4
BuildRequires: php-spl
# From composer, "require-dev": {
-# "phpunit/phpunit": "^9.3",
-# "psalm/plugin-phpunit": "^0.15.1",
-# "squizlabs/php_codesniffer": "^3.5",
-# "vimeo/psalm": "^4.6"
+# "phpunit/phpunit": "^9.5.14",
+# "psalm/plugin-phpunit": "^0.15.2",
+# "squizlabs/php_codesniffer": "^3.6.2",
+# "vimeo/psalm": "^4.21.0"
%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9 >= 9.3
+BuildRequires: phpunit9 >= 9.5.14
# Autoloader
BuildRequires: php-fedora-autoloader-devel >= 1.0.1
%endif
# From composer, "require": {
-# "php": "^7.3 || ~8.0.0 || ~8.1.0"
-Requires: php(language) >= 7.3
+# "php": ">=7.4, <8.2"
+Requires: php(language) >= 7.4
# From phpcompatinfo report for version 1.0.0
Requires: php-spl
# Autoloader
@@ -161,7 +161,7 @@ php %{buildroot}%{php_home}/%{namespace}/autoload.php
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -187,6 +187,10 @@ exit $ret
%changelog
+* Wed Feb 23 2022 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0
+- raise dependency on PHP 7.4
+
* Tue Dec 21 2021 Remi Collet <remi@remirepo.net> - 1.4.1-1
- update to 1.4.1 (no change)