Skip to content

Commit 8aa5e08

Browse files
tyrssontyrsson
committed
phpcs and psalm
Signed-off-by: Joey Smith <jsmith@webinertia.net> Signed-off-by: Joey Smith <jsmith@webinertia.net>
1 parent 8074b5b commit 8aa5e08

19 files changed

+195
-76
lines changed

‎psalm-baseline.xml‎

Lines changed: 159 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,157 @@
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>
332
<file src="src/Container/AdapterFactory.php">
433
<UnnecessaryVarAnnotation>
534
<code><![CDATA[PlatformInterface]]></code>
635
<code><![CDATA[ProfilerInterface|null]]></code>
736
<code><![CDATA[ResultSetInterface]]></code>
837
</UnnecessaryVarAnnotation>
938
</file>
10-
<file src="src/Container/AdapterManagerDelegator.php">
11-
<InvalidClass>
12-
<code><![CDATA[ConfigProvider]]></code>
13-
</InvalidClass>
39+
<file src="src/Container/ConnectionInterfaceFactoryFactory.php">
40+
<UndefinedClass>
41+
<code><![CDATA[FactoryFactoryInterface]]></code>
42+
</UndefinedClass>
43+
<UnusedParam>
44+
<code><![CDATA[$container]]></code>
45+
<code><![CDATA[$requestedName]]></code>
46+
</UnusedParam>
47+
</file>
48+
<file src="src/Container/DriverInterfaceFactoryFactory.php">
49+
<UndefinedClass>
50+
<code><![CDATA[FactoryFactoryInterface]]></code>
51+
</UndefinedClass>
52+
<UnusedParam>
53+
<code><![CDATA[$container]]></code>
54+
<code><![CDATA[$requestedName]]></code>
55+
</UnusedParam>
56+
</file>
57+
<file src="src/Container/MysqliConnectionFactory.php">
58+
<MixedArgument>
59+
<code><![CDATA[$adapterConfig['connection'] ?? []]]></code>
60+
</MixedArgument>
61+
<MixedArrayAccess>
62+
<code><![CDATA[$adapterConfig['connection']]]></code>
63+
</MixedArrayAccess>
64+
<MixedAssignment>
65+
<code><![CDATA[$adapterConfig]]></code>
66+
</MixedAssignment>
67+
<PossiblyUnusedMethod>
68+
<code><![CDATA[createFromConfig]]></code>
69+
</PossiblyUnusedMethod>
70+
</file>
71+
<file src="src/Container/MysqliDriverFactory.php">
72+
<InvalidArgument>
73+
<code><![CDATA[$connectionInstance]]></code>
74+
</InvalidArgument>
75+
<MissingDependency>
76+
<code><![CDATA[ConnectionInterfaceFactoryFactory]]></code>
77+
</MissingDependency>
78+
<MixedArgument>
79+
<code><![CDATA[$adapterConfig['options'] ?? []]]></code>
80+
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
81+
<code><![CDATA[ConnectionInterfaceFactoryFactory::class]]></code>
82+
</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>
94+
<PossiblyUnusedMethod>
95+
<code><![CDATA[createFromConfig]]></code>
96+
</PossiblyUnusedMethod>
1497
</file>
1598
<file src="src/Container/MysqliResultFactory.php">
1699
<UnusedParam>
17100
<code><![CDATA[$container]]></code>
18101
</UnusedParam>
19102
</file>
103+
<file src="src/Container/PdoConnectionFactory.php">
104+
<MixedArgument>
105+
<code><![CDATA[$adapterConfig['connection'] ?? []]]></code>
106+
</MixedArgument>
107+
<MixedArrayAccess>
108+
<code><![CDATA[$adapterConfig['connection']]]></code>
109+
</MixedArrayAccess>
110+
<MixedAssignment>
111+
<code><![CDATA[$adapterConfig]]></code>
112+
</MixedAssignment>
113+
<PossiblyUnusedMethod>
114+
<code><![CDATA[createFromConfig]]></code>
115+
</PossiblyUnusedMethod>
116+
</file>
117+
<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>
135+
<PossiblyUnusedMethod>
136+
<code><![CDATA[createFromConfig]]></code>
137+
</PossiblyUnusedMethod>
138+
</file>
20139
<file src="src/Container/PdoResultFactory.php">
21140
<UnusedParam>
22141
<code><![CDATA[$container]]></code>
23142
</UnusedParam>
24143
</file>
144+
<file src="src/Container/PlatformInterfaceFactory.php">
145+
<PossiblyUnusedMethod>
146+
<code><![CDATA[fromDriver]]></code>
147+
</PossiblyUnusedMethod>
148+
</file>
149+
<file src="src/Container/PlatformInterfaceFactoryFactory.php">
150+
<UndefinedClass>
151+
<code><![CDATA[FactoryFactoryInterface]]></code>
152+
</UndefinedClass>
153+
</file>
25154
<file src="src/Driver/Mysqli/Connection.php">
26-
<ClassMustBeFinal>
27-
<code><![CDATA[Connection]]></code>
28-
</ClassMustBeFinal>
29155
<InvalidReturnStatement>
30156
<code><![CDATA[$r[0]]]></code>
31157
</InvalidReturnStatement>
@@ -116,25 +242,30 @@
116242
</UnnecessaryVarAnnotation>
117243
</file>
118244
<file src="src/Driver/Mysqli/Mysqli.php">
119-
<ClassMustBeFinal>
120-
<code><![CDATA[Mysqli]]></code>
121-
</ClassMustBeFinal>
122245
<ImplementedParamTypeMismatch>
123246
<code><![CDATA[$resource]]></code>
124247
<code><![CDATA[$sqlOrResource]]></code>
125248
</ImplementedParamTypeMismatch>
126-
<InvalidReturnStatement>
127-
<code><![CDATA[$this->getConnection()->getLastGeneratedValue()]]></code>
128-
</InvalidReturnStatement>
129-
<InvalidReturnType>
130-
<code><![CDATA[int|string|null|false]]></code>
131-
</InvalidReturnType>
132249
<LessSpecificReturnStatement>
133250
<code><![CDATA[$this->resultPrototype]]></code>
134251
</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>
135263
<MoreSpecificReturnType>
136264
<code><![CDATA[ResultInterface&Result]]></code>
137265
</MoreSpecificReturnType>
266+
<NoValue>
267+
<code><![CDATA[return $this->connection;]]></code>
268+
</NoValue>
138269
<PossiblyUnusedMethod>
139270
<code><![CDATA[getProfiler]]></code>
140271
<code><![CDATA[getResultPrototype]]></code>
@@ -143,6 +274,9 @@
143274
<PossiblyUnusedReturnValue>
144275
<code><![CDATA[bool]]></code>
145276
</PossiblyUnusedReturnValue>
277+
<ReservedWord>
278+
<code><![CDATA[protected]]></code>
279+
</ReservedWord>
146280
<UndefinedDocblockClass>
147281
<code><![CDATA[\mysqli|mysqli_result|mysqli_stmt]]></code>
148282
</UndefinedDocblockClass>
@@ -151,9 +285,6 @@
151285
</UnusedVariable>
152286
</file>
153287
<file src="src/Driver/Mysqli/Result.php">
154-
<ClassMustBeFinal>
155-
<code><![CDATA[Result]]></code>
156-
</ClassMustBeFinal>
157288
<InvalidReturnStatement>
158289
<code><![CDATA[$this->resource->affected_rows]]></code>
159290
<code><![CDATA[$this->resource->num_rows]]></code>
@@ -225,9 +356,6 @@
225356
</UnusedVariable>
226357
</file>
227358
<file src="src/Driver/Mysqli/Statement.php">
228-
<ClassMustBeFinal>
229-
<code><![CDATA[Statement]]></code>
230-
</ClassMustBeFinal>
231359
<MixedAssignment>
232360
<code><![CDATA[$args[]]]></code>
233361
<code><![CDATA[$value]]></code>
@@ -288,9 +416,6 @@
288416
</TypeDoesNotContainType>
289417
</file>
290418
<file src="src/Driver/Pdo/Pdo.php">
291-
<ClassMustBeFinal>
292-
<code><![CDATA[Pdo]]></code>
293-
</ClassMustBeFinal>
294419
<ImplementedParamTypeMismatch>
295420
<code><![CDATA[$resource]]></code>
296421
</ImplementedParamTypeMismatch>
@@ -303,9 +428,6 @@
303428
</UnnecessaryVarAnnotation>
304429
</file>
305430
<file src="src/Metadata/Source/MysqlMetadata.php">
306-
<ClassMustBeFinal>
307-
<code><![CDATA[MysqlMetadata]]></code>
308-
</ClassMustBeFinal>
309431
<MissingClosureParamType>
310432
<code><![CDATA[$c]]></code>
311433
<code><![CDATA[$c]]></code>
@@ -480,14 +602,8 @@
480602
<ArgumentTypeCoercion>
481603
<code><![CDATA[$value]]></code>
482604
</ArgumentTypeCoercion>
483-
<ClassMustBeFinal>
484-
<code><![CDATA[Mysql]]></code>
485-
</ClassMustBeFinal>
486605
</file>
487606
<file src="src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php">
488-
<ClassMustBeFinal>
489-
<code><![CDATA[AlterTableDecorator]]></code>
490-
</ClassMustBeFinal>
491607
<LessSpecificImplementedReturnType>
492608
<code><![CDATA[array]]></code>
493609
<code><![CDATA[array]]></code>
@@ -546,9 +662,6 @@
546662
</UnusedReturnValue>
547663
</file>
548664
<file src="src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php">
549-
<ClassMustBeFinal>
550-
<code><![CDATA[CreateTableDecorator]]></code>
551-
</ClassMustBeFinal>
552665
<MixedArgument>
553666
<code><![CDATA[$coValue]]></code>
554667
<code><![CDATA[$coValue]]></code>
@@ -585,15 +698,7 @@
585698
<code><![CDATA[int]]></code>
586699
</UnusedReturnValue>
587700
</file>
588-
<file src="src/Sql/Platform/Mysql/Mysql.php">
589-
<ClassMustBeFinal>
590-
<code><![CDATA[Mysql]]></code>
591-
</ClassMustBeFinal>
592-
</file>
593701
<file src="src/Sql/Platform/Mysql/SelectDecorator.php">
594-
<ClassMustBeFinal>
595-
<code><![CDATA[SelectDecorator]]></code>
596-
</ClassMustBeFinal>
597702
<InvalidArrayOffset>
598703
<code><![CDATA[$this->processInfo['paramPrefix']]]></code>
599704
<code><![CDATA[$this->processInfo['paramPrefix']]]></code>
@@ -628,6 +733,12 @@
628733
<code><![CDATA[$subject]]></code>
629734
</PropertyNotSetInConstructor>
630735
</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>
631742
<file src="test/integration/Container/TestAsset/SetupTrait.php">
632743
<MixedArgument>
633744
<code><![CDATA[(new ConfigProvider())()['dependencies']]]></code>
@@ -718,6 +829,9 @@
718829
</RiskyTruthyFalsyComparison>
719830
</file>
720831
<file src="test/integration/Platform/MysqlTest.php">
832+
<InvalidArgument>
833+
<code><![CDATA[new Mysqli\Connection($this->mysqliParams)]]></code>
834+
</InvalidArgument>
721835
<InvalidClass>
722836
<code><![CDATA[\Mysqli]]></code>
723837
</InvalidClass>

