Skip to content

Commit 2c9828b

Browse files
tyrssontyrsson
committed
Updates psalm baseline file with coverage at 95%
PhpCS cleanup Signed-off-by: Joey Smith <jsmith@webinertia.net> Signed-off-by: Joey Smith <jsmith@webinertia.net>
1 parent 129be3c commit 2c9828b

23 files changed

+354
-301
lines changed

‎composer.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
7575
"test-integration": "phpunit --colors=always --testsuite \"integration test\"",
7676
"static-analysis": "psalm --shepherd --stats",
77+
"sa-update-baseline": "psalm --update-baseline",
78+
"sa-no-baseline": "psalm --shepherd --stats --ignore-baseline",
7779
"upload-coverage": "coveralls -v"
7880
}
7981
}

‎composer.lock‎

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

‎psalm-baseline.xml‎

Lines changed: 48 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -6,101 +6,36 @@
66
</ClassMustBeFinal>
77
</file>
88
<file src="src/Container/AdapterFactory.php">
9-
<MixedArgument>
10-
<code><![CDATA[$adapterManager->get($config['db']['driver'])]]></code>
11-
<code><![CDATA[$config['db']['driver']]]></code>
12-
<code><![CDATA[$config['db']['driver']]]></code>
13-
<code><![CDATA[$config['db']['driver']]]></code>
14-
</MixedArgument>
15-
</file>
16-
<file src="src/Container/AdapterManagerDelegator.php">
17-
<MixedAssignment>
18-
<code><![CDATA[$adapterManager]]></code>
19-
</MixedAssignment>
20-
<MixedMethodCall>
21-
<code><![CDATA[configure]]></code>
22-
</MixedMethodCall>
23-
<MixedReturnStatement>
24-
<code><![CDATA[$adapterManager]]></code>
25-
</MixedReturnStatement>
9+
<UnnecessaryVarAnnotation>
10+
<code><![CDATA[PlatformInterface]]></code>
11+
<code><![CDATA[ProfilerInterface|null]]></code>
12+
<code><![CDATA[ResultSetInterface]]></code>
13+
</UnnecessaryVarAnnotation>
2614
</file>
2715
<file src="src/Container/DriverFeatureFactory.php">
2816
<UnusedClass>
2917
<code><![CDATA[DriverFeatureFactory]]></code>
3018
</UnusedClass>
3119
</file>
32-
<file src="src/Container/MysqliConnectionFactory.php">
33-
<MixedArgument>
34-
<code><![CDATA[$dbConfig]]></code>
35-
</MixedArgument>
36-
<MixedAssignment>
37-
<code><![CDATA[$dbConfig]]></code>
38-
</MixedAssignment>
39-
</file>
40-
<file src="src/Container/MysqliDriverFactory.php">
41-
<MixedArgument>
42-
<code><![CDATA[$options]]></code>
43-
</MixedArgument>
44-
<MixedAssignment>
45-
<code><![CDATA[$options]]></code>
46-
</MixedAssignment>
47-
</file>
4820
<file src="src/Container/MysqliResultFactory.php">
4921
<UnusedParam>
5022
<code><![CDATA[$container]]></code>
5123
</UnusedParam>
5224
</file>
5325
<file src="src/Container/MysqliStatementFactory.php">
54-
<MixedArgument>
26+
<UndefinedVariable>
5527
<code><![CDATA[$bufferResults]]></code>
56-
</MixedArgument>
57-
<MixedAssignment>
58-
<code><![CDATA[$bufferResults]]></code>
59-
</MixedAssignment>
60-
</file>
61-
<file src="src/Container/PdoConnectionFactory.php">
62-
<MixedArgument>
63-
<code><![CDATA[$dbConfig]]></code>
64-
</MixedArgument>
65-
<MixedAssignment>
66-
<code><![CDATA[$dbConfig]]></code>
67-
</MixedAssignment>
28+
</UndefinedVariable>
6829
</file>
6930
<file src="src/Container/PdoResultFactory.php">
7031
<UnusedParam>
7132
<code><![CDATA[$container]]></code>
7233
</UnusedParam>
7334
</file>
74-
<file src="src/Container/PdoStatementFactory.php">
75-
<MixedArgument>
76-
<code><![CDATA[$options]]></code>
77-
</MixedArgument>
78-
<MixedAssignment>
79-
<code><![CDATA[$options]]></code>
80-
</MixedAssignment>
81-
<PossiblyFalseArgument>
82-
<code><![CDATA[$options]]></code>
83-
</PossiblyFalseArgument>
84-
</file>
85-
<file src="src/Container/PlatformInterfaceFactory.php">
86-
<MixedArgument>
87-
<code><![CDATA[$adapterManager->get($driver)]]></code>
88-
<code><![CDATA[$driver]]></code>
89-
</MixedArgument>
90-
<MixedArrayAccess>
91-
<code><![CDATA[$container->get('config')['db']]]></code>
92-
</MixedArrayAccess>
93-
<MixedAssignment>
94-
<code><![CDATA[$driver]]></code>
95-
</MixedAssignment>
96-
</file>
9735
<file src="src/Driver/Mysqli/Connection.php">
9836
<ClassMustBeFinal>
9937
<code><![CDATA[Connection]]></code>
10038
</ClassMustBeFinal>
101-
<DocblockTypeContradiction>
102-
<code><![CDATA[null !== $connectionInfo]]></code>
103-
</DocblockTypeContradiction>
10439
<InvalidArgument>
10540
<code><![CDATA[$resultResource === true ? $this->resource : $resultResource]]></code>
10641
</InvalidArgument>
@@ -110,9 +45,6 @@
11045
<InvalidReturnType>
11146
<code><![CDATA[string|bool]]></code>
11247
</InvalidReturnType>
113-
<MissingClosureReturnType>
114-
<code><![CDATA[function (array $names) use ($p) {]]></code>
115-
</MissingClosureReturnType>
11648
<MissingParamType>
11749
<code><![CDATA[$sql]]></code>
11850
</MissingParamType>
@@ -122,20 +54,10 @@
12254
<code><![CDATA[$cipher]]></code>
12355
<code><![CDATA[$clientCert]]></code>
12456
<code><![CDATA[$clientKey]]></code>
125-
<code><![CDATA[$database]]></code>
126-
<code><![CDATA[$database]]></code>
127-
<code><![CDATA[$hostname]]></code>
128-
<code><![CDATA[$hostname]]></code>
12957
<code><![CDATA[$option]]></code>
13058
<code><![CDATA[$p['charset']]]></code>
131-
<code><![CDATA[$password]]></code>
132-
<code><![CDATA[$password]]></code>
133-
<code><![CDATA[$socket]]></code>
134-
<code><![CDATA[$socket]]></code>
13559
<code><![CDATA[$sql]]></code>
13660
<code><![CDATA[$sql]]></code>
137-
<code><![CDATA[$username]]></code>
138-
<code><![CDATA[$username]]></code>
13961
<code><![CDATA[$value]]></code>
14062
</MixedArgument>
14163
<MixedArrayOffset>
@@ -147,17 +69,15 @@
14769
<code><![CDATA[$cipher]]></code>
14870
<code><![CDATA[$clientCert]]></code>
14971
<code><![CDATA[$clientKey]]></code>
150-
<code><![CDATA[$database]]></code>
151-
<code><![CDATA[$hostname]]></code>
15272
<code><![CDATA[$name]]></code>
15373
<code><![CDATA[$option]]></code>
15474
<code><![CDATA[$option]]></code>
155-
<code><![CDATA[$password]]></code>
156-
<code><![CDATA[$socket]]></code>
15775
<code><![CDATA[$useSSL]]></code>
158-
<code><![CDATA[$username]]></code>
15976
<code><![CDATA[$value]]></code>
16077
</MixedAssignment>
78+
<MixedReturnStatement>
79+
<code><![CDATA[$p[$name]]]></code>
80+
</MixedReturnStatement>
16181
<NonInvariantDocblockPropertyType>
16282
<code><![CDATA[$resource]]></code>
16383
</NonInvariantDocblockPropertyType>
@@ -196,6 +116,14 @@
196116
<TooManyArguments>
197117
<code><![CDATA[profilerFinish]]></code>
198118
</TooManyArguments>
119+
<TypeDoesNotContainType>
120+
<code><![CDATA[null !== $connectionInfo]]></code>
121+
</TypeDoesNotContainType>
122+
<UnnecessaryVarAnnotation>
123+
<code><![CDATA[array]]></code>
124+
<code><![CDATA[int|null]]></code>
125+
<code><![CDATA[string|null]]></code>
126+
</UnnecessaryVarAnnotation>
199127
</file>
200128
<file src="src/Driver/Mysqli/Mysqli.php">
201129
<ClassMustBeFinal>
@@ -204,6 +132,9 @@
204132
<ImplementedParamTypeMismatch>
205133
<code><![CDATA[$sqlOrResource]]></code>
206134
</ImplementedParamTypeMismatch>
135+
<InvalidArgument>
136+
<code><![CDATA[$resource]]></code>
137+
</InvalidArgument>
207138
<InvalidReturnStatement>
208139
<code><![CDATA[$this->getConnection()->getLastGeneratedValue()]]></code>
209140
</InvalidReturnStatement>
@@ -239,12 +170,12 @@
239170
<InvalidReturnStatement>
240171
<code><![CDATA[$this->resource->affected_rows]]></code>
241172
<code><![CDATA[$this->resource->num_rows]]></code>
242-
<code><![CDATA[$this->resource->num_rows]]></code>
243173
</InvalidReturnStatement>
244174
<InvalidReturnType>
245175
<code><![CDATA[int]]></code>
246176
</InvalidReturnType>
247177
<MissingConstructor>
178+
<code><![CDATA[$generatedValue]]></code>
248179
<code><![CDATA[$isBuffered]]></code>
249180
<code><![CDATA[$resource]]></code>
250181
</MissingConstructor>
@@ -376,12 +307,13 @@
376307
<ImplementedParamTypeMismatch>
377308
<code><![CDATA[$resource]]></code>
378309
</ImplementedParamTypeMismatch>
379-
<PossiblyUndefinedMethod>
380-
<code><![CDATA[getLastGeneratedValue]]></code>
381-
</PossiblyUndefinedMethod>
382310
<PropertyNotSetInConstructor>
383311
<code><![CDATA[Pdo]]></code>
384312
</PropertyNotSetInConstructor>
313+
<UnnecessaryVarAnnotation>
314+
<code><![CDATA[null]]></code>
315+
<code><![CDATA[string|int|bool|null]]></code>
316+
</UnnecessaryVarAnnotation>
385317
</file>
386318
<file src="src/Metadata/Source/MysqlMetadata.php">
387319
<ClassMustBeFinal>
@@ -705,22 +637,21 @@
705637
</MoreSpecificReturnType>
706638
</file>
707639
<file src="test/integration/Driver/Mysqli/ConnectionTest.php">
708-
<MixedArgument>
709-
<code><![CDATA[$this->getConfig()['db']['connection']]]></code>
710-
</MixedArgument>
711-
<MixedArrayAccess>
712-
<code><![CDATA[$this->getConfig()['db']['connection']]]></code>
713-
</MixedArrayAccess>
640+
<UnnecessaryVarAnnotation>
641+
<code><![CDATA[array]]></code>
642+
</UnnecessaryVarAnnotation>
714643
</file>
715644
<file src="test/integration/Driver/Pdo/AbstractAdapterTestCase.php">
716645
<RedundantCondition>
717-
<code><![CDATA[(string) $this->getConfig()['db']['connection']['port']]]></code>
646+
<code><![CDATA[(string) $connectionConfig['port']]]></code>
718647
</RedundantCondition>
719648
<TypeDoesNotContainNull>
720649
<code><![CDATA['3306']]></code>
721650
</TypeDoesNotContainNull>
722651
<UnnecessaryVarAnnotation>
723652
<code><![CDATA[ConnectionInterface]]></code>
653+
<code><![CDATA[array]]></code>
654+
<code><![CDATA[string]]></code>
724655
</UnnecessaryVarAnnotation>
725656
</file>
726657
<file src="test/integration/Driver/Pdo/AdapterTest.php">
@@ -729,19 +660,13 @@
729660
</UndefinedTrait>
730661
</file>
731662
<file src="test/integration/Driver/Pdo/TableGatewayAndAdapterTest.php">
732-
<MixedArgument>
733-
<code><![CDATA[$result->current()]]></code>
734-
</MixedArgument>
735663
<MixedReturnStatement>
736664
<code><![CDATA[array]]></code>
737665
</MixedReturnStatement>
738666
<PossiblyNullArgument>
667+
<code><![CDATA[$result->current()]]></code>
739668
<code><![CDATA[$this->adapter]]></code>
740669
</PossiblyNullArgument>
741-
<UndefinedInterfaceMethod>
742-
<code><![CDATA[current]]></code>
743-
<code><![CDATA[query]]></code>
744-
</UndefinedInterfaceMethod>
745670
</file>
746671
<file src="test/integration/Driver/Pdo/TableGatewayTest.php">
747672
<InvalidArgument>
@@ -806,33 +731,18 @@
806731
<InvalidClass>
807732
<code><![CDATA[\Mysqli]]></code>
808733
</InvalidClass>
809-
<RedundantConditionGivenDocblockType>
810-
<code><![CDATA[$this->adapters['mysqli'] instanceof \Mysqli]]></code>
811-
</RedundantConditionGivenDocblockType>
812-
<TooFewArguments>
813-
<code><![CDATA[new Mysqli\Mysqli(new Mysqli\Connection($this->adapters['mysqli']))]]></code>
814-
<code><![CDATA[new Mysqli\Mysqli(new Mysqli\Connection($this->adapters['mysqli']))]]></code>
815-
<code><![CDATA[new Pdo\Pdo(new Pdo\Connection($this->adapters['pdo_mysql']))]]></code>
816-
<code><![CDATA[new Pdo\Pdo(new Pdo\Connection($this->adapters['pdo_mysql']))]]></code>
817-
</TooFewArguments>
818-
<UnevaluatedCode>
819-
<code><![CDATA[if (extension_loaded('mysqli')) {
820-
$this->adapters['mysqli'] = new \mysqli(
821-
getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_HOSTNAME'),
822-
getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_USERNAME'),
823-
getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_PASSWORD'),
824-
getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_DATABASE')
825-
);
826-
}]]></code>
827-
<code><![CDATA[if (extension_loaded('pdo')) {
828-
$this->adapters['pdo_mysql'] = new \PDO(
829-
'mysql:host=' . getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_HOSTNAME') . ';dbname='
830-
. getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_DATABASE'),
831-
getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_USERNAME'),
832-
getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_PASSWORD')
833-
);
834-
}]]></code>
835-
</UnevaluatedCode>
734+
<PossiblyFalseArgument>
735+
<code><![CDATA[$this->mysqliParams['database']]]></code>
736+
<code><![CDATA[$this->mysqliParams['hostname']]]></code>
737+
<code><![CDATA[$this->mysqliParams['password']]]></code>
738+
<code><![CDATA[$this->mysqliParams['username']]]></code>
739+
<code><![CDATA[$this->pdoParams['password']]]></code>
740+
<code><![CDATA[$this->pdoParams['username']]]></code>
741+
</PossiblyFalseArgument>
742+
<PossiblyFalseOperand>
743+
<code><![CDATA[$this->pdoParams['database']]]></code>
744+
<code><![CDATA[$this->pdoParams['hostname']]]></code>
745+
</PossiblyFalseOperand>
836746
</file>
837747
<file src="test/unit/Driver/Pdo/ConnectionIntegrationTest.php">
838748
<PossiblyUnusedProperty>
@@ -887,34 +797,18 @@
887797
</file>
888798
<file src="test/unit/Driver/Pdo/ResultTest.php">
889799
<ArgumentTypeCoercion>
890-
<code><![CDATA['PDOStatement']]></code>
891-
<code><![CDATA['PDOStatement']]></code>
892-
<code><![CDATA['PDOStatement']]></code>
893-
<code><![CDATA['PDOStatement']]></code>
894800
<code><![CDATA['stdClass']]></code>
895801
<code><![CDATA['stdClass']]></code>
896802
</ArgumentTypeCoercion>
897-
<InvalidArgument>
898-
<code><![CDATA[$stub]]></code>
899-
<code><![CDATA[$stub]]></code>
900-
<code><![CDATA[$stub]]></code>
901-
</InvalidArgument>
902803
<InvalidArrayOffset>
903804
<code><![CDATA[$data[$position++]]]></code>
904805
</InvalidArrayOffset>
905806
<MissingClosureReturnType>
906807
<code><![CDATA[function () use ($data, &$position) {]]></code>
907808
</MissingClosureReturnType>
908-
</file>
909-
<file src="test/unit/Driver/Pdo/StatementIntegrationTest.php">
910-
<ArgumentTypeCoercion>
911-
<code><![CDATA['PDOStatement']]></code>
912-
</ArgumentTypeCoercion>
913-
<InvalidArgument>
914-
<code><![CDATA[$this->pdoStatementMock = $this->getMockBuilder('PDOStatement')
915-
->onlyMethods(['execute', 'bindParam'])
916-
->getMock()]]></code>
917-
</InvalidArgument>
809+
<RedundantConditionGivenDocblockType>
810+
<code><![CDATA[assert($stub instanceof PDOStatement)]]></code>
811+
</RedundantConditionGivenDocblockType>
918812
</file>
919813
<file src="test/unit/Driver/Pdo/StatementTest.php">
920814
<PossiblyNullArgument>
@@ -924,9 +818,4 @@
924818
<code><![CDATA[self::assertSame($stmt, $this->statement->getResource());]]></code>
925819
</UnevaluatedCode>
926820
</file>
927-
<file src="test/unit/Driver/TestAsset/PdoMock.php">
928-
<ImplementedParamTypeMismatch>
929-
<code><![CDATA[$attribute]]></code>
930-
</ImplementedParamTypeMismatch>
931-
</file>
932821
</files>

0 commit comments

Comments
 (0)