Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Commit 9db11b4

Browse files
svpernova09svpernova09
committed
Merge branch 'main' into release
2 parents 6c474ca + e466c30 commit 9db11b4

20 files changed

+213
-92
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
1111
[*.md]
1212
trim_trailing_whitespace = false
1313

14-
[*.yml]
14+
[*.{yml,yaml,yaml.example}]
1515
indent_size = 2

‎.github/workflows/tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,8 @@ jobs:
3838
- name: Install dependencies
3939
run: composer install --prefer-dist --no-interaction --no-progress
4040

41+
- name: Run PhpStan
42+
run: vendor/bin/phpstan analyse src tests
43+
4144
- name: Execute tests
4245
run: vendor/bin/phpunit --verbose

‎Homestead.yaml.example

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,42 @@ provider: virtualbox
77
authorize: ~/.ssh/id_rsa.pub
88

99
keys:
10-
- ~/.ssh/id_rsa
10+
- ~/.ssh/id_rsa
1111

1212
folders:
13-
- map: ~/code
14-
to: /home/vagrant/code
13+
- map: ~/code
14+
to: /home/vagrant/code
1515

1616
sites:
17-
- map: homestead.test
18-
to: /home/vagrant/code/public
17+
- map: homestead.test
18+
to: /home/vagrant/code/public
1919

2020
databases:
21-
- homestead
21+
- homestead
2222

2323
features:
24-
- mariadb: false
25-
- postgresql: false
26-
- ohmyzsh: false
27-
- webdriver: false
28-
- influxdb: false
24+
- mariadb: false
25+
- postgresql: false
26+
- ohmyzsh: false
27+
- webdriver: false
28+
- influxdb: false
2929

3030
services:
31-
- enabled:
32-
- "mysql"
33-
# - disabled:
34-
# - "postgresql@11-main"
35-
36-
#ports:
37-
# - send: 33060 # MySQL/MariaDB
38-
# to: 3306
39-
# - send: 4040
40-
# to: 4040
41-
# - send: 54320 # PostgreSQL
42-
# to: 5432
43-
# - send: 8025 # Mailpit
44-
# to: 8025
45-
# - send: 9600
46-
# to: 9600
47-
# - send: 27017
48-
# to: 27017
31+
- enabled:
32+
- "mysql"
33+
# - disabled:
34+
# - "postgresql@11-main"
35+
36+
# ports:
37+
# - send: 33060 # MySQL/MariaDB
38+
# to: 3306
39+
# - send: 4040
40+
# to: 4040
41+
# - send: 54320 # PostgreSQL
42+
# to: 5432
43+
# - send: 8025 # Mailpit
44+
# to: 8025
45+
# - send: 9600
46+
# to: 9600
47+
# - send: 27017
48+
# to: 27017

‎bin/homestead

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if(is_file( __DIR__.'/../vendor/autoload.php')) {
88
require __DIR__.'/../../../autoload.php';
99
}
1010

11-
$app = new Symfony\Component\Console\Application('Laravel Homestead', '15.0.2');
11+
$app = new Symfony\Component\Console\Application('Laravel Homestead', '15.0.3');
1212

1313
$app->add(new Laravel\Homestead\MakeCommand);
1414
$app->add(new Laravel\Homestead\WslApplyFeatures);

