Merge branch 'main' into release

.editorconfig

@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.yml]
+[*.{yml,yaml,yaml.example}]
 indent_size = 2

.github/workflows/tests.yml

@@ -38,5 +38,8 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist --no-interaction --no-progress
 
+      - name: Run PhpStan
+        run: vendor/bin/phpstan analyse src tests
+
       - name: Execute tests
         run: vendor/bin/phpunit --verbose

Homestead.yaml.example

@@ -7,42 +7,42 @@ provider: virtualbox
 authorize: ~/.ssh/id_rsa.pub
 
 keys:
-    - ~/.ssh/id_rsa
+  - ~/.ssh/id_rsa
 
 folders:
-    - map: ~/code
-      to: /home/vagrant/code
+  - map: ~/code
+    to: /home/vagrant/code
 
 sites:
-    - map: homestead.test
-      to: /home/vagrant/code/public
+  - map: homestead.test
+    to: /home/vagrant/code/public
 
 databases:
-    - homestead
+  - homestead
 
 features:
-    - mariadb: false
-    - postgresql: false
-    - ohmyzsh: false
-    - webdriver: false
-    - influxdb: false
+  - mariadb: false
+  - postgresql: false
+  - ohmyzsh: false
+  - webdriver: false
+  - influxdb: false
 
 services:
-    - enabled:
-          - "mysql"
-#    - disabled:
-#        - "postgresql@11-main"
-
-#ports:
-#    - send: 33060 # MySQL/MariaDB
-#      to: 3306
-#    - send: 4040
-#      to: 4040
-#    - send: 54320 # PostgreSQL
-#      to: 5432
-#    - send: 8025 # Mailpit
-#      to: 8025
-#    - send: 9600
-#      to: 9600
-#    - send: 27017
-#      to: 27017
+  - enabled:
+      - "mysql"
+#   - disabled:
+#       - "postgresql@11-main"
+
+# ports:
+#   - send: 33060 # MySQL/MariaDB
+#     to: 3306
+#   - send: 4040
+#     to: 4040
+#   - send: 54320 # PostgreSQL
+#     to: 5432
+#   - send: 8025 # Mailpit
+#     to: 8025
+#   - send: 9600
+#     to: 9600
+#   - send: 27017
+#     to: 27017

bin/homestead

@@ -8,7 +8,7 @@ if(is_file( __DIR__.'/../vendor/autoload.php')) {
     require __DIR__.'/../../../autoload.php';
 }
 
-$app = new Symfony\Component\Console\Application('Laravel Homestead', '15.0.2');
+$app = new Symfony\Component\Console\Application('Laravel Homestead', '15.0.3');
 
 $app->add(new Laravel\Homestead\MakeCommand);
 $app->add(new Laravel\Homestead\WslApplyFeatures);

composer.json

