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('arrays')),
     ))
     ->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"
+        "phpunit/phpunit": ">=4.8"
     },
     "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
      */
@@ -590,6 +590,7 @@ 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) {

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 {}