Skip to content

Commit ae9972e

Browse files
akagane99akagane99
authored
Merge pull request #2030 from opensource-workshop/revert-2029-2
Revert "Merge v1.4.2 into 2"
2 parents f8ff5d0 + 60b54c7 commit ae9972e

File tree

12 files changed

+1910
-3093
lines changed

12 files changed

+1910
-3093
lines changed

‎.github/workflows/laravel_dusk_connect-cms-test-matrix.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
php: ['8.0', '8.1', '8.2']
23+
php: ['7.3', '7.4', '8.0', '8.1']
2424

2525
name: ubuntu-latest-mysql PHP ${{ matrix.php }}
2626

@@ -127,24 +127,23 @@ jobs:
127127
- name: Chrome Version
128128
run: /opt/google/chrome/chrome --version
129129

130-
# https://readouble.com/laravel/9.x/ja/dusk.html#managing-chromedriver-installations
131-
# https://readouble.com/laravel/9.x/ja/dusk.html#running-tests-on-github-actions
132-
- name: Upgrade Chrome Driver
133-
run: php artisan dusk:chrome-driver --detect
130+
# https://readouble.com/laravel/8.x/ja/dusk.html#managing-chromedriver-installations
131+
#- name: Upgrade Chrome Driver
132+
# run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
134133

135134
# https://stackoverflow.com/questions/76980975/chrome-driver-failing-in-laravel-dusk-failed-to-open-stream-http-request-fai
136135
# https://voicetechno-jp.secure-web.jp/ChromeDriverV115orNewer.html
137136
# https://github.com/browser-actions/setup-chrome (community)
138-
# - name: Downgrade Chrome browser to v114
139-
# uses: browser-actions/setup-chrome@latest
140-
# with:
141-
# chrome-version: 1134343 # Last commit number for Chrome v114
137+
- name: Downgrade Chrome browser to v114
138+
uses: browser-actions/setup-chrome@latest
139+
with:
140+
chrome-version: 1134343 # Last commit number for Chrome v114
142141

143-
# - name: Chrome bin-path Override
144-
# run: sudo ln -nfs `which chrome` /usr/bin/google-chrome
142+
- name: Chrome bin-path Override
143+
run: sudo ln -nfs `which chrome` /usr/bin/google-chrome
145144

146-
# - name: Downgrade Chrome driver to v114
147-
# run: php artisan dusk:chrome-driver 114
145+
- name: Downgrade Chrome driver to v114
146+
run: php artisan dusk:chrome-driver 114
148147

149148
- name: Start Chrome Driver
150149
run: ./vendor/laravel/dusk/bin/chromedriver-linux &

‎.github/workflows/laravel_dusk_connect-cms-test.yml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@ on:
1212
description: 'テストするPHPバージョン'
1313
required: true
1414
options:
15+
- '7.3'
16+
- '7.4'
1517
- '8.0'
1618
- '8.1'
1719
- '8.2'
18-
default: '8.0'
20+
default: '7.4'
1921
# is_output_manual:
2022
# type: boolean
2123
# description: 'マニュアル出力'
2224
# default: 'false'
2325
env:
2426
# schedule用
25-
PHP_VERSION_DEFAULT: '8.0'
27+
PHP_VERSION_DEFAULT: '7.4'
2628
# IS_OUTPUT_MANUAL_DEFAULT: 'false'
2729

2830
jobs:
@@ -83,14 +85,14 @@ jobs:
8385
run: |
8486
mysql --user="root" --password="root" -e "SELECT user, host, plugin FROM mysql.user;"
8587
86-
# - name: PHP 7.3 changes database user authentication method
87-
# run: |
88-
# if [[ "$PHP_VERSION" = "7.3" ]]; then
89-
# mysql --user="root" --password="root" -e "alter user 'root'@'localhost' identified with mysql_native_password by 'root';"
90-
# mysql --user="root" --password="root" -e "SELECT user, host, plugin FROM mysql.user;"
91-
# fi
92-
# env:
93-
# PHP_VERSION: ${{ env.PHP_VERSION }}
88+
- name: PHP 7.3 changes database user authentication method
89+
run: |
90+
if [[ "$PHP_VERSION" = "7.3" ]]; then
91+
mysql --user="root" --password="root" -e "alter user 'root'@'localhost' identified with mysql_native_password by 'root';"
92+
mysql --user="root" --password="root" -e "SELECT user, host, plugin FROM mysql.user;"
93+
fi
94+
env:
95+
PHP_VERSION: ${{ env.PHP_VERSION }}
9496

