Skip to content

Commit 34c01bb

Browse files
tyrssontyrsson
authored
Merge pull request #32 from php-db/0.1.x
0.1.x-merge-up-into-0.2.x
2 parents d7e2ba4 + bfb2978 commit 34c01bb

24 files changed

+377
-95
lines changed

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
}
3333
},
3434
"require": {
35-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
36-
"php-db/phpdb": "^0.1.0"
35+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
36+
"php-db/phpdb": "^0.1.1"
3737
},
3838
"require-dev": {
3939
"ext-mysqli": "*",

‎composer.lock‎

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎psalm-baseline.xml‎

Lines changed: 115 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,133 @@
77
<code><![CDATA[ResultSetInterface]]></code>
88
</UnnecessaryVarAnnotation>
99
</file>
10-
<file src="src/Container/AdapterManagerDelegator.php">
11-
<InvalidClass>
12-
<code><![CDATA[ConfigProvider]]></code>
13-
</InvalidClass>
10+
<file src="src/Container/ConnectionInterfaceFactoryFactory.php">
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>
33+
<code><![CDATA[$requestedName]]></code>
34+
</PossiblyNullArgument>
35+
<PossiblyNullReference>
36+
<code><![CDATA[get]]></code>
37+
<code><![CDATA[get]]></code>
38+
</PossiblyNullReference>
39+
</file>
40+
<file src="src/Container/DriverInterfaceFactoryFactory.php">
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>
63+
<code><![CDATA[$requestedName]]></code>
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>
72+
</file>
73+
<file src="src/Container/MysqliConnectionFactory.php">
74+
<MixedArgument>
75+
<code><![CDATA[$adapterConfig['connection'] ?? []]]></code>
76+
</MixedArgument>
77+
<MixedArrayAccess>
78+
<code><![CDATA[$adapterConfig['connection']]]></code>
79+
</MixedArrayAccess>
80+
<MixedAssignment>
81+
<code><![CDATA[$adapterConfig]]></code>
82+
</MixedAssignment>
83+
<PossiblyUnusedMethod>
84+
<code><![CDATA[createFromConfig]]></code>
85+
</PossiblyUnusedMethod>
86+
</file>
87+
<file src="src/Container/MysqliDriverFactory.php">
88+
<MixedArgument>
89+
<code><![CDATA[$adapterConfig['options'] ?? []]]></code>
90+
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
91+
</MixedArgument>
92+
<PossiblyUnusedMethod>
93+
<code><![CDATA[createFromConfig]]></code>
94+
</PossiblyUnusedMethod>
95+
<UndefinedClass>
96+
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
97+
</UndefinedClass>
1498
</file>
1599
<file src="src/Container/MysqliResultFactory.php">
16100
<UnusedParam>
17101
<code><![CDATA[$container]]></code>
18102
</UnusedParam>
19103
</file>
104+
<file src="src/Container/PdoConnectionFactory.php">
105+
<MixedArgument>
106+
<code><![CDATA[$adapterConfig['connection'] ?? []]]></code>
107+
</MixedArgument>
108+
<MixedArrayAccess>
109+
<code><![CDATA[$adapterConfig['connection']]]></code>
110+
</MixedArrayAccess>
111+
<MixedAssignment>
112+
<code><![CDATA[$adapterConfig]]></code>
113+
</MixedAssignment>
114+
<PossiblyUnusedMethod>
115+
<code><![CDATA[createFromConfig]]></code>
116+
</PossiblyUnusedMethod>
117+
</file>
118+
<file src="src/Container/PdoDriverFactory.php">
119+
<PossiblyUnusedMethod>
120+
<code><![CDATA[createFromConfig]]></code>
121+
</PossiblyUnusedMethod>
122+
<UndefinedClass>
123+
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
124+
</UndefinedClass>
125+
</file>
20126
<file src="src/Container/PdoResultFactory.php">
21127
<UnusedParam>
22128
<code><![CDATA[$container]]></code>
23129
</UnusedParam>
24130
</file>
131+
<file src="src/Container/PlatformInterfaceFactory.php">
132+
<PossiblyUnusedMethod>
133+
<code><![CDATA[fromDriver]]></code>
134+
</PossiblyUnusedMethod>
135+
</file>
25136
<file src="src/Driver/Mysqli/Connection.php">
26-
<ClassMustBeFinal>
27-
<code><![CDATA[Connection]]></code>
28-
</ClassMustBeFinal>
29137
<InvalidReturnStatement>
30138
<code><![CDATA[$r[0]]]></code>
31139
</InvalidReturnStatement>
@@ -116,9 +224,6 @@
116224
</UnnecessaryVarAnnotation>
117225
</file>
118226
<file src="src/Driver/Mysqli/Mysqli.php">
119-
<ClassMustBeFinal>
120-
<code><![CDATA[Mysqli]]></code>
121-
</ClassMustBeFinal>
122227
<ImplementedParamTypeMismatch>
123228
<code><![CDATA[$resource]]></code>
124229
<code><![CDATA[$sqlOrResource]]></code>
@@ -151,9 +256,6 @@
151256
</UnusedVariable>
152257
</file>
153258
<file src="src/Driver/Mysqli/Result.php">
154-
<ClassMustBeFinal>
155-
<code><![CDATA[Result]]></code>
156-
</ClassMustBeFinal>
157259
<InvalidReturnStatement>
158260
<code><![CDATA[$this->resource->affected_rows]]></code>
159261
<code><![CDATA[$this->resource->num_rows]]></code>
@@ -225,9 +327,6 @@
225327
</UnusedVariable>
226328
</file>
227329
<file src="src/Driver/Mysqli/Statement.php">
228-
<ClassMustBeFinal>
229-
<code><![CDATA[Statement]]></code>
230-
</ClassMustBeFinal>
231330
<MixedAssignment>
232331
<code><![CDATA[$args[]]]></code>
233332
<code><![CDATA[$value]]></code>
@@ -288,9 +387,6 @@
288387
</TypeDoesNotContainType>
289388
</file>
290389
<file src="src/Driver/Pdo/Pdo.php">
291-
<ClassMustBeFinal>
292-
<code><![CDATA[Pdo]]></code>
293-
</ClassMustBeFinal>
294390
<ImplementedParamTypeMismatch>
295391
<code><![CDATA[$resource]]></code>
296392
</ImplementedParamTypeMismatch>
@@ -303,9 +399,6 @@
303399
</UnnecessaryVarAnnotation>
304400
</file>
305401
<file src="src/Metadata/Source/MysqlMetadata.php">
306-
<ClassMustBeFinal>
307-
<code><![CDATA[MysqlMetadata]]></code>
308-
</ClassMustBeFinal>
309402
<MissingClosureParamType>
310403
<code><![CDATA[$c]]></code>
311404
<code><![CDATA[$c]]></code>
@@ -480,14 +573,8 @@
480573
<ArgumentTypeCoercion>
481574
<code><![CDATA[$value]]></code>
482575
</ArgumentTypeCoercion>
483-
<ClassMustBeFinal>
484-
<code><![CDATA[Mysql]]></code>
485-
</ClassMustBeFinal>
486576
</file>
487577
<file src="src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php">
488-
<ClassMustBeFinal>
489-
<code><![CDATA[AlterTableDecorator]]></code>
490-
</ClassMustBeFinal>
491578
<LessSpecificImplementedReturnType>
492579
<code><![CDATA[array]]></code>
493580
<code><![CDATA[array]]></code>
@@ -546,9 +633,6 @@
546633
</UnusedReturnValue>
547634
</file>
548635
<file src="src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php">
549-
<ClassMustBeFinal>
550-
<code><![CDATA[CreateTableDecorator]]></code>
551-
</ClassMustBeFinal>
552636
<MixedArgument>
553637
<code><![CDATA[$coValue]]></code>
554638
<code><![CDATA[$coValue]]></code>
@@ -585,15 +669,7 @@
585669
<code><![CDATA[int]]></code>
586670
</UnusedReturnValue>
587671
</file>
588-
<file src="src/Sql/Platform/Mysql/Mysql.php">
589-
<ClassMustBeFinal>
590-
<code><![CDATA[Mysql]]></code>
591-
</ClassMustBeFinal>
592-
</file>
593672
<file src="src/Sql/Platform/Mysql/SelectDecorator.php">
594-
<ClassMustBeFinal>
595-
<code><![CDATA[SelectDecorator]]></code>
596-
</ClassMustBeFinal>
597673
<InvalidArrayOffset>
598674
<code><![CDATA[$this->processInfo['paramPrefix']]]></code>
599675
<code><![CDATA[$this->processInfo['paramPrefix']]]></code>

‎psalm.xml.dist‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@
3535
</errorLevel>
3636
</MissingOverrideAttribute>
3737

38+
<ClassMustBeFinal>
39+
<errorLevel type="suppress">
40+
<directory name="src" />
41+
</errorLevel>
42+
</ClassMustBeFinal>
43+
3844
<PossiblyNullReference>
3945
<errorLevel type="suppress">
4046
<directory name="test" />

0 commit comments

Comments
 (0)