Skip to content

Commit 4fbde0d

Browse files
mpywmpyw
committed
chore: 🤖 Drop support for stale versions
1 parent d965e5d commit 4fbde0d

File tree

8 files changed

+43
-65
lines changed

8 files changed

+43
-65
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
services:
1010
mysql:
11-
image: mysql:5.7
11+
image: mysql:8.0
1212
ports:
1313
- '3306:3306'
1414
env:
@@ -24,30 +24,18 @@ jobs:
2424
2525
strategy:
2626
matrix:
27-
php: [7.4, '8.0', 8.1]
27+
php: ['8.0', 8.1, 8.2]
2828
lib:
29+
# - { laravel: ^11.0 }
2930
- { laravel: ^10.0 }
3031
- { laravel: ^9.0 }
31-
- { laravel: ^8.0 }
32-
- { laravel: ^7.0 }
33-
- { laravel: ^6.0 }
34-
- { laravel: ^6.0, flags: --prefer-lowest }
3532
exclude:
36-
- { php: 8.1, lib: { laravel: ^7.0 } }
37-
- { php: 8.1, lib: { laravel: ^6.0 } }
38-
- { php: 8.1, lib: { laravel: ^6.0, flags: --prefer-lowest } }
3933
- { php: 8.0, lib: { laravel: ^10.0 } }
40-
- { php: 7.4, lib: { laravel: ^10.0 } }
41-
- { php: 7.4, lib: { laravel: ^9.0 } }
42-
include:
43-
- { php: 8.1, lib: { laravel: ^10.0 }, phpstan: '1' }
44-
- { php: 8.1, lib: { laravel: ^9.0 }, phpstan: '1' }
45-
- { php: 8.1, lib: { laravel: ^8.0 }, phpstan: '1' }
46-
- { php: '8.0', lib: { laravel: ^9.0 }, phpstan: '1' }
47-
- { php: '8.0', lib: { laravel: ^8.0 }, phpstan: '1' }
34+
# - { php: 8.0, lib: { laravel: ^11.0 } }
35+
# - { php: 8.1, lib: { laravel: ^11.0 } }
4836

4937
steps:
50-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v3
5139

5240
- name: Setup PHP
5341
uses: shivammathur/setup-php@v2
@@ -57,10 +45,9 @@ jobs:
5745

5846
- name: Adjust Package Versions
5947
run: |
60-
composer require "laravel/framework:${{ matrix.lib.laravel }}" --dev ${{ matrix.lib.flags }}
48+
composer require "laravel/framework:${{ matrix.lib.laravel }}" --dev
6149
6250
- name: PHPStan
63-
if: ${{ matrix.phpstan }}
6451
run: composer phpstan
6552

6653
- run: mkdir -p build/logs

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ composer.lock
33
/vendor/
44
/build/logs/
55
.php_cs.cache
6-
.phpunit.result.cache
6+
/.phpunit.cache/

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ A tiny extension of `MySqlConnection` that manages **session** system variables
44

55
## Requirements
66

7-
| Package | Version | Mandatory |
8-
|:---|:---|:---:|
9-
| PHP | <code>^7.4 &#124;&#124; ^8.0</code> | ✅ |
10-
| Laravel | <code>^6.0 &#124;&#124; ^7.0 &#124;&#124; ^8.0 &#124;&#124; ^9.0 &#124;&#124; ^10.0</code> | ✅ |
11-
| PHPStan | <code>&gt;=1.1</code> | |
7+
| Package | Version | Mandatory |
8+
|:--------|:--------------------------------------------------------|:---------:|
9+
| PHP | <code>^8.0</code> | ✅ |
10+
| Laravel | <code>^9.0 &#124;&#124; ^10.0 &#124;&#124; ^11.0</code> | ✅ |
11+
| PHPStan | <code>&gt;=1.1</code> | |
1212

1313
## Installing
1414

@@ -52,7 +52,7 @@ DB::setSystemVariable('long_query_time', 10.0);
5252
DB::setSystemVariable('long_query_time', 10.0, false);
5353

