Update code style action. (#28)

mikaeljorhult · web-flow · commit d06923a3888e · 2023-03-10T23:26:10.000+04:00
diff --git a/.github/workflows/run-php-cs-fixer.yml b/.github/workflows/run-php-cs-fixer.yml
@@ -10,14 +10,16 @@ jobs:
   fix-php-code-style:
     name: Fix PHP Code Style
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 2
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga:2.18.6
+        uses: docker://oskarstark/php-cs-fixer-ga
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /vendor
 composer.lock
-/.idea
+/.idea
+.php-cs-fixer.cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,12 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('node_modules')
+    ->exclude('vendor')
+    ->in(__DIR__);
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+        '@PSR2' => true,
+    ])
+    ->setFinder($finder);
diff --git a/src/FlashMessage/FlashMessage.php b/src/FlashMessage/FlashMessage.php
@@ -149,7 +149,8 @@ public function get(string $key)
     public function toArray()
     {
         return array_merge(
-            $this->attributes, [
+            $this->attributes,
+            [
                 'content' => $this->content,
                 'title' => $this->title,
                 'type' => $this->type,

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 /vendor
 composer.lock
 -/.idea
 +/.idea
 +.php-cs-fixer.cache