Skip to content

Commit

Permalink
update php-cs-fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
g-plane committed Jan 27, 2023
1 parent 3748163 commit 81f421b
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 31 deletions.
19 changes: 12 additions & 7 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@

$config = new PhpCsFixer\Config();
return $config->setRules([
'@Symfony' => true,
'align_multiline_comment' => true,
'array_syntax' => ['syntax' => 'short'],
'increment_style' => ['style' => 'post'],
'list_syntax' => ['syntax' => 'short'],
'yoda_style' => false,
])
'@Symfony' => true,
'align_multiline_comment' => true,
'array_syntax' => ['syntax' => 'short'],
'increment_style' => ['style' => 'post'],
'list_syntax' => ['syntax' => 'short'],
'yoda_style' => false,
'global_namespace_import' => [
'import_constants' => true,
'import_functions' => true,
'import_classes' => null,
],
])
->setFinder($finder);
19 changes: 0 additions & 19 deletions .php_cs.dist

This file was deleted.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "bs-community/blessing-skin-plugins",
"license": "MIT",
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.0"
"friendsofphp/php-cs-fixer": "^3.13"
},
"repositories": {
"packagist": {
Expand Down
4 changes: 2 additions & 2 deletions plugins/forum-integration/views/config.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
];
config(['database.connections.remote' => array_merge(
forum_get_default_db_config(), $config
)]);
forum_get_default_db_config(), $config
)]);
try {
DB::connection('remote')->getPdo();
Expand Down
2 changes: 1 addition & 1 deletion plugins/refresh-ali-cdn/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
$signText = preg_replace('/\*/', '%2A', $signText);
$signText = preg_replace('/%7E/', '~', $signText);
$stringToSign = 'GET&%2F&'.$signText;
$signature = base64_encode(hash_hmac('sha1', $stringToSign, ($accessKeySecret.'&'), true));
$signature = base64_encode(hash_hmac('sha1', $stringToSign, $accessKeySecret.'&', true));

// URL 拼接
$apiQuery['Signature'] = $signature;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public function hasJoinedServer(Request $request)
'user_id' => $profile->player->uid,
'player_id' => $profile->player->pid,
'parameters' => json_encode($request->except('username')),
], ($ip ? compact('ip') : [])));
], $ip ? compact('ip') : []));

return response()->json()->setContent($response);
}
Expand Down

0 comments on commit 81f421b

Please sign in to comment.