summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--composer.json14
-rw-r--r--php-bartlett-PHP-Reflect-autoload.php2
-rw-r--r--php-bartlett-PHP-Reflect.spec77
4 files changed, 36 insertions, 64 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1ab5c4f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-package-*.xml
-*.tgz
-*.tar.gz
-*.tar.xz
-*.tar.xz.asc
-*.src.rpm
-*/*rpm
diff --git a/composer.json b/composer.json
index 401c7dc..cdc5d85 100644
--- a/composer.json
+++ b/composer.json
@@ -25,14 +25,14 @@
"ext-date": "*",
"ext-reflection": "*",
"sebastian/version": "~1.0|~2.0",
- "nikic/php-parser": "~2.1",
+ "nikic/php-parser": "~1.4",
"doctrine/collections": "~1.2",
- "symfony/event-dispatcher": "~2.5|~3.0",
- "symfony/finder": "~2.5|~3.0",
- "symfony/console": "~2.5|~3.0",
- "symfony/stopwatch": "~2.5|~3.0",
- "symfony/dependency-injection": "~2.5|~3.0",
- "phpdocumentor/reflection-docblock": "~3.0",
+ "symfony/event-dispatcher": "~2.5",
+ "symfony/finder": "~2.5",
+ "symfony/console": "~2.5",
+ "symfony/stopwatch": "~2.5",
+ "symfony/dependency-injection": "~2.5",
+ "phpdocumentor/reflection-docblock": "~2.0",
"justinrainbow/json-schema": "~1.3",
"seld/jsonlint": "~1.1"
},
diff --git a/php-bartlett-PHP-Reflect-autoload.php b/php-bartlett-PHP-Reflect-autoload.php
index 0598262..5f23681 100644
--- a/php-bartlett-PHP-Reflect-autoload.php
+++ b/php-bartlett-PHP-Reflect-autoload.php
@@ -8,7 +8,7 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('Bartlett\\', dirname(__DIR__));
\Fedora\Autoloader\Dependencies::required(array(
'/usr/share/php/Symfony/Component/autoload.php',
- '/usr/share/php/PhpParser2/autoload.php',
+ '/usr/share/php/PhpParser/autoload.php',
'/usr/share/php/Seld/JsonLint/autoload.php',
'/usr/share/php/JsonSchema/autoload.php',
'/usr/share/php/SebastianBergmann/Version/autoload.php',
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index d132550..010567d 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 458d9deef8ce3b96e7f51164b9e00507d8cd575b
+%global gh_commit 7aaf1f43760aff4b97c679c46dd8b6700c948ff5
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150331
%global gh_owner llaville
@@ -19,14 +19,10 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
%endif
-
-### TODO waiting for phpdocumentor/reflection-docblock 3.0
-
-
Name: php-bartlett-PHP-Reflect
-Version: 4.1.0
-%global specrel 1
-Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
+Version: 4.0.2
+%global specrel 2
+Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Adds the ability to reverse-engineer PHP
Group: Development/Libraries
@@ -45,30 +41,19 @@ BuildRequires: php(language) >= 5.4.0
%if %{with_tests}
# to run test suite
BuildRequires: %{_bindir}/phpunit
-BuildRequires: php-composer(sebastian/version) < 3
BuildRequires: php-composer(sebastian/version) >= 1.0
-BuildRequires: php-nikic-php-parser
-BuildRequires: php-composer(nikic/php-parser) < 3
-BuildRequires: php-composer(nikic/php-parser) >= 2.1
-BuildRequires: php-composer(doctrine/collections) < 2
+BuildRequires: php-composer(nikic/php-parser) >= 1.4
+BuildRequires: php-composer(nikic/php-parser) < 2
BuildRequires: php-composer(doctrine/collections) >= 1.2
-BuildRequires: php-composer(symfony/event-dispatcher) < 3
BuildRequires: php-composer(symfony/event-dispatcher) >= 2.5
-BuildRequires: php-composer(symfony/finder) < 3
BuildRequires: php-composer(symfony/finder) >= 2.5
-BuildRequires: php-composer(symfony/console) < 3
BuildRequires: php-composer(symfony/console) >= 2.5
-BuildRequires: php-composer(symfony/stopwatch) < 3
BuildRequires: php-composer(symfony/stopwatch) >= 2.5
-BuildRequires: php-composer(symfony/dependency-injection) < 3
BuildRequires: php-composer(symfony/dependency-injection) >= 2.5
-BuildRequires: php-composer(phpdocumentor/reflection-docblock) < 4
-BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= 3.0
-BuildRequires: php-composer(seld/jsonlint) < 3
+BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= 2.0
BuildRequires: php-composer(seld/jsonlint) >= 1.1
-BuildRequires: php-composer(justinrainbow/json-schema) < 2
BuildRequires: php-composer(justinrainbow/json-schema) >= 1.3
-BuildRequires: php-composer(monolog/monolog) < 2
+BuildRequires: php-composer(justinrainbow/json-schema) < 2
BuildRequires: php-composer(monolog/monolog) >= 1.10
# For our patch / autoloader
BuildRequires: php-doctrine-collections >= 1.3.0-2
@@ -85,14 +70,14 @@ BuildRequires: php-composer(fedora/autoloader)
# "ext-date": "*",
# "ext-reflection": "*",
# "sebastian/version": "~1.0|~2.0",
-# "nikic/php-parser": "~2.1",
+# "nikic/php-parser": "~1.4",
# "doctrine/collections": "~1.2",
-# "symfony/event-dispatcher": "~2.5|~3.0",
-# "symfony/finder": "~2.5|~3.0",
-# "symfony/console": "~2.5|~3.0"
-# "symfony/stopwatch": "~2.5|~3.0",
-# "symfony/dependency-injection": "~2.5|~3.0",
-# "phpdocumentor/reflection-docblock": "~3.0",
+# "symfony/event-dispatcher": "~2.5",
+# "symfony/finder": "~2.5",
+# "symfony/console": "~2.5"
+# "symfony/stopwatch": "~2.5",
+# "symfony/dependency-injection": "~2.5",
+# "phpdocumentor/reflection-docblock": "~2.0",
# "justinrainbow/json-schema": "~1.3",
# "seld/jsonlint": "~1.1"
Requires: php(language) >= 5.4.0
@@ -104,29 +89,28 @@ Requires: php-pdo_sqlite
Requires: php-reflection
Requires: php-spl
Requires: php-tokenizer
-Requires: php-composer(sebastian/version) < 3
Requires: php-composer(sebastian/version) >= 1.0
-Requires: php-nikic-php-parser
-Requires: php-composer(nikic/php-parser) < 3
-Requires: php-composer(nikic/php-parser) >= 2.1
-Requires: php-composer(doctrine/collections) < 2
+Requires: php-composer(sebastian/version) < 3
+Requires: php-composer(nikic/php-parser) >= 1.4
+Requires: php-composer(nikic/php-parser) < 2
Requires: php-composer(doctrine/collections) >= 1.2
-Requires: php-composer(symfony/event-dispatcher) < 3
+Requires: php-composer(doctrine/collections) < 2
Requires: php-composer(symfony/event-dispatcher) >= 2.5
-Requires: php-composer(symfony/finder) < 3
+Requires: php-composer(symfony/event-dispatcher) < 3
Requires: php-composer(symfony/finder) >= 2.5
-Requires: php-composer(symfony/console) < 3
+Requires: php-composer(symfony/finder) < 3
Requires: php-composer(symfony/console) >= 2.5
-Requires: php-composer(symfony/stopwatch) < 3
+Requires: php-composer(symfony/console) < 3
Requires: php-composer(symfony/stopwatch) >= 2.5
-Requires: php-composer(symfony/dependency-injection) < 3
+Requires: php-composer(symfony/stopwatch) < 3
Requires: php-composer(symfony/dependency-injection) >= 2.5
-Requires: php-composer(phpdocumentor/reflection-docblock) < 4
-Requires: php-composer(phpdocumentor/reflection-docblock) >= 3.0
-Requires: php-composer(seld/jsonlint) < 2
+Requires: php-composer(symfony/dependency-injection) < 3
+Requires: php-composer(phpdocumentor/reflection-docblock) >= 2.0
+Requires: php-composer(phpdocumentor/reflection-docblock) < 3
Requires: php-composer(seld/jsonlint) >= 1.1
-Requires: php-composer(justinrainbow/json-schema) < 2
+Requires: php-composer(seld/jsonlint) < 2
Requires: php-composer(justinrainbow/json-schema) >= 1.3
+Requires: php-composer(justinrainbow/json-schema) < 2
# "require-dev": {
# "doctrine/cache": "~1.3",
# "psr/log": "~1.0",
@@ -235,11 +219,6 @@ fi
%changelog
-* Tue Apr 11 2017 Remi Collet <remi@remirepo.net> - 4.1.0-1
-- Update to 4.1.0
-- raise dependency on nikic/php-parser 2.1
-- raise dependency on phpdocumentor/reflection-docblock 3.0
-
* Mon Oct 31 2016 Remi Collet <remi@fedoraproject.org> - 4.0.2-2
- switch to fedora/autoloader