Skip to content

Commit 2282462

Browse files
Merge pull request #94 from stackkit/feature/laravel-10
Bring back support for Laravel 6 and 7
2 parents d30c589 + 257b347 commit 2282462

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

.github/workflows/run-tests.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ jobs:
2121
- { queue: 'github-actions-laravel8-php81', laravel: '8.*', php: '8.1', 'testbench': '6.*'}
2222
- { queue: 'github-actions-laravel8-php80', laravel: '8.*', php: '8.0', 'testbench': '6.*'}
2323
- { queue: 'github-actions-laravel8-php74', laravel: '8.*', php: '7.4', 'testbench': '6.*'}
24+
- { queue: 'github-actions-laravel7-php80', laravel: '7.*', php: '8.0', 'testbench': '5.*' }
25+
- { queue: 'github-actions-laravel7-php74', laravel: '7.*', php: '7.4', 'testbench': '5.*' }
26+
- { queue: 'github-actions-laravel6-php80', laravel: '6.*', php: '8.0', 'testbench': '4.*' }
27+
- { queue: 'github-actions-laravel6-php74', laravel: '6.*', php: '7.4', 'testbench': '4.*' }
2428

2529
name: PHP ${{ matrix.payload.php }} - Laravel ${{ matrix.payload.laravel }} - DB ${{ matrix.db }}
2630

@@ -41,7 +45,7 @@ jobs:
4145
- name: Install dependencies
4246
run: |
4347
composer require "laravel/framework:${{ matrix.payload.laravel }}" "orchestra/testbench:${{ matrix.payload.testbench }}" --no-interaction --no-update
44-
composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
48+
composer update --prefer-stable --prefer-dist --no-interaction
4549
if [ "${{ matrix.db }}" = "mysql" ]; then
4650
while ! mysqladmin ping --host=127.0.0.1 --user=cloudtasks --port=3307 --password=cloudtasks --silent; do
4751
echo "Waiting for MySQL..."

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
99
**Changed**
1010

1111
- Added support for Laravel 10
12-
- Dropped support for Laravel 6 and 7
1312

1413
## 3.3.2 - 2022-11-19
1514

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This package allows Google Cloud Tasks to be used as the queue driver.
2121
</summary>
2222

2323
<br>
24-
This package requires Laravel 8 or higher and supports MySQL 8 and PostgreSQL 14. Might support older database versions too, but package hasn't been tested for it.
24+
This package requires Laravel 6 or higher and supports MySQL 8 and PostgreSQL 14. Might support older database versions too, but package hasn't been tested for it.
2525

2626
Please check the [Laravel support policy](https://laravel.com/docs/master/releases#support-policy) table for supported Laravel and PHP versions.
2727
</details>

composer.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111
"ext-json": "*",
1212
"phpseclib/phpseclib": "~2.0",
1313
"google/cloud-tasks": "^1.10",
14-
"illuminate/support": "^8.0|^9.0|^10.0",
1514
"thecodingmachine/safe": "^1.0|^2.0"
1615
},
1716
"require-dev": {
18-
"orchestra/testbench": "^6.0 || ^7.0 || ^8.0",
17+
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
1918
"nunomaduro/larastan": "^1.0 || ^2.0",
2019
"thecodingmachine/phpstan-safe-rule": "^1.2",
2120
"laravel/legacy-factories": "^1.3"
@@ -43,23 +42,23 @@
4342
"scripts": {
4443
"l10": [
4544
"composer require laravel/framework:10.* orchestra/testbench:8.* --no-interaction --no-update",
46-
"composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
45+
"composer update --prefer-stable --prefer-dist --no-interaction"
4746
],
4847
"l9": [
4948
"composer require laravel/framework:9.* orchestra/testbench:7.* --no-interaction --no-update",
50-
"composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
49+
"composer update --prefer-stable --prefer-dist --no-interaction"
5150
],
5251
"l8": [
5352
"composer require laravel/framework:8.* orchestra/testbench:6.* --no-interaction --no-update",
54-
"composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
53+
"composer update --prefer-stable --prefer-dist --no-interaction"
5554
],
5655
"l7": [
5756
"composer require laravel/framework:7.* orchestra/testbench:5.* --no-interaction --no-update",
58-
"composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
57+
"composer update --prefer-stable --prefer-dist --no-interaction"
5958
],
6059
"l6": [
6160
"composer require laravel/framework:6.* orchestra/testbench:4.* --no-interaction --no-update",
62-
"composer update --prefer-stable --prefer-dist --no-interaction --no-suggest"
61+
"composer update --prefer-stable --prefer-dist --no-interaction"
6362
]
6463
}
6564
}

0 commit comments

Comments
 (0)