diff options
| -rw-r--r-- | php-bartlett-PHP-Reflect-3.0.0-rpm.patch | 27 | ||||
| -rw-r--r-- | php-bartlett-PHP-Reflect.spec | 9 |
2 files changed, 19 insertions, 17 deletions
diff --git a/php-bartlett-PHP-Reflect-3.0.0-rpm.patch b/php-bartlett-PHP-Reflect-3.0.0-rpm.patch index ea2760a..c9b4c73 100644 --- a/php-bartlett-PHP-Reflect-3.0.0-rpm.patch +++ b/php-bartlett-PHP-Reflect-3.0.0-rpm.patch @@ -21,28 +21,27 @@ diff -up ./bin/phpreflect.json.dist.rpm ./bin/phpreflect.json.dist ], "analysers": [ ], -diff -up ./bin/phpreflect.rpm ./bin/phpreflect ---- ./bin/phpreflect.rpm 2015-05-11 12:55:49.000000000 +0200 -+++ ./bin/phpreflect 2015-05-11 13:24:26.130135886 +0200 -@@ -5,19 +5,35 @@ $appName = 'phpReflect'; +--- ./bin/phpreflect.rpm 2015-06-18 13:30:46.000000000 +0200 ++++ ./bin/phpreflect 2015-06-18 15:22:05.844085467 +0200 +@@ -5,19 +5,34 @@ if (\Phar::running()) { $vendorDir = 'phar://' . strtolower($appName) . '.phar/vendor'; } else { - $baseDir = dirname(__DIR__); - $vendorDir = $baseDir . '/vendor'; -+ putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite'); - +- - if (!file_exists($vendorDir . '/autoload.php')) { - $vendorDir = dirname(dirname($baseDir)); - } -+ $vendorDir = '/usr/share/php'; - ++ putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite'); + if (!getenv("BARTLETTRC")) { putenv("BARTLETTRC=" . strtolower($appName) . '.json'); } } -$loader = require_once $vendorDir . '/autoload.php'; -$loader->setUseIncludePath(true); ++ +require_once $vendorDir . '/PhpParser/Autoloader.php'; +PhpParser\Autoloader::register(); + @@ -64,13 +63,13 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect +)); +$loader->useIncludePath(true); +$loader->register(); - - if (PHP_SAPI !== 'cli') { - return; -@@ -28,5 +44,5 @@ use Bartlett\Reflect\Console\Application - + + if (\Phar::running()) { + if ($home) { +@@ -40,5 +55,5 @@ + Environment::setScanDir(); - + -$application = new Application($appName, '3.1'); +$application = new Application($appName, '@package_version@'); $application->run(); diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec index 52176b7..fb07c2c 100644 --- a/php-bartlett-PHP-Reflect.spec +++ b/php-bartlett-PHP-Reflect.spec @@ -1,4 +1,4 @@ -# spec file for php-bartlett-PHP-Reflect +# remirepo/fedora spec file for php-bartlett-PHP-Reflect # # Copyright (c) 2011-2015 Remi Collet # License: CC-BY-SA @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit c5c669565030b1d051dfa75feb49783ac6b9dfa9 +%global gh_commit b07c6160c9a6dd6ecfeeb4e72527e15bbe8099cd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150331 %global gh_owner llaville @@ -20,7 +20,7 @@ %endif Name: php-bartlett-PHP-Reflect -Version: 3.1.0 +Version: 3.1.1 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Adds the ability to reverse-engineer PHP @@ -191,6 +191,9 @@ fi %changelog +* Thu Jun 18 2015 Remi Collet <remi@fedoraproject.org> - 3.1.1-1 +- update to 3.1.1 + * Mon May 11 2015 Remi Collet <remi@fedoraproject.org> - 3.1.0-1 - update to 3.1.0 |