‎src/ConfigProvider.php‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
use PhpDb\Container\AdapterManager;
1919
use PhpDb\Container\ConnectionInterfaceFactoryFactoryInterface;
2020
use PhpDb\Container\DriverInterfaceFactoryFactoryInterface;
21-
use PhpDb\Container\PlatformInterfaceFactoryFactoryInterface;
2221
use PhpDb\Container\MetadataFactory;
22+
use PhpDb\Container\PlatformInterfaceFactoryFactoryInterface;
2323
use PhpDb\Metadata\MetadataInterface;
2424
use PhpDb\ResultSet;
2525

@@ -39,13 +39,13 @@ public function getDependencies(): array
3939
'abstract_factories' => [
4040
AdapterAbstractServiceFactory::class,
4141
],
42-
'aliases' => [
42+
'aliases' => [
4343
MetadataInterface::class => MysqlMetadata::class,
4444
],
45-
'factories' => [
45+
'factories' => [
4646
MysqlMetadata::class => MetadataFactory::class,
4747
],
48-
'delegators' => [
48+
'delegators' => [
4949
AdapterManager::class => [
5050
Container\AdapterManagerDelegator::class,
5151
],
@@ -56,7 +56,7 @@ public function getDependencies(): array
5656
public function getAdapterManagerConfig(): array
5757
{
5858
return [
59-
'aliases' => [
59+
'aliases' => [
6060
'MySqli' => Driver\Mysqli\Mysqli::class,
6161
'MySQLi' => Driver\Mysqli\Mysqli::class,
6262
'Mysqli' => Driver\Mysqli\Mysqli::class,
@@ -76,7 +76,7 @@ public function getAdapterManagerConfig(): array
7676
DriverInterfaceFactoryFactoryInterface::class => Container\DriverInterfaceFactoryFactory::class,
7777
PlatformInterfaceFactoryFactoryInterface::class => Container\PlatformInterfaceFactoryFactory::class,
7878
],
79-
'factories' => [
79+
'factories' => [
8080
AdapterInterface::class => Container\AdapterFactory::class,
8181
Driver\Mysqli\Mysqli::class => Container\MysqliDriverFactory::class,
8282
Driver\Mysqli\Connection::class => Container\MysqliConnectionFactory::class,
@@ -91,9 +91,12 @@ public function getAdapterManagerConfig(): array
9191
ResultSet\ResultSet::class => InvokableFactory::class,
9292
],
9393
'invokables' => [
94-
Container\ConnectionInterfaceFactoryFactory::class => Container\ConnectionInterfaceFactoryFactory::class,
95-
Container\DriverInterfaceFactoryFactory::class => Container\DriverInterfaceFactoryFactory::class,
96-
Container\PlatformInterfaceFactoryFactory::class => Container\PlatformInterfaceFactoryFactory::class,
94+
Container\ConnectionInterfaceFactoryFactory::class
95+
=> Container\ConnectionInterfaceFactoryFactory::class,
96+
Container\DriverInterfaceFactoryFactory::class
97+
=> Container\DriverInterfaceFactoryFactory::class,
98+
Container\PlatformInterfaceFactoryFactory::class
99+
=> Container\PlatformInterfaceFactoryFactory::class,
97100
],
98101
];
99102
}

‎src/Container/AdapterManagerDelegator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace PhpDb\Adapter\Mysql\Container;
66

77
use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
8-
use PhpDB\Adapter\Mysql\ConfigProvider;
8+
use PhpDb\Adapter\Mysql\ConfigProvider;
99
use PhpDb\Container\AdapterManager;
1010
use Psr\Container\ContainerInterface;
1111

‎src/Container/ConnectionInterfaceFactoryFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function __invoke(
2424
): callable {
2525
$adapterConfig = $container->get('config')['db']['adapters'] ?? [];
2626
if (! isset($adapterConfig[$requestedName]['driver'])) {
27-
throw new \RuntimeException(sprintf(
27+
throw new RuntimeException(sprintf(
2828
'Named adapter "%s" is not configured with a driver',
2929
$requestedName
3030
));

0 commit comments

Comments
 (0)