chore: Updating php-cs-fixer config file to support php-cs-fixer 3.0 (GoogleCloudPlatform#1442)

Author: rsamborski

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -1,14 +1,17 @@
 
 
-return PhpCsFixer\Config::create()
+// php-cs-fixer 3.0 distributed config file
+
+$config = new PhpCsFixer\Config();
+$config
     ->setRules([
         '@PSR2' => true,
         'concat_space' => ['spacing' => 'one'],
         'no_unused_imports' => true,
-        'method_argument_space' => false,
         'whitespace_after_comma_in_array' => true,
         'method_argument_space' => [
-            'keep_multiple_spaces_after_comma' => true
+            'keep_multiple_spaces_after_comma' => true,
+            'on_multiline' => 'ignore'
         ],
         'return_type_declaration' => [
             'space_before' => 'none'
@@ -19,3 +22,5 @@
             ->in(__DIR__)
     )
 ;
+
+return $config;

testing/composer.json

@@ -7,6 +7,7 @@
         "google/auth": "^1.12",
         "google/cloud-tools": "dev-master",
         "guzzlehttp/guzzle": "^7.0",
-        "phpunit/phpunit": "^7|^8"
+        "phpunit/phpunit": "^7|^8",
+        "friendsofphp/php-cs-fixer": "^3.0"
     }
 }

testing/run_cs_check.sh

@@ -15,15 +15,19 @@
 
 set -ex
 
+PROJECT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.."
+DIR="${1:-$PROJECT_ROOT}"
+
+# we run the script from PROJECT_ROOT
+cd $PROJECT_ROOT
+
+# install local version of php-cs-fixer 3.0 from composer.json
+composer -q install -d testing/
+
 # run php-cs-fixer
 PHP_CS_FIXER="php-cs-fixer"
-if [ -f "vendor/bin/php-cs-fixer" ]; then
-    PHP_CS_FIXER="vendor/bin/php-cs-fixer"
-elif [ -f "./php-cs-fixer" ]; then
-    PHP_CS_FIXER="./php-cs-fixer"
+if [ -f "testing/vendor/bin/php-cs-fixer" ]; then
+    PHP_CS_FIXER="testing/vendor/bin/php-cs-fixer"
 fi
 
-PROJECT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.."
-DIR="${1:-$PROJECT_ROOT}"
-
-$PHP_CS_FIXER fix --dry-run --diff --config="${PROJECT_ROOT}/.php_cs.dist" --path-mode=intersection $DIR
+$PHP_CS_FIXER fix --dry-run --diff --config="${PROJECT_ROOT}/.php-cs-fixer.dist.php" --path-mode=intersection $DIR