Merge pull request #1023 from liip/fix_tests

fix tests on Symfony 3.4/4.0
liip · Dec 12, 2017 · 20321dc · 20321dc
2 parents 67fc8be + f2859d0
commit 20321dc
Show file tree

Hide file tree

Showing 48 changed files with 233 additions and 261 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,5 +1,3 @@
----
-
 preset: symfony
 
 enabled:
@@ -16,5 +14,3 @@ finder :
   name    : [ "*.php", "*.twig" ]
   exclude : [ "vendor", "var" ]
   path    : [ "./" ]
-
-...
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,10 @@
----
-
 sudo: false
 
 language: php
 
 php:
   - 7.1
-  - nightly
+  - 7.2
 
 cache:
   directories:
@@ -15,15 +13,11 @@ cache:
 env:
   global:
     - SYMFONY_DEPRECATIONS_HELPER=weak
-    - SYMFONY_VERSION=3.2.x-dev
+    - SYMFONY_VERSION=3.4.*
 
 matrix:
   include:
-    - env: SYMFONY_VERSION=3.3.x-dev
-    - env: SYMFONY_VERSION=3.4.x-dev
-    - env: SYMFONY_VERSION=4.0.x-dev
-  allow_failures:
-    - php: nightly
+    - env: SYMFONY_VERSION=4.0.*
   fast_finish: true
 
 before_install:
@@ -33,9 +27,7 @@ install:
   - travis_retry composer require "symfony/symfony:${SYMFONY_VERSION}" $COMPOSER_FLAGS
 
 script:
-  - bin/simple-phpunit -vvv || bin/phpunit -vvv
+  - ./vendor/bin/simple-phpunit -vvv || ./vendor/bin/phpunit -vvv
 
 after_script:
-  - bash ./.travis/exec-after.bash
-
-...
+  - bash ./.travis/exec-after.bash
diff --git a/Command/RemoveCacheCommand.php b/Command/RemoveCacheCommand.php
@@ -12,18 +12,27 @@
 namespace Liip\ImagineBundle\Command;
 
 use Liip\ImagineBundle\Imagine\Cache\CacheManager;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class RemoveCacheCommand extends ContainerAwareCommand
