Reformat

Author: matthiasmullie

.gitattributes

@@ -11,4 +11,3 @@
 /makefile export-ignore
 /phpunit.xml export-ignore
 /README.md export-ignore
-/ruleset.xml.dist export-ignore

.php-cs-fixer.php

@@ -9,12 +9,14 @@
 return $config
     ->setRules(array(
         '@Symfony' => true,
+        '@PER-CS' => true,
         'array_syntax' => array('syntax' => 'long'),
+        'concat_space' => array('spacing' => 'one'),
         'single_line_throw' => false,
         'yoda_style' => array('equal' => false, 'identical' => false, 'less_and_greater' => false),
-        '@PSR12' => true,
-        'class_definition' => false, // @see https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/5463
         'visibility_required' => array('elements' => array('property', 'method')),
+        'phpdoc_align' => array('align' => 'left'),
+        'trailing_comma_in_multiline' => array('elements' => array('arguments', 'arrays', 'match', 'parameters')),
     ))
     ->setFinder($finder)
     ->setUsingCache(false);

composer.json

@@ -19,10 +19,9 @@
         "matthiasmullie/path-converter": "~1.1"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": ">=2.0",
+        "friendsofphp/php-cs-fixer": ">=3.0",
         "matthiasmullie/scrapbook": ">=1.3",
         "phpunit/phpunit": ">=4.8",
-        "squizlabs/php_codesniffer": ">=3.0"
     },
     "suggest": {
         "psr/cache-implementation": "Cache implementation to use with Minify::cache"

makefile

@@ -1,6 +1,6 @@
 PHP ?=
 TEST ?=
-VOLUME_BINDS ?= src,tests,build,.php-cs-fixer.php,phpunit.xml,ruleset.xml
+VOLUME_BINDS ?= src,tests,build,.php-cs-fixer.php,phpunit.xml
 
 docs:
 	docker run --rm -v $$(pwd)/src:/data/src -v $$(pwd)/docs:/data/docs -w /data php:cli bash -c "\
@@ -18,6 +18,6 @@ format:
 	VOLUMES=""
 	for VOLUME in $$(echo "$(VOLUME_BINDS)" | tr "," "\n"); do VOLUMES="$$VOLUMES -v $$(pwd)/$$VOLUME:/var/www/$$VOLUME"; done;\
 	test $$(docker images -q matthiasmullie/minify:cli) || docker build -t matthiasmullie/minify:cli .;\
-	docker run $$VOLUMES matthiasmullie/minify:cli sh -c "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix && vendor/bin/phpcbf --standard=ruleset.xml"
+	docker run $$VOLUMES matthiasmullie/minify:cli sh -c "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix"
 
 .PHONY: docs

ruleset.xml

@@ -109,8 +109,8 @@ protected function moveImportsToTop($content)
      * \@import's will be loaded and their content merged into the original file,
      * to save HTTP requests.
      *
-     * @param string   $source  The file to combine imports for
-     * @param string   $content The CSS content to combine imports for
+     * @param string $source The file to combine imports for
+     * @param string $content The CSS content to combine imports for
      * @param string[] $parents Parent paths, for circular reference checks
      *
      * @return string
@@ -245,7 +245,7 @@ protected function combineImports($source, $content, $parents)
      * @url(image.jpg) images will be loaded and their content merged into the
      * original file, to save HTTP requests.
      *
-     * @param string $source  The file to import files for
+     * @param string $source The file to import files for
      * @param string $content The CSS content to import files for
      *
      * @return string
@@ -357,7 +357,7 @@ public function execute($path = null, $parents = array())
      * (e.g. ../../images/image.gif, if the new CSS file is 1 folder deeper).
      *
      * @param ConverterInterface $converter Relative path converter
-     * @param string             $content   The CSS content to update relative urls for
+     * @param string $content The CSS content to update relative urls for
      *
      * @return string
      */
@@ -561,7 +561,7 @@ protected function shortenHexColors($content)
             function ($match) use ($colors) {
                 return $colors[strtolower($match[0])];
             },
-            $content
+            $content,
         );
     }
 
@@ -590,12 +590,13 @@ protected function convertLegacyColors($content)
 
         // convert `rgb` to `hex`
         $dec = '([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])';
+
         return preg_replace_callback(
             "/rgb\($dec $dec $dec\)/i",
             function ($match) {
                 return sprintf('#%02x%02x%02x', $match[1], $match[2], $match[3]);
             },
-            $content
+            $content,
         );
     }
 
@@ -826,7 +827,7 @@ function ($match) use ($minifier) {
                 $minifier->extracted[$placeholder] = $match[1] . ':' . trim($match[2]);
 
                 return $placeholder;
-            }
+            },
         );
     }
 

src/CSS.php

@@ -17,6 +17,4 @@
  *
  * @author Matthias Mullie <[email protected]>
  */
-abstract class Exception extends \Exception
-{
-}
+abstract class Exception extends \Exception {}

src/Exception.php

@@ -19,6 +19,4 @@
  *
  * @author Matthias Mullie <[email protected]>
  */
-abstract class BasicException extends Exception
-{
-}
+abstract class BasicException extends Exception {}

src/Exceptions/BasicException.php

@@ -17,6 +17,4 @@
  *
  * @author Matthias Mullie <[email protected]>
  */
-class FileImportException extends BasicException
-{
-}
+class FileImportException extends BasicException {}

src/Exceptions/FileImportException.php

@@ -17,6 +17,4 @@
  *
  * @author Matthias Mullie <[email protected]>
  */
-class IOException extends BasicException
-{
-}
+class IOException extends BasicException {}

