@lando/php 0.9.0 → 0.10.1

package/.node-version

@@ -1 +1 @@
-16
+18

package/.nyc_output/33a95323-e2a9-46ad-b3d5-f5e5411e7140.json

@@ -0,0 +1 @@
+{}

package/.nyc_output/processinfo/13cec594-963c-4e3a-ad7a-a8adee6104c3.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2039,"argv":["/opt/hostedtoolcache/node/18.18.2/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1701122258224,"ppid":2028,"coverageFilename":"/home/runner/work/php/php/.nyc_output/13cec594-963c-4e3a-ad7a-a8adee6104c3.json","externalId":"","uuid":"13cec594-963c-4e3a-ad7a-a8adee6104c3","files":[]}

package/.nyc_output/processinfo/33a95323-e2a9-46ad-b3d5-f5e5411e7140.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2028,"argv":["/opt/hostedtoolcache/node/18.18.2/x64/bin/node","/home/runner/work/php/php/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/php/php","time":1701122258034,"ppid":2027,"coverageFilename":"/home/runner/work/php/php/.nyc_output/33a95323-e2a9-46ad-b3d5-f5e5411e7140.json","externalId":"","uuid":"33a95323-e2a9-46ad-b3d5-f5e5411e7140","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"36aaa902-a24e-4870-b1a6-90ad6d8f9432":{"parent":null,"children":[]},"a34cf428-a006-4783-94b9-89cb4b6bca82":{"parent":null,"children":[]}},"files":{"/home/runner/work/php/php/lib/utils.js":["a34cf428-a006-4783-94b9-89cb4b6bca82"],"/home/runner/work/php/php/services/php/builder.js":["a34cf428-a006-4783-94b9-89cb4b6bca82"]},"externalIds":{}}
+{"processes":{"13cec594-963c-4e3a-ad7a-a8adee6104c3":{"parent":null,"children":[]},"33a95323-e2a9-46ad-b3d5-f5e5411e7140":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.10.1 - [November 27, 2023](https://github.com/lando/php/releases/tag/v0.10.1)
+* Removed relative references to dependencies.
+* Added nginxServiceType option so other services can override the default `php-nginx` service with their own.
+
+## v0.10.0 - [November 21, 2023](https://github.com/lando/php/releases/tag/v0.10.0)
+* Removed MultiViews from Apache config. [#66](https://github.com/lando/php/issues/66)
+* Isolated PHP to work as a standalone service. [#78](https://github.com/lando/php/pull/78)
+
 ## v0.9.0 - [July 3, 2023](https://github.com/lando/php/releases/tag/v0.9.0)
   * Removed bundle-dependencies and version-bump-prompt from plugin.
   * Updated package to use prepare-release-action.

package/builders/php-nginx.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const _ = require('lodash');
+const LandoNginx = require('@lando/nginx/builders/nginx.js');
+
+// Builder
+module.exports = {
+  name: 'php-nginx',
+  parent: '_webserver',
+  builder: (parent, config) => class PhpNginx extends LandoNginx.builder(parent, LandoNginx.config) {
+    constructor(id, options = {}) {
+      super(id, options, {services: _.set({}, options.name)});
+    };
+  },
+};

package/{services/php/builder.js → builders/php.js}

@@ -4,8 +4,7 @@
 const _ = require('lodash');
 const path = require('path');
 const semver = require('semver');
-const utils = require('./../../lib/utils');
-
+const addBuildStep = require('./../utils/add-build-step');
 /*
  * Helper to get nginx config
  */
@@ -18,11 +17,11 @@ const nginxConfig = options => ({
   info: {managed: true},
   home: options.home,
   name: `${options.name}_nginx`,
-  overrides: utils.cloneOverrides(options.overrides),
+  overrides: require('../utils/clone-overrides')(options.overrides),
   project: options.project,
   root: options.root,
   ssl: options.nginxSsl,
-  type: 'nginx',
+  type: options.nginxServiceType,
   userConfRoot: options.userConfRoot,
   webroot: options.webroot,
   version: options.via.split(':')[1],
@@ -108,7 +107,7 @@ module.exports = {
       '/var/www/.composer/vendor/bin',
       '/helpers',
     ],
-    confSrc: __dirname,
+    confSrc: path.resolve(__dirname, '..', 'config'),
     command: ['sh -c \'a2enmod rewrite && apache2-foreground\''],
     composer_version: '2.2.18',
     image: 'apache',
@@ -133,6 +132,7 @@ module.exports = {
     via: 'apache',
     volumes: ['/usr/local/bin'],
     webroot: '.',
+    nginxServiceType: 'php-nginx',
   },
   parent: '_appserver',
   builder: (parent, config) => class LandoPhp extends parent {
@@ -171,34 +171,41 @@ module.exports = {
 
       // Add our composer things to run step
       if (!_.isEmpty(options.composer)) {
-        const commands = utils.getInstallCommands(options.composer, pkger, ['composer', 'global', 'require', '-n']);
-        utils.addBuildStep(commands, options._app, options.name, 'build_internal');
+        const commands =
+          require('../utils/get-install-commands')(options.composer, pkger, ['composer', 'global', 'require', '-n']);
+        addBuildStep(commands, options._app, options.name, 'build_internal');
       }
 
       // Add activate steps for xdebug
       if (options.xdebug) {
-        utils.addBuildStep(['docker-php-ext-enable xdebug'], options._app, options.name, 'build_as_root_internal');
+        addBuildStep(['docker-php-ext-enable xdebug'], options._app, options.name, 'build_as_root_internal');
       }
 
       // Install the desired composer version
       if (options.composer_version) {
         const commands = [`/helpers/install-composer.sh ${options.composer_version}`];
-        utils.addBuildStep(commands, options._app, options.name, 'build_internal', true);
+        addBuildStep(commands, options._app, options.name, 'build_internal', true);
       }
 
       // Add in nginx if we need to
       if (_.startsWith(options.via, 'nginx')) {
         // Set another lando service we can pass down the stream
         const nginxOpts = nginxConfig(options);
+
         // Merge in any user specifified
-        const LandoNginx = factory.get('nginx');
-        const data = new LandoNginx(nginxOpts.name, nginxOpts);
+        const PhpNginx = factory.get(nginxOpts.type);
+        const data = new PhpNginx(nginxOpts.name, nginxOpts);
         // If the user has overriden this service lets make sure we include that as well
         const userOverrides = _.get(options, `_app.config.services.${nginxOpts.name}.overrides`, {});
         data.data.push({
           services: _.set({}, nginxOpts.name, userOverrides),
           version: _.get(data, 'data[0].version'),
         });
+        // Add a depends_on to make sure nginx waits for php-fpm to be up.
+        data.data.push({
+          services: _.set({}, nginxOpts.name, {'depends_on': [options.name]}),
+          version: _.get(data, 'data[0].version'),
+        });
         // This is a trick to basically replicate what happens upstream
         options._app.add(data);
         options._app.info.push(data.info);

package/{services/php → config}/default-ssl.conf

@@ -12,7 +12,7 @@
   ServerAdmin webmaster@localhost
   DocumentRoot ${LANDO_WEBROOT}
   <Directory />
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes FollowSymLinks
     AllowOverride All
     Order allow,deny
     Allow from all
@@ -48,7 +48,7 @@
 
     DocumentRoot ${LANDO_WEBROOT}
     <Directory />
-      Options Indexes FollowSymLinks MultiViews
+      Options Indexes FollowSymLinks
       AllowOverride All
       Order allow,deny
       Allow from all

package/{services/php → config}/default.conf

@@ -12,7 +12,7 @@
   ServerAdmin webmaster@localhost
   DocumentRoot ${LANDO_WEBROOT}
   <Directory />
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes FollowSymLinks
     AllowOverride All
     Order allow,deny
     Allow from all

package/coverage/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">Unknown% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>0/92</span>
+                <span class='fraction'>0/0</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">Unknown% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/57</span>
+                <span class='fraction'>0/0</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">Unknown% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>0/17</span>
+                <span class='fraction'>0/0</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">Unknown% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>0/81</span>
+                <span class='fraction'>0/0</span>
             </div>
         
             
@@ -61,7 +61,7 @@
             </div>
         </template>
     </div>
-    <div class='status-line low'></div>
+    <div class='status-line medium'></div>
     <div class="pad1">
 <table class="coverage-summary">
 <thead>
@@ -78,37 +78,7 @@
    <th data-col="lines_raw" data-type="number" data-fmt="html" class="abs"></th>
 </tr>
 </thead>
-<tbody><tr>
-	<td class="file low" data-value="lib"><a href="lib/index.html">lib</a></td>
-	<td data-value="0" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
-	</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="23" class="abs low">0/23</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="15" class="abs low">0/15</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="8" class="abs low">0/8</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="20" class="abs low">0/20</td>
-	</tr>
-
-<tr>
-	<td class="file low" data-value="services/php"><a href="services/php/index.html">services/php</a></td>
-	<td data-value="0" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
-	</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="69" class="abs low">0/69</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="42" class="abs low">0/42</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="9" class="abs low">0/9</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="61" class="abs low">0/61</td>
-	</tr>
-
-</tbody>
+<tbody></tbody>
 </table>
 </div>
                 <div class='push'></div><!-- for sticky footer -->
@@ -116,7 +86,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2023-07-03T19:48:18.214Z
+                at 2023-11-27T21:57:38.429Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/node_modules/@lando/nginx/.editorconfig

@@ -0,0 +1,12 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[*.js]
+indent_style = space
+indent_size = 2

package/node_modules/@lando/nginx/.eslintignore

@@ -0,0 +1,4 @@
+.temp
+.cache
+dist
+_site

package/node_modules/@lando/nginx/.eslintrc.json

@@ -0,0 +1,31 @@
+{
+  "env": {
+    "node": true,
+    "mocha": true
+  },
+  "parser": "@babel/eslint-parser",
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaVersion": 8,
+    "requireConfigFile": false
+  },
+  "extends": "google",
+  "rules": {
+    "arrow-parens": ["error",
+      "as-needed"
+    ],
+    "max-len": ["error", {
+      "code": 120,
+      "ignoreComments": true
+    }],
+    "require-jsdoc": ["error", {
+      "require": {
+        "FunctionDeclaration": true,
+        "MethodDefinition": false,
+        "ClassDeclaration": false,
+        "ArrowFunctionExpression": false,
+        "FunctionExpression": false
+      }
+    }]
+  }
+}

package/node_modules/@lando/nginx/.gitattributes

@@ -0,0 +1,11 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Declare files that will always have LF line endings on checkout.
+*.js text eol=lf
+*.sh text eol=lf
+*.conf text eol=lf
+*.cnf text eol=lf
+*.ini text eol=lf
+*.php text eol=lf
+*.vcl text eol=lf

package/node_modules/@lando/nginx/.lando.yml

@@ -0,0 +1,14 @@
+name: lando-nginx-plugin
+services:
+  node:
+    type: node:16
+    build:
+      - yarn install
+    scanner: false
+    ssl: false
+    sslExpose: false
+tooling:
+  node:
+    service: node
+  yarn:
+    service: node

package/node_modules/@lando/nginx/.node-version

@@ -0,0 +1 @@
+16

package/node_modules/@lando/nginx/.nyc_output/25008f82-06ee-4bbc-8343-1d528da4b82d.json

@@ -0,0 +1 @@
+{}

package/node_modules/@lando/nginx/.nyc_output/6426f44d-f78d-4e10-9b15-d18497ce3d61.json

@@ -0,0 +1 @@
+{}

package/node_modules/@lando/nginx/.nyc_output/processinfo/25008f82-06ee-4bbc-8343-1d528da4b82d.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2030,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1700078683137,"ppid":2019,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/25008f82-06ee-4bbc-8343-1d528da4b82d.json","externalId":"","uuid":"25008f82-06ee-4bbc-8343-1d528da4b82d","files":[]}

package/node_modules/@lando/nginx/.nyc_output/processinfo/6426f44d-f78d-4e10-9b15-d18497ce3d61.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2019,"argv":["/opt/hostedtoolcache/node/16.20.2/x64/bin/node","/home/runner/work/nginx/nginx/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/nginx/nginx","time":1700078682991,"ppid":2018,"coverageFilename":"/home/runner/work/nginx/nginx/.nyc_output/6426f44d-f78d-4e10-9b15-d18497ce3d61.json","externalId":"","uuid":"6426f44d-f78d-4e10-9b15-d18497ce3d61","files":[]}

package/node_modules/@lando/nginx/.nyc_output/processinfo/index.json

@@ -0,0 +1 @@
+{"processes":{"25008f82-06ee-4bbc-8343-1d528da4b82d":{"parent":null,"children":[]},"6426f44d-f78d-4e10-9b15-d18497ce3d61":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/node_modules/@lando/nginx/CHANGELOG.md

@@ -0,0 +1,30 @@
+## v0.10.0 - [November 15, 2023](https://github.com/lando/nginx/releases/tag/v0.10.0)
+* Moved builder file to the new builders/ directory.
+* Isolated testing to fit with HARDCORE strategy.
+
+## v0.9.0 - [July 3, 2023](https://github.com/lando/nginx/releases/tag/v0.9.0)
+* Removed bundle-dependencies and version-bump-prompt from plugin.
+* Updated package to use prepare-release-action.
+* Updated documentation to reflect new release process.
+
+## v0.8.0 - [May 10, 2023](https://github.com/lando/nginx/releases/tag/v0.8.0)
+
+* Added support for `nginx:1.19`
+* Added support for `nginx:1.20`
+* Added support for `nginx:1.21`
+* Added support for `nginx:1.22`
+* Added support for `nginx:1.23`
+* Added support for `nginx:1.24`
+
+## v0.7.0 - [December 12, 2022](https://github.com/lando/nginx/releases/tag/v0.7.0)
+
+* Added bundle-dependencies to release process.
+* Fixed bug in plugin dogfooding test.
+
+## v0.6.0 - [September 7, 2022](https://github.com/lando/nginx/releases/tag/v0.6.0)
+
+## v0.5.0 - [November 9, 2021](https://github.com/lando/nginx/releases/tag/v0.5.0)
+
+Lando is **free** and **open source** software that relies on contributions from developers like you! If you like Lando then help us spend more time making, updating and supporting it by [contributing](https://github.com/sponsors/lando).
+
+* Initial Release