Merge branch 'main' into master

.github/workflows/tests.yml

@@ -0,0 +1,39 @@
+name: tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  tests:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.4, 8.0]
+
+    name: PHP_${{ matrix.php }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/phpunit --verbose

Homestead.yaml.example

@@ -25,6 +25,12 @@ features:
     - ohmyzsh: false
     - webdriver: false
 
+#services:
+#    - enabled:
+#        - "postgresql@12-main"
+#    - disabled:
+#        - "postgresql@11-main"
+
 # ports:
 #     - send: 50000
 #       to: 5000

Vagrantfile

@@ -20,7 +20,7 @@ Vagrant.require_version '>= 2.2.4'
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     if File.exist? aliasesPath then
         config.vm.provision "file", source: aliasesPath, destination: "/tmp/bash_aliases"
-        config.vm.provision "shell" do |s|
+        config.vm.provision "handle_aliases", type: "shell" do |s|
             s.inline = "awk '{ sub(\"\r$\", \"\"); print }' /tmp/bash_aliases > /home/vagrant/.bash_aliases && chown vagrant:vagrant /home/vagrant/.bash_aliases"
         end
     end
@@ -36,11 +36,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     Homestead.configure(config, settings)
 
     if File.exist? afterScriptPath then
-        config.vm.provision "shell", path: afterScriptPath, privileged: false, keep_color: true
+        config.vm.provision "Run after.sh", type: "shell", path: afterScriptPath, privileged: false, keep_color: true
     end
 
     if File.exist? customizationScriptPath then
-        config.vm.provision "shell", path: customizationScriptPath, privileged: false, keep_color: true
+        config.vm.provision "Run customize script", type: "shell", path: customizationScriptPath, privileged: false, keep_color: true
     end
 
     if Vagrant.has_plugin?('vagrant-hostsupdater')
@@ -50,6 +50,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         config.hostmanager.enabled = true
         config.hostmanager.manage_host = true
         config.hostmanager.aliases = settings['sites'].map { |site| site['map'] }
+    elsif Vagrant.has_plugin?('vagrant-goodhosts')
+        config.goodhosts.aliases = settings['sites'].map { |site| site['map'] }
     end
 
     if Vagrant.has_plugin?('vagrant-notify-forwarder')

bin/homestead

@@ -1,10 +1,18 @@
 #!/usr/bin/env php
 <?php
 
-require __DIR__.'/../../../autoload.php';
+// Are we running global or per project?
+if(is_file( __DIR__.'/../vendor/autoload.php')) {
+    require  __DIR__.'/../vendor/autoload.php';
+} else {
+    require __DIR__.'/../../../autoload.php';
+}
 
-$app = new Symfony\Component\Console\Application('Laravel Homestead', '10.17.0');
+$app = new Symfony\Component\Console\Application('Laravel Homestead', '12.3.2');
 
 $app->add(new Laravel\Homestead\MakeCommand);
+$app->add(new Laravel\Homestead\WslApplyFeatures);
+$app->add(new Laravel\Homestead\WslCreateSiteCommand);
+$app->add(new Laravel\Homestead\WslCreateDatabaseCommand());
 
 $app->run();