5454
// Assign multiple variables
55-
DB::setSystemVariables(['long_query_time' => 10.0, 'tx_isolation' => 'read-committed']);
55+
DB::setSystemVariables(['long_query_time' => 10.0, 'transaction_isolation' => 'read-committed']);
5656

5757
// Assign a variable on a different connection
5858
DB::connection('other_mysql_connection')->setSystemVariable('long_query_time', 10.0);
@@ -63,7 +63,7 @@ DB::usingSystemVariable('long_query_time', 10.0, function () {
6363
});
6464

6565
// Run callback temporarily assigning multiple variables
66-
DB::usingSystemVariables(['long_query_time' => 10.0, 'tx_isolation' => 'read-committed'], function () {
66+
DB::usingSystemVariables(['long_query_time' => 10.0, 'transaction_isolation' => 'read-committed'], function () {
6767
/* ... */
6868
});
6969

‎compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 'Compose-Spec'
33
services:
44

55
php:
6-
image: joseluisq/php-fpm:8.1
6+
image: joseluisq/php-fpm:8.2
77
volumes:
88
- .:/code:cached
99
working_dir: /code

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
}
2323
},
2424
"require": {
25-
"php": "^7.4 || ^8.0",
25+
"php": "^8.0",
2626
"ext-pdo": "*",
27-
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
28-
"illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
27+
"illuminate/support": "^9.0 || ^10.0",
28+
"illuminate/database": "^9.0 || ^10.0",
2929
"mpyw/unclosure": "^3.0",
3030
"mpyw/laravel-pdo-emulation-control": "^2.0.2"
3131
},
3232
"require-dev": {
3333
"orchestra/testbench": "*",
34-
"orchestra/testbench-core": "^4.9 || ^5.9 || >=6.6",
34+
"orchestra/testbench-core": ">=7.0",
3535
"phpunit/phpunit": ">=9.5",
3636
"phpstan/phpstan": ">=1.1",
3737
"phpstan/extension-installer": ">=1.1",

‎phpunit.xml‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
3-
bootstrap="vendor/autoload.php"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
>
2+
<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">
3+
<coverage>
4+
<include>
5+
<directory suffix=".php">src</directory>
6+
</include>
7+
</coverage>
128
<testsuites>
139
<testsuite name="Package Test Suite">
1410
<directory suffix="Test.php">./tests/</directory>
1511
</testsuite>
1612
</testsuites>
17-
<filter>
18-
<whitelist processUncoveredFilesFromWhitelist="true">
19-
<directory suffix=".php">src</directory>
20-
</whitelist>
21-
</filter>
2213
</phpunit>

‎tests/BasicVariableAssignmentTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,32 +55,32 @@ public function provideBasicVariables(): array
5555
'assigning integer (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), 15, $this->v81('15.000000', 15.0)],
5656
'assigning boolean (native)' => ['foreign_key_checks', false, 1, false, 0],
5757
'assigning boolean (emulated)' => ['foreign_key_checks', true, $this->v81('1', 1), false, $this->v81('0', 0)],
58-
'assigning string (native)' => ['tx_isolation', false, 'REPEATABLE-READ', 'read-committed', 'READ-COMMITTED'],
59-
'assigning string (emulated)' => ['tx_isolation', true, 'REPEATABLE-READ', 'read-committed', 'READ-COMMITTED'],
58+
'assigning string (native)' => ['transaction_isolation', false, 'REPEATABLE-READ', 'read-committed', 'READ-COMMITTED'],
59+
'assigning string (emulated)' => ['transaction_isolation', true, 'REPEATABLE-READ', 'read-committed', 'READ-COMMITTED'],
6060
'assigning wrapped float (native)' => ['long_query_time', false, 10.0, Value::float(15.0), 15.0],
6161
'assigning wrapped float (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), Value::float(15.0), $this->v81('15.000000', 15.0)],
6262
'assigning wrapped integer (native)' => ['long_query_time', false, 10.0, Value::int(15), 15.0],
6363
'assigning wrapped integer (emulated)' => ['long_query_time', true, $this->v81('10.000000', 10.0), Value::int(15), $this->v81('15.000000', 15.0)],
6464
'assigning wrapped boolean (native)' => ['foreign_key_checks', false, 1, Value::bool(false), 0],
6565
'assigning wrapped boolean (emulated)' => ['foreign_key_checks', true, $this->v81('1', 1), Value::bool(false), $this->v81('0', 0)],
66-
'assigning wrapped string (native)' => ['tx_isolation', false, 'REPEATABLE-READ', Value::str('read-committed'), 'READ-COMMITTED'],
67-
'assigning wrapped string (emulated)' => ['tx_isolation', true, 'REPEATABLE-READ', Value::str('read-committed'), 'READ-COMMITTED'],
66+
'assigning wrapped string (native)' => ['transaction_isolation', false, 'REPEATABLE-READ', Value::str('read-committed'), 'READ-COMMITTED'],
67+
'assigning wrapped string (emulated)' => ['transaction_isolation', true, 'REPEATABLE-READ', Value::str('read-committed'), 'READ-COMMITTED'],
6868
'replacing explicit float (native)' => ['long_query_time', false, 10.0, Replacer::float(function ($v) { return $v + 5.0; }), 15.0],
6969
'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)],
7070
'replacing explicit integer (native)' => ['long_query_time', false, 10.0, Replacer::int(function ($v) { return $v + 5; }), 15.0],
7171
'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)],
7272
'replacing explicit boolean (native)' => ['foreign_key_checks', false, 1, Replacer::bool(function ($v) { return !$v; }), 0],
7373
'replacing explicit boolean (emulated)' => ['foreign_key_checks', true, $this->v81('1', 1), Replacer::bool(function ($v) { return !$v; }), $this->v81('0', 0)],
74-
'replacing explicit string (native)' => ['tx_isolation', false, 'REPEATABLE-READ', Replacer::str(function ($v) { return str_ireplace('repeatable-read', 'read-committed', $v); }), 'READ-COMMITTED'],
75-
'replacing explicit string (emulated)' => ['tx_isolation', true, 'REPEATABLE-READ', Replacer::str(function ($v) { return str_ireplace('repeatable-read', 'read-committed', $v); }), 'READ-COMMITTED'],
74+
'replacing explicit string (native)' => ['transaction_isolation', false, 'REPEATABLE-READ', Replacer::str(function ($v) { return str_ireplace('repeatable-read', 'read-committed', $v); }), 'READ-COMMITTED'],
75+
'replacing explicit string (emulated)' => ['transaction_isolation', true, 'REPEATABLE-READ', Replacer::str(function ($v) { return str_ireplace('repeatable-read', 'read-committed', $v); }), 'READ-COMMITTED'],
7676
'replacing implicit float (native)' => ['long_query_time', false, 10.0, function ($v): float { return $v + 5.0; }, 15.0],
7777
'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)],
7878
'replacing implicit integer (native)' => ['long_query_time', false, 10.0, function ($v): int { return $v + 5; }, 15.0],
7979
'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)],
8080
'replacing implicit boolean (native)' => ['foreign_key_checks', false, 1, function ($v): bool { return !$v; }, 0],
8181
'replacing implicit boolean (emulated)' => ['foreign_key_checks', true, $this->v81('1', 1), function ($v): bool { return !$v; }, $this->v81('0', 0)],
82-
'replacing implicit string (native)' => ['tx_isolation', false, 'REPEATABLE-READ', function ($v): string { return str_ireplace('repeatable-read', 'read-committed', $v); }, 'READ-COMMITTED'],
83-
'replacing implicit string (emulated)' => ['tx_isolation', true, 'REPEATABLE-READ', function ($v): string { return str_ireplace('repeatable-read', 'read-committed', $v); }, 'READ-COMMITTED'],
82+
'replacing implicit string (native)' => ['transaction_isolation', false, 'REPEATABLE-READ', function ($v): string { return str_ireplace('repeatable-read', 'read-committed', $v); }, 'READ-COMMITTED'],
83+
'replacing implicit string (emulated)' => ['transaction_isolation', true, 'REPEATABLE-READ', function ($v): string { return str_ireplace('repeatable-read', 'read-committed', $v); }, 'READ-COMMITTED'],
8484
];
8585
}
8686

