Skip to content

Commit 492d191

Browse files
tyrssontyrsson
committed
Namespace update
Signed-off-by: Joey Smith <jsmith@webinertia.net> Signed-off-by: Joey Smith <jsmith@webinertia.net>
1 parent 9519c3a commit 492d191

File tree

68 files changed

+385
-389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+385
-389
lines changed

‎.laminas-ci/phpunit.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
colors="true">
88

99
<extensions>
10-
<bootstrap class="LaminasIntegrationTest\Db\Mysql\Extension\ListenerExtension" />
10+
<bootstrap class="PhpDbIntegrationTest\Mysql\Extension\ListenerExtension" />
1111
</extensions>
1212
<testsuites>
1313
<testsuite name="unit test">
@@ -19,11 +19,11 @@
1919
</testsuites>
2020
<php>
2121
<!-- Integration Test Variables -->
22-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL" value="true" /><!-- todo: remove this env variable as its no longer needed-->
23-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL_HOSTNAME" value="mysql" />
24-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL_USERNAME" value="gha" />
25-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL_PASSWORD" value="password" />
26-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL_DATABASE" value="laminasdb_test" />
22+
<env name="TESTS_PHPDB_ADAPTER_MYSQL" value="true" /><!-- todo: remove this env variable as its no longer needed-->
23+
<env name="TESTS_PHPDB_ADAPTER_MYSQL_HOSTNAME" value="mysql" />
24+
<env name="TESTS_PHPDB_ADAPTER_MYSQL_USERNAME" value="gha" />
25+
<env name="TESTS_PHPDB_ADAPTER_MYSQL_PASSWORD" value="password" />
26+
<env name="TESTS_PHPDB_ADAPTER_MYSQL_DATABASE" value="laminasdb_test" />
2727
</php>
2828
</phpunit>
2929

