From 7da01603ca93cbeb4ee638ee5adb92af6b5ebc18 Mon Sep 17 00:00:00 2001 From: Ilya Antipenko Date: Wed, 22 Nov 2017 15:38:49 +0200 Subject: [PATCH] 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 --- .travis.yml | 7 +++++-- .../EventListener/MaintenanceListenerTest.php | 17 +++++++++++---- Tests/Maintenance/DriverFactoryTest.php | 17 +++++++++++---- Tests/Maintenance/FileMaintenanceTest.php | 21 +++++++++++++------ composer.json | 8 ++++--- 5 files changed, 51 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0fecc3..b18bcca 100644 --- 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,8 +19,11 @@ 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 @@ -28,4 +31,4 @@ before_install: install: composer update $COMPOSER_FLAGS -script: phpunit +script: ./vendor/bin/phpunit diff --git a/Tests/EventListener/MaintenanceListenerTest.php b/Tests/EventListener/MaintenanceListenerTest.php index e1574e6..320392d 100644 --- 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 index 685a09a..91b36c0 100644 --- 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 index acd23e1..8dc61c0 100644 --- a/Tests/Maintenance/FileMaintenanceTest.php +++ b/Tests/Maintenance/FileMaintenanceTest.php @@ -7,6 +7,7 @@ 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 @@ -14,12 +15,12 @@ * @package LexikMaintenanceBundle * @author Gilles Gauthier */ -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 index 8d5513c..2c261a0 100644 --- 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\\": "" }