Merge pull request #6 from niden-code/1.x-84

Adjusments to run Atlas.Statement with PHP 8.4

Author: pmjones

.github/workflows/ci.yml

@@ -0,0 +1,100 @@
+name: Atlas.Statement CI
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+  workflow_dispatch:
+
+env:
+  fail-fast: true
+
+  # PHP extensions required by Composer
+  EXTENSIONS: pdo
+
+permissions:
+  contents: read
+
+jobs:
+
+#  # PHPStan
+#  quality:
+#    name: "Validate Quality"
+#    if: "!contains(github.event.head_commit.message, 'ci skip')"
+#
+#    permissions:
+#      contents: read
+#
+#    runs-on: ubuntu-22.04
+#
+#    strategy:
+#      fail-fast: true
+#      matrix:
+#        php:
+#          - '8.0'
+#          - '8.1'
+#          - '8.2'
+#          - '8.3'
+#          - '8.4'
+#    steps:
+#      - uses: actions/checkout@v4
+#
+#      - name: "Setup PHP"
+#        uses: shivammathur/setup-php@2.35.3
+#        with:
+#          php-version: ${{ matrix.php }}
+#          extensions: ${{ env.EXTENSIONS }}
+#        env:
+#          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#
+#      - name: "Install development dependencies with Composer"
+#        uses: "ramsey/composer-install@v3"
+#        with:
+#          composer-options: "--prefer-dist"
+#
+#      - name: "PHPStan"
+#        run: |
+#          composer stan
+
+  unit-tests:
+#    needs: quality
+
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+
+    name: Unit tests / PHP-${{ matrix.php }}
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        php:
+          - '8.0'
+          - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@2.35.3
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: ${{ env.EXTENSIONS }}
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Install development dependencies with Composer"
+        uses: "ramsey/composer-install@v3"
+        with:
+          composer-options: "--prefer-dist"
+
+      - name: "Run Unit Tests"
+        if: always()
+        run: |
+          composer test

.gitignore

@@ -1,3 +1,5 @@
 /composer.lock
 /vendor
 /.phpunit.result.cache
+.bash_history
+.composer

.travis.yml

@@ -10,7 +10,7 @@
 
 use PDO;
 
-class DeleteTest extends StatementTest
+class DeleteTest extends StatementTestCase
 {
     public function testCommon()
     {

tests/DeleteTest.php

@@ -10,7 +10,7 @@
 
 use PDO;
 
-class InsertTest extends StatementTest
+class InsertTest extends StatementTestCase
 {
     public function testCommon()
     {

tests/InsertTest.php

@@ -11,7 +11,7 @@
 use PDO;
 use Atlas\Statement\Driver\FakeDriver;
 
-class SelectTest extends StatementTest
+class SelectTest extends StatementTestCase
 {
     public function testDistinct()
     {

tests/SelectTest.php

@@ -9,10 +9,11 @@
 namespace Atlas\Statement;
 
 use PDO;
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use Atlas\Statement\Driver\FakeDriver;
 
-abstract class StatementTest extends \PHPUnit\Framework\TestCase
+abstract class StatementTestCase extends TestCase
 {
     protected $statement;
 
@@ -23,7 +24,7 @@ protected function setUp() : void
         $rc = new ReflectionClass(Bind::CLASS);
         $rp = $rc->getProperty('instanceCount');
         $rp->setAccessible(true);
-        $rp->setValue(0);
+        $rp->setValue(null, 0);
 
         $this->statement = $this->newStatement();
     }

tests/StatementTest.php tests/StatementTestCase.phptests/StatementTest.php renamed to tests/StatementTestCase.php

@@ -10,7 +10,7 @@
 
 use PDO;
 
-class UpdateTest extends StatementTest
+class UpdateTest extends StatementTestCase
 {
     public function testCommon()
     {