diff options
| -rw-r--r-- | Autoload-pr78.patch | 36 | ||||
| -rw-r--r-- | php-theseer-autoload.spec | 11 |
2 files changed, 6 insertions, 41 deletions
diff --git a/Autoload-pr78.patch b/Autoload-pr78.patch deleted file mode 100644 index 979ab0a..0000000 --- a/Autoload-pr78.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ff3e1ccdca5792de7a1aed654272f04bffe833ba Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 26 Jun 2017 09:04:17 +0200 -Subject: [PATCH] restore PHP 5.3 compatibility - ---- - src/CollectorResult.php | 2 +- - tests/DuplicateDetectionTest.php | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/CollectorResult.php b/src/CollectorResult.php -index 9556767..3538140 100644 ---- a/src/CollectorResult.php -+++ b/src/CollectorResult.php -@@ -44,7 +44,7 @@ public function addParseResult(\SplFileInfo $file, ParseResult $result) { - } - if (isset($this->units[$unit])) { - if (!isset($this->duplicates[$unit])) { -- $this->duplicates[$unit] = [ $this->units[$unit] ]; -+ $this->duplicates[$unit] = array( $this->units[$unit] ); - } - $this->duplicates[$unit][] = $filename; - continue; -diff --git a/tests/DuplicateDetectionTest.php b/tests/DuplicateDetectionTest.php -index cf88701..4b02da1 100644 ---- a/tests/DuplicateDetectionTest.php -+++ b/tests/DuplicateDetectionTest.php -@@ -43,7 +43,7 @@ - class DuplicateDetectionTest extends \PHPUnit\Framework\TestCase { - - public function testBugIsFixed() { -- $config = new Config([]); -+ $config = new Config(array()); - $config->setLowercaseMode(true); - - $factory = new Factory(); diff --git a/php-theseer-autoload.spec b/php-theseer-autoload.spec index f68a604..1c04015 100644 --- a/php-theseer-autoload.spec +++ b/php-theseer-autoload.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit c764a62ac6e558cb22e7a1ce09f4f9554b385937 +%global gh_commit 784b31aaedbd0db069357ce8dae64ab70e3579ca %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner theseer %global gh_project Autoload @@ -15,7 +15,7 @@ %global pear_channel pear.netpirates.net Name: php-theseer-autoload -Version: 1.24.0 +Version: 1.24.1 Release: 1%{?dist} Summary: A tool and library to generate autoload code @@ -26,8 +26,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Autoloader path Patch0: %{gh_project}-rpm.patch -# PHP 5.3 -Patch1: %{gh_project}-pr78.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.1 @@ -76,7 +74,6 @@ the option of creating static require lists as well as phar archives. %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p0 -b .rpm -%patch1 -p1 : drop composer dependencies sed -e '\:../vendor/:d' -i src/autoload.php @@ -138,6 +135,10 @@ fi %changelog +* Mon Jun 26 2017 Remi Collet <remi@remirepo.net> - 1.24.1-1 +- Update to 1.24.1 +- drop patch merged upstream + * Mon Jun 26 2017 Remi Collet <remi@remirepo.net> - 1.24.0-1 - Update to 1.24.0 - use phpunit6 on F26+ |