src/Exceptions/IOException.php

@@ -336,7 +336,7 @@ protected function stripWhitespace($content)
                 '/\s+(' . implode('|', $operatorsAfter) . ')/',
             ),
             '\\1',
-            $content
+            $content,
         );
 
         // make sure + and - can't be mistaken for, or joined into ++ and --
@@ -346,7 +346,7 @@ protected function stripWhitespace($content)
                 '/(?<![\+\-])([\+\-])\s*(?![\+\-])/',
             ),
             '\\1',
-            $content
+            $content,
         );
 
         // collapse whitespace around reserved words into single space
@@ -450,7 +450,7 @@ protected function stripWhitespace($content)
      * This will prepare the given array by escaping all characters.
      *
      * @param string[] $operators
-     * @param string   $delimiter
+     * @param string $delimiter
      *
      * @return string[]
      */
@@ -481,7 +481,7 @@ protected function getOperatorsForRegex(array $operators, $delimiter = '/')
      * This will prepare the given array by escaping all characters.
      *
      * @param string[] $keywords
-     * @param string   $delimiter
+     * @param string $delimiter
      *
      * @return string[]
      */

src/JS.php

@@ -230,7 +230,7 @@ protected function load($data)
      * Save to file.
      *
      * @param string $content The minified data
-     * @param string $path    The path to save the minified data to
+     * @param string $path The path to save the minified data to
      *
      * @throws IOException
      */
@@ -249,7 +249,7 @@ protected function save($content, $path)
      * If $replacement is a string, it must be plain text. Placeholders like $1 or \2 don't work.
      * If you need that functionality, use a callback instead.
      *
-     * @param string          $pattern     PCRE pattern
+     * @param string $pattern PCRE pattern
      * @param string|callable $replacement Replacement value for matched pattern
      */
     protected function registerPattern($pattern, $replacement = '')
@@ -390,7 +390,7 @@ protected function replace($content)
      * If it's a string, just pass it through.
      *
      * @param string|callable $replacement Replacement value
-     * @param array           $match       Match data, in PREG_OFFSET_CAPTURE form
+     * @param array $match Match data, in PREG_OFFSET_CAPTURE form
      *
      * @return string
      */
@@ -532,8 +532,8 @@ protected function openFileForWriting($path)
      * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions.
      *
      * @param resource $handler The resource to write to
-     * @param string   $content The content to write
-     * @param string   $path    The path to the file (for exception printing only)
+     * @param string $content The content to write
+     * @param string $path The path to the file (for exception printing only)
      *
      * @throws IOException
      */

src/Minify.php

@@ -203,7 +203,7 @@ public static function dataProvider()
         );
 
         $tests[] = array(
-        <<<'JS'
+            <<<'JS'
 p * i ,  html
 /* remove spaces */
 
@@ -222,7 +222,7 @@ public static function dataProvider()
   margin-right : 10px;
 }
 JS
-        ,
+            ,
             'p * i,html body p,p [remove~=" spaces  "] :nth-child(3+2n)>b span i,div::after{content:" escapes \\" allowed \\\\";content:"  /* string */  "!important;width:calc(100% - 3em + 5px);margin-top:0;margin-bottom:0;margin-left:10px;margin-right:10px}',
         );
 
@@ -486,13 +486,13 @@ public static function dataProvider()
 
         // https://github.com/matthiasmullie/minify/issues/274
         $tests[] = array(
-              '.cvp-live-filter select {
+            '.cvp-live-filter select {
   background-position:
     calc(100% - 20px) calc(1em + 2px),
     calc(100% - 15px) calc(1em + 2px),
     calc(100% - 2.5em) 0.5em;
 }',
-              '.cvp-live-filter select{background-position:calc(100% - 20px) calc(1em + 2px),calc(100% - 15px) calc(1em + 2px),calc(100% - 2.5em) .5em}',
+            '.cvp-live-filter select{background-position:calc(100% - 20px) calc(1em + 2px),calc(100% - 15px) calc(1em + 2px),calc(100% - 2.5em) .5em}',
         );
 
         // https://github.com/matthiasmullie/minify/issues/301

tests/CSS/CSSTest.php

@@ -8,9 +8,7 @@
     method_exists('PHPUnit\\Framework\\TestCase', 'expectException')
     || !method_exists('PHPUnit\\Framework\\TestCase', 'setExpectedException')
 ) {
-    class CompatTestCase extends PHPUnitTestCase
-    {
-    }
+    class CompatTestCase extends PHPUnitTestCase {}
 } else {
     class CompatTestCase extends PHPUnitTestCase
     {

tests/CompatTestCase.php

@@ -208,16 +208,16 @@ public static function dataProvider()
         );
 
         $tests[] = array(
-          'for ( i = 0; ; i++ ) statement',
-          'for(i=0;;i++)statement',
+            'for ( i = 0; ; i++ ) statement',
+            'for(i=0;;i++)statement',
         );
         $tests[] = array(
             'for (i = 0; (i < 10); i++) statement',
             'for(i=0;(i<10);i++)statement',
         );
         $tests[] = array(
-          'alert("test");;alert("test2")',
-          'alert("test");alert("test2")',
+            'alert("test");;alert("test2")',
+            'alert("test");alert("test2")',
         );
         $tests[] = array(
             '-1
@@ -710,7 +710,7 @@ function isJSON() {
     str.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']');
 }
 BUG
-,
+            ,
             <<<'BUG'
 function inspect(){escapedString.replace(/abc/g,'\\\'')}
 function isJSON(){str.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']')}