Merge branch 'main' into release v15.0.0

.github/workflows/tests.yml

@@ -14,16 +14,16 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.0, 8.1, 8.2]
+        php: [8.0, 8.1, 8.2, 8.3]
 
     name: PHP_${{ matrix.php }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache/files
           key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

Homestead.yaml.example

@@ -21,11 +21,11 @@ databases:
     - homestead
 
 features:
-    - mysql: true
     - mariadb: false
     - postgresql: false
     - ohmyzsh: false
     - webdriver: false
+    - influxdb: false
 
 services:
     - enabled:
@@ -40,7 +40,7 @@ services:
 #      to: 4040
 #    - send: 54320 # PostgreSQL
 #      to: 5432
-#    - send: 8025 # Mailhog
+#    - send: 8025 # Mailpit
 #      to: 8025
 #    - send: 9600
 #      to: 9600

Vagrantfile

@@ -15,7 +15,7 @@ aliasesPath = confDir + "/aliases"
 
 require File.expand_path(File.dirname(__FILE__) + '/scripts/homestead.rb')
 
-Vagrant.require_version '>= 2.2.4'
+Vagrant.require_version '>= 2.4'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     if File.exist? aliasesPath then

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', '14.5.0');
+$app = new Symfony\Component\Console\Application('Laravel Homestead', '15.0.0');
 
 $app->add(new Laravel\Homestead\MakeCommand);
 $app->add(new Laravel\Homestead\WslApplyFeatures);

bin/wsl-init

@@ -21,65 +21,72 @@ apt-get upgrade -y
 echo "LC_ALL=en_US.UTF-8" >> /etc/default/locale
 locale-gen en_US.UTF-8
 
-apt-get install -y software-properties-common curl
+apt-get install -y software-properties-common curl gnupg debian-keyring debian-archive-keyring apt-transport-https \
+ca-certificates
 
 # Install Some PPAs
 apt-add-repository ppa:ondrej/php -y
-apt-add-repository ppa:chris-lea/redis-server -y
+
+# Prepare keyrings directory
+sudo mkdir -p /etc/apt/keyrings
+
 # NodeJS
-curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
-# PostgreSQL
-tee /etc/apt/sources.list.d/pgdg.list <<END
-deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main
-END
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_21.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
 
-wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+# PostgreSQL
+curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg
+sudo sh -c 'echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 
 ## Update Package Lists
-apt-get update
+apt-get update -y
 
 # Install Some Basic Packages
-apt-get install -y build-essential dos2unix gcc git git-lfs libmcrypt4 libpcre3-dev libpng-dev unzip make \
-python3-pip re2c supervisor unattended-upgrades whois vim libnotify-bin pv mcrypt bash-completion zsh imagemagick
-
-## Set My Timezone
-#ln -sf /usr/share/zoneinfo/UTC /etc/localtime
+apt-get install -y build-essential dos2unix gcc git git-lfs libmcrypt4 libpcre3-dev libpng-dev chrony unzip make pv \
+python3-pip re2c supervisor unattended-upgrades whois vim cifs-utils bash-completion zsh graphviz avahi-daemon tshark
 
 # Install Generic PHP packages
 apt-get install -y --allow-change-held-packages \
 php-imagick php-memcached php-redis php-xdebug php-dev php-swoole
 
-# PHP 8.2
+# PHP 8.3
 apt-get install -y --allow-change-held-packages \
-php8.2 php8.2-bcmath php8.2-bz2 php8.2-cgi php8.2-cli php8.2-common php8.2-curl php8.2-dba php8.2-dev \
-php8.2-enchant php8.2-fpm php8.2-gd php8.2-gmp php8.2-imap php8.2-interbase php8.2-intl php8.2-ldap \
-php8.2-mbstring php8.2-mysql php8.2-odbc php8.2-opcache php8.2-pgsql php8.2-phpdbg php8.2-pspell php8.2-readline \
-php8.2-snmp php8.2-soap php8.2-sqlite3 php8.2-sybase php8.2-tidy php8.2-xml php8.2-xsl \
-php8.2-zip
+php8.3 php8.3-bcmath php8.3-bz2 php8.3-cgi php8.3-cli php8.3-common php8.3-curl php8.3-dba php8.3-dev \
+php8.3-enchant php8.3-fpm php8.3-gd php8.3-gmp php8.3-imap php8.3-interbase php8.3-intl php8.3-ldap \
+php8.3-mbstring php8.3-mysql php8.3-odbc php8.3-opcache php8.3-pgsql php8.3-phpdbg php8.3-pspell php8.3-readline \
+php8.3-snmp php8.3-soap php8.3-sqlite3 php8.3-sybase php8.3-tidy php8.3-xml php8.3-xsl \
+php8.3-zip php8.3-imagick php8.3-memcached php8.3-redis php8.3-xmlrpc php8.3-xdebug
+
+# Configure php.ini for CLI
+sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/8.3/cli/php.ini
+sed -i "s/display_errors = .*/display_errors = On/" /etc/php/8.3/cli/php.ini
+sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/8.3/cli/php.ini
+sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/8.3/cli/php.ini
+
+# Configure Xdebug
+echo "xdebug.mode = debug" >> /etc/php/8.3/mods-available/xdebug.ini
+echo "xdebug.discover_client_host = true" >> /etc/php/8.3/mods-available/xdebug.ini
+echo "xdebug.client_port = 9003" >> /etc/php/8.3/mods-available/xdebug.ini
+echo "xdebug.max_nesting_level = 512" >> /etc/php/8.3/mods-available/xdebug.ini
+echo "opcache.revalidate_freq = 0" >> /etc/php/8.3/mods-available/opcache.ini
 
 # Fixed php fpm bind listening socket - no such file issue.
 mkdir -p /run/php
-touch /run/php/php8.2-fpm.sock
-
-# Install Composer
-curl -sS https://getcomposer.org/installer | php
-mv composer.phar /usr/local/bin/composer
-chown -R $WSL_USER_NAME:$WSL_USER_NAME /home/$WSL_USER_NAME/.config
-
-## Install Global Packages
-sudo su $WSL_USER_NAME <<'EOF'
-/usr/local/bin/composer global require "laravel/envoy=^2.0"
-/usr/local/bin/composer global require "laravel/installer=^4.2"
-/usr/local/bin/composer global config --no-plugins allow-plugins.slince/composer-registry-manager true
-/usr/local/bin/composer global require "slince/composer-registry-manager=^2.0"
+touch /run/php/php8.3-fpm.sock
+
+  # Install Composer
+  curl -sS https://getcomposer.org/installer | php
+  mv composer.phar /usr/local/bin/composer
+  chown -R vagrant:vagrant /home/vagrant/.config
+
+  # Install Global Packages
+  sudo su vagrant <<'EOF'
+  /usr/local/bin/composer global require "laravel/envoy=^2.0"
+  /usr/local/bin/composer global require "laravel/installer=^5.0"
+  /usr/local/bin/composer global config --no-plugins allow-plugins.slince/composer-registry-manager true
+  /usr/local/bin/composer global require "slince/composer-registry-manager=^2.0"
 EOF
 
-# Configure php.ini for CLI
-sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/8.2/cli/php.ini
-sed -i "s/display_errors = .*/display_errors = On/" /etc/php/8.2/cli/php.ini
-sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/8.2/cli/php.ini
-sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/8.2/cli/php.ini
-
 # Install Nginx
 apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages nginx
 
@@ -92,37 +99,36 @@ chown -R $WSL_USER_NAME:$WSL_USER_GROUP /home/$WSL_USER_NAME
 touch /home/$WSL_USER_NAME/.config/nginx/nginx.conf
 ln -sf /home/$WSL_USER_NAME/.config/nginx/nginx.conf /etc/nginx/conf.d/nginx.conf
 
-# Setup Some PHP-FPM Options
-sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/8.2/fpm/php.ini
-sed -i "s/display_errors = .*/display_errors = On/" /etc/php/8.2/fpm/php.ini
-sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/" /etc/php/8.2/fpm/php.ini
-sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/8.2/fpm/php.ini
-sed -i "s/upload_max_filesize = .*/upload_max_filesize = 100M/" /etc/php/8.2/fpm/php.ini
-sed -i "s/post_max_size = .*/post_max_size = 100M/" /etc/php/8.2/fpm/php.ini
-sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/8.2/fpm/php.ini
-
-printf "[openssl]\n" | tee -a /etc/php/8.2/fpm/php.ini
-printf "openssl.cainfo = /etc/ssl/certs/ca-certificates.crt\n" | tee -a /etc/php/8.2/fpm/php.ini
+# Configure php.ini for FPM
+sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/8.3/fpm/php.ini
+sed -i "s/display_errors = .*/display_errors = On/" /etc/php/8.3/fpm/php.ini
+sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/" /etc/php/8.3/fpm/php.ini
+sed -i "s/memory_limit = .*/memory_limit = 512M/" /etc/php/8.3/fpm/php.ini
+sed -i "s/upload_max_filesize = .*/upload_max_filesize = 100M/" /etc/php/8.3/fpm/php.ini
+sed -i "s/post_max_size = .*/post_max_size = 100M/" /etc/php/8.3/fpm/php.ini
+sed -i "s/;date.timezone.*/date.timezone = UTC/" /etc/php/8.3/fpm/php.ini
 
-printf "[curl]\n" | tee -a /etc/php/8.2/fpm/php.ini
-printf "curl.cainfo = /etc/ssl/certs/ca-certificates.crt\n" | tee -a /etc/php/8.2/fpm/php.ini
-
-# Disable XDebug On The CLI
-sudo phpdismod -s cli xdebug
+printf "[openssl]\n" | tee -a /etc/php/8.3/fpm/php.ini
+printf "openssl.cainfo = /etc/ssl/certs/ca-certificates.crt\n" | tee -a /etc/php/8.3/fpm/php.ini
+printf "[curl]\n" | tee -a /etc/php/8.3/fpm/php.ini
+printf "curl.cainfo = /etc/ssl/certs/ca-certificates.crt\n" | tee -a /etc/php/8.3/fpm/php.ini
 
 # Set The Nginx & PHP-FPM User
 sed -i "s/user www-data;/user $WSL_USER_NAME;/" /etc/nginx/nginx.conf
 sed -i "s/# server_names_hash_bucket_size.*/server_names_hash_bucket_size 64;/" /etc/nginx/nginx.conf
 
-sed -i "s/user = www-data/user = $WSL_USER_NAME/" /etc/php/8.2/fpm/pool.d/www.conf
-sed -i "s/group = www-data/group = $WSL_USER_NAME/" /etc/php/8.2/fpm/pool.d/www.conf
+sed -i "s/user = www-data/user = $WSL_USER_NAME/" /etc/php/8.3/fpm/pool.d/www.conf
+sed -i "s/group = www-data/group = $WSL_USER_NAME/" /etc/php/8.3/fpm/pool.d/www.conf
+
+sed -i "s/listen\.owner.*/listen.owner = $WSL_USER_NAME/" /etc/php/8.3/fpm/pool.d/www.conf
+sed -i "s/listen\.group.*/listen.group = $WSL_USER_NAME/" /etc/php/8.3/fpm/pool.d/www.conf
+sed -i "s/;listen\.mode.*/listen.mode = 0666/" /etc/php/8.3/fpm/pool.d/www.conf
 
-sed -i "s/listen\.owner.*/listen.owner = $WSL_USER_NAME/" /etc/php/8.2/fpm/pool.d/www.conf
-sed -i "s/listen\.group.*/listen.group = $WSL_USER_NAME/" /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
+# Disable XDebug On The CLI
+sudo phpdismod -s cli xdebug
 
 service nginx restart
-service php8.0-fpm restart
+service php8.3-fpm restart
 
 # Add $WSL_USER_NAME User To WWW-Data
 usermod -a -G www-data $WSL_USER_NAME

readme.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="/art/logo.svg"></p>
+<p align="center"><img src="/art/logo.svg" alt="Laravel Homestead Logo"></p>
 
 <p align="center">
     <a href="https://github.com/laravel/homestead/actions">
@@ -17,9 +17,9 @@
 
 ## Introduction
 
-Laravel Homestead is an official, pre-packaged Vagrant box that provides you a wonderful development environment without requiring you to install PHP, a web server, and any other server software on your local machine. No more worrying about messing up your operating system! Vagrant boxes are completely disposable. If something goes wrong, you can destroy and re-create the box in minutes!
+Laravel Homestead is an official, pre-packaged Vagrant box that provides you a wonderful development environment without requiring you to install PHP, a web server, or any other server software on your local machine. No more worrying about messing up your operating system! Vagrant boxes are completely disposable. If something goes wrong, you can destroy and re-create the box in minutes!
 
-Homestead runs on any Windows, Mac, or Linux system, and includes the Nginx web server, PHP 8.2, MySQL, Postgres, Redis, Memcached, Node, and all of the other goodies you need to develop amazing Laravel applications.
+Homestead runs on any Windows, Mac, or Linux system, and includes the Nginx web server, PHP, MySQL, Postgres, Redis, Memcached, Node, and all of the other goodies you need to develop amazing Laravel applications.
 
 Official documentation [is located here](https://laravel.com/docs/homestead).
 
@@ -30,10 +30,10 @@ Homestead is made up of 2 different projects. The first is this repo which is th
 > When you run `vagrant up` for the first time Vagrant will download the large base box from Vagrant cloud. The base box is the output from Settler. The base box will be stored at `~/.vagrant.d/` and copied to the folder you ran vagrant up command from in a hidden folder named `.vagrant`. This is what allows vagrant to create a VM and destroy it quickly and without having to download the large base box again.
 
 ##### Current versions
-| Ubuntu LTS | Settler Version | Homestead Version | Branch      | Status
-| -----------|-----------------|-------------------| ----------- | -----------
-| 20.04      | 13.x            | 14.x              | `main`      | Development/Unstable
-| 20.04      | 13.x            | 14.x              | `release`   | Stable
+| Ubuntu LTS | Settler Version | Homestead Version | Branch    | Status               |
+|------------|-----------------|-------------------|-----------|----------------------|
+| 22.04      | 14.x            | 15.x              | `main`    | Development/Unstable |
+| 22.04      | 14.x            | 15.x              | `release` | Stable               |
 
 ## Developing Homestead
 

resources/Homestead.yaml

@@ -21,7 +21,6 @@ databases:
     - homestead
 
 features:
-    - mysql: true
     - mariadb: false
     - postgresql: false
     - ohmyzsh: false
@@ -40,7 +39,7 @@ services:
 #      to: 4040
 #    - send: 54320 # PostgreSQL
 #      to: 5432
-#    - send: 8025 # Mailhog
+#    - send: 8025 # Mailpit
 #      to: 8025
 #    - send: 9600
 #      to: 9600

resources/aliases

@@ -119,7 +119,7 @@ function serve-apache() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/apache.sh
-        sudo bash /vagrant/scripts/site-types/apache.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/apache.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "
@@ -132,7 +132,7 @@ function serve-apache-proxy() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/apache-proxy.sh
-        sudo bash /vagrant/scripts/site-types/apache-proxy.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/apache-proxy.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "
@@ -145,7 +145,7 @@ function serve-laravel() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/laravel.sh
-        sudo bash /vagrant/scripts/site-types/laravel.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/laravel.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "
@@ -158,7 +158,7 @@ function serve-proxy() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/proxy.sh
-        sudo bash /vagrant/scripts/site-types/proxy.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/proxy.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "
@@ -171,7 +171,7 @@ function serve-silverstripe() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/silverstripe.sh
-        sudo bash /vagrant/scripts/site-types/silverstripe.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/silverstripe.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "
@@ -184,7 +184,7 @@ function serve-spa() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/spa.sh
-        sudo bash /vagrant/scripts/site-types/spa.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/spa.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "
@@ -197,7 +197,7 @@ function serve-statamic() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/statamic.sh
-        sudo bash /vagrant/scripts/site-types/statamic.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/statamic.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "
@@ -210,7 +210,7 @@ function serve-symfony2() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/symfony2.sh
-        sudo bash /vagrant/scripts/site-types/symfony2.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/symfony2.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "
@@ -223,7 +223,7 @@ function serve-symfony4() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/symfony4.sh
-        sudo bash /vagrant/scripts/site-types/symfony4.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/symfony4.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "
@@ -236,7 +236,7 @@ function serve-pimcore() {
     then
         sudo bash /vagrant/scripts/create-certificate.sh "$1"
         sudo dos2unix /vagrant/scripts/site-types/pimcore.sh
-        sudo bash /vagrant/scripts/site-types/pimcore.sh "$1" "$2" 80 443 "${3:-8.1}"
+        sudo bash /vagrant/scripts/site-types/pimcore.sh "$1" "$2" 80 443 "${3:-8.3}"
     else
         echo "Error: missing required parameters."
         echo "Usage: "