fix jwt factory configuration merge order (#131)

* fix jwt factory configuration merge order

* Apply cs fix

* ci: remove json-fix script and composer json checks

- Remove json-fix script from composer.json
- Remove Check Composer Json step from GitHub Actions workflow

Author: zds-s

.github/workflows/test.yml

@@ -29,10 +29,6 @@ jobs:
           extensions: redis, pdo, pdo_mysql, bcmath, ${{ matrix.swoole }}
       - name: Setup Packages
         run: composer update -oW
-      - name: Check Composer Json
-        run: |
-          composer normalize --dry-run --no-update-lock
-          find ./src -name composer.json -exec composer normalize --dry-run --no-update-lock {} \;
       - name: Run CS Fix
         run: vendor/bin/php-cs-fixer fix src --dry-run --diff
   tests:

composer.json

@@ -101,10 +101,6 @@
         "analyse": "phpstan analyse --memory-limit 1000M -l 0 -c phpstan.neon ./src",
         "coverage": "pest --coverage --coverage-clover tests/coverage.xml",
         "cs-fix": "php-cs-fixer fix $1",
-        "json-fix": [
-            "@composer normalize --no-update-lock",
-            "find ./src -name composer.json -exec composer normalize --no-update-lock {} \\;"
-        ],
         "test": "pest"
     },
     "extra": {

src/AppStore/src/Command/CreateCommand.php

@@ -63,7 +63,7 @@ public function __invoke(): int
     public function createNamespace(string $path, string $name): string
     {
         $pluginPath = Str::replace(Plugin::PLUGIN_PATH . '/', '', $path);
-        list($orgName) = explode('/', $pluginPath);
+        [$orgName] = explode('/', $pluginPath);
         return 'Plugin\\' . Str::studly($orgName) . '\\' . Str::studly($name);
     }
 

src/Jwt/Factory.php

@@ -37,8 +37,8 @@ public function getConfig(string $scene): array
             return $this->config->get($this->getConfigKey());
         }
         return Arr::merge(
-            $this->config->get($this->getConfigKey($scene)),
-            $this->config->get($this->getConfigKey())
+            $this->config->get($this->getConfigKey()),
+            $this->config->get($this->getConfigKey($scene))
         );
     }