chore: 🤖 Drop support for stale versions

mpyw · mpyw · commit 4fbde0de034d · 2023-03-13T23:36:46.000+09:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         ports:
           - '3306:3306'
         env:
@@ -24,30 +24,18 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.4, '8.0', 8.1]
+        php: ['8.0', 8.1, 8.2]
         lib:
+          # - { laravel: ^11.0 }
           - { laravel: ^10.0 }
           - { laravel: ^9.0 }
-          - { laravel: ^8.0 }
-          - { laravel: ^7.0 }
-          - { laravel: ^6.0 }
-          - { laravel: ^6.0, flags: --prefer-lowest }
         exclude:
-          - { php: 8.1, lib: { laravel: ^7.0 } }
-          - { php: 8.1, lib: { laravel: ^6.0 } }
-          - { php: 8.1, lib: { laravel: ^6.0, flags: --prefer-lowest } }
           - { php: 8.0, lib: { laravel: ^10.0 } }
-          - { php: 7.4, lib: { laravel: ^10.0 } }
-          - { php: 7.4, lib: { laravel: ^9.0 } }
-        include:
-          - { php: 8.1, lib: { laravel: ^10.0 }, phpstan: '1' }
-          - { php: 8.1, lib: { laravel: ^9.0 }, phpstan: '1' }
-          - { php: 8.1, lib: { laravel: ^8.0 }, phpstan: '1' }
-          - { php: '8.0', lib: { laravel: ^9.0 }, phpstan: '1' }
-          - { php: '8.0', lib: { laravel: ^8.0 }, phpstan: '1' }
+          # - { php: 8.0, lib: { laravel: ^11.0 } }
+          # - { php: 8.1, lib: { laravel: ^11.0 } }
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -57,10 +45,9 @@ jobs:
 
       - name: Adjust Package Versions
         run: |
-          composer require "laravel/framework:${{ matrix.lib.laravel }}" --dev ${{ matrix.lib.flags }}
+          composer require "laravel/framework:${{ matrix.lib.laravel }}" --dev
 
       - name: PHPStan
-        if: ${{ matrix.phpstan }}
         run: composer phpstan
 
       - run: mkdir -p build/logs
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ composer.lock
 /vendor/
 /build/logs/
 .php_cs.cache
-.phpunit.result.cache
+/.phpunit.cache/
diff --git a/README.md b/README.md
@@ -4,11 +4,11 @@ A tiny extension of `MySqlConnection` that manages **session** system variables
 
 ## Requirements
 
-| Package | Version | Mandatory |
-|:---|:---|:---:|
-| PHP | <code>^7.4 &#124;&#124; ^8.0</code> | ✅ |
-| Laravel | <code>^6.0 &#124;&#124; ^7.0 &#124;&#124; ^8.0 &#124;&#124; ^9.0 &#124;&#124; ^10.0</code> | ✅ |
-| PHPStan | <code>&gt;=1.1</code> | |
+| Package | Version                                                 | Mandatory |
+|:--------|:--------------------------------------------------------|:---------:|
+| PHP     | <code>^8.0</code>                                       |     ✅     |
+| Laravel | <code>^9.0 &#124;&#124; ^10.0 &#124;&#124; ^11.0</code> |     ✅     |
+| PHPStan | <code>&gt;=1.1</code>                                   |           |
 
 ## Installing
 
@@ -52,7 +52,7 @@ DB::setSystemVariable('long_query_time', 10.0);
 DB::setSystemVariable('long_query_time', 10.0, false);
 
 // Assign multiple variables
-DB::setSystemVariables(['long_query_time' => 10.0, 'tx_isolation' => 'read-committed']);
+DB::setSystemVariables(['long_query_time' => 10.0, 'transaction_isolation' => 'read-committed']);
 
 // Assign a variable on a different connection
 DB::connection('other_mysql_connection')->setSystemVariable('long_query_time', 10.0);
@@ -63,7 +63,7 @@ DB::usingSystemVariable('long_query_time', 10.0, function () {
 });
 
 // Run callback temporarily assigning multiple variables
