Skip to content

AdapterAbstractServiceFactory #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tyrsson merged 13 commits into from
Sep 20, 2025
Merged

AdapterAbstractServiceFactory #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9f7d523
VERY ROUGH first draft. (just makes it work)
tyrsson Sep 9, 2025
028f39a
Slight refactor to align code with php-db/phpdb
tyrsson Sep 15, 2025
59854cb
PhpCS and Psalm corrections
tyrsson Sep 16, 2025
8074b5b
Revert "PhpCS and Psalm corrections"
tyrsson Sep 16, 2025
8aa5e08
phpcs and psalm
tyrsson Sep 16, 2025
74a97a4
Fix existing unit/integration test
tyrsson Sep 16, 2025
5124b86
Try to exclude psalm from the 8.1 action run
tyrsson Sep 16, 2025
222dde5
Signed-off-by: Joey Smith <jsmith@webinertia.net>
tyrsson Sep 16, 2025
fe3e76c
Signed-off-by: Joey Smith <jsmith@webinertia.net>
tyrsson Sep 16, 2025
0f7551f
Make phpcs and psalm play nice
tyrsson Sep 16, 2025
999c249
Adjust psalm config
tyrsson Sep 16, 2025
c20ff4c
Bump min php-db/phpdb version to 0.1.1
tyrsson Sep 16, 2025
a66fa66
Drop php 8.1.0 support in composer.json.
tyrsson Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"php-db/phpdb": "^0.1.0"
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
"php-db/phpdb": "^0.1.1"
},
"require-dev": {
"ext-mysqli": "*",
Expand Down
40 changes: 20 additions & 20 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

154 changes: 115 additions & 39 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,133 @@
<code><![CDATA[ResultSetInterface]]></code>
</UnnecessaryVarAnnotation>
</file>
<file src="src/Container/AdapterManagerDelegator.php">
<InvalidClass>
<code><![CDATA[ConfigProvider]]></code>
</InvalidClass>
<file src="src/Container/ConnectionInterfaceFactoryFactory.php">
<MixedArgument>
<code><![CDATA[$adapterServices['aliases']]]></code>
<code><![CDATA[$configuredDriver]]></code>
<code><![CDATA[$configuredDriver]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$adapterServices['aliases']]]></code>
<code><![CDATA[$adapterServices['aliases']]]></code>
<code><![CDATA[$adapterServices['aliases'][$configuredDriver]]]></code>
<code><![CDATA[$container->get('config')[AdapterManager::class]]]></code>
</MixedArrayAccess>
<MixedArrayOffset>
<code><![CDATA[$adapterServices['aliases'][$configuredDriver]]]></code>
</MixedArrayOffset>
<MixedAssignment>
<code><![CDATA[$adapterConfig]]></code>
<code><![CDATA[$adapterServices]]></code>
<code><![CDATA[$aliasTo]]></code>
<code><![CDATA[$aliasTo]]></code>
<code><![CDATA[$configuredDriver]]></code>
</MixedAssignment>
<PossiblyNullArgument>
<code><![CDATA[$requestedName]]></code>
</PossiblyNullArgument>
<PossiblyNullReference>
<code><![CDATA[get]]></code>
<code><![CDATA[get]]></code>
</PossiblyNullReference>
</file>
<file src="src/Container/DriverInterfaceFactoryFactory.php">
<MixedArrayAccess>
<code><![CDATA[$adapterServices['aliases']]]></code>
<code><![CDATA[$adapterServices['aliases'][$configuredDriver]]]></code>
<code><![CDATA[$adapterServices['factories']]]></code>
<code><![CDATA[$adapterServices['factories'][$aliasTo]]]></code>
<code><![CDATA[$container->get('config')[AdapterManager::class]]]></code>
</MixedArrayAccess>
<MixedArrayOffset>
<code><![CDATA[$adapterServices['aliases'][$configuredDriver]]]></code>
<code><![CDATA[$adapterServices['factories'][$aliasTo]]]></code>
</MixedArrayOffset>
<MixedAssignment>
<code><![CDATA[$adapterConfig]]></code>
<code><![CDATA[$adapterServices]]></code>
<code><![CDATA[$aliasTo]]></code>
<code><![CDATA[$configuredDriver]]></code>
<code><![CDATA[$driverFactory]]></code>
</MixedAssignment>
<MixedMethodCall>
<code><![CDATA[new $driverFactory()]]></code>
</MixedMethodCall>
<PossiblyNullArgument>
<code><![CDATA[$requestedName]]></code>
</PossiblyNullArgument>
<PossiblyNullReference>
<code><![CDATA[get]]></code>
<code><![CDATA[get]]></code>
</PossiblyNullReference>
<UndefinedVariable>
<code><![CDATA[$aliasTo]]></code>
</UndefinedVariable>
</file>
<file src="src/Container/MysqliConnectionFactory.php">
<MixedArgument>
<code><![CDATA[$adapterConfig['connection'] ?? []]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$adapterConfig['connection']]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$adapterConfig]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[createFromConfig]]></code>
</PossiblyUnusedMethod>
</file>
<file src="src/Container/MysqliDriverFactory.php">
<MixedArgument>
<code><![CDATA[$adapterConfig['options'] ?? []]]></code>
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[createFromConfig]]></code>
</PossiblyUnusedMethod>
<UndefinedClass>
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
</UndefinedClass>
</file>
<file src="src/Container/MysqliResultFactory.php">
<UnusedParam>
<code><![CDATA[$container]]></code>
</UnusedParam>
</file>
<file src="src/Container/PdoConnectionFactory.php">
<MixedArgument>
<code><![CDATA[$adapterConfig['connection'] ?? []]]></code>
</MixedArgument>
<MixedArrayAccess>
<code><![CDATA[$adapterConfig['connection']]]></code>
</MixedArrayAccess>
<MixedAssignment>
<code><![CDATA[$adapterConfig]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[createFromConfig]]></code>
</PossiblyUnusedMethod>
</file>
<file src="src/Container/PdoDriverFactory.php">
<PossiblyUnusedMethod>
<code><![CDATA[createFromConfig]]></code>
</PossiblyUnusedMethod>
<UndefinedClass>
<code><![CDATA[$connectionFactory::createFromConfig($container, $requestedName)]]></code>
</UndefinedClass>
</file>
<file src="src/Container/PdoResultFactory.php">
<UnusedParam>
<code><![CDATA[$container]]></code>
</UnusedParam>
</file>
<file src="src/Container/PlatformInterfaceFactory.php">
<PossiblyUnusedMethod>
<code><![CDATA[fromDriver]]></code>
</PossiblyUnusedMethod>
</file>
<file src="src/Driver/Mysqli/Connection.php">
<ClassMustBeFinal>
<code><![CDATA[Connection]]></code>
</ClassMustBeFinal>
<InvalidReturnStatement>
<code><![CDATA[$r[0]]]></code>
</InvalidReturnStatement>
Expand Down Expand Up @@ -116,9 +224,6 @@
</UnnecessaryVarAnnotation>
</file>
<file src="src/Driver/Mysqli/Mysqli.php">
<ClassMustBeFinal>
<code><![CDATA[Mysqli]]></code>
</ClassMustBeFinal>
<ImplementedParamTypeMismatch>
<code><![CDATA[$resource]]></code>
<code><![CDATA[$sqlOrResource]]></code>
Expand Down Expand Up @@ -151,9 +256,6 @@
</UnusedVariable>
</file>
<file src="src/Driver/Mysqli/Result.php">
<ClassMustBeFinal>
<code><![CDATA[Result]]></code>
</ClassMustBeFinal>
<InvalidReturnStatement>
<code><![CDATA[$this->resource->affected_rows]]></code>
<code><![CDATA[$this->resource->num_rows]]></code>
Expand Down Expand Up @@ -225,9 +327,6 @@
</UnusedVariable>
</file>
<file src="src/Driver/Mysqli/Statement.php">
<ClassMustBeFinal>
<code><![CDATA[Statement]]></code>
</ClassMustBeFinal>
<MixedAssignment>
<code><![CDATA[$args[]]]></code>
<code><![CDATA[$value]]></code>
Expand Down Expand Up @@ -288,9 +387,6 @@
</TypeDoesNotContainType>
</file>
<file src="src/Driver/Pdo/Pdo.php">
<ClassMustBeFinal>
<code><![CDATA[Pdo]]></code>
</ClassMustBeFinal>
<ImplementedParamTypeMismatch>
<code><![CDATA[$resource]]></code>
</ImplementedParamTypeMismatch>
Expand All @@ -303,9 +399,6 @@
</UnnecessaryVarAnnotation>
</file>
<file src="src/Metadata/Source/MysqlMetadata.php">
<ClassMustBeFinal>
<code><![CDATA[MysqlMetadata]]></code>
</ClassMustBeFinal>
<MissingClosureParamType>
<code><![CDATA[$c]]></code>
<code><![CDATA[$c]]></code>
Expand Down Expand Up @@ -480,14 +573,8 @@
<ArgumentTypeCoercion>
<code><![CDATA[$value]]></code>
</ArgumentTypeCoercion>
<ClassMustBeFinal>
<code><![CDATA[Mysql]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php">
<ClassMustBeFinal>
<code><![CDATA[AlterTableDecorator]]></code>
</ClassMustBeFinal>
<LessSpecificImplementedReturnType>
<code><![CDATA[array]]></code>
<code><![CDATA[array]]></code>
Expand Down Expand Up @@ -546,9 +633,6 @@
</UnusedReturnValue>
</file>
<file src="src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php">
<ClassMustBeFinal>
<code><![CDATA[CreateTableDecorator]]></code>
</ClassMustBeFinal>
<MixedArgument>
<code><![CDATA[$coValue]]></code>
<code><![CDATA[$coValue]]></code>
Expand Down Expand Up @@ -585,15 +669,7 @@
<code><![CDATA[int]]></code>
</UnusedReturnValue>
</file>
<file src="src/Sql/Platform/Mysql/Mysql.php">
<ClassMustBeFinal>
<code><![CDATA[Mysql]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Sql/Platform/Mysql/SelectDecorator.php">
<ClassMustBeFinal>
<code><![CDATA[SelectDecorator]]></code>
</ClassMustBeFinal>
<InvalidArrayOffset>
<code><![CDATA[$this->processInfo['paramPrefix']]]></code>
<code><![CDATA[$this->processInfo['paramPrefix']]]></code>
Expand Down
6 changes: 6 additions & 0 deletions psalm.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@
</errorLevel>
</MissingOverrideAttribute>

<ClassMustBeFinal>
<errorLevel type="suppress">
<directory name="src" />
</errorLevel>
</ClassMustBeFinal>

<PossiblyNullReference>
<errorLevel type="suppress">
<directory name="test" />
Expand Down
Loading
Loading