+class RemoveCacheCommand extends Command
 {
+    /* @var CacheManager cacheManager */
+    private $cacheManager;
+
+    public function __construct(CacheManager $cacheManager)
+    {
+        $this->cacheManager = $cacheManager;
+
+        parent::__construct('liip:imagine:cache:remove');
+    }
+
     protected function configure()
     {
         $this
-            ->setName('liip:imagine:cache:remove')
             ->setDescription('Remove cache for given paths and set of filters.')
             ->addArgument('paths', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Image paths')
             ->addOption(
@@ -61,9 +70,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $filters = null;
         }
 
-        /* @var CacheManager cacheManager */
-        $cacheManager = $this->getContainer()->get('liip_imagine.cache.manager');
-
-        $cacheManager->remove($paths, $filters);
+        $this->cacheManager->remove($paths, $filters);
     }
 }
diff --git a/Command/ResolveCacheCommand.php b/Command/ResolveCacheCommand.php
@@ -13,18 +13,31 @@
 
 use Liip\ImagineBundle\Imagine\Filter\FilterManager;
 use Liip\ImagineBundle\Service\FilterService;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class ResolveCacheCommand extends ContainerAwareCommand
+class ResolveCacheCommand extends Command
 {
+    /* @var FilterManager $filterManager */
+    private $filterManager;
+
+    /* @var FilterService $filterService */
+    private $filterService;
+
+    public function __construct(FilterManager $filterManager, FilterService $filterService)
+    {
+        $this->filterManager = $filterManager;
+        $this->filterService = $filterService;
+
+        parent::__construct('liip:imagine:cache:resolve');
+    }
+
     protected function configure()
     {
         $this
-            ->setName('liip:imagine:cache:resolve')
             ->setDescription('Resolve cache for given path and set of filters.')
             ->addArgument('paths', InputArgument::REQUIRED | InputArgument::IS_ARRAY, 'Image paths')
             ->addOption(
@@ -62,19 +75,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $paths = $input->getArgument('paths');
         $filters = $input->getOption('filters');
 
-        /* @var FilterManager $filterManager */
-        $filterManager = $this->getContainer()->get('liip_imagine.filter.manager');
-
-        /* @var FilterService $filterService */
-        $filterService = $this->getContainer()->get('liip_imagine.service.filter');
-
         if (empty($filters)) {
-            $filters = array_keys($filterManager->getFilterConfiguration()->all());
+            $filters = array_keys($this->filterManager->getFilterConfiguration()->all());
         }
 
         foreach ($paths as $path) {
             foreach ($filters as $filter) {
-                $output->writeln($filterService->getUrlOfFilteredImage($path, $filter));
+                $output->writeln($this->filterService->getUrlOfFilteredImage($path, $filter));
             }
         }
     }

diff --git a/DependencyInjection/Factory/ChildDefinitionTrait.php b/DependencyInjection/Factory/ChildDefinitionTrait.php
@@ -12,16 +12,14 @@
 namespace Liip\ImagineBundle\DependencyInjection\Factory;
 
 use Symfony\Component\DependencyInjection\ChildDefinition;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 
 trait ChildDefinitionTrait
 {
     /**
-     * @return ChildDefinition|DefinitionDecorator
+     * @return ChildDefinition
      */
     private function getChildDefinition($parent)
     {
-        return class_exists(ChildDefinition::class) ?
-            new ChildDefinition($parent) : new DefinitionDecorator($parent);
+        return new ChildDefinition($parent);
     }
 }
diff --git a/DependencyInjection/Factory/Loader/AbstractLoaderFactory.php b/DependencyInjection/Factory/Loader/AbstractLoaderFactory.php
@@ -47,6 +47,8 @@ final protected function setTaggedLoaderDefinition($name, Definition $definition
             'loader' => $name,
         ]);
 
+        $definition->setPublic(true);
+
         $container->setDefinition(
             $id = sprintf('%s.%s', static::$namePrefix, $name),
             $definition

diff --git a/DependencyInjection/LiipImagineExtension.php b/DependencyInjection/LiipImagineExtension.php
@@ -71,6 +71,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('imagine.xml');
+        $loader->load('commands.xml');
 
         if ($config['enqueue']) {
             $loader->load('enqueue.xml');

diff --git a/Resources/config/commands.xml b/Resources/config/commands.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+
+        <service id="liip_imagine.command.remove_cache_command" class="Liip\ImagineBundle\Command\RemoveCacheCommand" public="true">
+            <argument type="service" id="liip_imagine.cache.manager"/>
+            <tag name="console.command" command="liip:imagine:cache:remove" />
+        </service>
+
+        <service id="liip_imagine.command.resolve_cache_command" class="Liip\ImagineBundle\Command\ResolveCacheCommand" public="true">
+            <argument type="service" id="liip_imagine.filter.manager"/>
+            <argument type="service" id="liip_imagine.service.filter"/>
+            <tag name="console.command" command="liip:imagine:cache:resolve" />
+        </service>
+
+    </services>
+</container>
diff --git a/Resources/config/imagine.xml b/Resources/config/imagine.xml
@@ -34,13 +34,13 @@
 
         <!-- Utility services -->
 
-        <service id="liip_imagine.filter.manager" class="Liip\ImagineBundle\Imagine\Filter\FilterManager">
+        <service id="liip_imagine.filter.manager" class="Liip\ImagineBundle\Imagine\Filter\FilterManager" public="true">
             <argument type="service" id="liip_imagine.filter.configuration" />
             <argument type="service" id="liip_imagine" />
             <argument type="service" id="liip_imagine.binary.mime_type_guesser" />
         </service>
 
-        <service id="liip_imagine.data.manager" class="Liip\ImagineBundle\Imagine\Data\DataManager">
+        <service id="liip_imagine.data.manager" class="Liip\ImagineBundle\Imagine\Data\DataManager" public="true">
             <argument type="service" id="liip_imagine.binary.mime_type_guesser" />
             <argument type="service" id="liip_imagine.extension_guesser" />
             <argument type="service" id="liip_imagine.filter.configuration" />
@@ -117,7 +117,7 @@
             <tag name="liip_imagine.filter.loader" loader="crop" />
         </service>
 
-        <service id="liip_imagine.filter.loader.grayscale" class="Liip\ImagineBundle\Imagine\Filter\Loader\GrayscaleFilterLoader">
+        <service id="liip_imagine.filter.loader.grayscale" class="Liip\ImagineBundle\Imagine\Filter\Loader\GrayscaleFilterLoader" public="true">
             <tag name="liip_imagine.filter.loader" loader="grayscale" />
         </service>
 
@@ -150,23 +150,23 @@
             <tag name="liip_imagine.filter.loader" loader="upscale" />
         </service>
 
-        <service id="liip_imagine.filter.loader.downscale" class="Liip\ImagineBundle\Imagine\Filter\Loader\DownscaleFilterLoader">
+        <service id="liip_imagine.filter.loader.downscale" class="Liip\ImagineBundle\Imagine\Filter\Loader\DownscaleFilterLoader" public="true">
             <tag name="liip_imagine.filter.loader" loader="downscale" />
         </service>
 
         <service id="liip_imagine.filter.loader.auto_rotate" class="Liip\ImagineBundle\Imagine\Filter\Loader\AutoRotateFilterLoader">
             <tag name="liip_imagine.filter.loader" loader="auto_rotate" />
         </service>
 
-        <service id="liip_imagine.filter.loader.rotate" class="Liip\ImagineBundle\Imagine\Filter\Loader\RotateFilterLoader">
+        <service id="liip_imagine.filter.loader.rotate" class="Liip\ImagineBundle\Imagine\Filter\Loader\RotateFilterLoader" public="true">
             <tag name="liip_imagine.filter.loader" loader="rotate" />
         </service>
 
-        <service id="liip_imagine.filter.loader.flip" class="Liip\ImagineBundle\Imagine\Filter\Loader\FlipFilterLoader">
+        <service id="liip_imagine.filter.loader.flip" class="Liip\ImagineBundle\Imagine\Filter\Loader\FlipFilterLoader" public="true">
             <tag name="liip_imagine.filter.loader" loader="flip" />
         </service>
 
-        <service id="liip_imagine.filter.loader.interlace" class="Liip\ImagineBundle\Imagine\Filter\Loader\InterlaceFilterLoader">
+        <service id="liip_imagine.filter.loader.interlace" class="Liip\ImagineBundle\Imagine\Filter\Loader\InterlaceFilterLoader" public="true">
             <tag name="liip_imagine.filter.loader" loader="interlace" />
         </service>
 
@@ -259,7 +259,7 @@
             <argument type="service" id="liip_imagine.mime_type_guesser" />
         </service>
 
-        <service id="liip_imagine.cache.signer" class="Liip\ImagineBundle\Imagine\Cache\Signer">
+        <service id="liip_imagine.cache.signer" class="Liip\ImagineBundle\Imagine\Cache\Signer" public="true">
             <argument>%kernel.secret%</argument>
         </service>
 

diff --git a/Tests/AbstractTest.php b/Tests/AbstractTest.php
@@ -30,7 +30,7 @@
 use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesserInterface;
 use Symfony\Component\Routing\RouterInterface;
 
-abstract class AbstractTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Filesystem

diff --git a/Tests/Async/CacheResolvedTest.php b/Tests/Async/CacheResolvedTest.php
@@ -5,7 +5,7 @@
 use Enqueue\Bundle\EnqueueBundle;
 use Liip\ImagineBundle\Async\CacheResolved;
 
-class CacheResolvedTest extends \PHPUnit_Framework_TestCase
+class CacheResolvedTest extends \PHPUnit\Framework\TestCase
 {
     public static function setUpBeforeClass()
     {

diff --git a/Tests/Async/ResolveCacheProcessorTest.php b/Tests/Async/ResolveCacheProcessorTest.php
@@ -69,11 +69,13 @@ public function testShouldSubscribeToExpectedQueue()
 
     public function testCouldBeConstructedWithExpectedArguments()
     {
-        new ResolveCacheProcessor(
+        $processor = new ResolveCacheProcessor(
             $this->createFilterManagerMock(),
             $this->createFilterServiceMock(),
             $this->createProducerMock()
         );
+
+        $this->assertInstanceOf(ResolveCacheProcessor::class, $processor);
     }
 
     public function testShouldRejectMessagesWithInvalidJsonBody()

diff --git a/Tests/Async/ResolveCacheTest.php b/Tests/Async/ResolveCacheTest.php
@@ -5,7 +5,7 @@
 use Enqueue\Bundle\EnqueueBundle;
 use Liip\ImagineBundle\Async\ResolveCache;
 
-class ResolveCacheTest extends \PHPUnit_Framework_TestCase
+class ResolveCacheTest extends \PHPUnit\Framework\TestCase
 {
     public static function setUpBeforeClass()
     {

diff --git a/Tests/Binary/Loader/AbstractDoctrineLoaderTest.php b/Tests/Binary/Loader/AbstractDoctrineLoaderTest.php
@@ -18,7 +18,7 @@
 /**
  * @covers \Liip\ImagineBundle\Binary\Loader\AbstractDoctrineLoader<extended>
  */
-class AbstractDoctrineLoaderTest extends \PHPUnit_Framework_TestCase
+class AbstractDoctrineLoaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|ObjectRepository

diff --git a/Tests/Binary/Loader/FileSystemLoaderTest.php b/Tests/Binary/Loader/FileSystemLoaderTest.php
@@ -22,11 +22,13 @@
 /**
  * @covers \Liip\ImagineBundle\Binary\Loader\FileSystemLoader
  */
-class FileSystemLoaderTest extends \PHPUnit_Framework_TestCase
+class FileSystemLoaderTest extends \PHPUnit\Framework\TestCase
 {
     public function testConstruction()
     {
-        $this->getFileSystemLoader();
+        $loader = $this->getFileSystemLoader();
+
+        $this->assertInstanceOf(FileSystemLoader::class, $loader);
     }
 
     public function testImplementsLoaderInterface()
@@ -109,7 +111,9 @@ public function testMultipleRootLoadCases($root, $path)
 
     public function testAllowsEmptyRootPath()
     {
-        $this->getFileSystemLoader(array());
+        $loader = $this->getFileSystemLoader(array());
+
+        $this->assertInstanceOf(FileSystemLoader::class, $loader);
     }
 
     /**
@@ -118,7 +122,9 @@ public function testAllowsEmptyRootPath()
      */
     public function testThrowsIfRootPathDoesNotExist()
     {
-        $this->getFileSystemLoader(array('/a/bad/root/path'));
+        $loader = $this->getFileSystemLoader(array('/a/bad/root/path'));
+
+        $this->assertInstanceOf(FileSystemLoader::class, $loader);
     }
 
     /**
@@ -140,7 +146,9 @@ public function provideOutsideRootPathsData()
      */
     public function testThrowsIfRealPathOutsideRootPath($path)
     {
-        $this->getFileSystemLoader()->find($path);
+        $loader = $this->getFileSystemLoader()->find($path);
+
+        $this->assertInstanceOf(FileSystemLoader::class, $loader);
     }
 
     public function testPathWithDoublePeriodBackStep()
@@ -154,7 +162,9 @@ public function testPathWithDoublePeriodBackStep()
      */
     public function testThrowsIfFileDoesNotExist()
     {
-        $this->getFileSystemLoader()->find('fileNotExist');
+        $loader = $this->getFileSystemLoader()->find('fileNotExist');
+
+        $this->assertInstanceOf(FileSystemLoader::class, $loader);
     }
 
     /**