@lando/php 0.5.1 → 0.5.4

package/.nyc_output/processinfo/7a9b7642-606d-45e3-a275-61f3768ed52b.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1766,"argv":["/opt/hostedtoolcache/node/14.19.1/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":1650556423393,"ppid":1765,"coverageFilename":"/home/runner/work/php/php/.nyc_output/7a9b7642-606d-45e3-a275-61f3768ed52b.json","externalId":"","uuid":"7a9b7642-606d-45e3-a275-61f3768ed52b","files":["/home/runner/work/php/php/lib/utils.js","/home/runner/work/php/php/services/php/builder.js"]}

package/.nyc_output/processinfo/b8101546-4ea0-4907-a886-344fd146f182.json

@@ -0,0 +1 @@
+{"parent":null,"pid":1777,"argv":["/opt/hostedtoolcache/node/14.19.1/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":1650556424213,"ppid":1766,"coverageFilename":"/home/runner/work/php/php/.nyc_output/b8101546-4ea0-4907-a886-344fd146f182.json","externalId":"","uuid":"b8101546-4ea0-4907-a886-344fd146f182","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"a93a2974-f0ba-49d3-9e61-87c218714d04":{"parent":null,"children":[]},"b05f40b6-a318-4feb-bdf3-929de4f5fdcc":{"parent":null,"children":[]}},"files":{"/home/runner/work/php/php/lib/utils.js":["b05f40b6-a318-4feb-bdf3-929de4f5fdcc"],"/home/runner/work/php/php/services/php/builder.js":["b05f40b6-a318-4feb-bdf3-929de4f5fdcc"]},"externalIds":{}}
+{"processes":{"7a9b7642-606d-45e3-a275-61f3768ed52b":{"parent":null,"children":[]},"b8101546-4ea0-4907-a886-344fd146f182":{"parent":null,"children":[]}},"files":{"/home/runner/work/php/php/lib/utils.js":["7a9b7642-606d-45e3-a275-61f3768ed52b"],"/home/runner/work/php/php/services/php/builder.js":["7a9b7642-606d-45e3-a275-61f3768ed52b"]},"externalIds":{}}

package/CHANGELOG.md

@@ -1,13 +1,33 @@
 ## IN DEVELOPMENT
 
-## v0.5.1 - [February 2, 2022](https://github.com/lando/plugin-template/releases/tag/v0.5.1)
+## v0.5.4 - [April 21, 2022](https://github.com/lando/php/releases/tag/v0.5.4)
+
+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).
+
+* Clean up unused dependencies
+
+## v0.5.3 - [April 19, 2022](https://github.com/lando/php/releases/tag/v0.5.3)
+
+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).
+
+* Update default composer version (Addresses [CVE-2022-24828](https://blog.packagist.com/cve-2022-24828-composer-command-injection-vulnerability/)) [PR #33](https://github.com/lando/php/pull/33) 
+
+## v0.5.2 - [March 2, 2022](https://github.com/lando/php/releases/tag/v0.5.2)
+
+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).
+
+* Update php 7.4+ to Composer 2.2.6 [PR #25](https://github.com/lando/php/pull/25)
+
+## v0.5.1 - [February 2, 2022](https://github.com/lando/php/releases/tag/v0.5.1)
 
 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).
 
 * Add the no-interaction flag to composer global require commands [#19](https://github.com/lando/php/issues/19)
 
-## v0.5.0 - [November 9, 2021](https://github.com/lando/plugin-template/releases/tag/v0.5.0)
+## v0.5.0 - [November 9, 2021](https://github.com/lando/php/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
+
+

package/README.md

@@ -1,65 +1,43 @@
-# Lando PHP Plugin
+# PHP Lando Plugin
 
-The lando PHP plugin service.
+This is the _official_ [Lando](https://lando.dev) plugin for [PHP](https://php.net). When installed it...
 
-## Installation
+* Allows users to run various `php` versions
+* Serves applications over `nginx` or `apache`
+* Runs in `cli` mode
+* Comes with easy `composer` support
 
-```bash
-# With npm
-npm install @lando/php
+Of course, once a user is running their PHP project with Lando they can take advantage of [all the other awesome development features](https://docs.lando.dev) Lando provides.
 
-# With yarn
-yarn add @lando/php
-```
-
-## Issues, Questions and Support
-
-If you have a question or would like some community support we recommend you [join us on Slack](https://launchpass.com/devwithlando). Note that this is the Slack community for [Lando](https://lando.dev) but we are more than happy to help with this module as well!
-
-If you'd like to report a bug or submit a feature request then please [use the issue queue](https://github.com/lando/php/issues/new/choose) in this repo.
-
-## Changelog
-
-We try to log all changes big and small in both [THE CHANGELOG](https://github.com/lando/php/blob/main/CHANGELOG.md) and the [release notes](https://github.com/lando/php/releases).
+## Basic Usage
 
+Add a `php` service to your Landofile
 
-## Development
-
-* Requires [Node 14+](https://nodejs.org/dist/latest-v14.x/)
-* Prefers [Yarn](https://classic.yarnpkg.com/lang/en/docs/install)
-
-```bash
-git clone https://github.com/lando/php.git && cd php
-yarn install
+```yaml
+services:
+  myservice:
+    type: php:8.0
+    via: nginx
+    webroot: www
 ```
 
-If you dont' want to install Node 14 or Yarn for whatever reason you can install [Lando](https://docs.lando.dev/basics/installation.html) and use that:
+For more info you should check out the [docs](https://docs.lando.dev/php):
 
-```bash
-git clone https://github.com/lando/php.git && cd php
-# Install deps and get node
-lando start
+* [Getting Started](https://docs.lando.dev/php/)
+* [Configuration](https://docs.lando.dev/php/config.html)
+* [Guides](https://docs.lando.dev/php/accessing-logs.html)
+* [Examples](https://github.com/lando/php/tree/main/examples)
+* [Development](https://docs.lando.dev/php/development.html)
 
-# Run commands
-lando node
-lando yarn
-```
-
-## Testing
+## Issues, Questions and Support
 
-```bash
-# Lint the code
-yarn lint
+If you have a question or would like some community support we recommend you [join us on Slack](https://launchpass.com/devwithlando).
 
-# Run unit tests
-yarn test
-```
+If you'd like to report a bug or submit a feature request then please [use the issue queue](https://github.com/lando/php/issues/new/choose) in this repo.
 
-## Releasing
+## Changelog
 
-```bash
-yarn release
-```
+We try to log all changes big and small in both [THE CHANGELOG](https://github.com/lando/php/blob/main/CHANGELOG.md) and the [release notes](https://github.com/lando/php/releases).
 
 ## Contributors
 
@@ -69,6 +47,7 @@ yarn release
 
 Made with [contributors-img](https://contrib.rocks).
 
-## Other Resources
+## Other Selected Resources
 
-* [Important advice](https://www.youtube.com/watch?v=WA4iX5D9Z64)
+* [LICENSE](https://github.com/lando/php/blob/main/LICENSE.md)
+* [The best professional advice ever](https://www.youtube.com/watch?v=tkBVDh7my9Q)

package/coverage/index.html

@@ -115,10 +115,9 @@
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener">istanbul</a>
-                at Wed Feb 02 2022 13:18:41 GMT+0000 (Coordinated Universal Time)
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at Thu Apr 21 2022 15:53:44 GMT+0000 (Coordinated Universal Time)
             </div>
-        </div>
         <script src="prettify.js"></script>
         <script>
             window.onload = function () {

package/coverage/lib/index.html

@@ -100,10 +100,9 @@
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener">istanbul</a>
-                at Wed Feb 02 2022 13:18:41 GMT+0000 (Coordinated Universal Time)
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at Thu Apr 21 2022 15:53:44 GMT+0000 (Coordinated Universal Time)
             </div>
-        </div>
         <script src="../prettify.js"></script>
         <script>
             window.onload = function () {

package/coverage/lib/utils.js.html

@@ -249,10 +249,9 @@ const _ = <span class="cstat-no" title="statement not covered" >require('lodash'
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener">istanbul</a>
-                at Wed Feb 02 2022 13:18:41 GMT+0000 (Coordinated Universal Time)
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at Thu Apr 21 2022 15:53:44 GMT+0000 (Coordinated Universal Time)
             </div>
-        </div>
         <script src="../prettify.js"></script>
         <script>
             window.onload = function () {

package/coverage/services/php/builder.js.html

@@ -603,7 +603,7 @@ const parseConfig = <span class="cstat-no" title="statement not covered" ><span
     ],
     confSrc: __dirname,
     command: ['sh -c \'a2enmod rewrite &amp;&amp; apache2-foreground\''],
-    composer_version: '2.0.7',
+    composer_version: '2.2.12',
     image: 'apache',
     defaultFiles: {
       _php: 'php.ini',
@@ -711,10 +711,9 @@ const parseConfig = <span class="cstat-no" title="statement not covered" ><span
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener">istanbul</a>
-                at Wed Feb 02 2022 13:18:41 GMT+0000 (Coordinated Universal Time)
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at Thu Apr 21 2022 15:53:44 GMT+0000 (Coordinated Universal Time)
             </div>
-        </div>
         <script src="../../prettify.js"></script>
         <script>
             window.onload = function () {

package/coverage/services/php/index.html

@@ -100,10 +100,9 @@
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener">istanbul</a>
-                at Wed Feb 02 2022 13:18:41 GMT+0000 (Coordinated Universal Time)
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at Thu Apr 21 2022 15:53:44 GMT+0000 (Coordinated Universal Time)
             </div>
-        </div>
         <script src="../../prettify.js"></script>
         <script>
             window.onload = function () {

package/images/7.3-apache/Dockerfile

@@ -74,10 +74,9 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     gettext \
     pcntl \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
+  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
   && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

package/images/7.3-fpm/Dockerfile

@@ -74,10 +74,9 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     gettext \
     pcntl \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
+  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
   && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

package/images/7.4-apache/Dockerfile

@@ -69,7 +69,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && docker-php-ext-install soap \
   && docker-php-ext-install zip \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.0.7 \
+  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
   && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/images/7.4-fpm/Dockerfile

@@ -69,7 +69,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && docker-php-ext-install soap \
   && docker-php-ext-install zip \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.0.7 \
+  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
   && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/images/8.0-apache/Dockerfile

@@ -70,7 +70,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && docker-php-ext-install soap \
   && docker-php-ext-install zip \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.0.7 \
+  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
   && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/images/8.0-fpm/Dockerfile

@@ -70,7 +70,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && docker-php-ext-install soap \
   && docker-php-ext-install zip \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.0.7 \
+  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
   && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/images/8.1-apache/Dockerfile

@@ -70,7 +70,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && docker-php-ext-install soap \
   && docker-php-ext-install zip \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.0.7 \
+  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
   && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/images/8.1-fpm/Dockerfile

@@ -70,7 +70,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && docker-php-ext-install soap \
   && docker-php-ext-install zip \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.0.7 \
+  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
   && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/netlify.toml

@@ -1,10 +1,7 @@
 [build]
   base = "./"
-  publish = "_site"
+  publish = "docs/.vuepress/dist"
   command = "yarn docs:build"
-  # This sort of lets us build only on tagged commits to prod
-  # [context.production]
-  #   ignore = "if git diff $CACHED_COMMIT_REF $COMMIT_REF ./package.json | grep - | grep version && git diff $CACHED_COMMIT_REF $COMMIT_REF ./package.json | grep + | grep version; then exit 1; else exit 0; fi"
 
 # Sets our asset optimization
 [build.processing.css]
@@ -23,3 +20,13 @@
   for = "/images/*"
   [headers.values]
 	  Cache-Control = "public, max-age=31536000"
+
+# We need this so preview environments and the base site look ok on their own
+[[redirects]]
+  from = "/"
+  to = "/php"
+  status = 200
+[[redirects]]
+  from = "/php/*"
+  to = "/:splat"
+  status = 200

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/php",
   "description": "A Lando plugin that provides a tight integration with PHP.",
-  "version": "0.5.1",
+  "version": "0.5.4",
   "author": "John Ouellet @labboy0276",
   "license": "GPL-3.0",
   "repository": "lando/php",
@@ -31,8 +31,8 @@
   },
   "scripts": {
     "coverage": "nyc report --reporter=text-lcov | coveralls",
-    "docs:dev": "vuepress dev docs",
-    "docs:build": "vuepress build docs --dest _site",
+    "docs:dev": "vuepress dev docs --clean-cache --clean-temp",
+    "docs:build": "vuepress build docs",
     "docs:lint": "eslint -c docs/.eslintrc.json --quiet docs/.vuepress",
     "lint": "eslint --quiet . && yarn docs:lint",
     "release": "bump --prompt --tag --all --push",
@@ -42,13 +42,12 @@
   },
   "dependencies": {
     "js-yaml": "^3.4.6",
-    "lodash": "^4.17.21",
-    "tar": "^6.1.11"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "^0.6.4",
-    "@lando/vuepress-theme-lando-docs": "^0.2.3",
+    "@lando/vuepress-theme-default-plus": "1.0.0-beta.30",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
@@ -57,6 +56,6 @@
     "mocha": "^9.1.2",
     "nyc": "^15.1.0",
     "version-bump-prompt": "^4.2.1",
-    "vuepress": "^2.0.0-beta.27"
+    "vuepress": "^2.0.0-beta.35"
   }
 }

package/services/php/builder.js

@@ -110,7 +110,7 @@ module.exports = {
     ],
     confSrc: __dirname,
     command: ['sh -c \'a2enmod rewrite && apache2-foreground\''],
-    composer_version: '2.0.7',
+    composer_version: '2.2.12',
     image: 'apache',
     defaultFiles: {
       _php: 'php.ini',

package/.nyc_output/processinfo/a93a2974-f0ba-49d3-9e61-87c218714d04.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1676,"argv":["/opt/hostedtoolcache/node/14.18.3/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":1643807920787,"ppid":1665,"coverageFilename":"/home/runner/work/php/php/.nyc_output/a93a2974-f0ba-49d3-9e61-87c218714d04.json","externalId":"","uuid":"a93a2974-f0ba-49d3-9e61-87c218714d04","files":[]}

package/.nyc_output/processinfo/b05f40b6-a318-4feb-bdf3-929de4f5fdcc.json

@@ -1 +0,0 @@
-{"parent":null,"pid":1665,"argv":["/opt/hostedtoolcache/node/14.18.3/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":1643807920051,"ppid":1664,"coverageFilename":"/home/runner/work/php/php/.nyc_output/b05f40b6-a318-4feb-bdf3-929de4f5fdcc.json","externalId":"","uuid":"b05f40b6-a318-4feb-bdf3-929de4f5fdcc","files":["/home/runner/work/php/php/lib/utils.js","/home/runner/work/php/php/services/php/builder.js"]}