php-db · tyrsson · Apr 19, 2025 · Apr 23, 2025 · Apr 23, 2025 · Apr 26, 2025
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -4,8 +4,6 @@ on:
   pull_request:
   push:
     branches:
-      - '[0-9]+.[0-9]+.x'
-      - 'refs/pull/*'
     tags:
 
 jobs:

diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,10 +1,6 @@
 {
     "extensions": [
-        "pdo-mysql",
-        "pdo-pgsql",
         "pdo-sqlite",
-        "mysqli",
-        "pgsql",
         "sqlite3",
         "sqlsrv"
     ]

diff --git a/.laminas-ci/phpunit.xml b/.laminas-ci/phpunit.xml
@@ -23,16 +23,16 @@
     </testsuites>
 
     <listeners>
-        <listener class="LaminasIntegrationTest\Db\IntegrationTestListener" file="./test/integration/IntegrationTestListener.php"/>
+        <listener class="PhpDbIntegrationTest\IntegrationTestListener" file="./test/integration/IntegrationTestListener.php"/>
     </listeners>
 
     <php>
         <!-- Integration Test Variables -->
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL" value="true" />
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_HOSTNAME" value="mysql" />
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_USERNAME" value="gha" />
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_PASSWORD" value="password" />
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_DATABASE" value="laminasdb_test" />
+        <env name="TESTS_PHPDB_ADAPTER_DRIVER_MYSQL" value="true" />
+        <env name="TESTS_PHPDB_ADAPTER_DRIVER_MYSQL_HOSTNAME" value="mysql" />
+        <env name="TESTS_PHPDB_ADAPTER_DRIVER_MYSQL_USERNAME" value="gha" />
+        <env name="TESTS_PHPDB_ADAPTER_DRIVER_MYSQL_PASSWORD" value="password" />
+        <env name="TESTS_PHPDB_ADAPTER_DRIVER_MYSQL_DATABASE" value="laminasdb_test" />
 
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV" value="true" />
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV_HOSTNAME" value="mssql" />

diff --git a/README.md b/README.md
@@ -1,32 +1,20 @@
-# laminas-db
-
-[![Build Status](https://github.com/laminas/laminas-db/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/laminas/laminas-db/actions/workflows/continuous-integration.yml)
-
-> ## 🇷🇺 Русским гражданам
->
-> Мы, участники Laminas, родились и живем в разных странах. У многих из нас есть друзья, родственники и коллеги как в России, так и в Украине. Некоторые из нас родились в России. Некоторые из нас живут в России. У некоторых бабушки и дедушки сражались с фашистами во Второй мировой войне. Здесь никто не поддерживает фашизм.
->
-> У одного из нас есть украинская родственница, которая спаслась из дома вместе с сыном. Поезд задержался из-за бомбежки на дороге впереди. У нас есть друзья, которые прячутся в бомбоубежищах. Мы с тревогой ждем весточки от них после воздушных налетов, которые беспорядочно наносят удары и попадают по больницам, школам, детским садам и домам. Мы не берем это из каких-либо СМИ. Мы наблюдаем это напрямую.
->
-> Вы доверяете нам достаточно, чтоб использовать наши программы, и мы просим вас довериться нам вновь. Мы нуждаемся в помощи. Выходите и протестуйте против этой бесполезной войны. Остановите кровопролитие. Скажите "Нет войне!"
->
-> ## 🇺🇸 To Citizens of Russia
->
-> We at Laminas come from all over the world. Many of us have friends, family and colleagues in both Russia and Ukraine. Some of us were born in Russia. Some of us currently live in Russia. Some have grandparents who fought Nazis in World War II. Nobody here supports fascism.
->
-> One team member has a Ukrainian relative who fled her home with her son. The train was delayed due to bombing on the road ahead. We have friends who are hiding in bomb shelters. We anxiously follow up on them after the air raids, which indiscriminately fire at hospitals, schools, kindergartens and houses. We're not taking this from any media. These are our actual experiences.
->
-> You trust us enough to use our software. We ask that you trust us to say the truth on this. We need your help. Go out and protest this unnecessary war. Stop the bloodshed. Say "stop the war!"
-
-`Laminas\Db` is a component that abstract the access to a Database using an object
-oriented API to build the queries. `Laminas\Db` consumes different storage adapters
+# phpdb
+
+The continuation of the Laminas Db component, now under the `php-db` organization.
+
+The following information is outdated and will be updated in the coming days.
+
+[![Build Status](https://github.com/php-db/phpdb/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/php-db/phpdb/actions/workflows/continuous-integration.yml)
+
+`PhpDb` is a component that abstract the access to a Database using an object
+oriented API to build the queries. `PhpDb` consumes different storage adapters
 to access different database vendors such as MySQL, PostgreSQL, Oracle, IBM DB2,
 Microsoft Sql Server, PDO, etc.
 
 ## Contributing
 
-Please be sure to read the [contributor's guide](https://github.com/laminas/.github/blob/main/CONTRIBUTING.md) for general information on contributing.
-This section outlines specifics for laminas-db.
+Please be sure to read the [contributor's guide](https://github.com/php-db/.github/blob/main/CONTRIBUTING.md) for general information on contributing.
+This section outlines specifics for php-db.
 
 ### Test suites
 
@@ -62,17 +50,17 @@
 ```bash
 docker compose ps
 NAME                      IMAGE                                            COMMAND                SERVICE      CREATED       STATUS       PORTS
-laminas-db-mysql-1        docker.io/library/laminas-db-mysql:latest        "mysqld"               mysql        7 hours ago   Up 7 hours   
-laminas-db-php-1          docker.io/library/laminas-db-php:latest          "apache2-foreground"   php          7 hours ago   Up 7 hours   
+laminas-db-mysql-1        docker.io/library/laminas-db-mysql:latest        "mysqld"               mysql        7 hours ago   Up 7 hours
+laminas-db-php-1          docker.io/library/laminas-db-php:latest          "apache2-foreground"   php          7 hours ago   Up 7 hours
 laminas-db-postgresql-1   docker.io/library/laminas-db-postgresql:latest   "postgres"             postgresql   7 hours ago   Up 7 hours
 ```
 
 If you see three containers listed, then they're all running, and you are ready to run the test suite.
 So, copy `phpunit.xml.dist` to `phpunit.xml`, and change the following environment variable to "true" to enable the three databases:
 
-- TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL
-- TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL
-- TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLITE_MEMORY
+- TESTS_PHPDB_ADAPTER_DRIVER_MYSQL
+- TESTS_PHPDB_ADAPTER_DRIVER_PGSQL
+- TESTS_PHPDB_ADAPTER_DRIVER_SQLITE_MEMORY
 
 From there, you can run the integration tests by running the following command:
 
@@ -85,8 +73,8 @@
 
 -----
 
-- File issues at https://github.com/laminas/laminas-db/issues
-- Documentation is at https://docs.laminas.dev/laminas-db/
+- File issues at https://github.com/php-db/phpdb/issues
+- Documentation is at https://docs.php-db.dev
 
 [docker-compose]: https://docs.docker.com/compose/intro/features-uses/
 [deploy-with-docker-compose]: https://deploywithdockercompose.com
diff --git a/compose.yml b/compose.yml
@@ -8,29 +8,8 @@ services:
     volumes:
       - ./:/var/www/html
     depends_on:
-      - mysql
       - postgresql
 
-  mysql:
-    build:
-      context: ./
-      dockerfile: docker/databases/mysql/Dockerfile
-      args:
-        - VERSION=${MYSQL_VERSION:-oraclelinux9}
-    ports:
-      - "3306:3306"
-    environment:
-      - MYSQL_DATABASE=${MYSQL_DATABASE:-laminasdb_test}
-      - MYSQL_USER=${MYSQL_USER:-user}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}
-      - MYSQL_RANDOM_ROOT_PASSWORD=${MYSQL_RANDOM_ROOT_PASSWORD:-yes}
-    volumes:
-      - ./test/integration/TestFixtures/mysql.sql:/docker-entrypoint-initdb.d/mysql.sql
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
-      timeout: 20s
-      retries: 10
-
   postgresql:
     build:
       context: ./

diff --git a/composer.json b/composer.json
@@ -1,64 +1,60 @@
 {
-    "name": "laminas/laminas-db",
+    "name": "php-db/phpdb",
     "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
     "license": "BSD-3-Clause",
     "keywords": [
         "laminas",
+        "mezzio",
+        "php-db",
         "db"
     ],
-    "homepage": "https://laminas.dev",
+    "homepage": "https://php-db.dev",
     "support": {
-        "docs": "https://docs.laminas.dev/laminas-db/",
-        "issues": "https://github.com/laminas/laminas-db/issues",
-        "source": "https://github.com/laminas/laminas-db",
-        "rss": "https://github.com/laminas/laminas-db/releases.atom",
-        "chat": "https://laminas.dev/chat",
-        "forum": "https://discourse.laminas.dev"
+        "docs": "https://docs.php-db.dev/",
+        "issues": "https://github.com/php-db/phpdb/issues",
+        "source": "https://github.com/php-db/phpdb"
     },
     "config": {
         "sort-packages": true,
         "platform": {
-            "php": "8.3.99"
+            "php": "8.2.99"
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
-    "extra": {
+        "extra": {
         "laminas": {
-            "component": "Laminas\\Db",
-            "config-provider": "Laminas\\Db\\ConfigProvider"
+            "config-provider": "PhpDb\\Container\\ConfigProvider"
         }
     },
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "laminas/laminas-servicemanager": "^4.0.0",
         "laminas/laminas-stdlib": "^3.20.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "^3.0.1",
         "laminas/laminas-eventmanager": "^3.14.0",
-        "laminas/laminas-hydrator": "^4.16.0",
-        "laminas/laminas-servicemanager": "^3.23.0",
         "phpunit/phpunit": "^11.5.12",
         "psalm/plugin-phpunit": "^0.19.2",
         "rector/rector": "^2.0",
         "vimeo/psalm": "^6.8.8"
     },
     "suggest": {
         "laminas/laminas-eventmanager": "Laminas\\EventManager component",
-        "laminas/laminas-hydrator": "(^3.2 || ^4.3) Laminas\\Hydrator component for using HydratingResultSets",
-        "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
+        "laminas/laminas-hydrator": "(^5.0.0) Laminas\\Hydrator component for using HydratingResultSets"
     },
     "autoload": {
         "psr-4": {
-            "Laminas\\Db\\": "src/",
+            "PhpDb\\": "src/",
             "CustomRule\\PHPUnit\\": "rector/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "LaminasTest\\Db\\": "test/unit/",
-            "LaminasIntegrationTest\\Db\\": "test/integration/"
+            "PhpDbTest\\": "test/unit/",
+            "PhpDbIntegrationTest\\": "test/integration/"
         }
     },
     "scripts": {
@@ -75,6 +71,7 @@
         "upload-coverage": "coveralls -v"
     },
     "conflict": {
-        "zendframework/zend-db": "*"
+        "zendframework/zend-db": "*",
+        "laminas/laminas-db": "*"
     }
 }