-DB::usingSystemVariables(['long_query_time' => 10.0, 'tx_isolation' => 'read-committed'], function () {
+DB::usingSystemVariables(['long_query_time' => 10.0, 'transaction_isolation' => 'read-committed'], function () {
     /* ... */
 });
 
diff --git a/compose.yml b/compose.yml
@@ -3,7 +3,7 @@ version: 'Compose-Spec'
 services:
 
   php:
-    image: joseluisq/php-fpm:8.1
+    image: joseluisq/php-fpm:8.2
     volumes:
       - .:/code:cached
     working_dir: /code
diff --git a/composer.json b/composer.json
@@ -22,16 +22,16 @@
         }
     },
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-pdo": "*",
-        "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
-        "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
+        "illuminate/support": "^9.0 || ^10.0",
+        "illuminate/database": "^9.0 || ^10.0",
         "mpyw/unclosure": "^3.0",
         "mpyw/laravel-pdo-emulation-control": "^2.0.2"
     },
     "require-dev": {
         "orchestra/testbench": "*",
-        "orchestra/testbench-core": "^4.9 || ^5.9 || >=6.6",
+        "orchestra/testbench-core": ">=7.0",
         "phpunit/phpunit": ">=9.5",
         "phpstan/phpstan": ">=1.1",
         "phpstan/extension-installer": ">=1.1",
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         bootstrap="vendor/autoload.php"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Package Test Suite">
             <directory suffix="Test.php">./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/tests/BasicVariableAssignmentTest.php b/tests/BasicVariableAssignmentTest.php
@@ -55,32 +55,32 @@ public function provideBasicVariables(): array
             'assigning integer (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), 15, $this->v81('15.000000', 15.0)],
             'assigning boolean (native)' => ['foreign_key_checks', false, 1, false, 0],
             'assigning boolean (emulated)' => ['foreign_key_checks', true, $this->v81('1', 1), false, $this->v81('0', 0)],
-            'assigning string (native)' => ['tx_isolation', false, 'REPEATABLE-READ', 'read-committed', 'READ-COMMITTED'],
-            'assigning string (emulated)' => ['tx_isolation', true, 'REPEATABLE-READ', 'read-committed', 'READ-COMMITTED'],
+            'assigning string (native)' => ['transaction_isolation', false, 'REPEATABLE-READ', 'read-committed', 'READ-COMMITTED'],
+            'assigning string (emulated)' => ['transaction_isolation', true, 'REPEATABLE-READ', 'read-committed', 'READ-COMMITTED'],
             'assigning wrapped float (native)' => ['long_query_time', false, 10.0, Value::float(15.0), 15.0],
             'assigning wrapped float (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), Value::float(15.0), $this->v81('15.000000', 15.0)],
             'assigning wrapped integer (native)' => ['long_query_time', false, 10.0, Value::int(15), 15.0],
             'assigning wrapped integer (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), Value::int(15), $this->v81('15.000000', 15.0)],
             'assigning wrapped boolean (native)' => ['foreign_key_checks', false, 1, Value::bool(false), 0],
             'assigning wrapped boolean (emulated)' => ['foreign_key_checks', true, $this->v81('1', 1), Value::bool(false), $this->v81('0', 0)],
-            'assigning wrapped string (native)' => ['tx_isolation', false, 'REPEATABLE-READ', Value::str('read-committed'), 'READ-COMMITTED'],
-            'assigning wrapped string (emulated)' => ['tx_isolation', true, 'REPEATABLE-READ', Value::str('read-committed'), 'READ-COMMITTED'],
+            'assigning wrapped string (native)' => ['transaction_isolation', false, 'REPEATABLE-READ', Value::str('read-committed'), 'READ-COMMITTED'],
+            'assigning wrapped string (emulated)' => ['transaction_isolation', true, 'REPEATABLE-READ', Value::str('read-committed'), 'READ-COMMITTED'],
             'replacing explicit float (native)' => ['long_query_time', false, 10.0, Replacer::float(function ($v) { return $v + 5.0; }), 15.0],
             'replacing explicit float (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), Replacer::float(function ($v) { return $v + 5.0; }), $this->v81('15.000000', 15.0)],
             'replacing explicit integer (native)' => ['long_query_time', false, 10.0, Replacer::int(function ($v) { return $v + 5; }), 15.0],
             'replacing explicit integer (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), Replacer::int(function ($v) { return $v + 5; }), $this->v81('15.000000', 15.0)],
             'replacing explicit boolean (native)' => ['foreign_key_checks', false, 1, Replacer::bool(function ($v) { return !$v; }), 0],
             'replacing explicit boolean (emulated)' => ['foreign_key_checks', true, $this->v81('1', 1), Replacer::bool(function ($v) { return !$v; }), $this->v81('0', 0)],
-            'replacing explicit string (native)' => ['tx_isolation', false, 'REPEATABLE-READ', Replacer::str(function ($v) { return str_ireplace('repeatable-read', 'read-committed', $v); }), 'READ-COMMITTED'],
-            'replacing explicit string (emulated)' => ['tx_isolation', true, 'REPEATABLE-READ', Replacer::str(function ($v) { return str_ireplace('repeatable-read', 'read-committed', $v); }), 'READ-COMMITTED'],
+            'replacing explicit string (native)' => ['transaction_isolation', false, 'REPEATABLE-READ', Replacer::str(function ($v) { return str_ireplace('repeatable-read', 'read-committed', $v); }), 'READ-COMMITTED'],
+            'replacing explicit string (emulated)' => ['transaction_isolation', true, 'REPEATABLE-READ', Replacer::str(function ($v) { return str_ireplace('repeatable-read', 'read-committed', $v); }), 'READ-COMMITTED'],
             'replacing implicit float (native)' => ['long_query_time', false, 10.0, function ($v): float { return $v + 5.0; }, 15.0],
             'replacing implicit float (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), function ($v): float { return $v + 5.0; }, $this->v81('15.000000', 15.0)],
             'replacing implicit integer (native)' => ['long_query_time', false, 10.0, function ($v): int { return $v + 5; }, 15.0],
             'replacing implicit integer (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), function ($v): int { return $v + 5; }, $this->v81('15.000000', 15.0)],
             'replacing implicit boolean (native)' => ['foreign_key_checks', false, 1, function ($v): bool { return !$v; }, 0],
             'replacing implicit boolean (emulated)' => ['foreign_key_checks', true, $this->v81('1', 1), function ($v): bool { return !$v; }, $this->v81('0', 0)],
-            'replacing implicit string (native)' => ['tx_isolation', false, 'REPEATABLE-READ', function ($v): string { return str_ireplace('repeatable-read', 'read-committed', $v); }, 'READ-COMMITTED'],
-            'replacing implicit string (emulated)' => ['tx_isolation', true, 'REPEATABLE-READ', function ($v): string { return str_ireplace('repeatable-read', 'read-committed', $v); }, 'READ-COMMITTED'],
+            'replacing implicit string (native)' => ['transaction_isolation', false, 'REPEATABLE-READ', function ($v): string { return str_ireplace('repeatable-read', 'read-committed', $v); }, 'READ-COMMITTED'],
+            'replacing implicit string (emulated)' => ['transaction_isolation', true, 'REPEATABLE-READ', function ($v): string { return str_ireplace('repeatable-read', 'read-committed', $v); }, 'READ-COMMITTED'],
         ];
     }
 
