OPENEUROPA-1535: Revert.

CONVENTIONS.md

@@ -4,10 +4,7 @@ List of conventions for OpenEuropa projects and components.
 
 ## PHP Code Sniffer
 
-- For generic PHP projects: [PSR-2 coding standards](https://www.php-fig.org/psr/psr-2)
-  with the following additions:
-  - Comments, array declarations and code that is split over multiple lines also
-    need to be indented with 4 characters.
+- For generic PHP projects: [PSR-2 coding standards](https://www.php-fig.org/psr/psr-2).
 - For Drupal projects: [Drupal coding standards](https://www.drupal.org/docs/develop/standards) 
 
 ## PHP Mess Detector

README.md

@@ -186,12 +186,3 @@ git config --global --unset core.hooksPath
 * Best results were gained using the [Docker app](https://docs.docker.com/docker-for-mac/install/)
 * The local repo folder should be shared under Docker -> Preferences -> File sharing to enable the file to be written locally.
 
-## Patches
-
-The component uses the PSR-2 standard based on version 3.4 of package [squizlabs/PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer).
-As the PSR-2 standard does not enforce indentation, we decided to add custom rules in a custom ruleset in order to make sure
-that our code is properly indented.
-Unfortunately, there are some issues in versions 3.4 of [squizlabs/PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) regarding
-code indentation and we fixed them by including custom patches.
-Those issues are partially solved in version 3.5 which is not stable yet.
-As soon as 3.5 reaches a stable version, we will remove those patches.

composer.json

@@ -6,8 +6,7 @@
     "cweagans/composer-patches": "^1.0",
     "drupal/coder": "^8.3",
     "phpmd/phpmd" : "^2.6",
-    "phpro/grumphp": "^0.14.2",
-    "squizlabs/php_codesniffer": "^3.4.0"
+    "phpro/grumphp": "^0.14.2"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.5|^6.0"
@@ -22,17 +21,8 @@
       "OpenEuropa\\CodeReview\\Tests\\": "./tests/"
     }
   },
-  "extra": {
-    "enable-patching": true,
-    "composer-exit-on-patch-failure": 1,
-    "patches": {
-      "squizlabs/php_codesniffer": {
-        "Fix conflict between scope indentation and array indentation checking. Ref. https://github.com/squizlabs/PHP_CodeSniffer/issues/2281": "https://gist.githubusercontent.com/drupol/c307b48fe4eb187b0833afb1d1b97e6a/raw/c3d414e9f4c182387ca9405c36f5daeb7b51ae05/phpcs-390bffe2265aac8184fdf86400c0d0841e65bc4b.patch",
-        "Disable exact checking of multi-line chained method calls in Generic.WhiteSpace.ScopeIndent. Ref. https://github.com/squizlabs/PHP_CodeSniffer/pull/2372": "https://gist.githubusercontent.com/drupol/c307b48fe4eb187b0833afb1d1b97e6a/raw/c3d414e9f4c182387ca9405c36f5daeb7b51ae05/phpcs-pr-2372.patch"
-      }
-    }
-  },
   "scripts": {
     "changelog": "docker run --rm -v \"$(pwd):$(pwd)\" -w $(pwd) muccg/github-changelog-generator openeuropa/code-review -t $CHANGELOG_GITHUB_TOKEN --future-release=$CHANGELOG_FUTURE_RELEASE"
   }
 }
+

dist/library-conventions.yml

@@ -2,5 +2,5 @@ imports:
   - { resource: base-conventions.yml }
 
 parameters:
-  tasks.phpcs.standard: ./vendor/openeuropa/code-review/resources/library-phpcs-ruleset.xml
+  tasks.phpcs.standard: ./vendor/squizlabs/php_codesniffer/src/Standards/PSR2
   tasks.phpcs.warning_severity: 0

grumphp.yml.dist

@@ -10,4 +10,3 @@ parameters:
     - tests/fixtures/
   tasks.phpmd.ruleset:
   - ./resources/phpmd-ruleset.xml
-  tasks.phpcs.standard: ./resources/library-phpcs-ruleset.xml

tests/AbstractTest.php

@@ -41,10 +41,8 @@ public function getFixture($fixture)
      */
     protected function getContainer($configuration)
     {
-        // Create a GrumPHP configuration file to use in the test. Check if a configuration specific file exists, or
-        // fall back to a generic template file.
-        $filename = file_exists(__DIR__."/$configuration.yml.dist") ? __DIR__."/$configuration.yml.dist" : __DIR__.'/grumphp.yml.dist';
-        $content = file_get_contents($filename);
+        // Prepare test GrumPHP configuration file.
+        $content = file_get_contents(__DIR__."/grumphp.yml.dist");
         $content = str_replace("{configuration}", $configuration, $content);
         file_put_contents(__DIR__."/grumphp.yml", $content);
 

tests/DrupalTest.php

@@ -42,10 +42,10 @@ public function testPhpMessDetector($fixture, $expected)
     public function commitMessageProvider()
     {
         return [
-            ['phpmd/correct-code.inc', TaskResult::PASSED],
-            ['phpmd/correct-code.module', TaskResult::PASSED],
-            ['phpmd/correct-code.theme', TaskResult::PASSED],
-            ['phpmd/ignored-code.xxx', TaskResult::SKIPPED],
+          ['phpmd/correct-code.inc', TaskResult::PASSED],
+          ['phpmd/correct-code.module', TaskResult::PASSED],
+          ['phpmd/correct-code.theme', TaskResult::PASSED],
+          ['phpmd/ignored-code.xxx', TaskResult::SKIPPED],
         ];
     }
 }

tests/GitCommitMessageTest.php

@@ -39,10 +39,10 @@ public function testCommitMessage($message, $expected)
     public function commitMessageProvider()
     {
         return [
-            ['Issue #3: Nice GitHub commit message.', TaskResult::PASSED],
-            ['#3: Not nice GitHub commit message.', TaskResult::FAILED],
-            ['NEPT-123: Nice Jira commit message.', TaskResult::PASSED],
-            ['Failed message', TaskResult::FAILED],
+          ['Issue #3: Nice GitHub commit message.', TaskResult::PASSED],
+          ['#3: Not nice GitHub commit message.', TaskResult::FAILED],
+          ['NEPT-123: Nice Jira commit message.', TaskResult::PASSED],
+          ['Failed message', TaskResult::FAILED],
         ];
     }
 }

tests/PhpMessDetectorTest.php

@@ -39,8 +39,8 @@ public function testPhpCodeMessage($fixture, $expected)
     public function commitMessageProvider()
     {
         return [
-            ['phpmd/correct-code.php', TaskResult::PASSED],
-            ['phpmd/incorrect-code.php', TaskResult::FAILED],
+          ['phpmd/correct-code.php', TaskResult::PASSED],
+          ['phpmd/incorrect-code.php', TaskResult::FAILED],
         ];
     }
 }