Merge pull request #32 from janlam7/phpcs-tool-9

Update phpcs-tool to 9.1.0 with Hostnet-Level-2

Author: janlam7

.github/workflows/main.yaml

@@ -3,28 +3,29 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php-versions: ['7.3', '7.4', '8.0']
-    name: PHP ${{ matrix.php-versions }}
-    steps:
-      -   uses: actions/checkout@v2
-      -   uses: shivammathur/setup-php@v2
-          with:
-            php-version: ${{ matrix.php-versions }}
-      -   name: Get composer cache directory
-          id: composer-cache
-          run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      -   uses: actions/cache@v2
-          with:
-            path: ${{ steps.composer-cache.outputs.dir }}
-            key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-            restore-keys: ${{ runner.os }}-composer-
-      -   name: composer install
-          run: composer install --no-progress --prefer-dist --optimize-autoloader
-      -   name: phpunit
-          run: php vendor/bin/phpunit
+    test:
+        runs-on: ubuntu-latest
 
+        strategy:
+            matrix:
+                php-versions: ['7.3', '7.4', '8.0']
+        name: PHP ${{ matrix.php-versions }}
+        steps:
+            -   uses: actions/checkout@v2
+            -   uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-versions }}
+            -   name: Get composer cache directory
+                id: composer-cache
+                run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+            -   uses: actions/cache@v2
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: ${{ runner.os }}-composer-
+            -   name: composer install
+                run: composer install --no-progress --prefer-dist --optimize-autoloader
+            -   name: phpunit
+                run: php vendor/bin/phpunit
+            -   name: phpcs
+                run: php vendor/bin/phpcs

composer.json

@@ -14,7 +14,7 @@
     },
     "require-dev": {
         "hostnet/entity-blamable-component": "^1.0.4",
-        "hostnet/phpcs-tool":                "^8.3.15",
+        "hostnet/phpcs-tool":                "^9.1.0",
         "phpunit/phpunit":                   "^9.5.6",
         "symfony/framework-bundle":          "^4.4||^5.0",
         "symfony/security-bundle":           "^4.4||^5.0"
@@ -34,6 +34,12 @@
             "Hostnet\\Bundle\\EntityTrackerBundle\\": "tests/"
         }
     },
+    "config": {
+        "allow-plugins": {
+            "hostnet/*":                                      true,
+            "dealerdirect/phpcodesniffer-composer-installer": false
+        }
+    },
     "archive": {
         "exclude": [
             "/tests"

phpcs.xml.dist

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<ruleset name="entity-tracker-bundle PHPCS">
+  <rule ref="Hostnet-Level-2"/>
+</ruleset>

src/Services/Blamable/DefaultBlamableProvider.php

@@ -31,9 +31,6 @@ public function __construct(TokenStorageInterface $token_storage, string $userna
         $this->username      = $username;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getUpdatedBy(): string
     {
         if (($token = $this->token_storage->getToken()) instanceof TokenInterface) {
@@ -43,9 +40,6 @@ public function getUpdatedBy(): string
         return $this->username;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getChangedAt(): \DateTime
     {
         return new \DateTime();

tests/Functional/Fixtures/TestKernel.php

@@ -22,25 +22,16 @@ public function registerBundles(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__ . '/config/config.yaml');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCacheDir(): string
     {
         return __DIR__ . '/../../../var/cache/' . $this->getEnvironment();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getLogDir(): string
     {
         return __DIR__ . '/../../../var/logs';