summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-08-19 08:29:54 +0200
committerRemi Collet <remi@remirepo.net>2020-08-19 08:29:54 +0200
commitc787c25869d5437cc72509c9fa83379a6d1881d1 (patch)
tree14977cdf28f6656040b88f04db7775c04ffcff0a
parent01bb853fe5acb70f990682b1ea1609f7bffe6c45 (diff)
update to 1.1.0 (no change)
-rw-r--r--composer.json4
-rw-r--r--php-laminas-zendframework-bridge-rpm.patch16
-rw-r--r--php-laminas-zendframework-bridge.spec13
3 files changed, 20 insertions, 13 deletions
diff --git a/composer.json b/composer.json
index e4c9941..74e87cb 100644
--- a/composer.json
+++ b/composer.json
@@ -15,10 +15,10 @@
"forum": "https://discourse.laminas.dev/"
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^5.6 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+ "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
"squizlabs/php_codesniffer": "^3.5"
},
"autoload": {
diff --git a/php-laminas-zendframework-bridge-rpm.patch b/php-laminas-zendframework-bridge-rpm.patch
index 8edfafb..f2df390 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 2020-03-27 07:50:26.000000000 +0100
-+++ ./src/Autoloader.php 2020-03-27 07:51:49.165983073 +0100
+--- ./src/Autoloader.php.rpm 2020-08-19 08:24:30.000000000 +0200
++++ ./src/Autoloader.php 2020-08-19 08:27:21.275930504 +0200
@@ -9,7 +9,6 @@
namespace Laminas\ZendFrameworkBridge;
@@ -17,7 +17,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
$loaded
), true, true);
-@@ -61,32 +59,15 @@ class Autoloader
+@@ -61,36 +59,15 @@ class Autoloader
}
/**
@@ -26,6 +26,10 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
- */
- private static function getClassLoader()
- {
+- if (file_exists(getenv('COMPOSER_VENDOR_DIR') . '/autoload.php')) {
+- return include getenv('COMPOSER_VENDOR_DIR') . '/autoload.php';
+- }
+-
- if (file_exists(__DIR__ . '/../../../autoload.php')) {
- return include __DIR__ . '/../../../autoload.php';
- }
@@ -52,7 +56,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
if (isset($loaded[$class])) {
return;
}
-@@ -105,7 +86,7 @@ class Autoloader
+@@ -109,7 +86,7 @@ class Autoloader
return;
}
@@ -62,8 +66,8 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
. strtr(substr($class, strlen($check)), [
'ApiTools' => 'Apigility',
diff -up ./src/Replacements.php.rpm ./src/Replacements.php
---- ./src/Replacements.php.rpm 2020-03-27 07:50:49.818286139 +0100
-+++ ./src/Replacements.php 2020-03-27 07:52:36.321742255 +0100
+--- ./src/Replacements.php.rpm 2020-08-19 08:24:30.000000000 +0200
++++ ./src/Replacements.php 2020-08-19 08:25:20.004129165 +0200
@@ -21,7 +21,7 @@ class Replacements
public function __construct(array $additionalReplacements = [])
{
diff --git a/php-laminas-zendframework-bridge.spec b/php-laminas-zendframework-bridge.spec
index 19d90a2..9c7059e 100644
--- a/php-laminas-zendframework-bridge.spec
+++ b/php-laminas-zendframework-bridge.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit fcd87520e4943d968557803919523772475e8ea3
+%global gh_commit 4939c81f63a8a4968c108c440275c94955753b19
%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.0.4
+Version: 1.1.0
Release: 1%{?dist}
Summary: Alias legacy ZF class names to Laminas Project equivalents
@@ -39,7 +39,7 @@ BuildArch: noarch
BuildRequires: php(language) >= 5.6
BuildRequires: php-spl
# From composer, "require-dev": {
-# "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+# "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
# "squizlabs/php_codesniffer": "^3.5"
%global phpunit %{_bindir}/phpunit8
BuildRequires: phpunit8 >= 8.1
@@ -48,7 +48,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.1
%endif
# From composer, "require": {
-# "php": "^5.6 || ^7.0"
+# "php": "^5.6 || ^7.0 || ^8.0"
Requires: php(language) >= 5.6
# From phpcompatinfo report for version 1.0.0
Requires: php-spl
@@ -159,7 +159,7 @@ php %{buildroot}%{php_home}/%{namespace}/autoload.php
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php72 php73 php74 "php80 %{_bindir}/phpunit9"; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit8} --verbose || ret=1
@@ -185,6 +185,9 @@ exit $ret
%changelog
+* Wed Aug 19 2020 Remi Collet <remi@remirepo.net> - 1.1.0-1
+- update to 1.1.0 (no change)
+
* Fri May 22 2020 Remi Collet <remi@remirepo.net> - 1.0.4-1
- update to 1.0.4