Skip to content

Commit 1b584af

Browse files
committed
php-cs fix
1 parent 8f350a7 commit 1b584af

File tree

5 files changed

+86
-7
lines changed

5 files changed

+86
-7
lines changed

.php_cs.common.php

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?php
2+
3+
// Share common rules between non-test and test files
4+
return [
5+
// PSR12 from https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/4943
6+
'@PSR2' => true,
7+
'blank_line_after_opening_tag' => true,
8+
'braces' => [
9+
// Not-yet-implemented
10+
// 'allow_single_line_anonymous_class_with_empty_body' => true,
11+
],
12+
'compact_nullable_typehint' => true,
13+
'declare_equal_normalize' => true,
14+
'lowercase_cast' => true,
15+
'lowercase_static_reference' => true,
16+
'new_with_braces' => true,
17+
'no_blank_lines_after_class_opening' => true,
18+
'no_leading_import_slash' => true,
19+
'no_whitespace_in_blank_line' => true,
20+
'ordered_class_elements' => [
21+
'order' => [
22+
'use_trait',
23+
],
24+
],
25+
'ordered_imports' => [
26+
'imports_order' => [
27+
'class',
28+
'function',
29+
'const',
30+
],
31+
'sort_algorithm' => 'alpha',
32+
],
33+
'return_type_declaration' => true,
34+
'short_scalar_cast' => true,
35+
'single_blank_line_before_namespace' => true,
36+
'single_trait_insert_per_statement' => true,
37+
'ternary_operator_spaces' => true,
38+
'visibility_required' => [
39+
'elements' => [
40+
'const',
41+
'method',
42+
'property',
43+
],
44+
],
45+
46+
// Further quality-of-life improvements
47+
'array_syntax' => [
48+
'syntax' => 'short',
49+
],
50+
'concat_space' => [
51+
'spacing' => 'none',
52+
],
53+
'fully_qualified_strict_types' => true,
54+
'native_function_invocation' => [
55+
'include' => [],
56+
'strict' => true,
57+
],
58+
'no_unused_imports' => true,
59+
'single_quote' => true,
60+
'space_after_semicolon' => true,
61+
'trailing_comma_in_multiline_array' => true,
62+
'trim_array_spaces' => true,
63+
'unary_operator_spaces' => true,
64+
'whitespace_after_comma_in_array' => true,
65+
];

.php_cs.dist

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
require __DIR__ . '/vendor/autoload.php';
3+
4+
$finder = PhpCsFixer\Finder::create()
5+
->in(__DIR__)
6+
->exclude('tests');
7+
8+
$config = require __DIR__ . '/.php_cs.common.php';
9+
10+
return PhpCsFixer\Config::create()
11+
->setFinder($finder)
12+
->setRules($config)
13+
->setRiskyAllowed(true)
14+
->setCacheFile(__DIR__ . '/.php_cs.cache');

config/app-logger.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
\Illuminate\Http\Request::METHOD_POST,
2525
\Illuminate\Http\Request::METHOD_PUT,
2626
\Illuminate\Http\Request::METHOD_PATCH,
27-
\Illuminate\Http\Request::METHOD_DELETE
27+
\Illuminate\Http\Request::METHOD_DELETE,
2828
],
2929

3030
/*
@@ -66,7 +66,7 @@
6666
\Illuminate\Http\Request::METHOD_POST,
6767
\Illuminate\Http\Request::METHOD_PUT,
6868
\Illuminate\Http\Request::METHOD_PATCH,
69-
\Illuminate\Http\Request::METHOD_DELETE
69+
\Illuminate\Http\Request::METHOD_DELETE,
7070
],
7171

7272
/*
@@ -96,5 +96,5 @@
9696
* null value to use default channel.
9797
*/
9898
'channel' => null,
99-
]
99+
],
100100
];

src/PerformanceLog/LogWriter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected function getMessages(Request $request, string $uniqId): array
4949
protected function getTimeInMilliSeconds(): string
5050
{
5151
$milliSeconds = (microtime(true) - $this->start) * 1000;
52-
return sprintf("%.3f", $milliSeconds);
52+
return sprintf('%.3f', $milliSeconds);
5353
}
5454

5555
protected function getMemoryInMB(): int

src/QueryLog/LogWriter.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected function getMessages(QueryExecuted $query): array
4646
return [
4747
'time' => $query->time,
4848
'connection_name' => $query->connectionName,
49-
'sql' => $sql
49+
'sql' => $sql,
5050
];
5151
}
5252

@@ -63,8 +63,8 @@ protected function formatMessage(array $message): string
6363
*/
6464
protected function quote(string $value): string
6565
{
66-
$search = ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"];
67-
$replace = ["\\\\", "\\0", "\\n", "\\r", "\'", '\"', "\\Z"];
66+
$search = ['\\', "\x00", "\n", "\r", "'", '"', "\x1a"];
67+
$replace = ['\\\\', '\\0', '\\n', '\\r', "\'", '\"', '\\Z'];
6868

6969
return "'".str_replace($search, $replace, $value)."'";
7070
}

0 commit comments

Comments
 (0)