‎tests/ReconnectionTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,48 +10,48 @@ class ReconnectionTest extends TestCase
1010
public function testOnlyMemoizedVariablesAreReassigned(): void
1111
{
1212
$this->onNativeConnection(function (MySqlConnection $db) {
13-
$this->assertSame('REPEATABLE-READ', $db->selectOne('select @@tx_isolation as value')->value);
13+
$this->assertSame('REPEATABLE-READ', $db->selectOne('select @@transaction_isolation as value')->value);
1414
$this->assertSame(10.0, $db->selectOne('select @@long_query_time as value')->value);
1515

1616
$db
17-
->setSystemVariable('tx_isolation', 'read-committed')
17+
->setSystemVariable('transaction_isolation', 'read-committed')
1818
->setSystemVariable('long_query_time', 13.0, false);
1919
$db->getPdo();
2020
$db->reconnect();
2121

22-
$this->assertSame('READ-COMMITTED', $db->selectOne('select @@tx_isolation as value')->value);
22+
$this->assertSame('READ-COMMITTED', $db->selectOne('select @@transaction_isolation as value')->value);
2323
$this->assertSame(10.0, $db->selectOne('select @@long_query_time as value')->value);
2424
});
2525

2626
$this->onEmulatedConnection(function (MySqlConnection $db) {
27-
$this->assertSame('REPEATABLE-READ', $db->selectOne('select @@tx_isolation as value')->value);
27+
$this->assertSame('REPEATABLE-READ', $db->selectOne('select @@transaction_isolation as value')->value);
2828
$this->assertSame($this->v81('10.000000', 10.0), $db->selectOne('select @@long_query_time as value')->value);
2929

3030
$db
31-
->setSystemVariable('tx_isolation', 'read-committed')
31+
->setSystemVariable('transaction_isolation', 'read-committed')
3232
->setSystemVariable('long_query_time', 13.0, false);
3333
$db->getPdo();
3434
$db->reconnect();
3535

36-
$this->assertSame('READ-COMMITTED', $db->selectOne('select @@tx_isolation as value')->value);
36+
$this->assertSame('READ-COMMITTED', $db->selectOne('select @@transaction_isolation as value')->value);
3737
$this->assertSame($this->v81('10.000000', 10.0), $db->selectOne('select @@long_query_time as value')->value);
3838
});
3939
}
4040

4141
public function testDirectReconnectionCallDoesNotWork(): void
4242
{
43-
$this->assertSame('REPEATABLE-READ', DB::selectOne('select @@tx_isolation as value')->value);
43+
$this->assertSame('REPEATABLE-READ', DB::selectOne('select @@transaction_isolation as value')->value);
4444
$this->assertSame(10.0, DB::selectOne('select @@long_query_time as value')->value);
4545

46-
DB::setSystemVariable('tx_isolation', 'read-committed');
46+
DB::setSystemVariable('transaction_isolation', 'read-committed');
4747
DB::setSystemVariable('long_query_time', 13.0, false);
4848
DB::getPdo();
4949

5050
// This operation does not work.
5151
// Please use DB::connection()->reconnect() instead.
5252
DB::reconnect();
5353

54-
$this->assertSame('REPEATABLE-READ', DB::selectOne('select @@tx_isolation as value')->value);
54+
$this->assertSame('REPEATABLE-READ', DB::selectOne('select @@transaction_isolation as value')->value);
5555
$this->assertSame(10.0, DB::selectOne('select @@long_query_time as value')->value);
5656
}
5757
}

0 commit comments

Comments
 (0)