Fix tests (#71)

* Add compatibility with symfony 4 * Install phpunit * Fix php 5.3 on latest travis * Fix composer.json * Adjust dependencies * Fix tests * Fix tests * Remove php 7.2 * Fix tests * Remove excessive build
lexik · Nov 22, 2017 · 7da0160 · 7da0160
1 parent 67e1583
commit 7da0160
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 sudo: false
@@ -19,13 +19,16 @@ matrix:
   include:
     - php: 5.3
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
+      dist: precise
     - php: 5.6
       env: SYMFONY_VERSION='2.8.*'
+    - php: 7.1
+      env: SYMFONY_VERSION='^3.0'
 
 before_install:
   - composer self-update
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev symfony/framework-bundle:${SYMFONY_VERSION} --no-update; fi
 
 install: composer update $COMPOSER_FLAGS
 
-script: phpunit
+script: ./vendor/bin/phpunit
diff --git a/Tests/EventListener/MaintenanceListenerTest.php b/Tests/EventListener/MaintenanceListenerTest.php
@@ -10,6 +10,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Test for the maintenance listener
@@ -337,10 +338,18 @@ protected function getDatabaseDriver($lock = false)
      */
     public function getTranslator()
     {
-        $translator = new Translator(
-            $this->container,
-            $this->getMock('Symfony\Component\Translation\MessageSelector')
-        );
+        if (Kernel::VERSION_ID < 30300) {
+            $translator = new Translator(
+                $this->container,
+                $this->getMock('Symfony\Component\Translation\MessageSelector')
+            );
+        } else {
+            $translator = new Translator(
+                $this->container,
+                $this->getMock('Symfony\Component\Translation\MessageSelector'),
+                'en'
+            );
+        }
 
         return $translator;
     }

diff --git a/Tests/Maintenance/DriverFactoryTest.php b/Tests/Maintenance/DriverFactoryTest.php
@@ -6,6 +6,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
 use Lexik\Bundle\MaintenanceBundle\Drivers\DriverFactory;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Test driver factory
@@ -101,10 +102,18 @@ protected function getDatabaseDriver()
 
     public function getTranslator()
     {
-        $translator = new Translator(
-            $this->container,
-            $this->getMock('Symfony\Component\Translation\MessageSelector')
-        );
+        if (Kernel::VERSION_ID < 30300) {
+            $translator = new Translator(
+                $this->container,
+                $this->getMock('Symfony\Component\Translation\MessageSelector')
+            );
+        } else {
+            $translator = new Translator(
+                $this->container,
+                $this->getMock('Symfony\Component\Translation\MessageSelector'),
+                'en'
+            );
+        }
 
         return $translator;
     }

diff --git a/Tests/Maintenance/FileMaintenanceTest.php b/Tests/Maintenance/FileMaintenanceTest.php
@@ -7,19 +7,20 @@
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Test driver file
  *
  * @package LexikMaintenanceBundle
  * @author  Gilles Gauthier <[email protected]>
  */
-class FileDriverTest extends TestCase
+class FileMaintenanceTest extends TestCase
 {
     static protected $tmpDir;
     protected $container;
 
-    static public function setUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         parent::setUpBeforeClass();
 
@@ -134,10 +135,18 @@ protected function initContainer()
 
     public function getTranslator()
     {
-        $translator = new Translator(
-            $this->container,
-            $this->getMock('Symfony\Component\Translation\MessageSelector')
-        );
+        if (Kernel::VERSION_ID < 30300) {
+            $translator = new Translator(
+                $this->container,
+                $this->getMock('Symfony\Component\Translation\MessageSelector')
+            );
+        } else {
+            $translator = new Translator(
+                $this->container,
+                $this->getMock('Symfony\Component\Translation\MessageSelector'),
+                'en'
+            );
+        }
 
         return $translator;
     }

diff --git a/composer.json b/composer.json
@@ -20,11 +20,13 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2",
-        "symfony/framework-bundle": "~2.7|~3.0"
+        "php": ">=5.3.9",
+        "symfony/framework-bundle": "~2.7|~3.0",
+        "symfony/translation": "~2.7|~3.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0"
+        "symfony/phpunit-bridge": "~2.7|~3.0",
+        "phpunit/phpunit": "~4.8"
     },
     "autoload":     {
         "psr-4": { "Lexik\\Bundle\\MaintenanceBundle\\": "" }