remi pushed to php-bartlett-PHP-CompatInfo (f22). "- update to 4.2.0 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri May 22 17:22:02 UTC 2015
From c1b0beae351ce25c5b967fcd7837b9ea50dac100 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Fri, 22 May 2015 19:21:02 +0200
Subject: - update to 4.2.0 - raise dependency on bartlett/php-reflect 3.1 -
add dependency on bartlett/umlwriter - add fedora-review-check script -
handle --without tests option to skip test suite during build
diff --git a/.gitignore b/.gitignore
index 00940a2..8b85b01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ clog
/php-compat-info-3.7.1.tar.gz
/php-compat-info-3.7.2.tar.gz
/php-compat-info-3.7.3.tar.gz
+/php-compat-info-4.2.0-4026f69.tar.gz
diff --git a/fedora-review-check b/fedora-review-check
new file mode 100755
index 0000000..cc72fc4
--- /dev/null
+++ b/fedora-review-check
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ $# -eq 2 ]
+then exec /usr/bin/phpcompatinfo analyser:run $2 --output $1 --no-ansi
+
+else echo "usage $0 logname dirname"
+ exit 1
+fi
diff --git a/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.2.0-rpm.patch
new file mode 100644
index 0000000..2f04774
--- /dev/null
+++ b/php-bartlett-PHP-CompatInfo-4.2.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.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 @@
+ <?php
+
+ $baseDir = dirname(__DIR__);
+-$vendorDir = $baseDir . '/vendor';
++$vendorDir = '/usr/share/php';
+
+-require_once $vendorDir . '/autoload.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(
++ '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-rpm.patch b/php-bartlett-PHP-CompatInfo-rpm.patch
deleted file mode 100644
index 87bbfe0..0000000
--- a/php-bartlett-PHP-CompatInfo-rpm.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up ./bin/phpcompatinfo.json.dist.rpm ./bin/phpcompatinfo.json.dist
---- ./bin/phpcompatinfo.json.dist.rpm 2014-08-22 08:17:40.045281815 +0200
-+++ ./bin/phpcompatinfo.json.dist 2014-08-22 08:17:46.784308376 +0200
-@@ -9,6 +9,19 @@
- {
- "name": "Analyser",
- "class": "Bartlett\\Reflect\\Plugin\\Analyser\\AnalyserPlugin"
-+ },
-+ {
-+ "name": "Cache",
-+ "class": "Bartlett\\Reflect\\Plugin\\Cache\\CachePlugin",
-+ "options": {
-+ "adapter": "DoctrineCacheAdapter",
-+ "backend": {
-+ "class": "Doctrine\\Common\\Cache\\FilesystemCache",
-+ "args": [
-+ "%{HOME}/.cache/phpreflect"
-+ ]
-+ }
-+ }
- }
- ],
- "analysers" : [
-diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
---- ./bin/phpcompatinfo.rpm 2014-11-13 15:57:07.000000000 +0100
-+++ ./bin/phpcompatinfo 2014-11-13 17:57:48.174914678 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env php
-+#!/usr/bin/php
- <?php
- ini_set('memory_limit', -1);
-
-@@ -27,8 +27,28 @@ if (\Phar::running()) {
- }
- }
- }
--$loader = require_once $vendorDir . '/autoload.php';
--$loader->setUseIncludePath(true);
-+$vendorDir = '/usr/share/php';
-+require_once $vendorDir . '/PhpParser/Autoloader.php';
-+PhpParser\Autoloader::register();
-+
-+require_once $vendorDir . '/PHP/Timer.php';
-+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(
-+ 'Doctrine\\Common\\Cache' => $vendorDir,
-+ 'Symfony\\Component\\Finder' => $vendorDir,
-+ 'Symfony\\Component\\EventDispatcher' => $vendorDir,
-+ 'Symfony\\Component\\Console' => $vendorDir,
-+ 'Symfony\\Component\\ClassLoader' => $vendorDir,
-+ 'Seld\\JsonLint' => $vendorDir,
-+ 'JsonSchema' => $vendorDir,
-+ 'Bartlett' => $vendorDir,
-+));
-+$loader->register();
-
- if (PHP_SAPI !== 'cli') {
- return;
-diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm 2014-08-21 21:09:22.000000000 +0200
-+++ ./tests/bootstrap.php 2014-08-22 08:30:12.203270207 +0200
-@@ -1,8 +1,30 @@
- <?php
-
- $baseDir = dirname(__DIR__);
--$vendorDir = $baseDir . '/vendor';
-+$vendorDir = '/usr/share/php';
-
--require_once $vendorDir . '/autoload.php';
-+require_once $vendorDir . '/PhpParser/Autoloader.php';
-+PhpParser\Autoloader::register();
-
-+require_once $vendorDir . '/PHP/Timer.php';
-+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\\Finder' => $vendorDir,
-+ 'Symfony\\Component\\EventDispatcher' => $vendorDir,
-+ 'Symfony\\Component\\Console' => $vendorDir,
-+ 'Symfony\\Component\\ClassLoader' => $vendorDir,
-+ 'Bartlett\\Reflect' => $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 1216d39..b6af49e 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -1,61 +1,91 @@
-# spec file for php-bartlett-PHP-CompatInfo
+# remirepo/fedora spec file for php-bartlett-PHP-CompatInfo
#
# Copyright (c) 2011-2015 Remi Collet
# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit e84e2b60281f1f97b886208d6d06efa4d7701236
-#global gh_short %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_commit 4026f69cd3d5f03467a58386a4a00225e3dc2544
+%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner llaville
%global gh_project php-compat-info
+%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: php-bartlett-PHP-CompatInfo
-Version: 3.7.3
+Version: 4.2.0
Release: 1%{?dist}
Summary: Find out version and the extensions required for a piece of code to run
Group: Development/Libraries
License: BSD
URL: http://php5.laurent-laville.org/compatinfo/
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?gh_short:-%{gh_short}}.tar.gz
+Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
+# Script for fedora-review
+Source1: fedora-review-check
# Autoloader for RPM - die composer !
-Patch0: %{name}-rpm.patch
+# and sqlite database path
+Patch0: %{name}-4.2.0-rpm.patch
BuildArch: noarch
-BuildRequires: php(language) >= 5.3.0
+BuildRequires: php(language) >= 5.3.2
+BuildRequires: php-pdo_sqlite
+BuildRequires: php-composer(bartlett/php-reflect) >= 3.1
+%if %{with_tests}
# to run test suite
BuildRequires: %{_bindir}/phpunit
-BuildRequires: php-composer(bartlett/php-reflect) >= 2.6.2
+%endif
# From composer.json, "require"
-# "php": ">=5.3.0",
+# "php": ">=5.3.2",
# "ext-libxml": "*",
# "ext-pcre": "*",
# "ext-spl": "*",
# "ext-json": "*",
+# "ext-pdo_sqlite": "*",
# "symfony/console": "~2.5",
-# "bartlett/php-reflect": "^2.6.2",
-Requires: php(language) >= 5.3.0
+# "bartlett/php-reflect": "~3.1",
+Requires: php(language) >= 5.3.2
+Requires: php-cli
Requires: php-json
Requires: php-libxml
Requires: php-pcre
+Requires: php-pdo_sqlite
Requires: php-spl
-Requires: php-composer(bartlett/php-reflect) >= 2.6.2
-Requires: php-composer(bartlett/php-reflect) < 3
+Requires: php-composer(bartlett/php-reflect) >= 3.1
+Requires: php-composer(bartlett/php-reflect) < 4
Requires: php-composer(symfony/console) >= 2.5
Requires: php-composer(symfony/console) < 3
+# From composer.json, "require-dev": {
+# "doctrine/cache": "~1.3",
+# "psr/log": "~1.0",
+# "monolog/monolog": "~1.10",
+# "bartlett/monolog-callbackfilterhandler": "~1.0",
+# "bartlett/monolog-growlhandler": "~1.0",
+# "bartlett/phpunit-loggertestlistener": "~1.5",
+# "bartlett/umlwriter": "~1.0"
# From composer.json, "suggest"
+# "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2",
+# "psr/log": "Allow logging events with the LogPlugin",
+# "monolog/monolog": "Allow logging events with the LogPlugin",
+# "bartlett/monolog-callbackfilterhandler": "Advanced filtering strategies for Monolog",
+# "bartlett/monolog-growlhandler": "Sends notifications to Growl for Monolog",
+# "bartlett/phpunit-loggertestlistener": "Allow logging unit tests to your favorite PSR-3 logger interface",
+# "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)"
# "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2"
+# "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)"
Requires: php-composer(doctrine/cache)
+Requires: php-composer(bartlett/umlwriter)
# Required by autoloader
-Requires: php-composer(phpunit/php-timer)
Requires: php-composer(nikic/php-parser)
+Requires: php-composer(doctrine/collections)
Requires: php-composer(symfony/class-loader)
Requires: php-composer(symfony/event-dispatcher)
Requires: php-composer(symfony/finder)
+Requires: php-composer(symfony/stopwatch)
+Requires: php-composer(symfony/dependency-injection)
+Requires: php-composer(phpdocumentor/reflection-docblock)
Requires: php-composer(seld/jsonlint)
Requires: php-composer(sebastian/version)
Requires: php-composer(justinrainbow/json-schema)
@@ -78,12 +108,17 @@ Documentation: http://php5.laurent-laville.org/compatinfo/manual/current/en/
%patch0 -p1 -b .rpm
-sed -e 's/@package_version@/%{version}/' \
- -i $(find src -name \*.php)
+# Cleanup patched files
+find src -name \*rpm -delete -print
+
+# Set package version
+sed -e 's/@package_version@/%{version}%{?prever}/' \
+ -i $(find src -name \*.php) bin/phpcompatinfo
%build
-# Nothing
+: Generate the references database
+%{_bindir}/php -d date.timezone=Europe/Paris data/handleDB.php db:init
%install
@@ -93,14 +128,20 @@ cp -pr src/Bartlett %{buildroot}%{_datadir}/php/Bartlett
install -D -p -m 755 bin/phpcompatinfo %{buildroot}%{_bindir}/phpcompatinfo
install -D -p -m 644 bin/phpcompatinfo.json.dist %{buildroot}%{_sysconfdir}/phpcompatinfo.json
install -D -p -m 644 bin/phpcompatinfo.1 %{buildroot}%{_mandir}/man1/phpcompatinfo.1
+install -D -p -m 644 data/compatinfo.sqlite %{buildroot}%{_datadir}/%{name}/compatinfo.sqlite
+
+install -D -p -m 755 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/fedora-review-check
+%if %{with_tests}
%check
%{_bindir}/phpunit \
+ --include-path src \
-d memory_limit=-1 \
-%if 0%{?rhel} < 6 && 0%{?fedora} < 8
+%if 0%{?fedora} < 21
|| exit 0
%endif
+%endif
%post
@@ -117,11 +158,18 @@ fi
%config(noreplace) %{_sysconfdir}/phpcompatinfo.json
%{_bindir}/phpcompatinfo
%{_datadir}/php/Bartlett/CompatInfo
-%{_datadir}/php/Bartlett/CompatInfo.php
%{_mandir}/man1/phpcompatinfo.1*
+%{_datadir}/%{name}
%changelog
+* Tue May 19 2015 Remi Collet <remi at fedoraproject.org> - 4.2.0-1
+- update to 4.2.0
+- raise dependency on bartlett/php-reflect 3.1
+- add dependency on bartlett/umlwriter
+- add fedora-review-check script
+- handle --without tests option to skip test suite during build
+
* Mon Feb 2 2015 Remi Collet <remi at fedoraproject.org> - 3.7.3-1
- Update to 3.7.3
diff --git a/sources b/sources
index ae9320c..1684989 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfd5b14306cb43816daefc75423c6ff3 php-compat-info-3.7.3.tar.gz
+64324284bb811c9d185f41b5e5109a32 php-compat-info-4.2.0-4026f69.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/php-bartlett-PHP-CompatInfo.git/commit/?h=f22&id=c1b0beae351ce25c5b967fcd7837b9ea50dac100
More information about the scm-commits
mailing list