Merge pull request #939 from robfrawley/feature-use-version-id-instead-of-version-numbers

Use simplified Symfony version comparison operation and CS fixes

Author: robfrawley

Async/CacheResolved.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Async;
 
 use Enqueue\Util\JSON;
@@ -14,9 +15,9 @@ class CacheResolved implements \JsonSerializable
      * @var \string[]
      */
     private $uris;
-    
+
     /**
-     * @param string $path
+     * @param string        $path
      * @param string[]|null $uris
      */
     public function __construct($path, array $uris)

Async/ResolveCache.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Async;
 
 use Enqueue\Util\JSON;
@@ -21,9 +22,9 @@ class ResolveCache implements \JsonSerializable
     private $force;
 
     /**
-     * @param string $path
+     * @param string        $path
      * @param string[]|null $filters
-     * @param bool $force
+     * @param bool          $force
      */
     public function __construct($path, array $filters = null, $force = false)
     {

Async/ResolveCacheProcessor.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Async;
 
 use Enqueue\Client\ProducerInterface;
@@ -35,9 +36,9 @@ class ResolveCacheProcessor implements PsrProcessor, TopicSubscriberInterface, Q
     private $producer;
 
     /**
-     * @param CacheManager $cacheManager
-     * @param FilterManager $filterManager
-     * @param DataManager $dataManager
+     * @param CacheManager      $cacheManager
+     * @param FilterManager     $filterManager
+     * @param DataManager       $dataManager
      * @param ProducerInterface $producer
      */
     public function __construct(

Async/Topics.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Async;
 
 class Topics

LiipImagineBundle.php

@@ -64,5 +64,5 @@ public function build(ContainerBuilder $container)
                 ->add(Topics::CACHE_RESOLVED, 'The topic contains messages about resolved image\'s caches')
             );
         }
-     }
+    }
 }

Tests/Async/CacheResolvedTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Tests\Async;
 
 use Liip\ImagineBundle\Async\CacheResolved;
@@ -36,4 +37,4 @@ public function testCouldBeJsonDeSerialized()
             'barFilter' => 'http://example.com/barFilter/thePath',
         ), $message->getUris());
     }
-}
+}

Tests/Async/ResolveCacheProcessorTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Tests\Async;
 
 use Enqueue\Client\ProducerInterface;
@@ -260,7 +261,7 @@ public function testShouldSendMessageOnSuccessResolve()
         $cacheManagerMock
             ->expects($this->atLeastOnce())
             ->method('resolve')
-            ->willReturnCallback(function($path, $filter) {
+            ->willReturnCallback(function ($path, $filter) {
                 return $path.$filter.'Uri';
             })
         ;
@@ -278,7 +279,7 @@ public function testShouldSendMessageOnSuccessResolve()
             ->expects($this->once())
             ->method('send')
             ->with(Topics::CACHE_RESOLVED, $this->isInstanceOf('Liip\ImagineBundle\Async\CacheResolved'))
-        ->willReturnCallback(function($topic, CacheResolved $message) use ($testCase) {
+        ->willReturnCallback(function ($topic, CacheResolved $message) use ($testCase) {
             $testCase->assertEquals('theImagePath', $message->getPath());
             $testCase->assertEquals(array(
                 'fooFilter' => 'theImagePathfooFilterUri',
@@ -341,4 +342,4 @@ private function createDummyBinary()
     {
         return new Binary('theContent', 'image/png', 'png');
     }
-}
+}

Tests/Async/ResolveCacheTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Liip\ImagineBundle\Tests\Async;
 
 use Liip\ImagineBundle\Async\ResolveCache;
@@ -84,4 +85,4 @@ public function testThrowIfMessageContainsNotSupportedFilters()
         $this->setExpectedException('LogicException', 'The message filters could be either null or array.');
         ResolveCache::jsonDeserialize('{"path": "aPath", "filters": "stringFilterIsNotAllowed"}');
     }
-}
+}

Utility/Framework/SymfonyFramework.php

@@ -13,6 +13,9 @@
 
 use Symfony\Component\HttpKernel\Kernel;
 
+/**
+ * @internal
+ */
 class SymfonyFramework
 {
     /**
@@ -75,19 +78,6 @@ public static function isKernelLessThan($major, $minor = null, $patch = null)
      */
     private static function kernelVersionCompare($operator, $major, $minor = null, $patch = null)
     {
-        $vernum = $major;
-        $kernel = Kernel::MAJOR_VERSION;
-
-        if ($minor) {
-            $vernum .= '.'.$minor;
-            $kernel .= '.'.Kernel::MINOR_VERSION;
-
-            if ($patch) {
-                $vernum .= '.'.$patch;
-                $kernel .= '.'.Kernel::RELEASE_VERSION;
-            }
-        }
-
-        return version_compare($kernel, $vernum, $operator);
+        return version_compare(Kernel::VERSION_ID, sprintf("%d%'.02d%'.02d", $major, $minor ?: 0, $patch ?: 0), $operator);
     }
 }