diff options
-rw-r--r-- | composer.json | 18 | ||||
-rw-r--r-- | php-laminas-zendframework-bridge-rpm.patch | 79 | ||||
-rw-r--r-- | php-laminas-zendframework-bridge.spec | 71 |
3 files changed, 120 insertions, 48 deletions
diff --git a/composer.json b/composer.json index e4c9941..8bd5a23 100644 --- a/composer.json +++ b/composer.json @@ -15,11 +15,13 @@ "forum": "https://discourse.laminas.dev/" }, "require": { - "php": "^5.6 || ^7.0" + "php": "~8.0.0 || ~8.1.0 || ~8.2.0" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1", - "squizlabs/php_codesniffer": "^3.5" + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "squizlabs/php_codesniffer": "^3.7.1", + "vimeo/psalm": "^4.29.0" }, "autoload": { "files": [ @@ -42,20 +44,20 @@ } }, "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev", - "dev-develop": "1.1.x-dev" - }, "laminas": { "module": "Laminas\\ZendFrameworkBridge" } }, "config": { - "sort-packages": true + "sort-packages": true, + "platform": { + "php": "8.0.99" + } }, "scripts": { "cs-check": "phpcs", "cs-fix": "phpcbf", + "static-analysis": "psalm --shepherd --stats", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" } diff --git a/php-laminas-zendframework-bridge-rpm.patch b/php-laminas-zendframework-bridge-rpm.patch index 8edfafb..edc77c0 100644 --- a/php-laminas-zendframework-bridge-rpm.patch +++ b/php-laminas-zendframework-bridge-rpm.patch @@ -1,7 +1,7 @@ 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 -@@ -9,7 +9,6 @@ +--- ./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; use ArrayObject; @@ -9,50 +9,54 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php use RuntimeException; use function array_values; -@@ -50,7 +49,6 @@ class Autoloader +@@ -46,15 +45,9 @@ class Autoloader + public static function load() + { + $loaded = new ArrayObject([]); +- $classLoader = self::getClassLoader(); +- +- if ($classLoader === null) { +- return; +- } spl_autoload_register(self::createPrependAutoloader( RewriteRules::namespaceReverse(), -- self::getClassLoader(), +- $classLoader, $loaded ), true, true); -@@ -61,32 +59,15 @@ class Autoloader +@@ -64,28 +57,17 @@ class Autoloader + )); } - /** -- * @return ClassLoader -- * @throws RuntimeException -- */ -- private static function getClassLoader() +- private static function getClassLoader(): ?ClassLoader - { -- if (file_exists(__DIR__ . '/../../../autoload.php')) { -- return include __DIR__ . '/../../../autoload.php'; +- $composerVendorDirectory = getenv('COMPOSER_VENDOR_DIR'); +- if (is_string($composerVendorDirectory)) { +- return self::getClassLoaderFromVendorDirectory($composerVendorDirectory); - } - -- if (file_exists(__DIR__ . '/../vendor/autoload.php')) { -- return include __DIR__ . '/../vendor/autoload.php'; -- } -- -- throw new RuntimeException('Cannot detect composer autoload. Please run composer install'); +- return self::getClassLoaderFromVendorDirectory(self::UPSTREAM_COMPOSER_VENDOR_DIRECTORY) +- ?? self::getClassLoaderFromVendorDirectory(self::LOCAL_COMPOSER_VENDOR_DIRECTORY); - } - -- /** - * @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; } -@@ -105,7 +86,7 @@ class Autoloader +@@ -104,7 +86,7 @@ class Autoloader return; } @@ -61,10 +65,31 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php $legacy = $namespaces[$check] . strtr(substr($class, strlen($check)), [ 'ApiTools' => 'Apigility', +@@ -166,20 +148,4 @@ class Autoloader + } + }; + } +- +- private static function getClassLoaderFromVendorDirectory(string $composerVendorDirectory): ?ClassLoader +- { +- $filename = rtrim($composerVendorDirectory, '/') . '/autoload.php'; +- if (!file_exists($filename)) { +- return null; +- } +- +- /** @psalm-suppress MixedAssignment */ +- $loader = include $filename; +- if (!$loader instanceof ClassLoader) { +- return null; +- } +- +- return $loader; +- } + } 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 -@@ -21,7 +21,7 @@ class Replacements +--- ./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 = []) { $this->replacements = array_merge( diff --git a/php-laminas-zendframework-bridge.spec b/php-laminas-zendframework-bridge.spec index 3cb88eb..b2a7f4e 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 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 faf68f6109ceeff24241226033ab59640c7eb63b +%global gh_commit 5ef52e26392777a26dbb8f20fe24f91b406459f6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-zendframework-bridge @@ -21,11 +21,11 @@ %endif Name: php-%{gh_project} -Version: 1.0.2 +Version: 1.7.0 Release: 1%{?dist} Summary: Alias legacy ZF class names to Laminas Project equivalents -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -36,20 +36,22 @@ Patch0: %{name}-rpm.patch BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 8.0 BuildRequires: php-spl # From composer, "require-dev": { -# "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1", -# "squizlabs/php_codesniffer": "^3.5" -%global phpunit %{_bindir}/phpunit8 -BuildRequires: phpunit8 >= 8.1 +# "phpunit/phpunit": "^9.5.26", +# "psalm/plugin-phpunit": "^0.18.0", +# "squizlabs/php_codesniffer": "^3.7.1", +# "vimeo/psalm": "^4.29.0" +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.5.26 # Autoloader BuildRequires: php-fedora-autoloader-devel >= 1.0.1 %endif # From composer, "require": { -# "php": "^5.6 || ^7.0" -Requires: php(language) >= 5.6 +# "php": "~8.0.0 || ~8.1.0 || ~8.2.0" +Requires: php(language) >= 8.0 # From phpcompatinfo report for version 1.0.0 Requires: php-spl # Autoloader @@ -159,10 +161,10 @@ 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}" php74 php80 php81; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit8} --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 fi done exit $ret @@ -185,6 +187,49 @@ exit $ret %changelog +* Wed Dec 14 2022 Remi Collet <remi@remirepo.net> - 1.7.0-1 +- update to 1.7.0 (no change) +- raise dependency on PHP 8.0 + +* Mon Aug 1 2022 Remi Collet <remi@remirepo.net> - 1.6.1-1 +- update to 1.6.1 + +* Mon Jul 18 2022 Remi Collet <remi@remirepo.net> - 1.6.0-1 +- update to 1.6.0 + +* 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) + +* Wed Sep 8 2021 Remi Collet <remi@remirepo.net> - 1.4.0-1 +- update to 1.4.0 (no change) + +* Fri Jun 25 2021 Remi Collet <remi@remirepo.net> - 1.3.0-1 +- update to 1.3.0 + +* Thu Jun 24 2021 Remi Collet <remi@remirepo.net> - 1.2.1-1 +- update to 1.2.1 (no change) + +* Fri Feb 26 2021 Remi Collet <remi@remirepo.net> - 1.2.0-1 +- update to 1.2.0 (no change) +- raise dependency on PHP 7.3 + +* Tue Sep 15 2020 Remi Collet <remi@remirepo.net> - 1.1.1-1 +- update to 1.1.1 (no change) +- switch to phpunit9 + +* 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 + +* Sat Apr 4 2020 Remi Collet <remi@remirepo.net> - 1.0.3-1 +- update to 1.0.3 + * Fri Mar 27 2020 Remi Collet <remi@remirepo.net> - 1.0.2-1 - update to 1.0.2 |