Merge branch 'develop' into add/srv/vvv

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,8 +1,8 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: 'bug'
+title: 'Bug: '
+labels: 'type:bug'
 assignees: ''
 
 ---
@@ -19,7 +19,7 @@ assignees: ''
 <!--- If describing a bug, tell us what happens instead of the expected behavior -->
 <!--- If suggesting a change/improvement, explain the difference from current behavior -->
 
-## Possible Solution
+## Possible Solution?
 <!--- Not obligatory, but suggest a fix/reason for the bug, -->
 <!--- or ideas how to implement the addition or change -->
 
@@ -42,5 +42,5 @@ log into a gist at gist.github.com and paste the link here. -->
 
 ## Logs
 
-<!-- give us a full log of the provision, a copy paste from the terminal will do, or a gist, just remember to put it in code block tags with 3 backticks before and after, don't forget the splash screen with the logo! -->
-<!-- Also, your `vvv-custom.yml` would be super handy -->
+<!-- give us a FULL log of the provision, a copy paste from the terminal of the entire commands output will do, or a gist, just remember to put it in code block tags with 3 backticks before and after, don't forget the splash screen with the logo! -->
+<!-- Also, your `config/config.yml` would be super handy -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: VVV Troubleshooting
+    url: https://varyingvagrantvagrants.org/docs/en-US/troubleshooting/
+    about: Run through these to solve common issues
+  - name: VVV Support on Slack
+    url: https://varyingvagrantvagrants.org/docs/en-US/slack/
+    about: Join our support channel for help

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,24 +1,18 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest a feature for this project
 title: ''
-labels: 'feature'
+labels: 'type:feature'
 assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-
-A clear and concise description of what the problem is. e.g. _I'm always frustrated when ..._
-
-**Describe the solution you'd like**
-
-A clear and concise description of what you want to happen.
+<!-- Tell us about the feature -->
 
 **Describe alternatives you've considered**
 
-A clear and concise description of any alternative solutions or features you've considered.
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 **Additional context**
 
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/problems-provisioning-windows.md

@@ -1,8 +1,8 @@
 ---
 name: Problems Provisioning on Windows
 about: For when running vagrant up --provision or vagrant provision
-title: ''
-labels: 'Windows'
+title: 'Bug: Windows: '
+labels: 'os:windows,type:support'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/problems-provisioning.md

@@ -1,8 +1,8 @@
 ---
-name: Problems Provisioning
-about: For when running vagrant up --provision or vagrant provision
+name: Problems Provisioning on MacOS/Linux
+about: For when running vagrant up --provision or vagrant provision fails
 title: ''
-labels: ''
+labels: 'type:bug'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/support.md

@@ -1,8 +1,8 @@
 ---
 name: Support/Question
 about: Having Trouble? Unsure of how something works? Don't spend all day trying to debug it, we can help!
-title: ''
-labels: 'support, question'
+title: 'Q: '
+labels: 'type:support, type:question'
 assignees: ''
 
 ---

.github/workflows/vvv-provisioning.yml

@@ -30,13 +30,18 @@ jobs:
           sudo apt-get -q --autoremove --purge remove php*
           sudo apt-get -q autoclean
 
