Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/octane
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.6
Choose a base ref
...
head repository: laravel/octane
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.x
Choose a head ref
Loading
Showing with 953 additions and 132 deletions.
  1. +1 −0 .gitattributes
  2. +0 −18 .github/ISSUE_TEMPLATE/1_Bug_report.md
  3. +64 −0 .github/ISSUE_TEMPLATE/1_Bug_report.yml
  4. +12 −0 .github/workflows/issues.yml
  5. +12 −0 .github/workflows/pull-requests.yml
  6. +42 −0 .github/workflows/static-analysis.yml
  7. +13 −5 .github/workflows/tests.yml
  8. +1 −1 .github/workflows/update-changelog.yml
  9. +206 −1 CHANGELOG.md
  10. +1 −1 README.md
  11. +2 −2 bin/createSwooleServer.php
  12. +2 −1 bin/createSwooleTimerTable.php
  13. 0 bin/{file-watcher.js → file-watcher.cjs}
  14. +1 −1 bin/roadrunner-worker
  15. +10 −3 bin/swoole-server
  16. +14 −3 composer.json
  17. +12 −0 phpstan.neon.dist
  18. +10 −5 src/ApplicationFactory.php
  19. +7 −0 src/ApplicationGateway.php
  20. +1 −1 src/Commands/Concerns/InstallsRoadRunnerDependencies.php
  21. +15 −10 src/Commands/Concerns/InteractsWithIO.php
  22. +23 −3 src/Commands/Concerns/InteractsWithServers.php
  23. +7 −5 src/Commands/StartCommand.php
  24. +21 −9 src/Commands/StartRoadRunnerCommand.php
  25. +7 −4 src/Commands/StartSwooleCommand.php
  26. +5 −1 src/Concerns/ProvidesDefaultConfigurationOptions.php
  27. +10 −0 src/Concerns/ProvidesRouting.php
  28. +27 −0 src/Contracts/ServerProcessInspector.php
  29. +8 −0 src/Listeners/FlushLocaleState.php
  30. +4 −0 src/Listeners/FlushLogContext.php
  31. +25 −0 src/Listeners/GiveNewApplicationInstanceToCacheManager.php
  32. +17 −0 src/Listeners/GiveNewApplicationInstanceToSessionManager.php
  33. +1 −1 src/Listeners/GiveNewRequestInstanceToPaginator.php
  34. +29 −0 src/Listeners/RefreshQueryDurationHandling.php
  35. +3 −1 src/RoadRunner/ServerProcessInspector.php
  36. +13 −1 src/Swoole/Actions/EnsureRequestsDontExceedMaxExecutionTime.php
  37. +4 −3 src/Swoole/Handlers/OnServerStart.php
  38. +4 −8 src/Swoole/Handlers/OnWorkerStart.php
  39. +4 −3 src/Swoole/ServerProcessInspector.php
  40. +23 −6 src/Swoole/SwooleClient.php
  41. +9 −1 src/Swoole/SwooleExtension.php
  42. +32 −0 tests/Listeners/FlushLogContextTest.php
  43. +49 −0 tests/LocaleStateTest.php
  44. +81 −0 tests/RequestStateTest.php
  45. +1 −0 tests/RoadRunnerClientTest.php
  46. +1 −1 tests/RoadRunnerServerProcessInspectorTest.php
  47. +100 −33 tests/SwooleClientTest.php
  48. +17 −0 tests/SwooleExtensionTest.php
  49. +2 −0 tests/TestCase.php
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -13,5 +13,6 @@
.gitignore export-ignore
.styleci.yml export-ignore
CHANGELOG.md export-ignore
phpstan.neon.dist export-ignore
phpunit.xml.dist export-ignore
UPGRADE.md export-ignore
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE/1_Bug_report.md

This file was deleted.

64 changes: 64 additions & 0 deletions .github/ISSUE_TEMPLATE/1_Bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Bug Report
description: "Report a general library issue."
body:
- type: markdown
attributes:
value: "Before submitting your report, [please ensure your Laravel version is still supported](https://laravel.com/docs/releases#support-policy)."
- type: input
attributes:
label: Octane Version
description: Provide the Octane version that you are using.
placeholder: 1.6.1
validations:
required: true
- type: input
attributes:
label: Laravel Version
description: Provide the Laravel version that you are using.
placeholder: 10.4.1
validations:
required: true
- type: input
attributes:
label: PHP Version
description: Provide the PHP version that you are using.
placeholder: 8.1.4
validations:
required: true
- type: dropdown
attributes:
label: What server type are you using?
options:
- Open Swoole
- Roadrunner
- Swoole
validations:
required: true
- type: input
attributes:
label: Server Version
description: Provide the server version that you are using.
placeholder: 1.4.2
validations:
required: true
- type: input
attributes:
label: Database Driver & Version
description: If applicable, provide the database driver and version you are using.
placeholder: "MySQL 8.0.31 for macOS 13.0 on arm64 (Homebrew)"
validations:
required: false
- type: textarea
attributes:
label: Description
description: Provide a detailed description of the issue you are facing.
validations:
required: true
- type: textarea
attributes:
label: Steps To Reproduce
description: Provide detailed steps to reproduce your issue. If necessary, please provide a GitHub repository to demonstrate your issue using `laravel new bug-report --github="--public"`.
validations:
required: true


12 changes: 12 additions & 0 deletions .github/workflows/issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: issues

on:
issues:
types: [labeled]

permissions:
issues: write

jobs:
help-wanted:
uses: laravel/.github/.github/workflows/issues.yml@main
12 changes: 12 additions & 0 deletions .github/workflows/pull-requests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: pull requests

on:
pull_request_target:
types: [opened]

permissions:
pull-requests: write

jobs:
uneditable:
uses: laravel/.github/.github/workflows/pull-requests.yml@main
42 changes: 42 additions & 0 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: static analysis

on:
push:
branches:
- master
- '*.x'
pull_request:

permissions:
contents: read

jobs:
tests:
runs-on: ubuntu-22.04

strategy:
fail-fast: true

name: Static Analysis

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
tools: composer:v2
coverage: none
extensions: swoole

- name: Install dependencies
uses: nick-fields/retry@v2
with:
timeout_minutes: 5
max_attempts: 5
command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress

- name: Execute type checking
run: vendor/bin/phpstan
18 changes: 13 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -2,26 +2,34 @@ name: tests

on:
push:
branches:
- master
- '*.x'
pull_request:
schedule:
- cron: '0 0 * * *'

jobs:
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
fail-fast: true
matrix:
php: ['8.0', 8.1]
laravel: [8, 9]
php: ['8.0', 8.1, 8.2]
laravel: [8, 9, 10]
driver: [swoole, openswoole]
exclude:
- php: 8.0
laravel: 10
- php: 8.2
laravel: 8

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.driver }}

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup PHP
uses: shivammathur/setup-php@v2
@@ -38,7 +46,7 @@ jobs:
- name: Install dependencies
run: |
composer require "laravel/framework:^${{ matrix.laravel }}" --no-update
composer require "laravel/framework:^${{ matrix.laravel }}" --dev --no-update
composer update --prefer-dist --no-interaction --no-progress
- name: Execute tests
2 changes: 1 addition & 1 deletion .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Update Changelog"
name: update changelog

on:
release:
Loading