Fix cs-fixer

fulll · Jun 20, 2024 · 828ce3d · 828ce3d
1 parent dfc8543
commit 828ce3d
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 47 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,12 +5,21 @@ jobs:
   php-cs-fixer:
     name: PHP Coding Standards Fixer
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
-
+      - name: Add HTTP basic auth credentials
+        run: echo '${{ secrets.COMPOSER_AUTH }}' > $GITHUB_WORKSPACE/auth.json
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+      - name: Install dependencies
+        uses: php-actions/composer@v6
+        with:
+          php_version: 8.0
+          args: --no-scripts --dev
       - name: Php cs fixer
-        uses: fulll/actions/php-cs-fixer@master
+        run: bin/php-cs-fixer fix
 
   phpstan:
     name: PHPStan Static Analysis

diff --git a/Controller/Annotations/ObfuscateRequest.php b/Controller/Annotations/ObfuscateRequest.php
@@ -18,9 +18,6 @@ class ObfuscateRequest
      */
     private $obfuscatedPatterns;
 
-    /**
-     * @param array $data data
-     */
     public function __construct(array $obfuscatedPatterns)
     {
         $this->obfuscatedPatterns = $obfuscatedPatterns;

diff --git a/DataCollector/RequestDataCollector.php b/DataCollector/RequestDataCollector.php
@@ -16,7 +16,7 @@ public function __construct(private AnnotationReader $annotationReader, private
     {
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         parent::collect($request, $response, $exception);
 

diff --git a/DependencyInjection/Compiler/ObfuscatorCompilerPass.php b/DependencyInjection/Compiler/ObfuscatorCompilerPass.php
@@ -10,9 +10,6 @@
 
 class ObfuscatorCompilerPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function process(ContainerBuilder $container): void
     {
         // request obfuscator is not enabled.

diff --git a/DependencyInjection/RezzzaSecurityExtension.php b/DependencyInjection/RezzzaSecurityExtension.php
@@ -21,9 +21,6 @@
  */
 class RezzzaSecurityExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container): void
     {
         $processor = new Processor();

diff --git a/Request/Obfuscator/RequestObfuscator.php b/Request/Obfuscator/RequestObfuscator.php
@@ -16,9 +16,6 @@ class RequestObfuscator implements ObfuscatorInterface
     public const TOKEN_REPLACE = 'X';
     public const TOKEN_ALL = '*';
 
-    /**
-     * {@inheritdoc}
-     */
     public function obfuscate(array $data, array $obfuscatedPatterns)
     {
         foreach ($obfuscatedPatterns as $key => $pattern) {

diff --git a/RezzzaSecurityBundle.php b/RezzzaSecurityBundle.php
@@ -18,9 +18,6 @@
  */
 class RezzzaSecurityBundle extends Bundle
 {
-    /**
-     * {@inheritdoc}
-     */
     public function build(ContainerBuilder $container): void
     {
         parent::build($container);

diff --git a/Security/Firewall/RequestSignatureProdiver.php b/Security/Firewall/RequestSignatureProdiver.php
@@ -10,9 +10,6 @@
 
 class RequestSignatureProdiver implements UserProviderInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function loadUserByUsername($username): UserInterface
     {
         throw new \LogicException(sprintf('Method %s should never be called.', __METHOD__));
@@ -33,9 +30,6 @@ public function refreshUser(UserInterface $user): UserInterface
         return $user;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsClass($class): bool
     {
         return SignatureValidUser::class === $class;

diff --git a/Security/SignatureValidToken.php b/Security/SignatureValidToken.php
@@ -13,9 +13,6 @@ public function __construct(SignatureValidUser $user)
         $this->setUser($user);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCredentials(): string
     {
         return '';

diff --git a/Security/SignatureValidUser.php b/Security/SignatureValidUser.php
@@ -8,48 +8,30 @@
 
 class SignatureValidUser implements UserInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getRoles(): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPassword(): ?string
     {
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSalt(): ?string
     {
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function eraseCredentials(): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getUsername(): ?string
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getUserIdentifier(): string
     {
         return '';

diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
     },
     "require-dev": {
         "atoum/atoum": "~4.0",
-        "phpstan/phpstan": "^1.9"
+        "phpstan/phpstan": "^1.9",
+        "friendsofphp/php-cs-fixer": "v3.59.3"
     },
     "suggest": {
         "psr/http-message": "Required by \\Rezzza\\SecurityBundle\\Request\\Psr7RequestSigner"
-Original file line number
+Diff line change
@@ Expand Up @@
         {
         }
-        public function collect(Request $request, Response $response, \Throwable $exception = null): void
+        public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
         {
             parent::collect($request, $response, $exception);
@@ Expand Down @@