Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
feat: Laravel 10 (#111)
Browse files Browse the repository at this point in the history
  • Loading branch information
tarampampam authored Jan 11, 2023
1 parent 77aca1c commit 059c799
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 50 deletions.
37 changes: 3 additions & 34 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,17 @@ jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-ac
fail-fast: false
matrix:
setup: ['basic', 'lowest']
php: ['7.4', '8.0']
rr: ['2.7.6'] # Releases: <https://github.com/roadrunner-server/roadrunner/releases>
php: ['8.0', '8.1', '8.2']
rr: ['2.12.1'] # Releases: <https://github.com/roadrunner-server/roadrunner/releases>
coverage: ['true']
include:
- php: '7.4'
setup: 'basic'
rr: '2.0.0'
coverage: 'false'
- php: '8.0'
setup: 'lowest'
rr: '2.0.0'
coverage: 'false'
- php: '8.1'
setup: 'basic'
rr: '2.7.6'
rr: '2.12.1'
coverage: 'false'
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -88,30 +84,3 @@ jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-ac
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage/clover.xml
fail_ci_if_error: false

cs-check:
name: Check Code Style
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3

- uses: shivammathur/setup-php@v2
with:
php-version: 7.4

- name: Get Composer Cache Directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache dependencies
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install required Composer packages
run: composer require 'spiral/code-style:^1.0' -n --no-progress --prefer-dist # `--ignore-platform-reqs` is required only for PHP 8.0

- name: Execute check
run: php ./vendor/bin/spiral-cs check ./bin ./src ./tests --ansi
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.

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

## v5.10.0

### Added

- Laravel 10 support [#111]

### Changed

- Minimal required PHP version now is `8.0` [#111]
- Minimal required Laravel version now is `9.33` [#111]

[#111]:https://github.com/spiral/roadrunner-laravel/pull/111

## v5.9.0

### Added
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ FROM php:8.2.0-alpine
ENV COMPOSER_HOME="/tmp/composer"

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

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

RUN set -x \
&& apk add --no-cache binutils git \
&& apk add --no-cache --virtual .build-deps autoconf pkgconf make g++ gcc 1>/dev/null \
&& apk add --no-cache --virtual .build-deps autoconf pkgconf make g++ gcc linux-headers 1>/dev/null \
# install xdebug (for testing with code coverage), but do not enable it
&& pecl install xdebug-3.1.2 1>/dev/null \
&& pecl install xdebug-3.2.0 \
# install PHP extensions (CFLAGS usage reason - https://bit.ly/3ALS5NU)
&& CFLAGS="$CFLAGS -D_GNU_SOURCE" docker-php-ext-install -j$(nproc) sockets pcntl \
&& apk del .build-deps \
Expand Down
Empty file modified bin/rr-worker
100644 → 100755
Empty file.
23 changes: 12 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,27 @@
}
],
"require": {
"php": "^7.4 || ^8.0",
"php": "^8.0",
"composer-runtime-api": "^2.0",
"laravel/framework": "~8.0 || ~9.0",
"laravel/framework": "~9.33 || ~10.0",
"nyholm/psr7": "^1.5",
"spiral/roadrunner-http": "^2.0.4",
"spiral/roadrunner-worker": "^2.1.5",
"symfony/psr-http-message-bridge": "^2.0"
"spiral/roadrunner-http": "^2.2",
"spiral/roadrunner-worker": "^2.2",
"symfony/psr-http-message-bridge": "^2.1"
},
"require-dev": {
"guzzlehttp/guzzle": "^6.3 || ~7.0",
"inertiajs/inertia-laravel": "^0.4.2 || ^0.5",
"inertiajs/inertia-laravel": "^0.6",
"tightenco/ziggy": "^1.4.0",
"laravel/laravel": "~8.0 || ~9.0",
"laravel/scout": "~9.0",
"laravel/laravel": "~9.1 || ~10.0",
"laravel/scout": "~9.0 || ~10.0",
"laravel/socialite": "^5.0",
"laravel/telescope": "^4.5",
"livewire/livewire": "^2.7",
"mockery/mockery": "~1.3.3 || ^1.4.2",
"phpstan/phpstan": "~1.4",
"phpunit/phpunit": "^9.3.3"
"mockery/mockery": "^1.4.4",
"phpstan/phpstan": "~1.6",
"phpunit/phpunit": "^9.5.10",
"brick/math": "^0.10"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Console/Commands/StartCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ public function testCommandOptions(): void
*/
public function testCommandExecuting(): void
{
$this->markTestSkipped('There is now legal way for the execution method testing');
$this->markTestSkipped('There is no legal way for the execution method testing');
}
}
4 changes: 4 additions & 0 deletions tests/Unit/HelpersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public function testRrDump(): void
->andReturnUndefined();

\rr\dump('foo', 'bar');

$this->assertTrue(true);
}

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

\rr\dd('foo', 123);

$this->assertTrue(true);
}

/**
Expand Down

0 comments on commit 059c799

Please sign in to comment.