From a48a6db080ce7b8eaad08657ec66311898dae20a Mon Sep 17 00:00:00 2001
From: Alec Reynolds <1153738+reynoldsalec@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:01:18 -0800
Subject: [PATCH 1/2] Updated laravel to use lando/php@v1.7.1

---
 CHANGELOG.md      |  2 ++
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf5a153..e952abc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+* Updated lando/php to v1.7.1.
+
 ## v1.9.0 - [December 9, 2024](https://github.com/lando/laravel/releases/tag/v1.9.0)
 
 * Optimized for `midcore`
diff --git a/package-lock.json b/package-lock.json
index 859fbb0..c2e40bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,14 +6,14 @@
   "packages": {
     "": {
       "name": "@lando/laravel",
-      "version": "1.8.3",
+      "version": "1.9.0",
       "license": "GPL-3.0",
       "dependencies": {
         "@lando/mariadb": "^1.6.3",
         "@lando/memcached": "^1.3.3",
         "@lando/mssql": "^1.4.3",
         "@lando/mysql": "^1.4.4",
-        "@lando/php": "^1.6.3",
+        "@lando/php": "^1.7.1",
         "@lando/postgres": "^1.4.4",
         "@lando/redis": "^1.2.3",
         "lodash": "^4.17.21"
@@ -1666,15 +1666,14 @@
       "license": "MIT"
     },
     "node_modules/@lando/php": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.6.3.tgz",
-      "integrity": "sha512-UIYJ5fh2hCTQDal17UxuT+8A+CvEEfnjNtrXObArsb1G4qXrJdwwF9G3boQ57L3aj8Y5eLSmgClBC1wMw4xOUw==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.7.1.tgz",
+      "integrity": "sha512-yndqYlVy51k0GWVwbNas4MvY0mXTYyC9XJeUnyyx7kzX84j3TwnLt8/MYHXMaP6e/SsMp1nrb3Isi11NKYDrtg==",
       "bundleDependencies": [
         "@lando/nginx",
         "lodash",
         "semver"
       ],
-      "license": "GPL-3.0",
       "dependencies": {
         "@lando/nginx": "^1.4.4",
         "lodash": "^4.17.21",
@@ -7682,6 +7681,7 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
diff --git a/package.json b/package.json
index a481ed1..195073c 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@lando/memcached": "^1.3.3",
     "@lando/mssql": "^1.4.3",
     "@lando/mysql": "^1.4.4",
-    "@lando/php": "^1.6.3",
+    "@lando/php": "^1.7.1",
     "@lando/postgres": "^1.4.4",
     "@lando/redis": "^1.2.3",
     "lodash": "^4.17.21"

From e61bed8687f367eb415a2c734c171399cb27ba65 Mon Sep 17 00:00:00 2001
From: Alec Reynolds <1153738+reynoldsalec@users.noreply.github.com>
Date: Thu, 16 Jan 2025 13:34:56 -0800
Subject: [PATCH 2/2] Remove moveConfig from php builders.

---
 builders/laravel-php.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/builders/laravel-php.js b/builders/laravel-php.js
index abbe347..913da6f 100644
--- a/builders/laravel-php.js
+++ b/builders/laravel-php.js
@@ -1,30 +1,31 @@
 'use strict';
 
-const _ = require('lodash');
-const fs = require('fs');
 const path = require('path');
 const landoPhpPath = path.join(__dirname, '../node_modules/@lando/php');
 const LandoPhp = require(`${landoPhpPath}/builders/php.js`);
 
-const loadScripts = options => {
-  const lando = _.get(options, '_app._lando');
-  // Move the script to the confDir and make executable.
-  if (fs.existsSync(path.join(landoPhpPath, 'scripts'))) {
-    const confDir = path.join(lando.config.userConfRoot, 'scripts');
-    const dest = lando.utils.moveConfig(path.join(landoPhpPath, 'scripts'), confDir);
-    lando.utils.makeExecutable(fs.readdirSync(dest), dest);
-    lando.log.debug('automoved scripts from %s to %s and set to mode 755',
-        path.join(landoPhpPath, 'scripts'), confDir);
-  }
-};
-
-// Builder
+/**
+ * Laravel PHP builder class that extends Lando PHP builder.
+ * Uses the bundled version of @lando/php plugin instead of user's version.
+ *
+ * @module laravel-php
+ */
 module.exports = {
   name: 'laravel-php',
   parent: '_appserver',
+  /**
+   * Builder function that returns the LaravelPhp class
+   * @param {Object} parent - Parent builder class
+   * @return {Class} LaravelPhp class extending LandoPhp builder
+   */
   builder: parent => class LaravelPhp extends LandoPhp.builder(parent, LandoPhp.config) {
+    /**
+     * Create a new LaravelPhp instance
+     * @param {string} id - Service id
+     * @param {Object} options - Service options
+     * @param {Object} factory - App factory instance
+     */
     constructor(id, options = {}, factory) {
-      loadScripts(options);
       options.nginxServiceType = 'laravel-nginx';
       super(id, options, factory);
     }