Merge pull request #927 from robfrawley/bugfix-php-cs-fixer-rever-and…

…-run Revert to php-cs-fixer 1.x and run fixer
liip · May 8, 2017 · 610d4f5 · 610d4f5
2 parents a109cfd + 80c85c6
commit 610d4f5
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 29 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -11,9 +11,9 @@
 
 use SLLH\StyleCIBridge\ConfigBridge;
 
-require_once __DIR__.'/vendor/autoload.php';
+require_once __DIR__.'/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';
 
-$headerString = <<<EOF
+$header = <<<EOF
 This file is part of the `liip/LiipImagineBundle` project.
 
 (c) https://github.com/liip/LiipImagineBundle/graphs/contributors
@@ -22,9 +22,11 @@ For the full copyright and license information, please view the LICENSE.md
 file that was distributed with this source code.
 EOF;
 
-$headerConfig = array( 'header_comment' => array( 'header' => $headerString ) );
-
 $config = ConfigBridge::create();
-$config->setRules(array_merge($config->getRules(), $headerConfig));
+$config
+    ->setRules(array_merge($config->getRules(), array(
+        'header_comment' => array('header' => $header)
+    )))
+    ->setUsingCache(false);
 
 return $config;
diff --git a/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php b/DependencyInjection/Factory/Loader/FileSystemLoaderFactory.php
@@ -55,7 +55,9 @@ public function addConfiguration(ArrayNodeDefinition $builder)
                 ->arrayNode('data_root')
                     ->beforeNormalization()
                     ->ifString()
-                        ->then(function ($value) { return array($value); })
+                        ->then(function ($value) {
+                            return array($value);
+                        })
                     ->end()
                     ->treatNullLike(array())
                     ->treatFalseLike(array())