@@ -9,7 +9,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "dms/phpunit-arraysubset-asserts": "^0.2.1"
+        "dms/phpunit-arraysubset-asserts": "^0.2.1",
+        "phpstan/phpstan": "^1.10"
     },
     "license": "MIT",
     "authors": [

phpstan.src.neon.dist

@@ -0,0 +1,17 @@
+parameters:
+  paths:
+    - src
+  level: 0
+  ignoreErrors:
+    - "#\\(void\\) is used#"
+    - "#Access to an undefined property#"
+    - "#Call to an undefined method#"
+    - "#but return statement is missing.#"
+    - "#Caught class [a-zA-Z0-9\\\\_]+ not found.#"
+    - "#Class [a-zA-Z0-9\\\\_]+ not found.#"
+    - "#has invalid type#"
+    - "#should always throw an exception or terminate script execution#"
+    - "#Instantiated class [a-zA-Z0-9\\\\_]+ not found.#"
+    - "#Unsafe usage of new static#"
+  excludePaths:
+    - "src/Illuminate/Testing/ParallelRunner.php"

resources/Homestead.yaml

@@ -7,41 +7,41 @@ provider: virtualbox
 authorize: ~/.ssh/id_rsa.pub
 
 keys:
-    - ~/.ssh/id_rsa
+  - ~/.ssh/id_rsa
 
 folders:
-    - map: ~/code
-      to: /home/vagrant/code
+  - map: ~/code
+    to: /home/vagrant/code
 
 sites:
-    - map: homestead.test
-      to: /home/vagrant/code/public
+  - map: homestead.test
+    to: /home/vagrant/code/public
 
 databases:
-    - homestead
+  - homestead
 
 features:
-    - mariadb: false
-    - postgresql: false
-    - ohmyzsh: false
-    - webdriver: false
+  - mariadb: false
+  - postgresql: false
+  - ohmyzsh: false
+  - webdriver: false
 
 services:
-    - enabled:
-          - "mysql"
-#    - disabled:
-#        - "postgresql@11-main"
-
-#ports:
-#    - send: 33060 # MySQL/MariaDB
-#      to: 3306
-#    - send: 4040
-#      to: 4040
-#    - send: 54320 # PostgreSQL
-#      to: 5432
-#    - send: 8025 # Mailpit
-#      to: 8025
-#    - send: 9600
-#      to: 9600
-#    - send: 27017
-#      to: 27017
+  - enabled:
+      - "mysql"
+#   - disabled:
+#       - "postgresql@11-main"
+
+# ports:
+#   - send: 33060 # MySQL/MariaDB
+#     to: 3306
+#   - send: 4040
+#     to: 4040
+#   - send: 54320 # PostgreSQL
+#     to: 5432
+#   - send: 8025 # Mailpit
+#     to: 8025
+#   - send: 9600
+#     to: 9600
+#   - send: 27017
+#     to: 27017

scripts/features/dockstead/mysql-5.7.yaml

@@ -4,22 +4,22 @@
 #
 version: "3.7"
 services:
-    mysql:
-        image: mysql:5.7
-        volumes:
-            - type: volume
-              source: mysql-data
-              target: /var/lib/mysql
-              volume:
-                  nocopy: true
-        ports:
-            - "3306:3306"
-        healthcheck:
-            test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
-            interval: 3s
-            timeout: 1s
-            retries: 5
-        env_file:
-            - env.docker
+  mysql:
+    image: mysql:5.7
+    volumes:
+      - type: volume
+        source: mysql-data
+        target: /var/lib/mysql
+        volume:
+          nocopy: true
+    ports:
+      - "3306:3306"
+    healthcheck:
+      test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
+      interval: 3s
+      timeout: 1s
+      retries: 5
+    env_file:
+      - env.docker
 volumes:
-    mysql-data:
+  mysql-data:

scripts/features/php8.2.sh

@@ -10,6 +10,14 @@ fi
 
 export DEBIAN_FRONTEND=noninteractive
 
+SERVICE_STATUS=$(systemctl is-enabled php8.2-fpm.service)
+
+if [ "$SERVICE_STATUS" == "disabled" ];
+then
+  systemctl enable php8.2-fpm
+  service php8.2-fpm restart
+fi
+
 if [ -f /home/$WSL_USER_NAME/.homestead-features/php82 ]
 then
     echo "PHP 8.2 already installed."
@@ -60,3 +68,6 @@ sed -i "s/group = www-data/group = vagrant/" /etc/php/8.2/fpm/pool.d/www.conf
 sed -i "s/listen\.owner.*/listen.owner = vagrant/" /etc/php/8.2/fpm/pool.d/www.conf
 sed -i "s/listen\.group.*/listen.group = vagrant/" /etc/php/8.2/fpm/pool.d/www.conf
 sed -i "s/;listen\.mode.*/listen.mode = 0666/" /etc/php/8.2/fpm/pool.d/www.conf
+
+systemctl enable php8.2-fpm
+service php8.2-fpm restart

scripts/features/php8.3.sh

@@ -10,6 +10,14 @@ fi
 
 export DEBIAN_FRONTEND=noninteractive
 
+SERVICE_STATUS=$(systemctl is-enabled php8.3-fpm.service)
+
+if [ "$SERVICE_STATUS" == "disabled" ];
+then
+  systemctl enable php8.3-fpm
+  service php8.3-fpm restart
+fi
+
 if [ -f /home/$WSL_USER_NAME/.homestead-features/php83 ]
 then
     echo "PHP 8.3 already installed."

scripts/features/webdriver.sh

@@ -24,7 +24,7 @@ ARCH=$(arch)
 # Install The Chrome Web Driver & Dusk Utilities
 if [[ "$ARCH" != "aarch64" ]]; then
     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -O /tmp/chrome.deb
-    dpkg -i /tmp/chrome.deb
+    apt-get install -y /tmp/chrome.deb
     rm -f /tmp/chrome.deb
 fi
 

scripts/homestead.rb

@@ -673,7 +673,7 @@ def self.configure(config, settings)
     # Update Composer On Every Provision
     config.vm.provision 'shell' do |s|
       s.name = 'Update Composer'
-      s.inline = 'sudo chown -R vagrant:vagrant /usr/local/bin && sudo -u vagrant /usr/local/bin/composer self-update --no-progress && sudo chown -R vagrant:vagrant /home/vagrant/.config/'
+      s.inline = 'sudo chown -R vagrant:vagrant /usr/local/bin && sudo -u vagrant /usr/bin/php8.3 /usr/local/bin/composer self-update --no-progress && sudo chown -R vagrant:vagrant /home/vagrant/.config/'
       s.privileged = false
     end