Merge branch '8.x' into generator-presets

.github/workflows/analyse.yaml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/audits.yaml

@@ -3,8 +3,7 @@ name: audits
 on:
   push:
   pull_request:
-  schedule:
-    - cron: '0 0 1 * *'
+  workflow_dispatch:
 
 jobs:
   audit-dependencies:
@@ -15,17 +14,17 @@ jobs:
         os:
           - "ubuntu-latest"
         php:
-          # - '8.0'
           - 8.1
           - 8.2
+          - 8.3
         experimental:
           - true
 
     name: PHP${{ matrix.php }} on ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/coveralls.yaml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/tests.yaml

@@ -3,15 +3,17 @@ name: tests
 on:
   push:
   pull_request:
+  workflow_dispatch:
 
 jobs:
-  tests-on-laravel-10:
+  tests:
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
         os:
           - "ubuntu-latest"
+          - "windows-latest"
         php:
           - 8.1
           - 8.2
@@ -22,11 +24,11 @@ jobs:
         experimental:
           - false
 
-    name: PHP${{ matrix.php }}-${{ matrix.os }} with Laravel 10 (${{ matrix.dependencies }})
+    name: PHP${{ matrix.php }} on ${{ matrix.os }} (${{ matrix.dependencies }})
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -35,10 +37,6 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlite3, pdo_sqlite, bcmath, fileinfo
           coverage: none
 
-      - name: Install Laravel 10
-        run: |
-          composer require "illuminate/contracts:10.x" --no-interaction --no-update
-
       - name: Install dependencies
         uses: "ramsey/composer-install@v2"
         with:
@@ -50,49 +48,3 @@ jobs:
 
       - name: Execute tests
         run: vendor/bin/phpunit --testdox
-
-  # tests-on-laravel-9:
-  #   runs-on: ${{ matrix.os }}
-  #   continue-on-error: ${{ matrix.experimental }}
-  #   strategy:
-  #     matrix:
-  #       os:
-  #         - "ubuntu-latest"
-  #       php:
-  #         - '8.0'
-  #         - 8.1
-  #         - 8.2
-  #       dependencies:
-  #         - "highest"
-  #         - "lowest"
-  #       experimental:
-  #         - false
-
-  #   name: PHP${{ matrix.php }}-${{ matrix.os }} with Laravel 9 (${{ matrix.dependencies }})
-
-  #   steps:
-  #     - name: Checkout code
-  #       uses: actions/checkout@v3
-
-  #     - name: Setup PHP
-  #       uses: shivammathur/setup-php@v2
-  #       with:
-  #         php-version: ${{ matrix.php }}
-  #         extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlite3, pdo_sqlite, bcmath, fileinfo
-  #         coverage: none
-
-  #     - name: Install Laravel 9
-  #       run: |
-  #         composer require "illuminate/contracts:9.x" --no-interaction --no-update
-
-  #     - name: Install dependencies
-  #       uses: "ramsey/composer-install@v2"
-  #       with:
-  #         dependency-versions: "${{ matrix.dependencies }}"
-  #         composer-options: "--prefer-dist --no-cache"
-
-  #     - name: Installed dependencies
-  #       run: composer show -D
-
-  #     - name: Execute tests
-  #       run: vendor/bin/phpunit --testdox

CHANGELOG-1.x.md

@@ -2,6 +2,18 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/workbench`.
 
+## 1.0.1
+
+Released: 2023-10-31
+
+### Added
+
+* Added Workbench information to `about` artisan command.
+
+### Changes
+
+* Disable Composer script timeout to `composer run serve` generator.
+
 ## 1.0.0
 
 Released: 2023-10-24

CHANGELOG-7.x.md

@@ -0,0 +1,11 @@
+# Changes for 7.x
+
+This changelog references the relevant changes (bug and security fixes) done to `orchestra/workbench`.
+
+## 7.0.0
+
+Released: 2023-11-07
+
+### Changes
+
+Restructure releases for Workbench to follow Testbench version. `7.x` releases will only be compatible with Testbench `7.x` and Laravel `9.x`.

CHANGELOG-8.x.md

@@ -0,0 +1,11 @@
+# Changes for 8.x
+
+This changelog references the relevant changes (bug and security fixes) done to `orchestra/workbench`.
+
+## 8.0.0
+
+Released: 2023-11-07
+
+### Changes
+
+Restructure releases for Workbench to follow Testbench version. `8.x` releases will only be compatible with Testbench `8.x` and Laravel `10.x`.

composer.json

@@ -30,7 +30,7 @@
         "laravel/framework": "dev-generator-presets as 10.x-dev",
         "laravel/tinker": "^2.8.2",
         "orchestra/canvas": "dev-generator-presets as 8.12.0",
-        "orchestra/testbench-core": "^7.34.0 || ^8.14.0",
+        "orchestra/testbench-core": "^8.14",
         "symfony/yaml": "^6.0.9"
     },
     "require-dev": {

src/Composer.php

@@ -2,30 +2,10 @@
 
 namespace Orchestra\Workbench;
 
-use RuntimeException;
-
+/**
+ * @deprecated use `Illuminate\Support\Composer` instead
+ */
 class Composer extends \Illuminate\Support\Composer
 {
-    /**
-     * Modify composer content.
-     *
-     * @param  callable(array):array  $callback
-     */
-    public function modify(callable $callback): void
-    {
-        $composerFile = "{$this->workingPath}/composer.json";
-
-        if (! file_exists($composerFile)) {
-            throw new RuntimeException("Unable to locate `composer.json` file at [{$this->workingPath}].");
-        }
-
-        $composer = json_decode((string) file_get_contents($composerFile), true, 512, JSON_THROW_ON_ERROR);
-
-        $composer = \call_user_func($callback, $composer);
-
-        file_put_contents(
-            $composerFile,
-            json_encode($composer, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
-        );
-    }
+    //
 }

src/Console/DevToolCommand.php

@@ -9,7 +9,6 @@
 use Symfony\Component\Console\Attribute\AsCommand;
 
 use function Laravel\Prompts\select;
-use function Orchestra\Testbench\laravel_version_compare;
 use function Orchestra\Testbench\package_path;
 
 #[AsCommand(name: 'workbench:devtool', description: 'Configure Workbench for package development')]
@@ -82,9 +81,7 @@ protected function copyTestbenchDotEnvFile(Filesystem $filesystem, string $worki
             return;
         }
 
-        $choice = laravel_version_compare('10.17', '>=')
-            ? select("Export '.env' file as?", $choices)
-            : $this->components->choice("Export '.env' file as?", $choices);
+        $choice = select("Export '.env' file as?", $choices);
 
         if ($choice === 'Skip exporting .env') {
             return;

src/Console/InstallCommand.php

@@ -7,9 +7,9 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Composer;
 use Orchestra\Testbench\Foundation\Console\Actions\EnsureDirectoryExists;
 use Orchestra\Testbench\Foundation\Console\Actions\GeneratesFile;
-use Orchestra\Workbench\Composer;
 use Orchestra\Workbench\Events\InstallEnded;
 use Orchestra\Workbench\Events\InstallStarted;
 use Orchestra\Workbench\Workbench;
@@ -147,6 +147,7 @@ protected function appendScriptsToComposer(array $content, Filesystem $filesyste
 
         $content['scripts']['build'] = '@php vendor/bin/testbench workbench:build --ansi';
         $content['scripts']['serve'] = [
+            'Composer\\Config::disableProcessTimeout',
             '@build',
             '@php vendor/bin/testbench serve',
         ];