From fb1e279334dbd8f9bf310605b751433a73ae4d28 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Jun 2017 07:40:58 +0200 Subject: allow SF3 --- phinx-autoload.php | 13 ++++++++++++- phinx.spec | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/phinx-autoload.php b/phinx-autoload.php index b6d642e..7f20807 100644 --- a/phinx-autoload.php +++ b/phinx-autoload.php @@ -5,5 +5,16 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Phinx\\', __DIR__); \Fedora\Autoloader\Dependencies::required(array( - '/usr/share/php/Symfony/Component/autoload.php', + [ + '/usr/share/php/Symfony3/Component/Console/autoload.php', + '/usr/share/php/Symfony/Component/Console/autoload.php', + ], + [ + '/usr/share/php/Symfony3/Component/Config/autoload.php', + '/usr/share/php/Symfony/Component/Config/autoload.php', + ], + [ + '/usr/share/php/Symfony3/Component/Yaml/autoload.php', + '/usr/share/php/Symfony/Component/Yaml/autoload.php', + ], )); diff --git a/phinx.spec b/phinx.spec index 79b6c82..905a323 100644 --- a/phinx.spec +++ b/phinx.spec @@ -34,8 +34,11 @@ Source2: makesrc.sh BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.4 +BuildRequires: php-composer(symfony/console) < 4 BuildRequires: php-composer(symfony/console) >= 2.8 +BuildRequires: php-composer(symfony/config) < 4 BuildRequires: php-composer(symfony/config) >= 2.8 +BuildRequires: php-composer(symfony/yaml) < 4 BuildRequires: php-composer(symfony/yaml) >= 2.8 BuildRequires: php-pdo BuildRequires: php-date @@ -55,8 +58,11 @@ BuildRequires: php-composer(fedora/autoloader) # "symfony/config": "~2.8|~3.0", # "symfony/yaml": "~2.8|~3.0" Requires: php(language) >= 5.4 +Requires: php-composer(symfony/console) < 4 Requires: php-composer(symfony/console) >= 2.8 +Requires: php-composer(symfony/config) < 4 Requires: php-composer(symfony/config) >= 2.8 +Requires: php-composer(symfony/yaml) < 4 Requires: php-composer(symfony/yaml) >= 2.8 # From phpcompatinfo report for 0.6.4 Requires: php-pdo @@ -153,6 +159,7 @@ exit $ret %changelog * Tue Jun 6 2017 Remi Collet - 0.8.1-1 - Update to 0.8.1 +- allow Symfony 3 * Wed Mar 1 2017 Remi Collet - 0.8.0-1 - update to 0.8.0 -- cgit