+          # remove pre-installed composer
+          if [ -f /usr/bin/composer ]; then
+            sudo rm -f /usr/bin/composer
+          fi
+
           # create vagrant user
           sudo groupadd -g 2000 vagrant
           sudo useradd -u 2000 -g vagrant -m vagrant
 
           # vvv_symlink function to sumulate synced folders
           function vvv_symlink() {
-            if [ ! -d "${1}" ]; then 
+            if [ ! -d "${1}" ]; then
               sudo mkdir -p "${1}"
             fi
             sudo chown -R vagrant:vagrant "${1}"
@@ -87,7 +92,7 @@ jobs:
       # TODO: Ideas
       # - Add screenshots of provisioned sites
       # - CURL mailhog API to see if it's working or not
-      # - Check VM hostfile
+      # - Check VM hostfile
 
       - name: Prepare Output
         if: ${{ always() }}

CHANGELOG.md

@@ -6,10 +6,67 @@ permalink: /docs/en-US/changelog/
 
 # Changelog
 
-## 3.6.x ( 2021 )
+## 3.7.x ( 2021 )
 
 ### Enhancements
 
+* Improved site provisioning messages
+* MariaDB upgraded to v10.5
+* Improved Apt source file handling in core provisioners
+* Upgraded to Composer 2
+* Upgraded to Python 3 setuptools and pip3
+* PHPCS installation improvements
+* Added ARM64 support for Mailhog
+* Improved the splash screen provider version fetching
+* Added improved apt package upgrade routines
+* Provisioners now ask to install only packages that aren't installed
+* General package handling performance improvements
+* New config to exclude databases from backup in `config.yml` ( #2346 )
+* New config to gzip compress database backups in `config.yml` ( #2346 )
+* Experimental Apple silicon support using vagrant + parallels
+* Disable backup and restore of databases by default
+* Updated Mailhog to 1.0.1 for new installs
+* Improved MailHog downloading with retries and error output
+* Improved Composer installation
+* webp support in Imagemagick
+* Switch from Ubuntu 18.04 to 20.04 (current LTS release)
+* Simplified config folder
+* Increased the default PHP memory limit from 128MB to 256MB
+
+### Bug Fixes
+
+* Fixed `vvv_error` not always printing messages
+* When a sites repo has the wrong URL for the origin remote, the user is now told. This avoids certain mistakes being made.
+* Remote changes are now fetched before resetting, not afterwards.
+* Increased the priority of Nodesource and Ondrej packages to avoid issues
+* Fixed Parallels mount permissions
+* Fixes for site names containing spaces causing Nginx and TLS issues
+* Warnings that you're missing vagrant plugins no longer show when running vagrant plugin commands
+* Force the Virtual Machine to 64bit on VirtualBox to avoid infinite loops on 32bit architectures
+* Force the installation and update of grunt and grunt-cli so that old grunt is always overwritten when updated
+* Sync clocks before provisioning if ntpdate is available to avoid Apt mirror time issues
+* Fixed cloning the dashboard git repository with unknown remote branches
+
+## 3.6.2 ( 2021 March 17th )
+
+### Bug Fixes
+
+* Replaced PHPCS symlinking to avoid issues with Windows
+
+## 3.6.1 ( 2021 March 16th )
+
+### Important Note
+
+Lots of provisioners now run in strict mode. Your custom site and utility provisioners may fail if they do not handle bad return codes from commands correctly. For example if you ran `composer create-project` on a folder that was not empty, it will fail. In v3.5 this failure was ignored and the script continued despite the critical error, in v3.6 VVV will halt provisioning so that the error can be seen.
+
+Make sure that commands are only ran at their appropriate times, e.g. only install things if they aren't installed, and if you're checking the return value of a command, do it in an if check, not as a temporary variable. If you're feeling adventurous you can unset the strict flags ( danger! ).
+
+Finally, check that your custom modifications haven't been added in the official site templates.
+
+### Enhancements
+
+* Improve the way that PHPCS gets provisioned to avoid conflicts with composer v2 (#2357)
+* PHP v7.4 is now the default PHP ( other versions are available on CLI if installed via `php73`, `php72`, etc )
 * Beautify the PHP debug switcher script
 * Support for basic formatting tags in `vvv_warn` `vvv_error` `vvv_info` and `vvv_success`
 * A new `vvv_output` and `vvv_format_output` bash functions
@@ -18,17 +75,22 @@ permalink: /docs/en-US/changelog/
 * SHDocs added to core provisioners
 * A new `/srv/vvv` folder for files created inside the VM related to provisioning ( #2328 )
 * Improved PHP configuration file installation
+* Sites can now define composer create-project/install/update commands to run in their folders section in addition to the git options added in v3.5.1
 * Adds a `vagrant` command inside the virtual machine to tell users they are still inside the VM and need to exit
+* `switch_php_debugmod` now checks if a module is installed and enabled, with improved output to make it clearer which versions of PHP support the module
+* Print provision log if there are errors
+* Adds an Xdebug Info button to the dashboard when Xdebug is enabled
 
 ### Bug Fixes
 
-* Fixed the user of `vvv_warn` `vvv_success` `vvv_error` and `vvv_info` outside of provisioners
+* Fixed the use of `vvv_warn` `vvv_success` `vvv_error` and `vvv_info` outside of provisioners
 * Don't try to install shyaml if it's already installed
 * Global composer packages were only updated when composer itself was updated
 * Skip the WordPress unit tests database when running backups
 * Don't back up databases that have no tables
 * Xdebug deprecated configuration option warnings fixed
 * Use HTTPS instead of SSH for WP CLI Doctor subcommand installation
+* Install missing library for Xdebug support
 
 ## 3.5.1 ( 2020 December 11th )
 

README.md

@@ -9,7 +9,7 @@ VVV is a local developer environment, mainly aimed at [WordPress](https://wordpr
 To use it, download and install [Vagrant](https://www.vagrantup.com) and [VirtualBox](https://www.virtualbox.org/). Then, clone this repository and run:
 
 ```shell
-vagrant plugin install vagrant-goodhosts --local
+vagrant plugin install --local
 vagrant up --provision
 ```