Skip to content

Commit 0f7551f

Browse files
tyrssontyrsson
committed
Make phpcs and psalm play nice
Signed-off-by: Joey Smith <jsmith@webinertia.net> Signed-off-by: Joey Smith <jsmith@webinertia.net>
1 parent fe3e76c commit 0f7551f

File tree

2 files changed

+79
-108
lines changed

2 files changed

+79
-108
lines changed

‎psalm-baseline.xml‎

Lines changed: 78 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
3-
<file src="src/ConfigProvider.php">
4-
<MissingDependency>
5-
<code><![CDATA[Container\ConnectionInterfaceFactoryFactory]]></code>
6-
<code><![CDATA[Container\ConnectionInterfaceFactoryFactory]]></code>
7-
<code><![CDATA[Container\ConnectionInterfaceFactoryFactory]]></code>
8-
<code><![CDATA[Container\DriverInterfaceFactoryFactory]]></code>
9-
<code><![CDATA[Container\DriverInterfaceFactoryFactory]]></code>
10-
<code><![CDATA[Container\DriverInterfaceFactoryFactory]]></code>
11-
<code><![CDATA[Container\PlatformInterfaceFactoryFactory]]></code>
12-
<code><![CDATA[Container\PlatformInterfaceFactoryFactory]]></code>
13-
<code><![CDATA[Container\PlatformInterfaceFactoryFactory]]></code>
14-
</MissingDependency>
15-
<MixedArrayOffset>
16-
<code><![CDATA[[
17-
Container\ConnectionInterfaceFactoryFactory::class
18-
=> Container\ConnectionInterfaceFactoryFactory::class,
19-
Container\DriverInterfaceFactoryFactory::class
20-
=> Container\DriverInterfaceFactoryFactory::class,
21-
Container\PlatformInterfaceFactoryFactory::class
22-
=> Container\PlatformInterfaceFactoryFactory::class,
23-
]]]></code>
24-
</MixedArrayOffset>
25-
<UndefinedClass>
26-
<code><![CDATA[AdapterAbstractServiceFactory]]></code>
27-
<code><![CDATA[ConnectionInterfaceFactoryFactoryInterface]]></code>
28-
<code><![CDATA[DriverInterfaceFactoryFactoryInterface]]></code>
29-
<code><![CDATA[PlatformInterfaceFactoryFactoryInterface]]></code>
30-
</UndefinedClass>
31-
</file>
323
<file src="src/Container/AdapterFactory.php">
334
<UnnecessaryVarAnnotation>
345
<code><![CDATA[PlatformInterface]]></code>
@@ -37,22 +8,67 @@
378
</UnnecessaryVarAnnotation>
389
</file>
3910
<file src="src/Container/ConnectionInterfaceFactoryFactory.php">
40-
<UndefinedClass>
41-
<code><![CDATA[FactoryFactoryInterface]]></code>
42-
</UndefinedClass>
43-
<UnusedParam>
44-
<code><![CDATA[$container]]></code>
11+
<MixedArgument>
12+
<code><![CDATA[$adapterServices['aliases']]]></code>
13+
<code><![CDATA[$configuredDriver]]></code>
14+
<code><![CDATA[$configuredDriver]]></code>
15+
</MixedArgument>
16+
<MixedArrayAccess>
17+
<code><![CDATA[$adapterServices['aliases']]]></code>
18+
<code><![CDATA[$adapterServices['aliases']]]></code>
19+
<code><![CDATA[$adapterServices['aliases'][$configuredDriver]]]></code>
20+
<code><![CDATA[$container->get('config')[AdapterManager::class]]]></code>
21+
</MixedArrayAccess>
22+
<MixedArrayOffset>
23+
<code><![CDATA[$adapterServices['aliases'][$configuredDriver]]]></code>
24+
</MixedArrayOffset>
25+
<MixedAssignment>
26+
<code><![CDATA[$adapterConfig]]></code>
27+
<code><![CDATA[$adapterServices]]></code>
28+
<code><![CDATA[$aliasTo]]></code>
29+
<code><![CDATA[$aliasTo]]></code>
30+
<code><![CDATA[$configuredDriver]]></code>
31+
</MixedAssignment>
32+
<PossiblyNullArgument>
4533
<code><![CDATA[$requestedName]]></code>
46-
</UnusedParam>
34+
</PossiblyNullArgument>
35+
<PossiblyNullReference>
36+
<code><![CDATA[get]]></code>
37+
<code><![CDATA[get]]></code>
38+
</PossiblyNullReference>
4739
</file>
4840
<file src="src/Container/DriverInterfaceFactoryFactory.php">
49-
<UndefinedClass>
50-
<code><![CDATA[FactoryFactoryInterface]]></code>
51-
</UndefinedClass>
52-
<UnusedParam>
53-
<code><![CDATA[$container]]></code>
41+
<MixedArrayAccess>
42+
<code><![CDATA[$adapterServices['aliases']]]></code>
43+
<code><![CDATA[$adapterServices['aliases'][$configuredDriver]]]></code>
44+
<code><![CDATA[$adapterServices['factories']]]></code>
45+
<code><![CDATA[$adapterServices['factories'][$aliasTo]]]></code>
46+
<code><![CDATA[$container->get('config')[AdapterManager::class]]]></code>
47+
</MixedArrayAccess>
48+
<MixedArrayOffset>
49+
<code><![CDATA[$adapterServices['aliases'][$configuredDriver]]]></code>
50+
<code><![CDATA[$adapterServices['factories'][$aliasTo]]]></code>
51+
</MixedArrayOffset>
52+
<MixedAssignment>
53+
<code><![CDATA[$adapterConfig]]></code>
54+
<code><![CDATA[$adapterServices]]></code>
55+
<code><![CDATA[$aliasTo]]></code>
56+
<code><![CDATA[$configuredDriver]]></code>
57+
<code><![CDATA[$driverFactory]]></code>
58+
</MixedAssignment>
59+
<MixedMethodCall>
60+
<code><![CDATA[new $driverFactory()]]></code>
61+
</MixedMethodCall>
62+
<PossiblyNullArgument>
5463
<code><![CDATA[$requestedName]]></code>
55-
</UnusedParam>
64+
</PossiblyNullArgument>
65+
<PossiblyNullReference>
66+
<code><![CDATA[get]]></code>
67+
<code><![CDATA[get]]></code>
68+
</PossiblyNullReference>
69+
<UndefinedVariable>
70+
<code><![CDATA[$aliasTo]]></code>
71+
</UndefinedVariable>
5672
</file>
5773
<file src="src/Container/MysqliConnectionFactory.php">
5874
<MixedArgument>
@@ -69,31 +85,16 @@
6985
</PossiblyUnusedMethod>
7086
</file>
7187
<file src="src/Container/MysqliDriverFactory.php">
72-
<InvalidArgument>
73-
<code><![CDATA[$connectionInstance]]></code>
74-
</InvalidArgument>
75-
<MissingDependency>
76-
<code><![CDATA[ConnectionInterfaceFactoryFactory]]></code>
77-
</MissingDependency>
7888
<MixedArgument>
7989
<code><![CDATA[$adapterConfig['options'] ?? []]]></code>
8090
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
81-
<code><![CDATA[ConnectionInterfaceFactoryFactory::class]]></code>
8291
</MixedArgument>
83-
<MixedAssignment>
84-
<code><![CDATA[$connectionFactory]]></code>
85-
</MixedAssignment>
86-
<MixedFunctionCall>
87-
<code><![CDATA[(
88-
$adapterManager->get(ConnectionInterfaceFactoryFactory::class)
89-
)($container, $requestedName)]]></code>
90-
</MixedFunctionCall>
91-
<MixedMethodCall>
92-
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
93-
</MixedMethodCall>
9492
<PossiblyUnusedMethod>
9593
<code><![CDATA[createFromConfig]]></code>
9694
</PossiblyUnusedMethod>
95+
<UndefinedClass>
96+
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
97+
</UndefinedClass>
9798
</file>
9899
<file src="src/Container/MysqliResultFactory.php">
99100
<UnusedParam>
@@ -115,26 +116,12 @@
115116
</PossiblyUnusedMethod>
116117
</file>
117118
<file src="src/Container/PdoDriverFactory.php">
118-
<MissingDependency>
119-
<code><![CDATA[ConnectionInterfaceFactoryFactory]]></code>
120-
</MissingDependency>
121-
<MixedArgument>
122-
<code><![CDATA[ConnectionInterfaceFactoryFactory::class]]></code>
123-
</MixedArgument>
124-
<MixedAssignment>
125-
<code><![CDATA[$connectionFactory]]></code>
126-
</MixedAssignment>
127-
<MixedFunctionCall>
128-
<code><![CDATA[(
129-
$adapterManager->get(ConnectionInterfaceFactoryFactory::class)
130-
)($container, $requestedName)]]></code>
131-
</MixedFunctionCall>
132-
<MixedMethodCall>
133-
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
134-
</MixedMethodCall>
135119
<PossiblyUnusedMethod>
136120
<code><![CDATA[createFromConfig]]></code>
137121
</PossiblyUnusedMethod>
122+
<UndefinedClass>
123+
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
124+
</UndefinedClass>
138125
</file>
139126
<file src="src/Container/PdoResultFactory.php">
140127
<UnusedParam>
@@ -146,12 +133,10 @@
146133
<code><![CDATA[fromDriver]]></code>
147134
</PossiblyUnusedMethod>
148135
</file>
149-
<file src="src/Container/PlatformInterfaceFactoryFactory.php">
150-
<UndefinedClass>
151-
<code><![CDATA[FactoryFactoryInterface]]></code>
152-
</UndefinedClass>
153-
</file>
154136
<file src="src/Driver/Mysqli/Connection.php">
137+
<ClassMustBeFinal>
138+
<code><![CDATA[Connection]]></code>
139+
</ClassMustBeFinal>
155140
<InvalidReturnStatement>
156141
<code><![CDATA[$r[0]]]></code>
157142
</InvalidReturnStatement>
@@ -246,26 +231,18 @@
246231
<code><![CDATA[$resource]]></code>
247232
<code><![CDATA[$sqlOrResource]]></code>
248233
</ImplementedParamTypeMismatch>
234+
<InvalidReturnStatement>
235+
<code><![CDATA[$this->getConnection()->getLastGeneratedValue()]]></code>
236+
</InvalidReturnStatement>
237+
<InvalidReturnType>
238+
<code><![CDATA[int|string|null|false]]></code>
239+
</InvalidReturnType>
249240
<LessSpecificReturnStatement>
250241
<code><![CDATA[$this->resultPrototype]]></code>
251242
</LessSpecificReturnStatement>
252-
<MixedMethodCall>
253-
<code><![CDATA[connect]]></code>
254-
<code><![CDATA[getLastGeneratedValue]]></code>
255-
<code><![CDATA[getResource]]></code>
256-
<code><![CDATA[isConnected]]></code>
257-
<code><![CDATA[setDriver]]></code>
258-
<code><![CDATA[setProfiler]]></code>
259-
</MixedMethodCall>
260-
<MixedReturnStatement>
261-
<code><![CDATA[$this->getConnection()->getLastGeneratedValue()]]></code>
262-
</MixedReturnStatement>
263243
<MoreSpecificReturnType>
264244
<code><![CDATA[ResultInterface&Result]]></code>
265245
</MoreSpecificReturnType>
266-
<NoValue>
267-
<code><![CDATA[return $this->connection;]]></code>
268-
</NoValue>
269246
<PossiblyUnusedMethod>
270247
<code><![CDATA[getProfiler]]></code>
271248
<code><![CDATA[getResultPrototype]]></code>
@@ -274,9 +251,6 @@
274251
<PossiblyUnusedReturnValue>
275252
<code><![CDATA[bool]]></code>
276253
</PossiblyUnusedReturnValue>
277-
<ReservedWord>
278-
<code><![CDATA[protected]]></code>
279-
</ReservedWord>
280254
<UndefinedDocblockClass>
281255
<code><![CDATA[\mysqli|mysqli_result|mysqli_stmt]]></code>
282256
</UndefinedDocblockClass>
@@ -416,6 +390,9 @@
416390
</TypeDoesNotContainType>
417391
</file>
418392
<file src="src/Driver/Pdo/Pdo.php">
393+
<ClassMustBeFinal>
394+
<code><![CDATA[Pdo]]></code>
395+
</ClassMustBeFinal>
419396
<ImplementedParamTypeMismatch>
420397
<code><![CDATA[$resource]]></code>
421398
</ImplementedParamTypeMismatch>
@@ -602,6 +579,9 @@
602579
<ArgumentTypeCoercion>
603580
<code><![CDATA[$value]]></code>
604581
</ArgumentTypeCoercion>
582+
<ClassMustBeFinal>
583+
<code><![CDATA[Mysql]]></code>
584+
</ClassMustBeFinal>
605585
</file>
606586
<file src="src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php">
607587
<LessSpecificImplementedReturnType>
@@ -733,12 +713,6 @@
733713
<code><![CDATA[$subject]]></code>
734714
</PropertyNotSetInConstructor>
735715
</file>
736-
<file src="test/integration/Container/MysqliConnectionFactoryTest.php">
737-
<TooFewArguments>
738-
<code><![CDATA[$factory]]></code>
739-
<code><![CDATA[$factory]]></code>
740-
</TooFewArguments>
741-
</file>
742716
<file src="test/integration/Container/TestAsset/SetupTrait.php">
743717
<MixedArgument>
744718
<code><![CDATA[(new ConfigProvider())()['dependencies']]]></code>
@@ -829,9 +803,6 @@
829803
</RiskyTruthyFalsyComparison>
830804
</file>
831805
<file src="test/integration/Platform/MysqlTest.php">
832-
<InvalidArgument>
833-
<code><![CDATA[new Mysqli\Connection($this->mysqliParams)]]></code>
834-
</InvalidArgument>
835806
<InvalidClass>
836807
<code><![CDATA[\Mysqli]]></code>
837808
</InvalidClass>

‎src/Platform/Mysql.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use function implode;
1616
use function str_replace;
1717

18-
final class Mysql extends AbstractPlatform
18+
class Mysql extends AbstractPlatform
1919
{
2020
public final const PLATFORM_NAME = 'MySQL';
2121

0 commit comments

Comments
 (0)