summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-08-22 08:14:06 +0200
committerRemi Collet <fedora@famillecollet.com>2014-08-22 08:14:06 +0200
commit4f39b288d6e5f39ed95de4bc89a9df96c7faf11a (patch)
tree618fe86df044e8d213223209817c92d4c18a380c
parente63dcf13bc95d5d0cdf4eba5dca7bc3c60cd4f7f (diff)
php-bartlett-PHP-Reflect: 2.3.0
-rw-r--r--php-bartlett-PHP-Reflect-rpm.patch36
-rw-r--r--php-bartlett-PHP-Reflect.spec25
2 files changed, 46 insertions, 15 deletions
diff --git a/php-bartlett-PHP-Reflect-rpm.patch b/php-bartlett-PHP-Reflect-rpm.patch
index d68238d..2d25467 100644
--- a/php-bartlett-PHP-Reflect-rpm.patch
+++ b/php-bartlett-PHP-Reflect-rpm.patch
@@ -1,6 +1,29 @@
+diff -up ./bin/phpreflect.json.dist.rpm ./bin/phpreflect.json.dist
+--- ./bin/phpreflect.json.dist.rpm 2014-08-22 08:04:25.256132414 +0200
++++ ./bin/phpreflect.json.dist 2014-08-22 08:04:29.413148972 +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/phpreflect.rpm ./bin/phpreflect
---- ./bin/phpreflect.rpm 2014-07-23 17:49:46.000000000 +0200
-+++ ./bin/phpreflect 2014-07-24 07:32:27.586541797 +0200
+--- ./bin/phpreflect.rpm 2014-08-21 19:09:40.000000000 +0200
++++ ./bin/phpreflect 2014-08-22 08:04:07.852063131 +0200
@@ -1,11 +1,11 @@
-#!/usr/bin/env php
+#!/usr/bin/php
@@ -14,8 +37,8 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect
+ $vendorDir = '/usr/share/php';
if (!getenv("REFLECT")) {
- $files = array(
-@@ -21,7 +21,25 @@ if (\Phar::running()) {
+ $home = defined('PHP_WINDOWS_VERSION_BUILD') ? 'USERPROFILE' : 'HOME';
+@@ -22,7 +22,26 @@ if (\Phar::running()) {
}
}
}
@@ -36,6 +59,7 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect
+ 'Symfony\\Component\\Console' => $vendorDir,
+ 'Symfony\\Component\\ClassLoader' => $vendorDir,
+ 'Doctrine\\Common\\Cache' => $vendorDir,
++ 'Seld\\JsonLint' => $vendorDir,
+ 'Bartlett' => $vendorDir,
+));
+$loader->register();
@@ -43,8 +67,8 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect
if (PHP_SAPI !== 'cli') {
return;
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm 2014-07-23 17:49:46.000000000 +0200
-+++ ./tests/bootstrap.php 2014-07-24 07:32:12.151469115 +0200
+--- ./tests/bootstrap.php.rpm 2014-08-21 19:09:40.000000000 +0200
++++ ./tests/bootstrap.php 2014-08-22 08:04:07.852063131 +0200
@@ -1,6 +1,19 @@
<?php
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 0672161..45dc9ab 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -6,14 +6,14 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 971d6bfaf85b89df0f40245775fb94ba806c6f84
+%global gh_commit d29fddd3c9732d2faa74eae0c3ddfdfdef551489
#global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner llaville
%global gh_project php-reflect
Name: php-bartlett-PHP-Reflect
-Version: 2.2.0
-%global specrel 2
+Version: 2.3.0
+%global specrel 1
Release: %{?gh_short:0.%{specrel}.git%{gh_short}}%{!?gh_short:%{specrel}}%{?dist}
Summary: Adds the ability to reverse-engineer PHP
@@ -23,6 +23,7 @@ URL: http://php5.laurent-laville.org/reflect/
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?gh_short:-%{gh_short}}.tar.gz
# Autoloader for RPM - die composer !
+# Enable cache plugin
Patch0: %{name}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +37,7 @@ BuildRequires: php-composer(symfony/class-loader) >= 2.5
BuildRequires: php-composer(symfony/event-dispatcher) >= 2.5
BuildRequires: php-composer(symfony/finder) >= 2.5
BuildRequires: php-composer(symfony/console) >= 2.5
+BuildRequires: php-composer(seld/jsonlint) >= 1.1
# From composer.json, "require"
# "php": ">=5.3.0",
@@ -49,10 +51,12 @@ BuildRequires: php-composer(symfony/console) >= 2.5
# "symfony/event-dispatcher": "~2.5",
# "symfony/finder": "~2.5",
# "symfony/console": "~2.5"
+# "seld/jsonlint": "~1.1"
Requires: php(language) >= 5.3
Requires: php-date
Requires: php-json
Requires: php-pcre
+Requires: php-reflection
Requires: php-spl
Requires: php-tokenizer
Requires: php-composer(phpunit/php-timer) >= 1.0.0
@@ -63,15 +67,14 @@ Requires: php-composer(symfony/finder) >= 2.5
Requires: php-composer(symfony/finder) < 3
Requires: php-composer(symfony/console) >= 2.5
Requires: php-composer(symfony/console) < 3
-# From coposer.json, "suggest"
-# "doctrine/cache": "~1.3"
-Requires: php-composer(doctrine/cache) >= 1.3
-Requires: php-composer(doctrine/cache) < 2
+Requires: php-composer(seld/jsonlint) >= 1.1
+Requires: php-composer(seld/jsonlint) < 2
+# From composer.json, "suggest"
+# "doctrine/cache": "Allow caching results"
+Requires: php-composer(doctrine/cache)
# For our patch
Requires: php-composer(symfony/class-loader) >= 2.5
Requires: php-composer(symfony/class-loader) < 3
-# From package.xml
-Requires: php-reflection
Obsoletes: php-channel-bartlett <= 1.3
Provides: php-composer(bartlett/php-reflect) = %{version}
@@ -136,6 +139,10 @@ fi
%changelog
+* Fri Aug 22 2014 Remi Collet <remi@fedoraproject.org> - 2.3.0-1
+- Update to 2.3.0
+- add dependency on seld/jsonlint
+
* Fri Jul 25 2014 Remi Collet <remi@fedoraproject.org> - 2.2.0-2
- obsoletes php-channel-bartlett