Browse Source

Add PHP CS Fixer

Kuba Werłos 5 years ago
parent
commit
41c1a984f4

+ 1 - 0
.gitattributes

@@ -1,4 +1,5 @@
 /bin/ export-ignore
+/dev-tools/ export-ignore
 /Resources/ export-ignore
 /tests/ export-ignore
 /.* export-ignore

+ 1 - 0
.gitignore

@@ -1,6 +1,7 @@
 *.sublime-project
 *.sublime-workspace
 .idea
+/.php_cs.cache
 /nbproject/private/
 /build/
 /cache/

+ 16 - 0
.php_cs

@@ -0,0 +1,16 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->files()
+            ->in(__DIR__ . '/bin')
+            ->in(__DIR__ . '/src')
+            ->in(__DIR__ . '/tests')
+            ->append([__FILE__])
+            ->notName('DefaultRuleProvider.php')
+    )
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+    ]);

+ 5 - 1
.travis.yml

@@ -18,6 +18,7 @@ matrix:
     - php: 7.1
       env: COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.2
+      env: ANALYSIS=1
     - php: nightly
   allow_failures:
     - php: nightly
@@ -32,8 +33,11 @@ before_install:
 
 install:
   - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer update $COMPOSER_FLAGS --no-suggest
+  - if [ $ANALYSIS == 1 ]; then travis_retry composer update --working-dir=./dev-tools --no-suggest; fi
 
-script: vendor/bin/phpunit --verbose --coverage-clover=coverage.clover
+script:
+  - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover
+  - if [ $ANALYSIS == 1 ]; then PHP_CS_FIXER_FUTURE_MODE=1 ./dev-tools/vendor/bin/php-cs-fixer fix --ansi --diff --dry-run --verbose || travis_terminate 1; fi
 
 after_script:
   - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi;'

+ 0 - 1
bin/generate-default.php

@@ -56,4 +56,3 @@ if ($result) {
 } else {
     printf("Error writing rules into '%s'.\n", $fileName);
 }
-

+ 5 - 0
dev-tools/composer.json

@@ -0,0 +1,5 @@
+{
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "^2.16"
+    }
+}

+ 1 - 1
src/Bridge/Nette/SlugifyExtension.php

@@ -33,7 +33,7 @@ class SlugifyExtension extends CompilerExtension
         $builder = $this->getContainerBuilder();
 
         $self = $this;
-        $registerToLatte = function(ServiceDefinition $def) use ($self) {
+        $registerToLatte = function (ServiceDefinition $def) use ($self) {
             $def->addSetup('addFilter', ['slugify', [$self->prefix('@helper'), 'slugify']]);
         };
 

+ 0 - 1
src/Bridge/Symfony/Configuration.php

@@ -28,7 +28,6 @@ class Configuration implements ConfigurationInterface
             $rootNode = $treeBuilder->getRootNode();
         } else {
             $rootNode = $treeBuilder->root('cocur_slugify');
-
         }
 
         $rootNode

+ 0 - 1
src/Bridge/Twig/SlugifyExtension.php

@@ -76,5 +76,4 @@ class SlugifyExtension extends \Twig_Extension
     {
         return "SlugifyExtension";
     }
-
 }