Merge pull request GoogleCloudPlatform#108 from GoogleCloudPlatform/cs-fix

CS fixes.

Author: Takashi Matsuo

.gitignore

@@ -6,3 +6,4 @@ vendor/
 credentials.*
 **/vendor/
 **/build/
+.php_cs.cache

.php_cs

@@ -1,11 +1,16 @@
 <?php
 
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->fixers([
-        'concat_with_spaces',
-        'unused_use',
-        'trailing_spaces',
-        'indentation'
-    ])
-;
+$finder = PhpCsFixer\Finder::create()
+    ->notPath('appengine/wordpress/src/files/flexible/wp-config.php')
+    ->notPath('appengine/wordpress/src/files/standard/wp-config.php')
+    ->in(__DIR__);
+
+return PhpCsFixer\Config::create()
+    ->setRules(array(
+        '@PSR2' => true,
+        'concat_with_spaces' => true,
+        'no_unused_imports' => true,
+        'no_trailing_whitespace' => true,
+        'no_tab_indentation' => true,
+    ))
+    ->finder($finder);

appengine/standard/modules/tests/unit/ModulesApiTest.php

@@ -19,7 +19,6 @@
 
 class ModulesApiTest extends WebTestCase
 {
-
     public function createApplication()
     {
         $app = require __DIR__ . '/../../app.php';

appengine/standard/taskqueue/tests/unit/TaskQueueTest.php

@@ -20,7 +20,6 @@
 
 class TaskQueueTest extends WebTestCase
 {
-
     public function createApplication()
     {
         $app = require __DIR__ . '/../../app.php';

appengine/standard/taskqueue/tests/unit/mocks/PushTask.php

@@ -19,7 +19,6 @@
 
 class PushTask
 {
-
     public static $tasks = array();
     public static $added = array();
     public $url;

appengine/standard/users/tests/unit/mocks/User.php

@@ -22,7 +22,6 @@
  */
 class User
 {
-
     private $email;
     private $url;
 

testing/run_test_suite.sh

@@ -17,7 +17,7 @@ set -ex
 
 # run php-cs-fixer
 if [ "${RUN_CS_FIXER}" = "true" ]; then
-    ${HOME}/php-cs-fixer fix --dry-run --diff --config-file=.php_cs .
+    ${HOME}/php-cs-fixer fix --dry-run --diff --config=.php_cs
 fi
 
 # loop through all directories containing "phpunit.xml" and run them