From 50ccbb54720f3bafd0b065d0a907d0b7f80ac8cd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 16 Jun 2015 12:13:16 +0200 Subject: php-bartlett-PHP-CompatInfo: 4.3.0 --- php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch | 140 ---------------------------- php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch | 140 ++++++++++++++++++++++++++++ php-bartlett-PHP-CompatInfo.spec | 10 +- 3 files changed, 147 insertions(+), 143 deletions(-) delete mode 100644 php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch create mode 100644 php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch diff --git a/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch deleted file mode 100644 index 2f04774..0000000 --- a/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist ---- ./bin/phpcompatinfo.json.dist.rpm 2015-04-04 15:32:17.536201524 +0200 -+++ ./bin/phpcompatinfo.json.dist 2015-04-04 15:32:37.776282296 +0200 -@@ -6,6 +6,19 @@ - } - ], - "plugins": [ -+ { -+ "name": "Cache", -+ "class": "Bartlett\\Reflect\\Plugin\\CachePlugin", -+ "options": { -+ "adapter": "DoctrineCacheAdapter", -+ "backend": { -+ "class": "Doctrine\\Common\\Cache\\FilesystemCache", -+ "args": [ -+ "%{HOME}/.cache/php-reflect" -+ ] -+ } -+ } -+ } - ], - "analysers" : [ - ], -diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo ---- ./bin/phpcompatinfo.rpm 2015-04-04 08:52:23.000000000 +0200 -+++ ./bin/phpcompatinfo 2015-04-04 15:33:59.668609143 +0200 -@@ -16,8 +16,30 @@ if (\Phar::running()) { - putenv("BARTLETTRC=" . strtolower($appName) . '.json'); - } - } --$loader = require_once $vendorDir . '/autoload.php'; --$loader->setUseIncludePath(true); -+ -+putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite'); -+ -+$vendorDir = '/usr/share/php'; -+require_once $vendorDir . '/PhpParser/Autoloader.php'; -+PhpParser\Autoloader::register(); -+ -+require_once $vendorDir . '/SebastianBergmann/Version/Version.php'; -+ -+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; -+use Symfony\Component\ClassLoader\UniversalClassLoader; -+ -+$loader = new UniversalClassLoader(); -+$loader->registerNamespaces(array( -+ 'Symfony\\Component' => $vendorDir, -+ 'Doctrine\\Common' => $vendorDir, -+ 'phpDocumentor\\Reflection' => $vendorDir, -+ 'Seld\\JsonLint' => $vendorDir, -+ 'JsonSchema' => $vendorDir, -+ 'Psr\\Log' => $vendorDir, -+ 'Monolog' => $vendorDir, -+ 'Bartlett' => $vendorDir, -+)); -+$loader->register(); - - if (PHP_SAPI !== 'cli') { - return; -@@ -28,5 +50,5 @@ use Bartlett\CompatInfo\Console\Applicat - - Environment::setScanDir(); - --$application = new Application($appName, '4.2'); -+$application = new Application($appName, '@package_version@'); - $application->run(); -diff -up ./data/handleDB.php.rpm ./data/handleDB.php ---- ./data/handleDB.php.rpm 2015-04-04 08:52:23.000000000 +0200 -+++ ./data/handleDB.php 2015-04-04 15:31:55.188112331 +0200 -@@ -11,7 +11,18 @@ - * @since Release 4.0.0alpha3 - */ - --require_once dirname(__DIR__) . '/vendor/autoload.php'; -+$baseDir = dirname(__DIR__); -+$vendorDir = '/usr/share/php'; -+require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; -+use Symfony\Component\ClassLoader\UniversalClassLoader; -+ -+$loader = new UniversalClassLoader(); -+$loader->registerNamespaces(array( -+ 'Symfony\\Component' => $vendorDir, -+ )); -+ -+$loader->register(); -+ - require_once __DIR__ . '/ReferenceCollection.php'; - - use Bartlett\CompatInfo\Reference\ExtensionFactory; -diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo/Environment.php ---- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-04-04 08:52:23.000000000 +0200 -+++ ./src/Bartlett/CompatInfo/Environment.php 2015-04-04 15:31:55.188112331 +0200 -@@ -34,6 +34,10 @@ class Environment - */ - public static function initRefDb() - { -+ if ($database = getenv('BARTLETT_COMPATINFO_DB')) { -+ return new \PDO('sqlite:' . $database); -+ } -+ - $database = 'compatinfo.sqlite'; - $tempDir = sys_get_temp_dir() . '/bartlett'; - -diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2015-04-04 08:52:23.000000000 +0200 -+++ ./tests/bootstrap.php 2015-04-04 15:31:55.188112331 +0200 -@@ -1,8 +1,31 @@ - registerNamespaces(array( -+ 'Doctrine\\Common' => $vendorDir, -+ 'phpDocumentor\\Reflection' => $vendorDir, -+ 'Symfony\\Component' => $vendorDir, -+ 'Seld\\JsonLint' => $vendorDir, -+ 'JsonSchema' => $vendorDir, -+ 'Bartlett\\Reflect' => $vendorDir, -+ 'Bartlett\\UmlWriter' => $vendorDir, -+ 'Bartlett\\Tests\\CompatInfo' => $baseDir . '/tests', -+ 'Bartlett' => $baseDir . '/src', -+ )); -+ -+$loader->register(); -+ -+# Class not catched by autoloader -+require $vendorDir . '/Bartlett/Reflect.php'; - require __DIR__ . '/Reference/GenericTest.php'; diff --git a/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch new file mode 100644 index 0000000..36e02b5 --- /dev/null +++ b/php-bartlett-PHP-CompatInfo-4.3.0-rpm.patch @@ -0,0 +1,140 @@ +diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist +--- ./bin/phpcompatinfo.json.dist.rpm 2015-04-04 15:32:17.536201524 +0200 ++++ ./bin/phpcompatinfo.json.dist 2015-04-04 15:32:37.776282296 +0200 +@@ -6,6 +6,19 @@ + } + ], + "plugins": [ ++ { ++ "name": "Cache", ++ "class": "Bartlett\\Reflect\\Plugin\\CachePlugin", ++ "options": { ++ "adapter": "DoctrineCacheAdapter", ++ "backend": { ++ "class": "Doctrine\\Common\\Cache\\FilesystemCache", ++ "args": [ ++ "%{HOME}/.cache/php-reflect" ++ ] ++ } ++ } ++ } + ], + "analysers" : [ + ], +diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +--- ./bin/phpcompatinfo.rpm 2015-04-04 08:52:23.000000000 +0200 ++++ ./bin/phpcompatinfo 2015-04-04 15:33:59.668609143 +0200 +@@ -16,8 +16,30 @@ if (\Phar::running()) { + putenv("BARTLETTRC=" . strtolower($appName) . '.json'); + } + } +-$loader = require_once $vendorDir . '/autoload.php'; +-$loader->setUseIncludePath(true); ++ ++putenv('BARTLETT_COMPATINFO_DB=/usr/share/php-bartlett-PHP-CompatInfo/compatinfo.sqlite'); ++ ++$vendorDir = '/usr/share/php'; ++require_once $vendorDir . '/PhpParser/Autoloader.php'; ++PhpParser\Autoloader::register(); ++ ++require_once $vendorDir . '/SebastianBergmann/Version/Version.php'; ++ ++require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; ++use Symfony\Component\ClassLoader\UniversalClassLoader; ++ ++$loader = new UniversalClassLoader(); ++$loader->registerNamespaces(array( ++ 'Symfony\\Component' => $vendorDir, ++ 'Doctrine\\Common' => $vendorDir, ++ 'phpDocumentor\\Reflection' => $vendorDir, ++ 'Seld\\JsonLint' => $vendorDir, ++ 'JsonSchema' => $vendorDir, ++ 'Psr\\Log' => $vendorDir, ++ 'Monolog' => $vendorDir, ++ 'Bartlett' => $vendorDir, ++)); ++$loader->register(); + + if (PHP_SAPI !== 'cli') { + return; +@@ -28,5 +50,5 @@ use Bartlett\CompatInfo\Console\Applicat + + Environment::setScanDir(); + +-$application = new Application($appName, '4.3'); ++$application = new Application($appName, '@package_version@'); + $application->run(); +diff -up ./data/handleDB.php.rpm ./data/handleDB.php +--- ./data/handleDB.php.rpm 2015-04-04 08:52:23.000000000 +0200 ++++ ./data/handleDB.php 2015-04-04 15:31:55.188112331 +0200 +@@ -11,7 +11,18 @@ + * @since Release 4.0.0alpha3 + */ + +-require_once dirname(__DIR__) . '/vendor/autoload.php'; ++$baseDir = dirname(__DIR__); ++$vendorDir = '/usr/share/php'; ++require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; ++use Symfony\Component\ClassLoader\UniversalClassLoader; ++ ++$loader = new UniversalClassLoader(); ++$loader->registerNamespaces(array( ++ 'Symfony\\Component' => $vendorDir, ++ )); ++ ++$loader->register(); ++ + require_once __DIR__ . '/ReferenceCollection.php'; + + use Bartlett\CompatInfo\Reference\ExtensionFactory; +diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo/Environment.php +--- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-04-04 08:52:23.000000000 +0200 ++++ ./src/Bartlett/CompatInfo/Environment.php 2015-04-04 15:31:55.188112331 +0200 +@@ -34,6 +34,10 @@ class Environment + */ + public static function initRefDb() + { ++ if ($database = getenv('BARTLETT_COMPATINFO_DB')) { ++ return new \PDO('sqlite:' . $database); ++ } ++ + $database = 'compatinfo.sqlite'; + $tempDir = sys_get_temp_dir() . '/bartlett'; + +diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php +--- ./tests/bootstrap.php.rpm 2015-04-04 08:52:23.000000000 +0200 ++++ ./tests/bootstrap.php 2015-04-04 15:31:55.188112331 +0200 +@@ -1,8 +1,31 @@ + registerNamespaces(array( ++ 'Doctrine\\Common' => $vendorDir, ++ 'phpDocumentor\\Reflection' => $vendorDir, ++ 'Symfony\\Component' => $vendorDir, ++ 'Seld\\JsonLint' => $vendorDir, ++ 'JsonSchema' => $vendorDir, ++ 'Bartlett\\Reflect' => $vendorDir, ++ 'Bartlett\\UmlWriter' => $vendorDir, ++ 'Bartlett\\Tests\\CompatInfo' => $baseDir . '/tests', ++ 'Bartlett' => $baseDir . '/src', ++ )); ++ ++$loader->register(); ++ ++# Class not catched by autoloader ++require $vendorDir . '/Bartlett/Reflect.php'; + require __DIR__ . '/Reference/GenericTest.php'; diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 17c8dc8..dcfd868 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 4026f69cd3d5f03467a58386a4a00225e3dc2544 +%global gh_commit c4bfef85fe799d2079f98f7b3e46d021bc739069 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150303 %global gh_owner llaville @@ -15,7 +15,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-bartlett-PHP-CompatInfo -Version: 4.2.0 +Version: 4.3.0 %global specrel 1 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -29,7 +29,7 @@ Source1: fedora-review-check # Autoloader for RPM - die composer ! # and sqlite database path -Patch0: %{name}-4.2.0-rpm.patch +Patch0: %{name}-4.3.0-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.2 @@ -142,6 +142,7 @@ install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name} %{_bindir}/phpunit \ --include-path src \ -d memory_limit=-1 \ + --verbose \ %if 0%{?fedora} < 21 || exit 0 %endif @@ -167,6 +168,9 @@ fi %changelog +* Tue Jun 16 2015 Remi Collet - 4.6.0-1 +- update to 4.3.0 + * Tue May 19 2015 Remi Collet - 4.2.0-1 - update to 4.2.0 - raise dependency on bartlett/php-reflect 3.1 -- cgit