Skip to content

Commit

Permalink
Adds partial PHP 8.1 support (#93)
Browse files Browse the repository at this point in the history
* Tests against PHP 8.1

* Exclude PHP 8.1 on Laravel 6 and Laravel 7

* Runs octane tests on PHP 8.0

* Fixes `riverline/multipart-parser` dependency

* Apply fixes from StyleCI

* Removes no real dependency

* Use Octane stable version

* wip

* Apply fixes from StyleCI

Co-authored-by: Taylor Otwell <taylorotwell@users.noreply.github.com>
  • Loading branch information
nunomaduro and taylorotwell authored Oct 13, 2021
1 parent 65b06a0 commit 13fd1cf
Show file tree
Hide file tree
Showing 7 changed files with 426 additions and 7 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [7.2, 7.3, 7.4, 8.0]
php: [7.2, 7.3, 7.4, 8.0, 8.1]
laravel: [^6.0, ^7.0, ^8.0]
exclude:
- php: 7.2
laravel: ^8.0
- php: 8.1
laravel: ^6.0
- php: 8.1
laravel: ^7.0

name: P${{ matrix.php }} - L${{ matrix.laravel }}

Expand Down Expand Up @@ -46,7 +50,7 @@ jobs:
run: |
composer require laravel/octane --dev
if: |
matrix.php == 8.0 && matrix.laravel == '^8.0'
matrix.php >= 8.0 && matrix.laravel == '^8.0'
- name: Execute unit tests
run: vendor/bin/phpunit
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"illuminate/support": "^6.0|^7.0|^8.0",
"monolog/monolog": "^1.12|^2.0",
"nyholm/psr7": "^1.0",
"riverline/multipart-parser": "^2.0",
"symfony/process": "^4.3|^5.0",
"symfony/psr-http-message-bridge": "^1.0|^2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Runtime/Octane/OctaneRequestContextFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
use Laravel\Octane\RequestContext;
use Laravel\Vapor\Arr;
use Laravel\Vapor\Runtime\Request;
use Laravel\Vapor\Support\Part;
use Nyholm\Psr7\ServerRequest;
use Nyholm\Psr7\UploadedFile;
use Riverline\MultiPartParser\Part;

class OctaneRequestContextFactory
{
Expand Down
Loading

0 comments on commit 13fd1cf

Please sign in to comment.