diff options
| -rw-r--r-- | composer.json | 9 | ||||
| -rw-r--r-- | psysh.spec | 34 |
2 files changed, 29 insertions, 14 deletions
diff --git a/composer.json b/composer.json index 17926ef..69c226c 100644 --- a/composer.json +++ b/composer.json @@ -14,16 +14,15 @@ ], "require": { "php": ">=5.3.9", - "symfony/console": "~2.3.10|^2.4.2|~3.0", - "symfony/var-dumper": "~2.7|~3.0", + "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", + "symfony/var-dumper": "~2.7|~3.0|~4.0", "nikic/php-parser": "~1.3|~2.0|~3.0", "dnoegel/php-xdg-base-dir": "0.1", "jakub-onderka/php-console-highlighter": "0.3.*" }, "require-dev": { - "phpunit/phpunit": "~4.4|~5.0", - "symfony/finder": "~2.1|~3.0", - "friendsofphp/php-cs-fixer": "~1.11", + "phpunit/phpunit": "^4.8.35|^5.4.3", + "symfony/finder": "~2.1|~3.0|~4.0", "hoa/console": "~3.16|~1.14" }, "suggest": { @@ -12,8 +12,8 @@ %global github_owner bobthecow %global github_name psysh -%global github_version 0.8.8 -%global github_commit fe65c30cbc55c71e61ba3a38b5a581149be31b8e +%global github_version 0.8.16 +%global github_commit d4c8eab0683dc056f2ca54ca67f5388527c068b1 %global composer_vendor psy %global composer_project psysh @@ -31,12 +31,12 @@ # a dependency so it could possibly be retired %global php_parser_min_ver 2.0 %global php_parser_max_ver 4.0 -# "symfony/console": "~2.3.10|^2.4.2|~3.0" -# "symfony/finder": "~2.1|~3.0" -# "symfony/var-dumper": "~2.7|~3.0" +# "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0" +# "symfony/finder": "~2.1|~3.0|~4.0" +# "symfony/var-dumper": "~2.7|~3.0|~4.0" # NOTE: Min version not 2.7.0 because autoloader required %global symfony_min_ver 2.7.1 -%global symfony_max_ver 4.0 +%global symfony_max_ver 5.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -69,17 +69,23 @@ BuildRequires: php-composer(jakub-onderka/php-console-highlighter) < %{php_cons BuildRequires: php-composer(jakub-onderka/php-console-highlighter) >= %{php_console_highlighter_min_ver} BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} +%if 0%{?fedora} >= 26 BuildRequires: php-composer(symfony/console) < %{symfony_max_ver} BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/finder) < %{symfony_max_ver} BuildRequires: php-composer(symfony/finder) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/var-dumper) < %{symfony_max_ver} BuildRequires: php-composer(symfony/var-dumper) >= %{symfony_min_ver} +%else +BuildRequires: php-symfony3-console +BuildRequires: php-symfony3-finder +BuildRequires: php-symfony3-var-dumper +%endif ## composer.json: optional BuildRequires: php-pcntl BuildRequires: php-posix BuildRequires: php-readline -## phpcompatinfo (computed from version 0.8.8) +## phpcompatinfo (computed from version 0.8.16) BuildRequires: php-ctype BuildRequires: php-date BuildRequires: php-dom @@ -102,15 +108,20 @@ Requires: php-composer(jakub-onderka/php-console-highlighter) < %{php_cons Requires: php-composer(jakub-onderka/php-console-highlighter) >= %{php_console_highlighter_min_ver} Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} +%if 0%{?fedora} >= 26 Requires: php-composer(symfony/console) < %{symfony_max_ver} Requires: php-composer(symfony/console) >= %{symfony_min_ver} Requires: php-composer(symfony/var-dumper) < %{symfony_max_ver} Requires: php-composer(symfony/var-dumper) >= %{symfony_min_ver} +%else +Requires: php-symfony3-console +Requires: php-symfony3-var-dumper +%endif # composer.json: optional Requires: php-pcntl Requires: php-posix Requires: php-readline -# phpcompatinfo (computed from version 0.8.8) +# phpcompatinfo (computed from version 0.8.16) Requires: php-ctype Requires: php-date Requires: php-json @@ -160,10 +171,12 @@ require_once __DIR__.'/functions.php'; \Fedora\Autoloader\Dependencies::required(array( '%{phpdir}/JakubOnderka/PhpConsoleHighlighter/autoload.php', array( + '%{phpdir}/Symfony4/Component/Console/autoload.php', '%{phpdir}/Symfony3/Component/Console/autoload.php', '%{phpdir}/Symfony/Component/Console/autoload.php', ), array( + '%{phpdir}/Symfony4/Component/VarDumper/autoload.php', '%{phpdir}/Symfony3/Component/VarDumper/autoload.php', '%{phpdir}/Symfony/Component/VarDumper/autoload.php', ), @@ -213,7 +226,7 @@ rm test/Psy/Test/Readline/HoaConsoleTest.php : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php54 php55} php56 php70 php71; do +for PHP_EXEC in "" %{?rhel:php54 php55} php56 php70 php71 php72; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -235,6 +248,9 @@ exit $RETURN_CODE %changelog +* Wed Dec 13 2017 Shawn Iwinski <shawn@iwin.ski> - 0.8.16-1 +- Update to 0.8.16 (RHBZ #1468827) + * Sun Jun 25 2017 Shawn Iwinski <shawn@iwin.ski> - 0.8.8-1 - Update to 0.8.8 (RHBZ #1464772) |