Revert compat to php 5.4 min; try to fix compat with sf 2.3

kaliop-uk · Aug 4, 2016 · 13285c7 · 13285c7
1 parent 64f2487
commit 13285c7
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 11 deletions.
diff --git 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
@@ -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
@@ -1,13 +1,9 @@
 <?php
 
 namespace Kaliop\eZMigrationBundle\Command;
-use Symfony\Component\Console\Input\ArrayInput;
 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;
 use Symfony\Component\Console\Input\InputArgument;
 
 /**

diff --git a/Command/StatusCommand.php b/Command/StatusCommand.php
@@ -5,7 +5,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\Migration;
 use Kaliop\eZMigrationBundle\API\Value\MigrationDefinition;
 
@@ -144,7 +143,7 @@ public function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        $table = new Table($output);
+        $table = $this->getHelperSet()->get('table');
         $table
             ->setHeaders(array('#', 'Migration', 'Status', 'Executed on', 'Notes'))
             ->setRows($data);

diff --git 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.*"