diff --git a/tests/ReconnectionTest.php b/tests/ReconnectionTest.php
@@ -10,48 +10,48 @@ class ReconnectionTest extends TestCase
     public function testOnlyMemoizedVariablesAreReassigned(): void
     {
         $this->onNativeConnection(function (MySqlConnection $db) {
-            $this->assertSame('REPEATABLE-READ', $db->selectOne('select @@tx_isolation as value')->value);
+            $this->assertSame('REPEATABLE-READ', $db->selectOne('select @@transaction_isolation as value')->value);
             $this->assertSame(10.0, $db->selectOne('select @@long_query_time as value')->value);
 
             $db
-                ->setSystemVariable('tx_isolation', 'read-committed')
+                ->setSystemVariable('transaction_isolation', 'read-committed')
                 ->setSystemVariable('long_query_time', 13.0, false);
             $db->getPdo();
             $db->reconnect();
 
-            $this->assertSame('READ-COMMITTED', $db->selectOne('select @@tx_isolation as value')->value);
+            $this->assertSame('READ-COMMITTED', $db->selectOne('select @@transaction_isolation as value')->value);
             $this->assertSame(10.0, $db->selectOne('select @@long_query_time as value')->value);
         });
 
         $this->onEmulatedConnection(function (MySqlConnection $db) {
-            $this->assertSame('REPEATABLE-READ', $db->selectOne('select @@tx_isolation as value')->value);
+            $this->assertSame('REPEATABLE-READ', $db->selectOne('select @@transaction_isolation as value')->value);
             $this->assertSame($this->v81('10.000000', 10.0), $db->selectOne('select @@long_query_time as value')->value);
 
             $db
-                ->setSystemVariable('tx_isolation', 'read-committed')
+                ->setSystemVariable('transaction_isolation', 'read-committed')
                 ->setSystemVariable('long_query_time', 13.0, false);
             $db->getPdo();
             $db->reconnect();
 
-            $this->assertSame('READ-COMMITTED', $db->selectOne('select @@tx_isolation as value')->value);
+            $this->assertSame('READ-COMMITTED', $db->selectOne('select @@transaction_isolation as value')->value);
             $this->assertSame($this->v81('10.000000', 10.0), $db->selectOne('select @@long_query_time as value')->value);
         });
     }
 
     public function testDirectReconnectionCallDoesNotWork(): void
     {
-        $this->assertSame('REPEATABLE-READ', DB::selectOne('select @@tx_isolation as value')->value);
+        $this->assertSame('REPEATABLE-READ', DB::selectOne('select @@transaction_isolation as value')->value);
         $this->assertSame(10.0, DB::selectOne('select @@long_query_time as value')->value);
 
-        DB::setSystemVariable('tx_isolation', 'read-committed');
+        DB::setSystemVariable('transaction_isolation', 'read-committed');
         DB::setSystemVariable('long_query_time', 13.0, false);
         DB::getPdo();
 
         // This operation does not work.
         // Please use DB::connection()->reconnect() instead.
         DB::reconnect();
 
-        $this->assertSame('REPEATABLE-READ', DB::selectOne('select @@tx_isolation as value')->value);
+        $this->assertSame('REPEATABLE-READ', DB::selectOne('select @@transaction_isolation as value')->value);
         $this->assertSame(10.0, DB::selectOne('select @@long_query_time as value')->value);
     }
 }
