diff options
| -rw-r--r-- | 27.patch | 30 | ||||
| -rw-r--r-- | php-bartlett-PHP-Reflect.spec | 12 |
2 files changed, 6 insertions, 36 deletions
diff --git a/27.patch b/27.patch deleted file mode 100644 index 12ebe25..0000000 --- a/27.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a24e257e3f4975723e3176942ca9bcafb4222429 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 13 Dec 2017 15:37:15 +0100 -Subject: [PATCH] Fix #26 regression with previous cache configuration - ---- - src/Bartlett/Reflect/Plugin/PluginManager.php | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/Bartlett/Reflect/Plugin/PluginManager.php b/src/Bartlett/Reflect/Plugin/PluginManager.php -index 483b200..fdf19c5 100644 ---- a/src/Bartlett/Reflect/Plugin/PluginManager.php -+++ b/src/Bartlett/Reflect/Plugin/PluginManager.php -@@ -68,10 +68,12 @@ public function registerPlugins() - if (class_exists($plugin['class'])) { - if (isset($plugin['options'])) { - $options = $plugin['options']; -- if (is_string($options) && class_exists($options)) { -- $options = new $options; -- } else { -- $options = null; -+ if (is_string($options)) { -+ if (class_exists($options)) { -+ $options = new $options; -+ } else { -+ $options = null; -+ } - } - } else { - $options = null; diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec index e5bb589..3f27328 100644 --- a/php-bartlett-PHP-Reflect.spec +++ b/php-bartlett-PHP-Reflect.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 48b8e0f7770509a1e426abd412c0ad51011ff6e4 +%global gh_commit 7fe0e8e023b3126344a1bc5c2a408d49249001eb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150331 %global gh_owner llaville @@ -26,8 +26,8 @@ %endif Name: php-bartlett-PHP-Reflect -Version: 4.2.1 -%global specrel 2 +Version: 4.2.2 +%global specrel 1 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Adds the ability to reverse-engineer PHP @@ -42,8 +42,6 @@ Source1: %{name}-autoload.php # Enable cache plugin Patch0: %{name}-4.0.0-rpm.patch -Patch1: https://patch-diff.githubusercontent.com/raw/llaville/php-reflect/pull/27.patch - BuildArch: noarch BuildRequires: php(language) >= 5.5 %if %{with_tests} @@ -164,7 +162,6 @@ Documentation: http://php5.laurent-laville.org/reflect/manual/current/en/ %patch0 -p1 -b .rpm cp %{SOURCE1} src/Bartlett/Reflect/autoload.php -%patch1 -p1 sed -e 's/@package_version@/%{version}%{?prever}/' \ -i $(find src -name \*.php) bin/phpreflect @@ -217,6 +214,9 @@ fi %changelog +* Thu Dec 14 2017 Remi Collet <remi@remirepo.net> - 4.2.2-1 +- Update to 4.2.2 + * Tue Dec 12 2017 Remi Collet <remi@remirepo.net> - 4.2.1-2 - fix regression with cache configuration from https://github.com/llaville/php-reflect/pull/27 |