9597
# Composer
9698
- name: Validate composer.json and composer.lock
@@ -132,24 +134,23 @@ jobs:
132134
- name: Chrome Version
133135
run: /opt/google/chrome/chrome --version
134136

135-
# https://readouble.com/laravel/9.x/ja/dusk.html#managing-chromedriver-installations
136-
# https://readouble.com/laravel/9.x/ja/dusk.html#running-tests-on-github-actions
137-
- name: Upgrade Chrome Driver
138-
run: php artisan dusk:chrome-driver --detect
137+
# https://readouble.com/laravel/8.x/ja/dusk.html#managing-chromedriver-installations
138+
#- name: Upgrade Chrome Driver
139+
# run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
139140

140141
# https://stackoverflow.com/questions/76980975/chrome-driver-failing-in-laravel-dusk-failed-to-open-stream-http-request-fai
141142
# https://voicetechno-jp.secure-web.jp/ChromeDriverV115orNewer.html
142143
# https://github.com/browser-actions/setup-chrome (community)
143-
# - name: Downgrade Chrome browser to v114
144-
# uses: browser-actions/setup-chrome@latest
145-
# with:
146-
# chrome-version: 1134343 # Last commit number for Chrome v114
144+
- name: Downgrade Chrome browser to v114
145+
uses: browser-actions/setup-chrome@latest
146+
with:
147+
chrome-version: 1134343 # Last commit number for Chrome v114
147148

148-
# - name: Chrome bin-path Override
149-
# run: sudo ln -nfs `which chrome` /usr/bin/google-chrome
149+
- name: Chrome bin-path Override
150+
run: sudo ln -nfs `which chrome` /usr/bin/google-chrome
150151

151-
# - name: Downgrade Chrome driver to v114
152-
# run: php artisan dusk:chrome-driver 114
152+
- name: Downgrade Chrome driver to v114
153+
run: php artisan dusk:chrome-driver 114
153154

154155
- name: Start Chrome Driver
155156
run: ./vendor/laravel/dusk/bin/chromedriver-linux &

‎.github/workflows/phpcs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
workflow_dispatch:
2222

2323
env:
24-
PHP_VERSION: '8.0'
24+
PHP_VERSION: '7.3'
2525

2626
jobs:
2727
phpcs:

‎app/Http/Middleware/TrustProxies.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Middleware;
44

5-
use Illuminate\Http\Middleware\TrustProxies as Middleware;
5+
use Fideloper\Proxy\TrustProxies as Middleware;
66

77
class TrustProxies extends Middleware
88
{

‎composer-dev.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
],
1010
"license": "MIT",
1111
"require": {
12-
"php": "^8.0.2",
13-
"aws/aws-sdk-php": "^3.263",
12+
"php": ">=7.3.0",
13+
"aws/aws-sdk-php": "^3.262",
1414
"azuyalabs/yasumi": "^2.3",
1515
"doctrine/dbal": "^2.10",
1616
"ezyang/htmlpurifier": "^4.13",
17+
"fideloper/proxy": "^4.4",
1718
"firebase/php-jwt": "^6.0",
1819
"guzzlehttp/guzzle": "^7.5",
1920
"intervention/image": "^2.5",
2021
"intervention/imagecache": "^2.5",
2122
"kalnoy/nestedset": "^6.0",
22-
"laravel/framework": "^9.0",
23+
"laravel/framework": "^8.0",
2324
"laravel/helpers": "^1.4",
2425
"laravel/tinker": "^2.5",
2526
"laravel/ui": "^3.0",
@@ -35,9 +36,9 @@
3536
"barryvdh/laravel-debugbar": "^3.3",
3637
"filp/whoops": "~2.0",
3738
"fakerphp/faker": "^1.9.1",
38-
"laravel/dusk": "^7.10",
39+
"laravel/dusk": "^6.11",
3940
"mockery/mockery": "^1.0",
40-
"nunomaduro/collision": "^6.1",
41+
"nunomaduro/collision": "^5.0",
4142
"phpunit/phpunit": "^9.0",
4243
"squizlabs/php_codesniffer": "^3.5"
4344
},

0 commit comments

Comments
 (0)