‎composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
},
1010
"require-dev": {
1111
"phpunit/phpunit": "^9.5",
12-
"dms/phpunit-arraysubset-asserts": "^0.2.1"
12+
"dms/phpunit-arraysubset-asserts": "^0.2.1",
13+
"phpstan/phpstan": "^1.10"
1314
},
1415
"license": "MIT",
1516
"authors": [

‎composer.lock

Lines changed: 63 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎phpstan.src.neon.dist

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
parameters:
2+
paths:
3+
- src
4+
level: 0
5+
ignoreErrors:
6+
- "#\\(void\\) is used#"
7+
- "#Access to an undefined property#"
8+
- "#Call to an undefined method#"
9+
- "#but return statement is missing.#"
10+
- "#Caught class [a-zA-Z0-9\\\\_]+ not found.#"
11+
- "#Class [a-zA-Z0-9\\\\_]+ not found.#"
12+
- "#has invalid type#"
13+
- "#should always throw an exception or terminate script execution#"
14+
- "#Instantiated class [a-zA-Z0-9\\\\_]+ not found.#"
15+
- "#Unsafe usage of new static#"
16+
excludePaths:
17+
- "src/Illuminate/Testing/ParallelRunner.php"

‎resources/Homestead.yaml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,41 @@ provider: virtualbox
77
authorize: ~/.ssh/id_rsa.pub
88

99
keys:
10-
- ~/.ssh/id_rsa
10+
- ~/.ssh/id_rsa
1111

1212
folders:
13-
- map: ~/code
14-
to: /home/vagrant/code
13+
- map: ~/code
14+
to: /home/vagrant/code
1515

1616
sites:
17-
- map: homestead.test
18-
to: /home/vagrant/code/public
17+
- map: homestead.test
18+
to: /home/vagrant/code/public
1919

2020
databases:
21-
- homestead
21+
- homestead
2222

2323
features:
24-
- mariadb: false
25-
- postgresql: false
26-
- ohmyzsh: false
27-
- webdriver: false
24+
- mariadb: false
25+
- postgresql: false
26+
- ohmyzsh: false
27+
- webdriver: false
2828

2929
services:
30-
- enabled:
31-
- "mysql"
32-
# - disabled:
33-
# - "postgresql@11-main"
34-
35-
#ports:
36-
# - send: 33060 # MySQL/MariaDB
37-
# to: 3306
38-
# - send: 4040
39-
# to: 4040
40-
# - send: 54320 # PostgreSQL
41-
# to: 5432
42-
# - send: 8025 # Mailpit
43-
# to: 8025
44-
# - send: 9600
45-
# to: 9600
46-
# - send: 27017
47-
# to: 27017
30+
- enabled:
31+
- "mysql"
32+
# - disabled:
33+
# - "postgresql@11-main"
34+
35+
# ports:
36+
# - send: 33060 # MySQL/MariaDB
37+
# to: 3306
38+
# - send: 4040
39+
# to: 4040
40+
# - send: 54320 # PostgreSQL
41+
# to: 5432
42+
# - send: 8025 # Mailpit
43+
# to: 8025
44+
# - send: 9600
45+
# to: 9600
46+
# - send: 27017
47+
# to: 27017

‎scripts/features/dockstead/mysql-5.7.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
#
55
version: "3.7"
66
services:
7-
mysql:
8-
image: mysql:5.7
9-
volumes:
10-
- type: volume
11-
source: mysql-data
12-
target: /var/lib/mysql
13-
volume:
14-
nocopy: true
15-
ports:
16-
- "3306:3306"
17-
healthcheck:
18-
test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
19-
interval: 3s
20-
timeout: 1s
21-
retries: 5
22-
env_file:
23-
- env.docker
7+
mysql:
8+
image: mysql:5.7
9+
volumes:
10+
- type: volume
11+
source: mysql-data
12+
target: /var/lib/mysql
13+
volume:
14+
nocopy: true
15+
ports:
16+
- "3306:3306"
17+
healthcheck:
18+
test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
19+
interval: 3s
20+
timeout: 1s
21+
retries: 5
22+
env_file:
23+
- env.docker
2424
volumes:
25-
mysql-data:
25+
mysql-data:

‎scripts/features/php8.2.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ fi
1010

1111
export DEBIAN_FRONTEND=noninteractive
1212

13+
SERVICE_STATUS=$(systemctl is-enabled php8.2-fpm.service)
14+
15+
if [ "$SERVICE_STATUS" == "disabled" ];
16+
then
17+
systemctl enable php8.2-fpm
18+
service php8.2-fpm restart
19+
fi
20+
1321
if [ -f /home/$WSL_USER_NAME/.homestead-features/php82 ]
1422
then
1523
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
6068
sed -i "s/listen\.owner.*/listen.owner = vagrant/" /etc/php/8.2/fpm/pool.d/www.conf
6169
sed -i "s/listen\.group.*/listen.group = vagrant/" /etc/php/8.2/fpm/pool.d/www.conf
6270
sed -i "s/;listen\.mode.*/listen.mode = 0666/" /etc/php/8.2/fpm/pool.d/www.conf
71+
72+
systemctl enable php8.2-fpm
73+
service php8.2-fpm restart

‎scripts/features/php8.3.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ fi
1010

1111
export DEBIAN_FRONTEND=noninteractive
1212

13+
SERVICE_STATUS=$(systemctl is-enabled php8.3-fpm.service)
14+
15+
if [ "$SERVICE_STATUS" == "disabled" ];
16+
then
17+
systemctl enable php8.3-fpm
18+
service php8.3-fpm restart
19+
fi
20+
1321
if [ -f /home/$WSL_USER_NAME/.homestead-features/php83 ]
1422
then
1523
echo "PHP 8.3 already installed."

‎scripts/features/webdriver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ARCH=$(arch)
2424
# Install The Chrome Web Driver & Dusk Utilities
2525
if [[ "$ARCH" != "aarch64" ]]; then
2626
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -O /tmp/chrome.deb
27-
dpkg -i /tmp/chrome.deb
27+
apt-get install -y /tmp/chrome.deb
2828
rm -f /tmp/chrome.deb
2929
fi
3030

‎scripts/homestead.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ def self.configure(config, settings)
673673
# Update Composer On Every Provision
674674
config.vm.provision 'shell' do |s|
675675
s.name = 'Update Composer'
676-
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/'
676+
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/'
677677
s.privileged = false
678678
end
679679

0 commit comments

Comments
 (0)