Merge branch 'main' into php-82

.github/workflows/build-php-images.yml

@@ -13,6 +13,7 @@ jobs:
     env:
       TERM: xterm
     strategy:
+      fail-fast: false
       matrix:
         include:
           - image: php
@@ -78,21 +79,14 @@ jobs:
           tags: devwithlando/${{ matrix.image }}:${{ matrix.tag }}${{ steps.pr.outputs.TAG_SUFFIX }}
 
       # Handle Lando Install to test the images after build
-      # We are hardcoding the dtaa normally included in the matrix 
+      # We are hardcoding the dtaa normally included in the matrix
       # due to how this testing is setup
-      - name: Install node 14
+      - name: Install node 16
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
-      - name: Get Yarn cache directory
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Use Yarn cache
-        uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ubuntu-20.04-yarn-14-${{ hashFiles('**/yarn.lock') }}
+          node-version: '16'
+          registry-url: https://registry.npmjs.org
+          cache: yarn
       - name: Install Yarn dependencies
         run: yarn install --prefer-offline --frozen-lockfile
       - name: Grab latest edge Lando CLI
@@ -108,7 +102,8 @@ jobs:
       - name: Verify Lando works and we are dogfooding this plugin for tests
         run: |
           lando version
-          lando config --path plugins | grep php | grep /home/runner/work/php/php || echo "::error:: Not dogfooding this plugin correctly! "
+          lando config --path plugins | grep php | grep /home/runner/work/php/php || (echo "::error:: Not dogfooding this plugin correctly! " && exit 1)
+
       # This block should eventually become use lando/actions-leia@v2
       # @NOTE? Do we want a way for our leia-action to configure apparmor since
       # this might break a whole bunch of tests? or is this literally just a thing

.github/workflows/pr-legacy-php5-tests.yml

@@ -9,6 +9,7 @@ jobs:
     env:
       TERM: xterm
     strategy:
+      fail-fast: false
       matrix:
         leia-tests:
           - examples/5.3
@@ -52,7 +53,7 @@ jobs:
       - name: Verify Lando works and we are dogfooding this plugin for tests
         run: |
           lando version
-          lando config --path plugins | grep php | grep /home/runner/work/php/php || echo "::error:: Not dogfooding this plugin correctly! "
+          lando config --path plugins | grep php | grep /home/runner/work/php/php || (echo "::error:: Not dogfooding this plugin correctly! " && exit 1)
 
       # This block should eventually become use lando/actions-leia@v2
       # @NOTE? Do we want a way for our leia-action to configure apparmor since

.github/workflows/pr-legacy-php7-tests.yml

@@ -9,6 +9,7 @@ jobs:
     env:
       TERM: xterm
     strategy:
+      fail-fast: false
       matrix:
         leia-tests:
           - examples/7.0
@@ -51,7 +52,7 @@ jobs:
       - name: Verify Lando works and we are dogfooding this plugin for tests
         run: |
           lando version
-          lando config --path plugins | grep php | grep /home/runner/work/php/php || echo "::error:: Not dogfooding this plugin correctly! "
+          lando config --path plugins | grep php | grep /home/runner/work/php/php || (echo "::error:: Not dogfooding this plugin correctly! " && exit 1)
 
       # This block should eventually become use lando/actions-leia@v2
       # @NOTE? Do we want a way for our leia-action to configure apparmor since

.github/workflows/pr-php-extension-tests.yml

@@ -9,6 +9,7 @@ jobs:
     env:
       TERM: xterm
     strategy:
+      fail-fast: false
       matrix:
         leia-tests:
           - examples/php-extensions
@@ -19,8 +20,6 @@ jobs:
         node-version:
           - '16'
     steps:
-
-
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Install node ${{ matrix.node-version }}
@@ -50,7 +49,7 @@ jobs:
       - name: Verify Lando works and we are dogfooding this plugin for tests
         run: |
           lando version
-          lando config --path plugins | grep php | grep /home/runner/work/php/php || echo "::error:: Not dogfooding this plugin correctly! "
+          lando config --path plugins | grep php | grep /home/runner/work/php/php || (echo "::error:: Not dogfooding this plugin correctly! " && exit 1)
 
       # This block should eventually become use lando/actions-leia@v2
       # @NOTE? Do we want a way for our leia-action to configure apparmor since

.github/workflows/pr-php-other-tests.yml

@@ -9,6 +9,7 @@ jobs:
     env:
       TERM: xterm
     strategy:
+      fail-fast: false
       matrix:
         leia-tests:
           - examples/custom
@@ -51,7 +52,7 @@ jobs:
       - name: Verify Lando works and we are dogfooding this plugin for tests
         run: |
           lando version
-          lando config --path plugins | grep php | grep /home/runner/work/php/php || echo "::error:: Not dogfooding this plugin correctly! "
+          lando config --path plugins | grep php | grep /home/runner/work/php/php || (echo "::error:: Not dogfooding this plugin correctly! " && exit 1)
 
       # This block should eventually become use lando/actions-leia@v2
       # @NOTE? Do we want a way for our leia-action to configure apparmor since

.github/workflows/pr-php7-tests.yml

@@ -9,6 +9,7 @@ jobs:
     env:
       TERM: xterm
     strategy:
+      fail-fast: false
       matrix:
         php-versions:
           - '7.3'
