Merge pull request #7 from tyrsson/code-alignment-with-phpdb-0-6-x

Code alignment

Author: tyrsson

.ci/pgsql_fixtures.sh

@@ -33,7 +33,6 @@ jobs:
       postgres:
         image: postgres
         env:
-          POSTGRES_USER: 'gha'
           POSTGRES_PASSWORD: 'password'
           POSTGRES_DB: 'phpdb_test'
         options: >-
@@ -42,4 +41,4 @@ jobs:
           --health-timeout 5s
           --health-retries 3
         ports:
-          - 5432
+          - 5432

.github/workflows/continuous-integration.yml

@@ -8,12 +8,12 @@ services:
     volumes:
       - ./:/var/www/html
     depends_on:
-      - postgresql
+      - postgres
 
-  postgresql:
+  postgres:
     build:
       context: ./
-      dockerfile: docker/databases/postgresql/Dockerfile
+      dockerfile: docker/databases/postgres/Dockerfile
       args:
         - VERSION=${VERSION:-17.4}
         - ALPINE_VERSION=${ALPINE_VERSION:-3.21}
@@ -30,4 +30,4 @@ services:
       interval: 30s
       timeout: 60s
       retries: 5
-      start_period: 80s
+      start_period: 80s

.laminas-ci/phpunit.xml

@@ -26,7 +26,7 @@
     },
     "extra": {
         "laminas": {
-            "config-provider": "PhpDb\\Adapter\\Pgsql\\ConfigProvider"
+            "config-provider": "PhpDb\\Pgsql\\ConfigProvider"
         }
     },
     "require": {
@@ -48,14 +48,14 @@
     },
     "autoload": {
         "psr-4": {
-            "PhpDb\\Adapter\\Pgsql\\": "src/"
+            "PhpDb\\Pgsql\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "PhpDbTest\\Adapter\\Pgsql\\": "test/unit/",
+            "PhpDbTest\\Pgsql\\": "test/unit/",
             "PhpDbTestAsset\\Pgsql\\": "test/asset/",
-            "PhpDbIntegrationTest\\Adapter\\Pgsql\\": "test/integration/"
+            "PhpDbIntegrationTest\\Pgsql\\": "test/integration/"
         }
     },
     "scripts": {

.laminas-ci/pre-install.sh

@@ -1,5 +1,11 @@
 parameters:
 	ignoreErrors:
+		-
+			message: '#^PHPDoc tag @throws with type PhpDb\\Adapter\\Exception\\InvalidConnectionParametersException\|PhpDb\\Adapter\\Pgsql\\Exception\\ContainerException is not subtype of Throwable$#'
+			identifier: throws.notThrowable
+			count: 1
+			path: src/Container/ConnectionInterfaceFactory.php
+
 		-
 			message: '#^Parameter \#2 \$array of function implode expects array\<string\>, array\<int, array\<int\|string, string\>\> given\.$#'
 			identifier: argument.type

.laminas-ci/pre-run.sh

@@ -13,6 +13,10 @@
          failOnNotice="true"
          failOnDeprecation="true"
          failOnWarning="true">
+
+    <extensions>
+        <bootstrap class="PhpDbIntegrationTest\Pgsql\Extension\ListenerExtension" />
+    </extensions>
     <testsuites>
         <testsuite name="unit test">
             <directory>./test/unit</directory>
@@ -29,10 +33,10 @@
         </include>
     </source>
     <php>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL" value="true"/>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL_HOSTNAME" value="postgresql"/>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL_USERNAME" value="postgres"/>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL_PASSWORD" value="postgres"/>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL_DATABASE" value="phpdb_test"/>
+        <env name="TESTS_PHPDB_PGSQL" value="true"/>
+        <env name="TESTS_PHPDB_PGSQL_HOSTNAME" value="postgres"/>
+        <env name="TESTS_PHPDB_PGSQL_USERNAME" value="postgres"/>
+        <env name="TESTS_PHPDB_PGSQL_PASSWORD" value="password"/>
+        <env name="TESTS_PHPDB_PGSQL_DATABASE" value="phpdb_test"/>
     </php>
-</phpunit>
+</phpunit>