php-bartlett-PHP-Reflect: 2.5.0

2 files changed, 24 insertions, 13 deletions

diff --git a/php-bartlett-PHP-Reflect-rpm.patch b/php-bartlett-PHP-Reflect-rpm.patch
index 942bc5c..ad85dd3 100644
--- a/php-bartlett-PHP-Reflect-rpm.patch
+++ b/php-bartlett-PHP-Reflect-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/phpreflect.json.dist.rpm ./bin/phpreflect.json.dist
---- ./bin/phpreflect.json.dist.rpm	2014-09-19 13:52:26.000000000 +0200
-+++ ./bin/phpreflect.json.dist	2014-09-19 16:08:31.695874693 +0200
+--- ./bin/phpreflect.json.dist.rpm	2014-10-16 14:13:07.000000000 +0200
++++ ./bin/phpreflect.json.dist	2014-10-16 16:49:30.538850254 +0200
 @@ -9,6 +9,19 @@
          {
              "name": "Analyser",
@@ -22,9 +22,9 @@ diff -up ./bin/phpreflect.json.dist.rpm ./bin/phpreflect.json.dist
      ],
      "analysers" : [
 diff -up ./bin/phpreflect.rpm ./bin/phpreflect
---- ./bin/phpreflect.rpm	2014-09-19 13:52:26.000000000 +0200
-+++ ./bin/phpreflect	2014-09-19 16:12:13.853757847 +0200
-@@ -1,11 +1,11 @@
+--- ./bin/phpreflect.rpm	2014-10-16 14:13:07.000000000 +0200
++++ ./bin/phpreflect	2014-10-16 16:50:40.458190967 +0200
+@@ -1,15 +1,11 @@
 -#!/usr/bin/env php
 +#!/usr/bin/php
  <?php
@@ -34,11 +34,15 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect
  } else {
      $baseDir   = dirname(__DIR__);
 -    $vendorDir = $baseDir . '/vendor';
+-
+-    if (!file_exists($vendorDir . '/autoload.php')) {
+-        $vendorDir = dirname(dirname($baseDir));
+-    }
 +    $vendorDir = '/usr/share/php';
  
      if (!getenv("REFLECT")) {
          $home  = defined('PHP_WINDOWS_VERSION_BUILD') ? 'USERPROFILE' : 'HOME';
-@@ -22,8 +22,27 @@ if (\Phar::running()) {
+@@ -26,8 +22,28 @@ if (\Phar::running()) {
          }
      }
  }
@@ -50,6 +54,7 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect
 +require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
 +
 +require_once $vendorDir . '/PHP/Timer.php';
++require_once $vendorDir . '/SebastianBergmann/Version/Version.php';
 +
 +use Symfony\Component\ClassLoader\UniversalClassLoader;
 +
@@ -69,8 +74,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-09-19 13:52:26.000000000 +0200
-+++ ./tests/bootstrap.php	2014-09-19 16:08:31.695874693 +0200
+--- ./tests/bootstrap.php.rpm	2014-10-16 14:13:07.000000000 +0200
++++ ./tests/bootstrap.php	2014-10-16 16:49:30.538850254 +0200
 @@ -1,6 +1,19 @@
  <?php
  
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 8d1c900..8b9a9ea 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    5f2e0a7e08e377c6924ffb5d24bc41d800a393f2
+%global gh_commit    0e2a467f0b6f0c19ee61263bce97fb387408c6e3
 #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.4.0
+Version:        2.5.0
 %global specrel 1
 Release:        %{?gh_short:0.%{specrel}.git%{gh_short}}%{!?gh_short:%{specrel}}%{?dist}
 Summary:        Adds the ability to reverse-engineer PHP
@@ -31,8 +31,9 @@ BuildArch:      noarch
 BuildRequires:  php(language)               >= 5.3
 # to run test suite
 BuildRequires:  %{_bindir}/phpunit
+Requires:       php-composer(sebastian/version)        >= 1.0
 BuildRequires:  php-composer(phpunit/php-timer)        >= 1.0
-BuildRequires:  php-composer(nikic/php-parser)         >= 1.0.0
+BuildRequires:  php-composer(nikic/php-parser)         >= 1.0
 BuildRequires:  php-composer(symfony/class-loader)     >= 2.5
 BuildRequires:  php-composer(symfony/event-dispatcher) >= 2.5
 BuildRequires:  php-composer(symfony/finder)           >= 2.5
@@ -46,7 +47,8 @@ BuildRequires:  php-composer(seld/jsonlint)            >= 1.1
 #        "ext-spl": "*",
 #        "ext-json": "*",
 #        "ext-date": "*",
-#        "phpunit/php-timer": ">=1.0.0",
+#        "sebastian/version": "~1.0",
+#        "phpunit/php-timer": "~1.0",
 #        "nikic/php-parser": "~1.0",
 #        "symfony/event-dispatcher": "~2.5",
 #        "symfony/finder": "~2.5",
@@ -59,7 +61,10 @@ Requires:       php-pcre
 Requires:       php-reflection
 Requires:       php-spl
 Requires:       php-tokenizer
-Requires:       php-composer(phpunit/php-timer)        >= 1.0.0
+Requires:       php-composer(sebastian/version)        >= 1.0
+Requires:       php-composer(sebastian/version)        <  2
+Requires:       php-composer(phpunit/php-timer)        >= 1.0
+Requires:       php-composer(phpunit/php-timer)        <  2
 Requires:       php-composer(nikic/php-parser)         >= 1.0
 Requires:       php-composer(nikic/php-parser)         <  2
 Requires:       php-composer(symfony/event-dispatcher) >= 2.5
@@ -142,6 +147,7 @@ fi
 %changelog
 * Fri Sep 19 2014 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
 - Update to 2.4.0
+- add dependency on sebastian/version
 
 * Fri Aug 22 2014 Remi Collet <remi@fedoraproject.org> - 2.3.0-1
 - Update to 2.3.0