Add support for Laravel 12

Author: pionl

Dockerfile

@@ -1,4 +1,5 @@
-ARG IMAGE_VERSION
+ARG IMAGE_VERSION="8.2-node-20"
+
 FROM pionl/docker-php-laravel-ci:${IMAGE_VERSION}
 
 WORKDIR /app
@@ -7,7 +8,7 @@ COPY . .
 
 RUN npm install
 
-ARG LARAVEL_VERSION
+ARG LARAVEL_VERSION="12.*"
 
 RUN composer self-update
 RUN node setup.js ${LARAVEL_VERSION} --verbose

_setup/getVersions.js

@@ -10,6 +10,7 @@ function getVersions (userInput) {
 
     versions.forEach(version => {
         const preferredVersion = version.laravel === useOnlyGivenVersion;
+
         if (useOnlyGivenVersion === null || preferredVersion) {
             noVersions = false;
 

_setup/runTests.js

@@ -12,6 +12,7 @@ const path = require('path');
  */
 async function runTests (version, currentDirectory, verbose) {
     const dockerComposeArgs = [
+        'compose',
         '-f',
         'docker-compose.yml',
         '-f',
@@ -31,7 +32,7 @@ async function runTests (version, currentDirectory, verbose) {
         console.log(`${versionMessage} ${imageVersionMessage}`)
 
         const result = await run(
-            'docker-compose', dockerComposeArgs, currentDirectory, verbose, environmentVars
+            'docker', dockerComposeArgs, currentDirectory, verbose, environmentVars
         );
 
         return result.exitCode === 0

_setup/versionsRecursively.js

@@ -12,8 +12,10 @@ async function versionsRecursively (versions, onVersion, versionIndex = 0) {
 
     const version = versions[versionIndex];
 
+
     await onVersion(version)
 
+
     return versionsRecursively(versions, onVersion, versionIndex + 1)
 }
 

docker-compose-tests.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   codeceptjs:
     image: codeception/codeceptjs

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   laravel:
     build:

laravel-chunk-upload

@@ -44,7 +44,8 @@ Open http://localhost:8000
 
 | Laravel | PHP                                   | Run               | Tests                  |
 |---------|---------------------------------------|-------------------|------------------------|
-| 10.*    | 8.2-node-20, 8.2-node-20              | `node run "11.*"` | `node tests.js "11.*"` |
+| 12.*    | 8.2-node-20                           | `node run "12.*"` | `node tests.js "12.*"` |
+| 11.*    | 8.2-node-20                           | `node run "11.*"` | `node tests.js "11.*"` |
 | 10.*    | 8.1-node-17, 8.2-node-18              | `node run "10.*"` | `node tests.js "10.*"` |
 | 9.*     | 8.0-node-17, 8.1-node-17, 8.2-node-18 | `node run "9.*"`  | `node tests.js "9.*"`  |
 | 8.*     | 7.4-node-17, 8.0-node-17, 8.1-node-17 | `node run "8.*"`  | `node tests.js "8.*"`  |
@@ -78,9 +79,11 @@ node tests.js "8.*"
 * `abort-on-container-exit` needs to be used to stop the Laravel server.
 
 ```bash
-IMAGE_VERSION=7.4 LARAVEL_VERSION=8.\* docker-compose -f docker-compose.yml -f docker-compose-tests.yml up --abort-on-container-exit
+IMAGE_VERSION=8.2-node-20 LARAVEL_VERSION=12.\* docker compose -f docker-compose.yml -f docker-compose-tests.yml up --abort-on-container-exit
 ```
 
+We are using docker images built for [Laravel](https://github.com/pionl/docker-php-laravel-ci)
+
 ## Testing Your Contribution
 
 > Do not commit your changes - use a pull request in the main repo.
@@ -93,6 +96,12 @@ pr.sh <your-github-username> <branch = default is master> <repository-name = lar
 ```
 * Run tests on all versions with `node tests.js` to ensure backward compatibility.
 
+### Getting current master when PR is merged
+
+```
+bash update.sh
+```
+
 ## Adding Support for a New Laravel Release
 
 - Docker and Docker Compose installed.

package-lock.json

@@ -39,7 +39,8 @@ async function main () {
     }
 
     await versionsRecursively(useGivenVersions, async function (version) {
-        await run('docker-compose', ['up', '--build'], currentDirectory, cli.flags.verbose, {
+
+        await run('docker', ['compose', 'up', '--build'], currentDirectory, cli.flags.verbose, {
             IMAGE_VERSION: version.image_version,
             LARAVEL_VERSION: version.laravel,
         } );

readme.md

@@ -53,6 +53,7 @@ async function main () {
 
     const useGivenVersions = getVersions(cli.input);
 
+    console.log('Setting up versions: ', useGivenVersions)
     await versionsRecursively(useGivenVersions, async function (version) {
         await setupVersion(version, currentDirectory, cli.flags.verbose)
     });

run.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+ cd laravel-chunk-upload
+ git fetch
+ git reset --hard
+ git checkout master
+ git pull

setup.js

@@ -38,5 +38,17 @@
     {
         "laravel": "11.*",
         "image_version": "8.2-node-20"
+    },
+    {
+        "laravel": "12.*",
+        "image_version": "8.2-node-20"
+    },
+    {
+        "laravel": "12.*",
+        "image_version": "8.3-node-22"
+    },
+    {
+        "laravel": "12.*",
+        "image_version": "8.4-node-22"
     }
 ]