Merge branch '1.x'

# Conflicts:
#	CHANGELOG.md

Author: driesvints

.gitattributes

@@ -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

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -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
+      
+

.github/ISSUE_TEMPLATE/1_Bug_report.yml

@@ -0,0 +1,12 @@
+name: issues
+
+on:
+  issues:
+    types: [labeled]
+
+permissions:
+  issues: write
+
+jobs:
+  help-wanted:
+    uses: laravel/.github/.github/workflows/issues.yml@main

.github/workflows/issues.yml

@@ -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

.github/workflows/static-analysis.yml

@@ -11,23 +11,25 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: true
       matrix:
         php: ['8.0', 8.1, 8.2]
-        laravel: [8, 9]
+        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
@@ -44,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

.github/workflows/tests.yml

@@ -1,6 +1,80 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/octane/compare/v1.3.7...master)
+## [Unreleased](https://github.com/laravel/octane/compare/v1.5.4...master)
+
+## [v1.5.4](https://github.com/laravel/octane/compare/v1.5.3...v1.5.4) - 2023-04-18
+
+- Add ServerProcessInspector interface by @yiming0 in https://github.com/laravel/octane/pull/679
+
+## [v1.5.3](https://github.com/laravel/octane/compare/v1.5.2...v1.5.3) - 2023-04-04
+
+- Reverts #669 by @nunomaduro in https://github.com/laravel/octane/pull/676
+
+## [v1.5.2](https://github.com/laravel/octane/compare/v1.5.1...v1.5.2) - 2023-04-04
+
+- Give new container instance to session manager by @smortexa in https://github.com/laravel/octane/pull/669
+- Use getHost() by @chu121su12 in https://github.com/laravel/octane/pull/671
+
+## [v1.5.1](https://github.com/laravel/octane/compare/v1.5.0...v1.5.1) - 2023-03-27
+
+- Add method to fix octane route caching.  by @CharlesBilbo in https://github.com/laravel/octane/pull/659
+- Support setting swoole server mode by @sy-records in https://github.com/laravel/octane/pull/666
+- Give new app instance to cache manager by @smortexa in https://github.com/laravel/octane/pull/667
+
+## [v1.5.0](https://github.com/laravel/octane/compare/v1.4.3...v1.5.0) - 2023-03-04
+
+- Add support for custom HTTP headers on static files by @Starfox64 in https://github.com/laravel/octane/pull/653
+- Fix return value error and Remove useless code by @sy-records in https://github.com/laravel/octane/pull/655
+
+## [v1.4.3](https://github.com/laravel/octane/compare/v1.4.2...v1.4.3) - 2023-03-01
+
+- Fix timer table set failed by @sy-records in https://github.com/laravel/octane/pull/650
+
+## [v1.4.2](https://github.com/laravel/octane/compare/v1.4.1...v1.4.2) - 2023-02-07
+
+### Fixed
+
+- Allow graceful reload after installing packages by @taylorotwell in https://github.com/laravel/octane/pull/644
+
+## [v1.4.1](https://github.com/laravel/octane/compare/v1.4.0...v1.4.1) - 2023-02-03
+
+### Changed
+
+- Removes internal messages from output by @nunomaduro in https://github.com/laravel/octane/pull/639
+- Only displays source when there is source by @nunomaduro in https://github.com/laravel/octane/pull/640
+- Adds support for Collision `v7.x` by @nunomaduro in https://github.com/laravel/octane/pull/643
+
+### Fixed
+
+- Fix unsetting a cookie value when using Swoole by @oprypkhantc in https://github.com/laravel/octane/pull/642
+
+## [v1.4.0](https://github.com/laravel/octane/compare/v1.3.10...v1.4.0) - 2023-01-10
+
+### Added
+
+- Adds Laravel 10 support by @nunomaduro in https://github.com/laravel/octane/pull/629
+
+## [v1.3.10](https://github.com/laravel/octane/compare/v1.3.9...v1.3.10) - 2022-12-23
+
+### Changed
+
+- Adds support for Open Swoole `v22.x` by @nunomaduro in https://github.com/laravel/octane/pull/626
+
+## [v1.3.9](https://github.com/laravel/octane/compare/v1.3.8...v1.3.9) - 2022-11-19
+
+### Changed
+
+- Add `--rpc-host` option for Roadrunner by @matthew-inamdar in https://github.com/laravel/octane/pull/619
+
+### Fixed
+
+- Resolve typo resulting in deprecation notice by @owenvoke in https://github.com/laravel/octane/pull/614
+
+## [v1.3.8](https://github.com/laravel/octane/compare/v1.3.7...v1.3.8) - 2022-11-11
+
+### Fixed
+
+- Prefix rr binary permissions with 0 to specify it as an octal value by @Dylan-Buth in https://github.com/laravel/octane/pull/611
 
 ## [v1.3.7](https://github.com/laravel/octane/compare/v1.3.6...v1.3.7) - 2022-11-02
 

CHANGELOG.md

@@ -5,8 +5,8 @@
 try {
     $server = new Swoole\Http\Server(
         $serverState['host'] ?? '127.0.0.1',
-        $serverState['port'] ?? '8080',
-        SWOOLE_PROCESS,
+        $serverState['port'] ?? 8080,
+        $serverState['mode'] ?? SWOOLE_PROCESS,
         ($config['swoole']['ssl'] ?? false)
             ? SWOOLE_SOCK_TCP | SWOOLE_SSL
             : SWOOLE_SOCK_TCP,

bin/createSwooleServer.php

@@ -6,7 +6,7 @@
 require_once __DIR__.'/../src/Tables/TableFactory.php';
 
 if (($serverState['octaneConfig']['max_execution_time'] ?? 0) > 0) {
-    $timerTable = TableFactory::make(250);
+    $timerTable = TableFactory::make($serverState['octaneConfig']['max_timer_table_size'] ?? 250);
 
     $timerTable->column('worker_pid', Table::TYPE_INT);
     $timerTable->column('time', Table::TYPE_INT);

bin/createSwooleTimerTable.php

@@ -56,9 +56,15 @@ $server->on('start', fn (Server $server) => $bootstrap($serverState) && (new OnS
     $serverState['octaneConfig']['tick'] ?? true
 ))($server));
 
-$server->on('managerstart', fn () => $bootstrap($serverState) && (new OnManagerStart(
-    new SwooleExtension, $serverState['appName']
-))());
+$server->on('managerstart', function () use ($serverState) {
+    // Don't bootstrap entire application before server / worker start. Otherwise, files can't be gracefully reloaded... #632
+    require_once __DIR__.'/../src/Swoole/Handlers/OnManagerStart.php';
+    require_once __DIR__.'/../src/Swoole/SwooleExtension.php';
+
+    (new OnManagerStart(
+         new SwooleExtension, $serverState['appName']
+    ))();
+});
 
 /*
 |--------------------------------------------------------------------------