Merge pull request #26 from ray-di/php8.1-support

PHP 8.1 support

.github/workflows/continuous-integration.yml

@@ -19,6 +19,7 @@ jobs:
           - '7.3'
           - '7.4'
           - '8.0'
+          - '8.1'
         dependencies:
           - lowest
           - highest

src/PhpQueryModule.php

@@ -26,7 +26,7 @@ public function __construct(iterable $configs, ?AbstractModule $module = null)
 
     protected function configure(): void
     {
-        /** @var string $binding */
+        /** @var class-string $binding */
         foreach ($this->configs as $name => $binding) {
             $this->bindQuery($name, $binding);
             $this->bind()->annotatedWith($name)->to($binding);

tests/Iso8601FormatModuleTest.php

@@ -6,6 +6,7 @@
 
 use Aura\Sql\ExtendedPdo;
 use Aura\Sql\ExtendedPdoInterface;
+use PDO;
 use PHPUnit\Framework\TestCase;
 use Ray\Di\AbstractModule;
 use Ray\Di\Injector;
@@ -21,6 +22,7 @@ class Iso8601FormatModuleTest extends TestCase
     protected function setUp(): void
     {
         $pdo = new ExtendedPdo('sqlite::memory:');
+        $pdo->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
         $pdo->query('CREATE TABLE IF NOT EXISTS todo (
           id INTEGER,
           title TEXT,

tests/SqlQueryModuleTest.php

@@ -8,6 +8,7 @@
 use Aura\Sql\ExtendedPdoInterface;
 use Aura\Sql\PdoInterface;
 use InvalidArgumentException;
+use PDO;
 use PHPUnit\Framework\TestCase;
 use Ray\Di\AbstractModule;
 use Ray\Di\Injector;
@@ -26,6 +27,8 @@ class SqlQueryModuleTest extends TestCase
     protected function setUp(): void
     {
         $pdo = new ExtendedPdo('sqlite::memory:');
+        $pdo->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
+        $pdo->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
         $pdo->query('CREATE TABLE IF NOT EXISTS todo (
           id INTEGER,
           title TEXT
@@ -168,6 +171,7 @@ public function testResourceObject404(): void
     public function testDevSqlModule(): void
     {
         $pdo = new ExtendedPdo('sqlite::memory:');
+        $pdo->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
         $pdo->query('CREATE TABLE IF NOT EXISTS todo (
           id INTEGER,
           title TEXT

tests/SqlQueryTest.php

@@ -5,6 +5,7 @@
 namespace Ray\Query;
 
 use Aura\Sql\ExtendedPdo;
+use PDO;
 use PHPUnit\Framework\TestCase;
 
 use function file_get_contents;
@@ -17,6 +18,7 @@ class SqlQueryTest extends TestCase
     protected function setUp(): void
     {
         $pdo = new ExtendedPdo('sqlite::memory:');
+        $pdo->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
         $pdo->query('CREATE TABLE IF NOT EXISTS todo (
           id INTEGER,
           title TEXT

tests/bootstrap.php

@@ -5,15 +5,25 @@
 use Koriym\Attributes\AttributeReader;
 use Ray\ServiceLocator\ServiceLocator;
 
+require dirname(__DIR__) . '/vendor/autoload.php';
+
 $rm = static function ($dir) use (&$rm) {
     foreach ((array) glob($dir . '/*') as $file) {
         $f = (string) $file;
         is_dir($f) ? $rm($f) : @unlink($f);
         @rmdir($f);
     }
 };
+
 $rm(__DIR__ . '/tmp');
 
+// Suppress E_DEPRECATED in vendor files
+if (PHP_VERSION_ID >= 80100) {
+    set_error_handler(static function (int $errno, string $errstr, string $errfile) {
+        return $errno === E_DEPRECATED && str_contains($errfile, dirname(__DIR__) . '/vendor');
+    });
+}
+
 // no annotation in PHP 8
 if (PHP_MAJOR_VERSION >= 8) {
     ServiceLocator::setReader(new AttributeReader());