@lando/php 0.10.0 → 0.10.2

package/.nyc_output/processinfo/41cf4733-5fd1-4901-8efe-1d8147fe6dfd.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2031,"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":1701231814306,"ppid":2020,"coverageFilename":"/home/runner/work/php/php/.nyc_output/41cf4733-5fd1-4901-8efe-1d8147fe6dfd.json","externalId":"","uuid":"41cf4733-5fd1-4901-8efe-1d8147fe6dfd","files":[]}

package/.nyc_output/processinfo/ad2f5569-33d5-49eb-a1cf-96c429e575e8.json

@@ -0,0 +1 @@
+{"parent":null,"pid":2020,"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":1701231814117,"ppid":2019,"coverageFilename":"/home/runner/work/php/php/.nyc_output/ad2f5569-33d5-49eb-a1cf-96c429e575e8.json","externalId":"","uuid":"ad2f5569-33d5-49eb-a1cf-96c429e575e8","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"3f3dab62-d0cb-4485-a4eb-6821012b5917":{"parent":null,"children":[]},"bcd2e306-a8a2-474b-b7e0-35972746fd96":{"parent":null,"children":[]}},"files":{},"externalIds":{}}
+{"processes":{"41cf4733-5fd1-4901-8efe-1d8147fe6dfd":{"parent":null,"children":[]},"ad2f5569-33d5-49eb-a1cf-96c429e575e8":{"parent":null,"children":[]}},"files":{},"externalIds":{}}

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.10.2 - [November 28, 2023](https://github.com/lando/php/releases/tag/v0.10.2)
+* Added option to override the image powering the service.
+* Removed apparmor step from image building.
+
+## 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)

package/builders/php-nginx.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const LandoNginx = require('./../node_modules/@lando/nginx/builders/nginx.js');
+const LandoNginx = require('@lando/nginx/builders/nginx.js');
 
 // Builder
 module.exports = {

package/builders/php.js

@@ -21,7 +21,7 @@ const nginxConfig = options => ({
   project: options.project,
   root: options.root,
   ssl: options.nginxSsl,
-  type: 'php-nginx',
+  type: options.nginxServiceType,
   userConfRoot: options.userConfRoot,
   webroot: options.webroot,
   version: options.via.split(':')[1],
@@ -63,7 +63,7 @@ const parseCli = options => {
  */
 const parseNginx = options => {
   options.command = (process.platform !== 'win32') ? ['php-fpm'] : ['php-fpm -R'];
-  options.image = 'fpm';
+  options.phpServer = 'fpm';
   options.remoteFiles.vhosts = '/opt/bitnami/nginx/conf/lando.conf';
   options.defaultFiles.vhosts = (options.ssl) ? 'default-ssl.conf.tpl' : 'default.conf.tpl';
   options.nginxSsl = options.ssl;
@@ -110,7 +110,7 @@ module.exports = {
     confSrc: path.resolve(__dirname, '..', 'config'),
     command: ['sh -c \'a2enmod rewrite && apache2-foreground\''],
     composer_version: '2.2.18',
-    image: 'apache',
+    phpServer: 'apache',
     defaultFiles: {
       _php: 'php.ini',
       vhosts: 'default.conf',
@@ -132,6 +132,7 @@ module.exports = {
     via: 'apache',
     volumes: ['/usr/local/bin'],
     webroot: '.',
+    nginxServiceType: 'php-nginx',
   },
   parent: '_appserver',
   builder: (parent, config) => class LandoPhp extends parent {
@@ -154,7 +155,8 @@ module.exports = {
 
       // Build the php
       const php = {
-        image: `devwithlando/php:${options.version}-${options.image}-${options.suffix}`,
+        image: _.get(options, 'image') ?
+          options.image : `devwithlando/php:${options.version}-${options.phpServer}-${options.suffix}`,
         environment: _.merge({}, options.environment, {
           PATH: options.path.join(':'),
           LANDO_WEBROOT: `/app/${options.webroot}`,
@@ -192,7 +194,7 @@ module.exports = {
         const nginxOpts = nginxConfig(options);
 
         // Merge in any user specifified
-        const PhpNginx = factory.get('php-nginx');
+        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`, {});

package/coverage/index.html

@@ -86,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-11-21T20:14:14.144Z
+                at 2023-11-29T04:23:34.503Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/php",
   "description": "A Lando plugin that provides a tight integration with PHP.",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/php",

package/.nyc_output/processinfo/3f3dab62-d0cb-4485-a4eb-6821012b5917.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1974,"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":1700597653751,"ppid":1973,"coverageFilename":"/home/runner/work/php/php/.nyc_output/3f3dab62-d0cb-4485-a4eb-6821012b5917.json","externalId":"","uuid":"3f3dab62-d0cb-4485-a4eb-6821012b5917","files":[]}

package/.nyc_output/processinfo/bcd2e306-a8a2-474b-b7e0-35972746fd96.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1985,"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":1700597653949,"ppid":1974,"coverageFilename":"/home/runner/work/php/php/.nyc_output/bcd2e306-a8a2-474b-b7e0-35972746fd96.json","externalId":"","uuid":"bcd2e306-a8a2-474b-b7e0-35972746fd96","files":[]}