Skip to content

Commit ec4ab16

Browse files
authored
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
1 parent c67061a commit ec4ab16

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

.github/workflows/test.yml

-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ jobs:
2929
extensions: redis, pdo, pdo_mysql, bcmath, ${{ matrix.swoole }}
3030
- name: Setup Packages
3131
run: composer update -oW
32-
- name: Check Composer Json
33-
run: |
34-
composer normalize --dry-run --no-update-lock
35-
find ./src -name composer.json -exec composer normalize --dry-run --no-update-lock {} \;
3632
- name: Run CS Fix
3733
run: vendor/bin/php-cs-fixer fix src --dry-run --diff
3834
tests:

composer.json

-4
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@
101101
"analyse": "phpstan analyse --memory-limit 1000M -l 0 -c phpstan.neon ./src",
102102
"coverage": "pest --coverage --coverage-clover tests/coverage.xml",
103103
"cs-fix": "php-cs-fixer fix $1",
104-
"json-fix": [
105-
"@composer normalize --no-update-lock",
106-
"find ./src -name composer.json -exec composer normalize --no-update-lock {} \\;"
107-
],
108104
"test": "pest"
109105
},
110106
"extra": {

src/AppStore/src/Command/CreateCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function __invoke(): int
6363
public function createNamespace(string $path, string $name): string
6464
{
6565
$pluginPath = Str::replace(Plugin::PLUGIN_PATH . '/', '', $path);
66-
list($orgName) = explode('/', $pluginPath);
66+
[$orgName] = explode('/', $pluginPath);
6767
return 'Plugin\\' . Str::studly($orgName) . '\\' . Str::studly($name);
6868
}
6969

src/Jwt/Factory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public function getConfig(string $scene): array
3737
return $this->config->get($this->getConfigKey());
3838
}
3939
return Arr::merge(
40-
$this->config->get($this->getConfigKey($scene)),
41-
$this->config->get($this->getConfigKey())
40+
$this->config->get($this->getConfigKey()),
41+
$this->config->get($this->getConfigKey($scene))
4242
);
4343
}
4444

0 commit comments

Comments
 (0)