Merge branch '3.x' into move-to-glide-3

Author: ifox

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Checking for prtodo's.
         run: |
@@ -87,12 +87,12 @@ jobs:
 
     steps:
       - name: Set timezone?
-        uses: szenius/set-timezone@v1.0
+        uses: szenius/set-timezone@v2.0
         with:
-          timezoneLinux: "Europe/Paris"
+          timezoneLinux: 'Europe/Paris'
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -111,8 +111,8 @@ jobs:
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v4
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-${{ matrix.dbal }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -125,9 +125,9 @@ jobs:
           composer install --prefer-dist --no-interaction --no-plugins
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.x'
+          node-version: '24.x'
 
       - name: Build npm dependencies.
         run: |
@@ -139,7 +139,7 @@ jobs:
           CACHE_STORE: array
 
       - name: Upgrade Chrome
-        uses: browser-actions/setup-chrome@latest
+        uses: browser-actions/setup-chrome@v2
 
       - name: Upgrade Chrome Driver
         run: ./vendor/bin/testbench dusk:chrome-driver --detect
@@ -148,13 +148,17 @@ jobs:
         run: ./vendor/bin/testbench-dusk package:discover
 
       - name: Execute all tests
-        run: vendor/bin/phpunit --stop-on-error
+        run: vendor/bin/paratest --testsuite Unit,Integration --stop-on-error && vendor/bin/phpunit --testsuite Browser --stop-on-error --no-coverage
         env:
+          DB_HOST: 127.0.0.1
           DB_PORT: ${{ job.services.mysql.ports['3306'] }}
+          DB_PASSWORD: root
 
-      - uses: codecov/codecov-action@v2
+      - uses: codecov/codecov-action@v6
         with:
           files: .github/clover.xml
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Replace asterisks in Laravel
         run: echo "REPLACED_LARAVEL=${MATRIX_LARAVEL//\*/_}" >> $GITHUB_ENV
@@ -168,7 +172,7 @@ jobs:
           MATRIX_DBAL: ${{ matrix.dbal }}
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots-${{ matrix.os }}-${{ matrix.php }}-${{ env.REPLACED_LARAVEL }}-${{ env.REPLACED_DBAL }}
           path: |

.github/workflows/release.yml

@@ -14,12 +14,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           ref: 3.x
-      
+
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
           node-version: '20'
           cache: 'npm'
@@ -40,15 +40,15 @@ jobs:
         id: bump_version
         run: |
           npm version ${{ github.event.inputs.version_bump_type }} --no-git-tag-version
-          echo "::set-output name=new_version::$(node -p "require('./package.json').version")"
-      
+          echo "new_version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
+
       - name: Update version in PHP file
         run: |
           NEW_VERSION="${{ steps.bump_version.outputs.new_version }}"
           sed -i "s/\(public const VERSION = '\)[^']*\(';\)/\1${NEW_VERSION}\2/" src/TwillServiceProvider.php
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: |

.gitignore

@@ -17,6 +17,7 @@ public/
 tests/coverage
 tests/storage
 .phpunit.result.cache
+.phpunit.cache/
 .php-cs-fixer.cache
 .env.local
 .env.*.local

CONTRIBUTING.md

@@ -55,7 +55,7 @@ For PHP auto-formatting on save, you can use the [phpcsfixer](https://marketplac
 },
 ```
 
-For PHP contextual linting, you can use the [phpcs](https://marketplace.visualstudio.com/items?itemName=ikappas.phpcs) extension and then install [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) globally.
+For PHP contextual linting, you can use the [phpcs](https://marketplace.visualstudio.com/items?itemName=ikappas.phpcs) extension and then install [PHP_CodeSniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer) globally.
 
 ```
 composer global require "squizlabs/php_codesniffer=*"

composer.json

@@ -31,7 +31,7 @@
     "doctrine/dbal": "^3.0 || ^4.0",
     "guzzlehttp/guzzle": "^7.0",
     "imgix/imgix-php": "^3.0",
-    "kalnoy/nestedset": "^6.0",
+    "kalnoy/nestedset": "^6.0 <6.0.7",
     "laravel/framework": "^9.0 || ^10.0 || ^11.0 || ^12.0",
     "laravel/socialite": "^5.3",
     "laravel/ui": "^4.0",
@@ -46,6 +46,7 @@
   },
   "require-dev": {
     "area17/phptorch": "dev-main",
+    "brianium/paratest": "^6.0 | ^7.0",
     "chillerlan/php-qrcode": "~4.0",
     "friendsofphp/php-cs-fixer": "^3.0",
     "larastan/larastan": "^2.9 | ^3.0",
@@ -74,12 +75,14 @@
     }
   },
   "scripts": {
-    "test:phpunit": "vendor/bin/phpunit",
+    "test:phpunit": "vendor/bin/paratest --testsuite Unit,Integration --stop-on-error --no-coverage",
+    "test:browser": "vendor/bin/phpunit --testsuite Browser --stop-on-error --no-coverage",
     "test:analyse": "php -d memory_limit=-1 vendor/bin/phpstan analyse",
     "test:syntax": "vendor/bin/php-cs-fixer --dry-run fix src",
     "test": [
       "@test:syntax",
-      "@test:phpunit"
+      "@test:phpunit",
+      "@test:browser"
     ],
     "post-autoload-dump": [
       "@php ./vendor/bin/testbench package:discover --ansi"

docs/content/2_guides/1_page-builder-with-blade/2_installing-laravel.md

@@ -9,7 +9,7 @@ If you have any questions about a step, let us know on our Discord and we will t
 
 ## Install Laravel
 
-For the installation of Laravel, we will use some steps from the [official documentation](https://laravel.com/docs/10.x).
+For the installation of Laravel, we will use some steps from the [official documentation](https://laravel.com/docs/12.x).
 
 The official documentation is a goldmine of knowledge, if you ever have trouble understanding a concept, make sure to
 check it out!
@@ -41,7 +41,11 @@ While you are there, make sure that `APP_URL` matches your local url. For exampl
 
 `APP_URL=http://laravel-twill.test`
 
-If you do not have MySQL setup, you can use [SQLite](https://laravel.com/docs/10.x#databases-and-migrations) as well.
+If you are using the default `php artisan serve` command, the url will be `http://127.0.0.1:8000`.
+
+> If your `APP_URL` is set to `http://localhost`, you might experience issues with image cropping. Changing it to `http://127.0.0.1:8000` (or your local IP) should fix this.
+
+If you do not have MySQL setup, you can use [SQLite](https://laravel.com/docs/12.x/installation#databases-and-migrations) as well.
 
 As mentioned before, the Laravel documentation is far more extensive about the setup procedure, if this guide went too quick, make sure to give those a read.
 

docs/content/2_guides/1_page-builder-with-blade/3_installing-twill.md

@@ -4,7 +4,7 @@ Twill is a standard Laravel package, that means, we only have to require it (and
 
 So, before we get to the process of building our CMS, let's install Twill.
 
-We can do this using `composer require area17/twill:"^3.4"`.
+We can do this using `composer require area17/twill:"^3.5"`.
 
 This will install Twill 3 alongside all other required packages.
 
@@ -63,6 +63,10 @@ As you can see from the output, it:
 - Publishes the assets
 - Prompts you to create a super admin
 
+Finally, run the `storage:link` command to create the symbolic link for the storage directory:
+
+`php artisan storage:link`
+
 Once you have filled everything in, we can refresh our browser. We now see a proper login screen:
 
 <!-- <div class="max-w-lg mx-auto"></div> -->

examples/basic-page-builder/package.json

@@ -7,11 +7,11 @@
     "devDependencies": {
         "@tailwindcss/typography": "^0.5.7",
         "autoprefixer": "^10.4.12",
-        "axios": "^0.27",
-        "laravel-vite-plugin": "^0.6.0",
+        "axios": "^1.15.0",
+        "laravel-vite-plugin": "^3.0.1",
         "lodash": "^4.17.19",
         "postcss": "^8.4.18",
         "tailwindcss": "^3.2.1",
-        "vite": "^3.0.0"
+        "vite": "^8.0.8"
     }
 }

examples/tests-browsers/resources/views/site/bio.blade.php

@@ -1,7 +1,7 @@
 <div>This is a bio</div>
 
 <div>
-    @if ($writer = $item->writer->first())
+    @if ($writer = $item->writer)
         Writer: {{ $writer->title }}
     @else
         No writer