From 13285c7501aeb57e57e78dbeaa459f3c7578726b Mon Sep 17 00:00:00 2001 From: gggeek Date: Thu, 4 Aug 2016 22:24:52 +0100 Subject: [PATCH] Revert compat to php 5.4 min; try to fix compat with sf 2.3 --- .travis.yml | 2 -- Command/MigrateCommand.php | 3 +-- Command/MigrationCommand.php | 4 ---- Command/StatusCommand.php | 3 +-- composer.json | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd1ec26c..cb90725d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ sudo: required matrix: include: # ezpublish-community 2014.3 corresponds to enterprise 5.3, still supported, installs via composer - - php: 5.3 - env: EZ_PACKAGES='ezsystems/ezpublish-community:~2014.3.2' EZ_VERSION=ezpublish-community EZ_APP_DIR=ezpublish EZ_KERNEL=EzPublishKernel - php: 5.4 env: EZ_PACKAGES='ezsystems/ezpublish-community:~2014.3.2' EZ_VERSION=ezpublish-community EZ_APP_DIR=ezpublish EZ_KERNEL=EzPublishKernel #- php: 5.5 diff --git a/Command/MigrateCommand.php b/Command/MigrateCommand.php index 7e0df0d3..906f6fac 100644 --- a/Command/MigrateCommand.php +++ b/Command/MigrateCommand.php @@ -6,7 +6,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Helper\Table; use Kaliop\eZMigrationBundle\API\Value\MigrationDefinition; use Kaliop\eZMigrationBundle\API\Value\Migration; @@ -101,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output) ); } - $table = new Table($output); + $table = $this->getHelperSet()->get('table'); $table ->setHeaders(array('#', 'Migration', 'Notes')) ->setRows($data); diff --git a/Command/MigrationCommand.php b/Command/MigrationCommand.php index 22bee2bd..823f9f09 100644 --- a/Command/MigrationCommand.php +++ b/Command/MigrationCommand.php @@ -1,13 +1,9 @@ getHelperSet()->get('table'); $table ->setHeaders(array('#', 'Migration', 'Status', 'Executed on', 'Notes')) ->setRows($data); diff --git a/composer.json b/composer.json index ba028d6d..96b9eb32 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ } ], "require": { - "php": ">=5.3", + "php": ">=5.4", "ezsystems/ezpublish-kernel": ">=5.3|>=2014.03", "ext-pdo": "*", "nikic/php-parser": "2.*"