[php-bartlett-PHP-Reflect/f21] - Update to 2.3.0 - add dependency on seld/jsonlint
Remi Collet
remi at fedoraproject.org
Fri Aug 22 07:16:06 UTC 2014
commit e9ee481828d32a2b9272fb92d5fd7a5d6c857a39
Author: Remi Collet <remi at fedoraproject.org>
Date: Fri Aug 22 09:15:33 2014 +0200
- Update to 2.3.0
- add dependency on seld/jsonlint
.gitignore | 16 ++--------------
php-bartlett-PHP-Reflect-rpm.patch | 36 ++++++++++++++++++++++++++++++------
php-bartlett-PHP-Reflect.spec | 23 +++++++++++++++--------
sources | 2 +-
4 files changed, 48 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af997f8..04113ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,3 @@
-*spec~
-package-*.xml
-/PHP_Reflect-1.0.2.tgz
-/PHP_Reflect-1.1.0.tgz
-/PHP_Reflect-1.2.0.tgz
-/PHP_Reflect-1.3.0.tgz
-/PHP_Reflect-1.4.2.tgz
-/PHP_Reflect-1.5.0.tgz
-/PHP_Reflect-1.6.0.tgz
-/PHP_Reflect-1.6.1.tgz
-/PHP_Reflect-1.6.2.tgz
-/PHP_Reflect-1.7.0.tgz
-/PHP_Reflect-1.8.1.tgz
-/PHP_Reflect-1.9.0.tgz
+clog
/php-reflect-2.2.0.tar.gz
+/php-reflect-2.3.0.tar.gz
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 5811652..6ff6f26 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -6,13 +6,13 @@
#
# 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
+Version: 2.3.0
Release: 1%{?dist}
Summary: Adds the ability to reverse-engineer PHP
@@ -22,6 +22,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
BuildArch: noarch
@@ -34,6 +35,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",
@@ -47,10 +49,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
@@ -61,15 +65,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}
@@ -128,6 +131,10 @@ fi
%changelog
+* Fri Aug 22 2014 Remi Collet <remi at fedoraproject.org> - 2.3.0-1
+- Update to 2.3.0
+- add dependency on seld/jsonlint
+
* Fri Jul 25 2014 Remi Collet <remi at fedoraproject.org> - 2.2.0-2
- Update to 2.2.0
- sources from github
diff --git a/sources b/sources
index 83d9b78..f3bc9a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5458d3e9f6ad079f2e07a0b9b7c69537 php-reflect-2.2.0.tar.gz
+f603d1cbf0ff3dea758a32ed4751ef38 php-reflect-2.3.0.tar.gz
More information about the scm-commits
mailing list