diff --git a/Imagine/Filter/PostProcessor/JpegOptimPostProcessor.php b/Imagine/Filter/PostProcessor/JpegOptimPostProcessor.php
@@ -112,13 +112,9 @@ public function setStripAll($stripAll)
     /**
      * @param BinaryInterface $binary
      *
-     * @uses JpegOptimPostProcessor::processWithConfiguration
-     *
      * @throws ProcessFailedException
      *
      * @return BinaryInterface
-     *
-     * @see Implementation taken from Assetic\Filter\JpegoptimFilter
      */
     public function process(BinaryInterface $binary)
     {
@@ -132,8 +128,6 @@ public function process(BinaryInterface $binary)
      * @throws ProcessFailedException
      *
      * @return BinaryInterface
-     *
-     * @see Implementation taken from Assetic\Filter\JpegoptimFilter
      */
     public function processWithConfiguration(BinaryInterface $binary, array $options)
     {

diff --git a/Imagine/Filter/PostProcessor/MozJpegPostProcessor.php b/Imagine/Filter/PostProcessor/MozJpegPostProcessor.php
@@ -61,8 +61,6 @@ public function setQuality($quality)
     /**
      * @param BinaryInterface $binary
      *
-     * @uses MozJpegPostProcessor::processWithConfiguration
-     *
      * @throws ProcessFailedException
      *
      * @return BinaryInterface

diff --git a/Imagine/Filter/PostProcessor/OptiPngPostProcessor.php b/Imagine/Filter/PostProcessor/OptiPngPostProcessor.php
@@ -80,8 +80,6 @@ public function process(BinaryInterface $binary)
      * @throws ProcessFailedException
      *
      * @return BinaryInterface|Binary
-     *
-     * @see    Implementation taken from Assetic\Filter\optipngFilter
      */
     public function processWithConfiguration(BinaryInterface $binary, array $options)
     {

diff --git a/Imagine/Filter/PostProcessor/PngquantPostProcessor.php b/Imagine/Filter/PostProcessor/PngquantPostProcessor.php
@@ -59,8 +59,6 @@ public function setQuality($quality)
     /**
      * @param BinaryInterface $binary
      *
-     * @uses PngquantPostProcessor::processWithConfiguration
-     *
      * @throws ProcessFailedException
      *
      * @return BinaryInterface

diff --git a/Tests/AbstractTest.php b/Tests/AbstractTest.php
@@ -226,7 +226,7 @@ protected function createDataManagerMock()
      * @param string[] $methods
      * @param bool     $constructorInvoke
      * @param mixed[]  $constructorParams
-     * 
+     *
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
     protected function createObjectMock($object, array $methods = array(), $constructorInvoke = false, array $constructorParams = array())

diff --git a/Tests/DependencyInjection/Factory/Loader/FileSystemLoaderFactoryTest.php b/Tests/DependencyInjection/Factory/Loader/FileSystemLoaderFactoryTest.php
@@ -68,8 +68,8 @@ public function testCreateLoaderDefinitionOnCreate()
 
     public function testCreateLoaderDefinitionOnCreateWithBundlesEnabledUsingMetadata()
     {
-        $fooBundleRootPath = realpath(__DIR__ . '/../../../Functional/Fixtures/FooBundle');
-        $barBundleRootPath = realpath(__DIR__ . '/../../../Functional/Fixtures/BarBundle');
+        $fooBundleRootPath = realpath(__DIR__.'/../../../Functional/Fixtures/FooBundle');
+        $barBundleRootPath = realpath(__DIR__.'/../../../Functional/Fixtures/BarBundle');
 
         $container = new ContainerBuilder();
         $container->setParameter('kernel.bundles_metadata', array(
@@ -94,8 +94,8 @@ public function testCreateLoaderDefinitionOnCreateWithBundlesEnabledUsingMetadat
 
         $expected = array(
             'theDataRoot',
-            'LiipFooBundle' => $fooBundleRootPath . '/Resources/public',
-            'LiipBarBundle' => $barBundleRootPath . '/Resources/public',
+            'LiipFooBundle' => $fooBundleRootPath.'/Resources/public',
+            'LiipBarBundle' => $barBundleRootPath.'/Resources/public',
         );
 
         $this->assertEquals($expected, $container->getDefinition('liip_imagine.binary.loader.the_loader_name')->getArgument(2));
@@ -160,7 +160,7 @@ public function testCreateLoaderDefinitionOnCreateWithBundlesEnabledUsingMetadat
                 'enabled' => true,
                 'access_control_type' => 'whitelist',
                 'access_control_list' => array(
-                    'LiipFooBundle'
+                    'LiipFooBundle',
                 ),
             ),
         ));

diff --git a/Tests/Imagine/Filter/FilterManagerTest.php b/Tests/Imagine/Filter/FilterManagerTest.php
@@ -1062,7 +1062,6 @@ public function testApplyPostProcessorsWhenNotDefined()
      */
     protected function createFilterLoaderInterfaceMock()
     {
-//        $this->getMock()
         return $this->createObjectMock('\Liip\ImagineBundle\Imagine\Filter\Loader\LoaderInterface');
     }
 }
diff --git a/Tests/Imagine/Filter/Loader/ScaleFilterLoaderTest.php b/Tests/Imagine/Filter/Loader/ScaleFilterLoaderTest.php
@@ -200,5 +200,4 @@ public function minNotScaleDataProvider()
             array(array(600, 400), new Box(600, 400)),
         );
     }
-
 }
diff --git a/Tests/Templating/ImagineExtensionTest.php b/Tests/Templating/ImagineExtensionTest.php
@@ -11,7 +11,6 @@
 
 namespace Liip\ImagineBundle\Tests\Templating\Helper;
 
-use Liip\ImagineBundle\Imagine\Cache\CacheManager;
 use Liip\ImagineBundle\Templating\ImagineExtension;
 use Liip\ImagineBundle\Tests\AbstractTest;
 

diff --git a/Utility/OptionsResolver/OptionsResolver.php b/Utility/OptionsResolver/OptionsResolver.php
@@ -147,4 +147,4 @@ private function setupResolverLegacy(BaseOptionsResolver $resolver)
         $resolver->setAllowedTypes($this->allowedTypes);
         $resolver->setNormalizers($this->normalizers);
     }
-}
+}
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "aws/aws-sdk-php": "~2.4",
         "doctrine/cache": "~1.1",
         "doctrine/orm": "~2.3",
-        "friendsofphp/php-cs-fixer": "~2.0",
+        "friendsofphp/php-cs-fixer": "~1.0",
         "phpunit/phpunit": "~4.3|~5.0",
         "psr/log": "~1.0",
         "satooshi/php-coveralls": "~1.0",