fix php-cs-fixer

Author: makasim

.php_cs.dist renamed to .php_cs.php

@@ -26,4 +26,4 @@
         PhpCsFixer\Finder::create()
             ->in(__DIR__)
     )
-;
+;

.travis.yml

@@ -53,9 +53,9 @@ install:
     - if [ "$PREPARE_CONTAINER" = true ]; then bin/dev -b; fi
 
 script:
-    - IFS=$'\n'; COMMIT_SCA_FILES=($(git diff --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")); unset IFS
-    - if [ "$PHP_CS_FIXER" = true ]; then ./bin/php-cs-fixer --no-interaction --dry-run --diff -v --path-mode=intersection fix -- "${COMMIT_SCA_FILES[@]}" ; fi
-    - if [ "$PHPSTAN" = true ]; then docker run --workdir="/mqdev" -v "`pwd`:/mqdev" --rm enqueue/dev:latest php -d memory_limit=1024M bin/phpstan analyse -l 1 -c phpstan.neon -- "${COMMIT_SCA_FILES[@]}" ; fi
+    - PKG_PHP_CHANGED_FILES=`./bin/git-find-changed-php-files.sh "${TRAVIS_COMMIT_RANGE}"`
+    - if [ "$PHP_CS_FIXER" = true ] && [ ! -z "${PKG_PHP_CHANGED_FILES}" ]; then ./bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff -v --path-mode=intersection  -- ${PKG_PHP_CHANGED_FILES[@]} ; fi
+    - if [ "$PHPSTAN" = true ] && [ ! -z "${PKG_PHP_CHANGED_FILES}" ]; then docker run --workdir="/mqdev" -v "`pwd`:/mqdev" --rm enqueue/dev:latest php -d memory_limit=1024M bin/phpstan analyse -l 1 -c phpstan.neon -- ${PKG_PHP_CHANGED_FILES[@]} ; fi
     - if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi
     - if [ "$FUNCTIONAL_TESTS" = true ]; then bin/test.sh --exclude-group=rdkafka; fi
     - if [ "RDKAFKA_TESTS" = true ]; then bin/test.sh --group=rdkafka; fi

bin/git-find-changed-php-files.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if (( "$#" != 1 ))
+then
+    echo "Git range must be provided"
+    exit 1
+fi
+
+
+IFS='
+'
+ALL_CHANGED_FILES=$(git diff --name-only --diff-filter=ACMRTUXB "$1");
+PKG_PHP_CHANGED_FILES=$(echo "$ALL_CHANGED_FILES" | grep -E "^pkg\/" | grep -E ".*?\.php$");
+
+echo "$PKG_PHP_CHANGED_FILES";

bin/pre-commit

@@ -68,6 +68,10 @@ function getFilesToFix()
         return (bool) preg_match('/\.(php|twig|translations\/*.yml)$/', $file);
     });
 
+    $stagedFiles = array_filter($stagedFiles, function ($file) {
+        return (bool) preg_match('/^pkg\//', $file);
+    });
+
     return $stagedFiles;
 }
 
@@ -104,7 +108,7 @@ function runPhpCsFixer()
         $returnCode = null;
 
         exec(sprintf(
-            '%s %s fix %s --dry-run',
+            '%s %s fix %s --dry-run --config=.php_cs.php',
             $phpBin,
             $phpCsFixerBin,
             $projectRootDir.'/'.$file