Skip to content

Commit 059c799

Browse files
authored
feat: Laravel 10 (#111)
1 parent 77aca1c commit 059c799

File tree

7 files changed

+37
-50
lines changed

7 files changed

+37
-50
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,17 @@ jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-ac
1919
fail-fast: false
2020
matrix:
2121
setup: ['basic', 'lowest']
22-
php: ['7.4', '8.0']
23-
rr: ['2.7.6'] # Releases: <https://github.com/roadrunner-server/roadrunner/releases>
22+
php: ['8.0', '8.1', '8.2']
23+
rr: ['2.12.1'] # Releases: <https://github.com/roadrunner-server/roadrunner/releases>
2424
coverage: ['true']
2525
include:
26-
- php: '7.4'
27-
setup: 'basic'
28-
rr: '2.0.0'
29-
coverage: 'false'
3026
- php: '8.0'
3127
setup: 'lowest'
3228
rr: '2.0.0'
3329
coverage: 'false'
3430
- php: '8.1'
3531
setup: 'basic'
36-
rr: '2.7.6'
32+
rr: '2.12.1'
3733
coverage: 'false'
3834
steps:
3935
- uses: actions/checkout@v3
@@ -88,30 +84,3 @@ jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-ac
8884
token: ${{ secrets.CODECOV_TOKEN }}
8985
file: ./coverage/clover.xml
9086
fail_ci_if_error: false
91-
92-
cs-check:
93-
name: Check Code Style
94-
runs-on: ubuntu-20.04
95-
steps:
96-
- uses: actions/checkout@v3
97-
98-
- uses: shivammathur/setup-php@v2
99-
with:
100-
php-version: 7.4
101-
102-
- name: Get Composer Cache Directory
103-
id: composer-cache
104-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
105-
106-
- name: Cache dependencies
107-
uses: actions/cache@v3
108-
with:
109-
path: ${{ steps.composer-cache.outputs.dir }}
110-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
111-
restore-keys: ${{ runner.os }}-composer-
112-
113-
- name: Install required Composer packages
114-
run: composer require 'spiral/code-style:^1.0' -n --no-progress --prefer-dist # `--ignore-platform-reqs` is required only for PHP 8.0
115-
116-
- name: Execute check
117-
run: php ./vendor/bin/spiral-cs check ./bin ./src ./tests --ansi

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
66

7+
## v5.10.0
8+
9+
### Added
10+
11+
- Laravel 10 support [#111]
12+
13+
### Changed
14+
15+
- Minimal required PHP version now is `8.0` [#111]
16+
- Minimal required Laravel version now is `9.33` [#111]
17+
18+
[#111]:https://github.com/spiral/roadrunner-laravel/pull/111
19+
720
## v5.9.0
821

922
### Added

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ FROM php:8.2.0-alpine
44
ENV COMPOSER_HOME="/tmp/composer"
55

66
# Image page: <https://hub.docker.com/_/composer>
7-
COPY --from=composer:2.2.6 /usr/bin/composer /usr/bin/composer
7+
COPY --from=composer:2.5 /usr/bin/composer /usr/bin/composer
88

99
# Image page: <https://hub.docker.com/r/spiralscout/roadrunner>
10-
COPY --from=spiralscout/roadrunner:2.7.6 /usr/bin/rr /usr/bin/rr
10+
COPY --from=spiralscout/roadrunner:2.12.1 /usr/bin/rr /usr/bin/rr
1111

1212
RUN set -x \
1313
&& apk add --no-cache binutils git \
14-
&& apk add --no-cache --virtual .build-deps autoconf pkgconf make g++ gcc 1>/dev/null \
14+
&& apk add --no-cache --virtual .build-deps autoconf pkgconf make g++ gcc linux-headers 1>/dev/null \
1515
# install xdebug (for testing with code coverage), but do not enable it
16-
&& pecl install xdebug-3.1.2 1>/dev/null \
16+
&& pecl install xdebug-3.2.0 \
1717
# install PHP extensions (CFLAGS usage reason - https://bit.ly/3ALS5NU)
1818
&& CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install -j$(nproc) sockets pcntl \
1919
&& apk del .build-deps \

bin/rr-worker

100644100755
File mode changed.

composer.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,27 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^7.4 || ^8.0",
18+
"php": "^8.0",
1919
"composer-runtime-api": "^2.0",
20-
"laravel/framework": "~8.0 || ~9.0",
20+
"laravel/framework": "~9.33 || ~10.0",
2121
"nyholm/psr7": "^1.5",
22-
"spiral/roadrunner-http": "^2.0.4",
23-
"spiral/roadrunner-worker": "^2.1.5",
24-
"symfony/psr-http-message-bridge": "^2.0"
22+
"spiral/roadrunner-http": "^2.2",
23+
"spiral/roadrunner-worker": "^2.2",
24+
"symfony/psr-http-message-bridge": "^2.1"
2525
},
2626
"require-dev": {
2727
"guzzlehttp/guzzle": "^6.3 || ~7.0",
28-
"inertiajs/inertia-laravel": "^0.4.2 || ^0.5",
28+
"inertiajs/inertia-laravel": "^0.6",
2929
"tightenco/ziggy": "^1.4.0",
30-
"laravel/laravel": "~8.0 || ~9.0",
31-
"laravel/scout": "~9.0",
30+
"laravel/laravel": "~9.1 || ~10.0",
31+
"laravel/scout": "~9.0 || ~10.0",
3232
"laravel/socialite": "^5.0",
3333
"laravel/telescope": "^4.5",
3434
"livewire/livewire": "^2.7",
35-
"mockery/mockery": "~1.3.3 || ^1.4.2",
36-
"phpstan/phpstan": "~1.4",
37-
"phpunit/phpunit": "^9.3.3"
35+
"mockery/mockery": "^1.4.4",
36+
"phpstan/phpstan": "~1.6",
37+
"phpunit/phpunit": "^9.5.10",
38+
"brick/math": "^0.10"
3839
},
3940
"autoload": {
4041
"psr-4": {

tests/Unit/Console/Commands/StartCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ public function testCommandOptions(): void
5555
*/
5656
public function testCommandExecuting(): void
5757
{
58-
$this->markTestSkipped('There is now legal way for the execution method testing');
58+
$this->markTestSkipped('There is no legal way for the execution method testing');
5959
}
6060
}

tests/Unit/HelpersTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public function testRrDump(): void
2020
->andReturnUndefined();
2121

2222
\rr\dump('foo', 'bar');
23+
24+
$this->assertTrue(true);
2325
}
2426

2527
/**
@@ -33,6 +35,8 @@ public function testRrDd(): void
3335
->andReturnUndefined();
3436

3537
\rr\dd('foo', 123);
38+
39+
$this->assertTrue(true);
3640
}
3741

3842
/**

0 commit comments

Comments
 (0)