Merge pull request #6 from tyrsson/x.x.1-patch

Continues code alignment with PhpDb 0.0.1.

Author: tyrsson

.github/workflows/continuous-integration.yml

@@ -0,0 +1,31 @@
+name: "Continuous Integration"
+
+on:
+  pull_request:
+  push:
+    branches:
+    tags:
+
+jobs:
+  matrix:
+    name: Generate job matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
+    steps:
+      - name: Gather CI configuration
+        id: matrix
+        uses: laminas/laminas-ci-matrix-action@v1
+
+  qa:
+    name: QA Checks
+    needs: [matrix]
+    runs-on: ${{ matrix.operatingSystem }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
+    steps:
+      - name: ${{ matrix.name }}
+        uses: laminas/laminas-continuous-integration-action@v1
+        with:
+          job: ${{ matrix.job }}

.laminas-ci.json

@@ -0,0 +1,16 @@
+{
+    "ignore_php_platform_requirements": {
+        "8.4": true
+    },
+    "exclude": [
+        {
+            "name": "PHPUnit",
+            "php": "8.1"
+        },
+        {
+            "name": "PHPUnit",
+            "php": "8.4",
+            "dependencies": "lowest"
+        }
+    ]
+}

composer.json

@@ -25,13 +25,14 @@
         }
     },
     "extra": {
-        "php-db": {
+        "laminas": {
             "config-provider": "PhpDb\\Adapter\\Sqlite\\ConfigProvider"
         }
     },
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
-        "php-db/phpdb": "0.0.x-dev"
+        "php-db/phpdb": "dev-x.x.2",
+        "webmozart/assert": "^1.11"
     },
     "require-dev": {
         "ext-pdo": "*",
@@ -67,6 +68,8 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "test-integration": "phpunit --colors=always --testsuite \"integration test\"",
         "static-analysis": "psalm --shepherd --stats",
+        "sa-update-baseline": "psalm --update-baseline",
+        "sa-no-baseline": "psalm --shepherd --stats --ignore-baseline",
         "upload-coverage": "coveralls -v"
     }
 }

composer.lock

@@ -14,18 +14,16 @@
          failOnDeprecation="true"
          failOnWarning="true">
     <testsuites>
-        <testsuite name="unit">
-            <directory>test/unit</directory>
+        <testsuite name="unit test">
+            <directory>./test/unit</directory>
         </testsuite>
-        <testsuite name="integration">
-            <directory>test/integration</directory>
+        <testsuite name="integration test">
+            <directory>./test/integration</directory>
         </testsuite>
     </testsuites>
-    <coverage pathCoverage="false" disableCodeCoverageIgnore="true">
-    </coverage>
-    <source>
+    <source restrictNotices="true">
         <include>
-            <directory suffix=".php">src</directory>
+            <directory>./src</directory>
         </include>
     </source>
 </phpunit>