‎composer.json‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
{
2-
"name": "laminas/laminas-db-adapter-mysql",
3-
"description": "MySQL support for laminas-db",
2+
"name": "php-db/phpdb-adapter-mysql",
3+
"description": "MySQL support for php-db",
44
"license": "BSD-3-Clause",
55
"keywords": [
66
"laminas",
7+
"mezzio",
8+
"php-db",
79
"mysql",
810
"db"
911
],
10-
"homepage": "https://github.com/axleus/laminas-db-adapter-mysql/discussions",
12+
"homepage": "https://github.com/php-db/phpdb-adapter-mysql/discussions",
1113
"support": {
12-
"issues": "https://github.com/alxeus/laminas-db-adapter-mysql/issues",
13-
"source": "https://github.com/axleus/laminas-db-adapter-mysql",
14-
"forum": "https://github.com/axleus/laminas-db-adapter-mysql/discussions"
14+
"issues": "https://github.com/php-db/phpdb-adapter-mysql/issues",
15+
"source": "https://github.com/php-db/phpdb-adapter-mysql",
16+
"forum": "https://github.com/php-db/phpdb-adapter-mysql/discussions"
1517
},
1618
"minimum-stability": "dev",
1719
"prefer-stable": true,
@@ -26,18 +28,12 @@
2628
},
2729
"extra": {
2830
"laminas": {
29-
"config-provider": "Laminas\\Db\\Adapter\\Mysql\\ConfigProvider"
31+
"config-provider": "PhpDb\\Adapter\\Mysql\\ConfigProvider"
3032
}
3133
},
32-
"repositories": [
33-
{
34-
"type": "vcs",
35-
"url": "https://github.com/axleus/laminas-db"
36-
}
37-
],
3834
"require": {
3935
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
40-
"laminas/laminas-db": "dev-adapter-migration-mysql-new"
36+
"php-db/phpdb": "dev-adapter-migration-mysql-new"
4137
},
4238
"require-dev": {
4339
"ext-mysqli": "*",
@@ -54,13 +50,13 @@
5450
},
5551
"autoload": {
5652
"psr-4": {
57-
"Laminas\\Db\\Adapter\\Mysql\\": "src/"
53+
"PhpDb\\Adapter\\Mysql\\": "src/"
5854
}
5955
},
6056
"autoload-dev": {
6157
"psr-4": {
62-
"LaminasTest\\Db\\Adapter\\Mysql\\": "test/unit/",
63-
"LaminasIntegrationTest\\Db\\Adapter\\Mysql\\": "test/integration/"
58+
"PhpDbTest\\Adapter\\Mysql\\": "test/unit/",
59+
"PhpDbIntegrationTest\\Adapter\\Mysql\\": "test/integration/"
6460
}
6561
},
6662
"scripts": {

‎composer.lock‎

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

‎docs/book/service-manager.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
As of laminas-db 3.0.0 an AdapterManager has been introduced to manage the
44
adapter dependencies and to provide a means to allow the platform packages
55
to register their own factories for the required dependencies. This is
6-
handled by the Laminas\Db\Adapter\Mysql\Container\AdapterManagerDelegator class.
6+
handled by the PhpDb\Adapter\Mysql\Container\AdapterManagerDelegator class.

‎phpunit.xml.dist‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
failOnWarning="true">
1616

1717
<extensions>
18-
<bootstrap class="LaminasIntegrationTest\Db\Adapter\Mysql\Extension\ListenerExtension" />
18+
<bootstrap class="PhpDbIntegrationTest\Adapter\Mysql\Extension\ListenerExtension" />
1919
</extensions>
2020
<testsuites>
2121
<testsuite name="unit test">
@@ -31,11 +31,11 @@
3131
</include>
3232
</source>
3333
<php>
34-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL" value="true"/>
35-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL_HOSTNAME" value="mysql"/>
36-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL_USERNAME" value="gha"/>
37-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL_PASSWORD" value="password"/>
38-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL_DATABASE" value="laminasdb_test"/>
39-
<env name="TESTS_LAMINAS_DB_ADAPTER_MYSQL_PORT" value="3306"/>
34+
<env name="TESTS_PHPDB_ADAPTER_MYSQL" value="true"/>
35+
<env name="TESTS_PHPDB_ADAPTER_MYSQL_HOSTNAME" value="mysql"/>
36+
<env name="TESTS_PHPDB_ADAPTER_MYSQL_USERNAME" value="gha"/>
37+
<env name="TESTS_PHPDB_ADAPTER_MYSQL_PASSWORD" value="password"/>
38+
<env name="TESTS_PHPDB_ADAPTER_MYSQL_DATABASE" value="laminasdb_test"/>
39+
<env name="TESTS_PHPDB_ADAPTER_MYSQL_PORT" value="3306"/>
4040
</php>
4141
</phpunit>

‎psalm-baseline.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@
663663
<code><![CDATA[printf]]></code>
664664
</RedundantFunctionCall>
665665
<RiskyTruthyFalsyComparison>
666-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL')]]></code>
666+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL')]]></code>
667667
</RiskyTruthyFalsyComparison>
668668
<UndefinedDocblockClass>
669669
<code><![CDATA[$fixtureLoader]]></code>
@@ -690,20 +690,20 @@
690690
<file src="test/integration/FixtureLoader/MysqlFixtureLoader.php">
691691
<PossiblyFalseArgument>
692692
<code><![CDATA[file_get_contents($this->fixtureFile)]]></code>
693-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_DATABASE')]]></code>
694-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_DATABASE')]]></code>
695-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_DATABASE')]]></code>
696-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_DATABASE')]]></code>
697-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_PASSWORD')]]></code>
698-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_USERNAME')]]></code>
693+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_DATABASE')]]></code>
694+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_DATABASE')]]></code>
695+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_DATABASE')]]></code>
696+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_DATABASE')]]></code>
697+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_PASSWORD')]]></code>
698+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_USERNAME')]]></code>
699699
</PossiblyFalseArgument>
700700
<PossiblyFalseOperand>
701-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_DATABASE')]]></code>
702-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_HOSTNAME')]]></code>
703-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_PORT')]]></code>
701+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_DATABASE')]]></code>
702+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_HOSTNAME')]]></code>
703+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_PORT')]]></code>
704704
</PossiblyFalseOperand>
705705
<RiskyTruthyFalsyComparison>
706-
<code><![CDATA[getenv('TESTS_LAMINAS_DB_ADAPTER_MYSQL_PORT')]]></code>
706+
<code><![CDATA[getenv('TESTS_PHPDB_ADAPTER_MYSQL_PORT')]]></code>
707707
</RiskyTruthyFalsyComparison>
708708
</file>
709709
<file src="test/integration/Platform/MysqlTest.php">

‎src/ConfigProvider.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace Laminas\Db\Adapter\Mysql;
5+
namespace PhpDb\Adapter\Mysql;
66

7-
use Laminas\Db\Container\AdapterManager;
7+
use PhpDb\Container\AdapterManager;
88

99
readonly class ConfigProvider
1010
{

‎src/Container/AdapterFactory.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
declare(strict_types=1);
44

5-
namespace Laminas\Db\Adapter\Mysql\Container;
6-
7-
use Laminas\Db\Adapter\Adapter;
8-
use Laminas\Db\Adapter\AdapterInterface;
9-
use Laminas\Db\Adapter\Driver\DriverInterface;
10-
use Laminas\Db\Adapter\Driver\PdoDriverInterface;
11-
use Laminas\Db\Adapter\Exception\RuntimeException;
12-
use Laminas\Db\Adapter\Platform\PlatformInterface;
13-
use Laminas\Db\Adapter\Profiler\ProfilerInterface;
14-
use Laminas\Db\Container\AdapterManager;
15-
use Laminas\Db\ResultSet\ResultSetInterface;
5+
namespace PhpDb\Adapter\Mysql\Container;
6+
7+
use PhpDb\Adapter\Adapter;
8+
use PhpDb\Adapter\AdapterInterface;
9+
use PhpDb\Adapter\Driver\DriverInterface;
10+
use PhpDb\Adapter\Driver\PdoDriverInterface;
11+
use PhpDb\Adapter\Exception\RuntimeException;
12+
use PhpDb\Adapter\Platform\PlatformInterface;
13+
use PhpDb\Adapter\Profiler\ProfilerInterface;
14+
use PhpDb\Container\AdapterManager;
15+
use PhpDb\ResultSet\ResultSetInterface;
1616
use Laminas\ServiceManager\Exception\ServiceNotFoundException;
1717
use Psr\Container\ContainerInterface;
1818

‎src/Container/AdapterManagerDelegator.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
declare(strict_types=1);
44

5-
namespace Laminas\Db\Adapter\Mysql\Container;
5+
namespace PhpDb\Adapter\Mysql\Container;
66

7-
use Laminas\Db\Adapter\AdapterInterface;
8-
use Laminas\Db\Adapter\Driver\DriverInterface;
9-
use Laminas\Db\Adapter\Driver\Pdo\Result;
10-
use Laminas\Db\Adapter\Driver\Pdo\Statement as PdoStatement;
11-
use Laminas\Db\Adapter\Driver\PdoDriverInterface;
12-
use Laminas\Db\Adapter\Mysql\Driver;
13-
use Laminas\Db\Adapter\Platform\PlatformInterface;
14-
use Laminas\Db\Adapter\Profiler;
15-
use Laminas\Db\Container\AdapterManager;
16-
use Laminas\Db\ResultSet;
7+
use PhpDb\Adapter\AdapterInterface;
8+
use PhpDb\Adapter\Driver\DriverInterface;
9+
use PhpDb\Adapter\Driver\Pdo\Result;
10+
use PhpDb\Adapter\Driver\Pdo\Statement as PdoStatement;
11+
use PhpDb\Adapter\Driver\PdoDriverInterface;
12+
use PhpDb\Adapter\Mysql\Driver;
13+
use PhpDb\Adapter\Platform\PlatformInterface;
14+
use PhpDb\Adapter\Profiler;
15+
use PhpDb\Container\AdapterManager;
16+
use PhpDb\ResultSet;
1717
use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
1818
use Laminas\ServiceManager\Factory\InvokableFactory;
1919
use Psr\Container\ContainerInterface;

‎src/Container/MysqliConnectionFactory.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
declare(strict_types=1);
44

5-
namespace Laminas\Db\Adapter\Mysql\Container;
5+
namespace PhpDb\Adapter\Mysql\Container;
66

7-
use Laminas\Db\Adapter\Driver\ConnectionInterface;
8-
use Laminas\Db\Adapter\Mysql\Driver\Mysqli\Connection;
7+
use PhpDb\Adapter\Driver\ConnectionInterface;
8+
use PhpDb\Adapter\Mysql\Driver\Mysqli\Connection;
99
use Psr\Container\ContainerInterface;
1010

1111
final class MysqliConnectionFactory

0 commit comments

Comments
 (0)