@@ -50,7 +51,7 @@ jobs:
       - name: Verify Lando works and we are dogfooding this plugin for tests
         run: |
           lando version
-          lando config --path plugins | grep php | grep /home/runner/work/php/php || echo "::error:: Not dogfooding this plugin correctly! "
+          lando config --path plugins | grep php | grep /home/runner/work/php/php || (echo "::error:: Not dogfooding this plugin correctly! " && exit 1)
 
       # This block should eventually become use lando/actions-leia@v2
       # @NOTE? Do we want a way for our leia-action to configure apparmor since

.github/workflows/pr-php8-tests.yml

@@ -9,6 +9,7 @@ jobs:
     env:
       TERM: xterm
     strategy:
+      fail-fast: false
       matrix:
         php-versions:
           - '8.0'
@@ -51,7 +52,7 @@ jobs:
       - name: Verify Lando works and we are dogfooding this plugin for tests
         run: |
           lando version
-          lando config --path plugins | grep php | grep /home/runner/work/php/php || echo "::error:: Not dogfooding this plugin correctly! "
+          lando config --path plugins | grep php | grep /home/runner/work/php/php || (echo "::error:: Not dogfooding this plugin correctly! " && exit 1)
 
       # This block should eventually become use lando/actions-leia@v2
       # @NOTE? Do we want a way for our leia-action to configure apparmor since

CHANGELOG.md

@@ -1,11 +1,9 @@
 ## v0.7.1 - [January 6th, 2022](https://github.com/lando/php/releases/tag/v0.7.1)
-
 * Added support for PHP 8.2 [#51](https://github.com/lando/php/pull/51)
 
-## v0.7.0 - [December 16, 2022](https://github.com/lando/php/releases/tag/v0.7.0)
-
-* Added bundle-dependencies to release process
-* Fixed bug in plugin dogfooding test
+## v0.7.0 - [December 12, 2022](https://github.com/lando/php/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/php/releases/tag/v0.6.0)
 

examples/php-extensions/Dockerfile.custom

@@ -1,4 +1,4 @@
-FROM devwithlando/php:7.3-apache-2
+FROM devwithlando/php:7.4-apache-2
 
 # Add php extension helper
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

examples/php-extensions/README.md

@@ -3,7 +3,7 @@ PHP Extensions Example
 
 This example exists primarily to test the following:
 
-* [Installing PHP Extensions on Lando](https://docs.lando.devguides/installing-php-extensions-on-lando.html)
+* [Installing PHP Extensions on Lando](https://docs.lando.dev/guides/installing-php-extensions-on-lando.html)
 * [Issue #1894](https://github.com/lando/lando/pull/1894)
 * [Issue #1906](https://github.com/lando/lando/pull/1906)
 * [Issue #2201](https://github.com/lando/lando/pull/2201)

images/7.3-apache/Dockerfile

@@ -45,7 +45,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && pecl install memcached \
   && pecl install oauth-2.0.3 \
   && pecl install redis-4.2.0 \
-  && pecl install xdebug \
+  && pecl install xdebug-3.1.6 \
   && docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr \
   && docker-php-ext-configure imap --with-imap-ssl --with-kerberos \
   && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \

images/7.3-fpm/Dockerfile

@@ -45,7 +45,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && pecl install memcached \
   && pecl install oauth-2.0.3 \
   && pecl install redis-4.2.0 \
-  && pecl install xdebug \
+  && pecl install xdebug-3.1.6 \
   && docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr \
   && docker-php-ext-configure imap --with-imap-ssl --with-kerberos \
   && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \

images/7.4-apache/Dockerfile

@@ -45,7 +45,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && pecl install memcached \
   && pecl install oauth-2.0.4 \
   && pecl install redis-5.1.1 \
-  && pecl install xdebug \
+  && pecl install xdebug-3.1.6 \
   && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \
   && docker-php-ext-enable apcu \
   && docker-php-ext-enable imagick \

images/7.4-fpm/Dockerfile

@@ -45,7 +45,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && pecl install memcached \
   && pecl install oauth-2.0.4 \
   && pecl install redis-5.1.1 \
-  && pecl install xdebug \
+  && pecl install xdebug-3.1.6 \
   && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \
   && docker-php-ext-enable apcu \
   && docker-php-ext-enable imagick \

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/php",
   "description": "A Lando plugin that provides a tight integration with PHP.",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/php",
@@ -16,7 +16,10 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "bundledDependencies": true,
+  "bundledDependencies": [
+    "lodash",
+    "semver"
+  ],
   "lando": {},
   "main": "index.js",
   "nyc": {
@@ -38,7 +41,7 @@
     "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",
+    "release": "bundle-dependencies update && bump --prompt --tag --all --push",
     "test:unit": "nyc --reporter=html --reporter=text mocha --timeout 5000 test/**/*.spec.js",
     "test:leia": "yarn leia \"examples/**/README.md\" -c 'Destroy tests' --stdin",
     "test": "yarn lint && yarn test:unit"
@@ -51,6 +54,7 @@
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "^0.6.4",
     "@lando/vuepress-theme-default-plus": "1.0.0-beta.44",
+    "bundle-dependencies": "^1.0.2",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
@@ -61,4 +65,4 @@
     "version-bump-prompt": "^4.2.1",
     "vuepress": "2.0.0-beta.53"
   }
-}
+}