summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json14
-rw-r--r--php-bartlett-PHP-Reflect-autoload.php12
-rw-r--r--php-bartlett-PHP-Reflect.spec89
3 files changed, 55 insertions, 60 deletions
diff --git a/composer.json b/composer.json
index cdc5d85..401c7dc 100644
--- a/composer.json
+++ b/composer.json
@@ -25,14 +25,14 @@
"ext-date": "*",
"ext-reflection": "*",
"sebastian/version": "~1.0|~2.0",
- "nikic/php-parser": "~1.4",
+ "nikic/php-parser": "~2.1",
"doctrine/collections": "~1.2",
- "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",
+ "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",
"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 53aeafa..a7606de 100644
--- a/php-bartlett-PHP-Reflect-autoload.php
+++ b/php-bartlett-PHP-Reflect-autoload.php
@@ -7,17 +7,17 @@ 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/PhpParser/autoload.php',
+ array(
+ '/usr/share/php/Symfony/Component3/autoload.php',
+ '/usr/share/php/Symfony/Component/autoload.php',
+ ),
+ '/usr/share/php/PhpParser2/autoload.php',
'/usr/share/php/Seld/JsonLint/autoload.php',
'/usr/share/php/JsonSchema/autoload.php',
'/usr/share/php/SebastianBergmann/Version/autoload.php',
'/usr/share/php/Doctrine/Common/Collections/autoload.php',
'/usr/share/php/Doctrine/Common/Cache/autoload.php',
- array(
- '/usr/share/php/phpDocumentor/Reflection/DocBlock2/autoload.php',
- '/usr/share/php/phpDocumentor/Reflection/DocBlock/autoload.php',
- ),
+ '/usr/share/php/phpDocumentor/Reflection/DocBlock/autoload.php',
));
\Fedora\Autoloader\Dependencies::optional(array(
'/usr/share/php/Bartlett/CompatInfo/autoload.php', // Needed when installed for 'Bartlett\CompatInfo\Analyser\CompatibilityAnalyser'
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 984f46a..e30ea55 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 7aaf1f43760aff4b97c679c46dd8b6700c948ff5
+%global gh_commit 458d9deef8ce3b96e7f51164b9e00507d8cd575b
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150331
%global gh_owner llaville
@@ -20,9 +20,9 @@
%endif
Name: php-bartlett-PHP-Reflect
-Version: 4.0.2
-%global specrel 3
-Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
+Version: 4.1.0
+%global specrel 1
+Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Adds the ability to reverse-engineer PHP
Group: Development/Libraries
@@ -43,22 +43,22 @@ BuildRequires: php(language) >= 5.4.0
BuildRequires: %{_bindir}/phpunit
BuildRequires: php-composer(sebastian/version) >= 1.0
BuildRequires: php-composer(sebastian/version) < 3
-BuildRequires: php-composer(nikic/php-parser) >= 1.4
-BuildRequires: php-composer(nikic/php-parser) < 2
+BuildRequires: php-composer(nikic/php-parser) >= 2.1
+BuildRequires: php-composer(nikic/php-parser) < 3
BuildRequires: php-composer(doctrine/collections) >= 1.2
BuildRequires: php-composer(doctrine/collections) < 2
BuildRequires: php-composer(symfony/event-dispatcher) >= 2.5
-BuildRequires: php-composer(symfony/event-dispatcher) < 3
+BuildRequires: php-composer(symfony/event-dispatcher) < 4
BuildRequires: php-composer(symfony/finder) >= 2.5
-BuildRequires: php-composer(symfony/finder) < 3
+BuildRequires: php-composer(symfony/finder) < 4
BuildRequires: php-composer(symfony/console) >= 2.5
-BuildRequires: php-composer(symfony/console) < 3
+BuildRequires: php-composer(symfony/console) < 4
BuildRequires: php-composer(symfony/stopwatch) >= 2.5
-BuildRequires: php-composer(symfony/stopwatch) < 3
+BuildRequires: php-composer(symfony/stopwatch) < 4
BuildRequires: php-composer(symfony/dependency-injection) >= 2.5
-BuildRequires: php-composer(symfony/dependency-injection) < 3
-BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= 2.0
-BuildRequires: php-composer(phpdocumentor/reflection-docblock) < 3
+BuildRequires: php-composer(symfony/dependency-injection) < 4
+BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= 3.0
+BuildRequires: php-composer(phpdocumentor/reflection-docblock) < 4
BuildRequires: php-composer(seld/jsonlint) >= 1.1
BuildRequires: php-composer(seld/jsonlint) < 2
BuildRequires: php-composer(justinrainbow/json-schema) >= 1.3
@@ -80,14 +80,14 @@ BuildRequires: php-composer(fedora/autoloader)
# "ext-date": "*",
# "ext-reflection": "*",
# "sebastian/version": "~1.0|~2.0",
-# "nikic/php-parser": "~1.4",
+# "nikic/php-parser": "~2.1",
# "doctrine/collections": "~1.2",
-# "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",
+# "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",
# "justinrainbow/json-schema": "~1.3",
# "seld/jsonlint": "~1.1"
Requires: php(language) >= 5.4.0
@@ -101,22 +101,22 @@ Requires: php-spl
Requires: php-tokenizer
Requires: php-composer(sebastian/version) >= 1.0
Requires: php-composer(sebastian/version) < 3
-Requires: php-composer(nikic/php-parser) >= 1.4
-Requires: php-composer(nikic/php-parser) < 2
+Requires: php-composer(nikic/php-parser) >= 2.1
+Requires: php-composer(nikic/php-parser) < 3
Requires: php-composer(doctrine/collections) >= 1.2
Requires: php-composer(doctrine/collections) < 2
Requires: php-composer(symfony/event-dispatcher) >= 2.5
-Requires: php-composer(symfony/event-dispatcher) < 3
+Requires: php-composer(symfony/event-dispatcher) < 4
Requires: php-composer(symfony/finder) >= 2.5
-Requires: php-composer(symfony/finder) < 3
+Requires: php-composer(symfony/finder) < 4
Requires: php-composer(symfony/console) >= 2.5
-Requires: php-composer(symfony/console) < 3
+Requires: php-composer(symfony/console) < 4
Requires: php-composer(symfony/stopwatch) >= 2.5
-Requires: php-composer(symfony/stopwatch) < 3
+Requires: php-composer(symfony/stopwatch) < 4
Requires: php-composer(symfony/dependency-injection) >= 2.5
-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(symfony/dependency-injection) < 4
+Requires: php-composer(phpdocumentor/reflection-docblock) >= 3.0
+Requires: php-composer(phpdocumentor/reflection-docblock) < 4
Requires: php-composer(seld/jsonlint) >= 1.1
Requires: php-composer(seld/jsonlint) < 2
Requires: php-composer(justinrainbow/json-schema) >= 1.3
@@ -188,25 +188,14 @@ install -D -p -m 644 bin/phpreflect.1 %{buildroot}%{_mandir}/man1/phpref
%check
%if %{with_tests}
-# Version 4.0.2: OK, but incomplete, skipped, or risky tests!
-# Tests: 122, Assertions: 123, Incomplete: 3.
-# remirepo:11
-run=0
ret=0
-if which php56; then
- php56 %{_bindir}/phpunit --include-path=%{buildroot}%{_datadir}/php || ret=1
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit --include-path=%{buildroot}%{_datadir}/php || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit \
- --include-path=%{buildroot}%{_datadir}/php \
- --verbose
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit \
+ --include-path=%{buildroot}%{_datadir}/php \
+ --verbose || ret=1
+ fi
+done
exit $ret
%else
: Test suite disabled
@@ -231,6 +220,12 @@ fi
%changelog
+* Thu May 4 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
+- allow symfony 3
+
* Thu Apr 13 2017 Shawn Iwinski <shawn@iwin.ski> - 4.0.2-3
- Add max versions to BuildRequires
- Prepare for Symfony 3
generated by cgit (git 2.34.1) at 2024-11-21 22:42:56 +0000