Skip to content

Commit bb61ddd

Browse files
akagane99akagane99
authored
Merge branch '2' into 2.26.1
2 parents 2d25507 + de2ba40 commit bb61ddd

File tree

13 files changed

+2101
-1708
lines changed

13 files changed

+2101
-1708
lines changed

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

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

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

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

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`
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+
# Chrome Version と Chrome Driverを同じにする
133+
- name: Upgrade Chrome Driver
134+
# run: php artisan dusk:chrome-driver --detect
135+
# run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
136+
run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3`
137+
138+
- name: Chrome Driver Copy
139+
run: sudo \cp -f ./vendor/laravel/dusk/bin/chromedriver-linux64/chromedriver ./vendor/laravel/dusk/bin/chromedriver-linux
140+
141+
- name: Chrome Driver Permission Denied 対応
142+
run: |
143+
sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux64/chromedriver
144+
sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux
133145
134146
# https://stackoverflow.com/questions/76980975/chrome-driver-failing-in-laravel-dusk-failed-to-open-stream-http-request-fai
135147
# https://voicetechno-jp.secure-web.jp/ChromeDriverV115orNewer.html
@@ -145,25 +157,6 @@ jobs:
145157
# - name: Downgrade Chrome driver to v114
146158
# run: php artisan dusk:chrome-driver 114
147159

148-
- name: Set env CHROME_VERSION
149-
run: |
150-
echo CHROME_VERSION=`/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1` >> $GITHUB_ENV
151-
152-
# https://github.com/browser-actions/setup-chrome (community)
153-
- name: Download Chrome and Chrome Driver(use Chrome Driver Only)
154-
uses: browser-actions/setup-chrome@v1
155-
id: setup-chrome
156-
with:
157-
chrome-version: ${{ env.CHROME_VERSION }}
158-
install-chromedriver: true
159-
160-
- name: Chrome Driver Copy
161-
run: sudo \cp -f ${{ steps.setup-chrome.outputs.chromedriver-path }} ./vendor/laravel/dusk/bin/chromedriver-linux
162-
163-
- name: Chrome Driver Permission Denied 対応
164-
run: |
165-
sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux
166-
167160
- name: Start Chrome Driver
168161
run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &
169162

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

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,17 @@ on:
1212
description: 'テストするPHPバージョン'
1313
required: true
1414
options:
15-
# - '7.3'
16-
- '7.4'
1715
- '8.0'
1816
- '8.1'
1917
- '8.2'
20-
default: '7.4'
18+
default: '8.0'
2119
# is_output_manual:
2220
# type: boolean
2321
# description: 'マニュアル出力'
2422
# default: 'false'
2523
env:
2624
# schedule用
27-
PHP_VERSION_DEFAULT: '7.4'
25+
PHP_VERSION_DEFAULT: '8.0'
2826
# IS_OUTPUT_MANUAL_DEFAULT: 'false'
2927

3028
jobs:
@@ -85,14 +83,14 @@ jobs:
8583
run: |
8684
mysql --user="root" --password="root" -e "SELECT user, host, plugin FROM mysql.user;"
8785
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 }}
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 }}
9694

9795
# Composer
9896
- name: Validate composer.json and composer.lock
@@ -134,9 +132,21 @@ jobs:
134132
- name: Chrome Version
135133
run: /opt/google/chrome/chrome --version
136134

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`
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+
# Chrome Version と Chrome Driverを同じにする
138+
- name: Upgrade Chrome Driver
139+
# run: php artisan dusk:chrome-driver --detect
140+
# run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
141+
run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3`
142+
143+
- name: Chrome Driver Copy
144+
run: sudo \cp -f ./vendor/laravel/dusk/bin/chromedriver-linux64/chromedriver ./vendor/laravel/dusk/bin/chromedriver-linux
145+
146+
- name: Chrome Driver Permission Denied 対応
147+
run: |
148+
sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux64/chromedriver
149+
sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux
140150
141151
# https://stackoverflow.com/questions/76980975/chrome-driver-failing-in-laravel-dusk-failed-to-open-stream-http-request-fai
142152
# https://voicetechno-jp.secure-web.jp/ChromeDriverV115orNewer.html
@@ -152,25 +162,6 @@ jobs:
152162
# - name: Downgrade Chrome driver to v114
153163
# run: php artisan dusk:chrome-driver 114
154164

155-
- name: Set env CHROME_VERSION
156-
run: |
157-
echo CHROME_VERSION=`/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1` >> $GITHUB_ENV
158-
159-
# https://github.com/browser-actions/setup-chrome (community)
160-
- name: Download Chrome and Chrome Driver(use Chrome Driver Only)
161-
uses: browser-actions/setup-chrome@v1
162-
id: setup-chrome
163-
with:
164-
chrome-version: ${{ env.CHROME_VERSION }}
165-
install-chromedriver: true
166-
167-
- name: Chrome Driver Copy
168-
run: sudo \cp -f ${{ steps.setup-chrome.outputs.chromedriver-path }} ./vendor/laravel/dusk/bin/chromedriver-linux
169-
170-
- name: Chrome Driver Permission Denied 対応
171-
run: |
172-
sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux
173-
174165
- name: Start Chrome Driver
175166
run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &
176167

‎.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: '7.4'
24+
PHP_VERSION: '8.0'
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 Fideloper\Proxy\TrustProxies as Middleware;
5+
use Illuminate\Http\Middleware\TrustProxies as Middleware;
66

77
class TrustProxies extends Middleware
88
{

‎composer-dev.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@
99
],
1010
"license": "MIT",
1111
"require": {
12-
"php": "^7.4.0 || ~8.0 || ~8.1",
12+
"php": "^8.0.2 || ~8.1 || ~8.2",
1313
"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",
1817
"firebase/php-jwt": "^6.0",
1918
"guzzlehttp/guzzle": "^7.5",
2019
"intervention/image": "^2.5",
2120
"intervention/imagecache": "^2.5",
2221
"kalnoy/nestedset": "^6.0",
23-
"laravel/framework": "^8.0",
22+
"laravel/framework": "^9.0",
2423
"laravel/helpers": "^1.4",
2524
"laravel/tinker": "^2.5",
2625
"laravel/ui": "^3.0",
@@ -35,9 +34,9 @@
3534
"barryvdh/laravel-debugbar": "^3.3",
3635
"filp/whoops": "~2.0",
3736
"fakerphp/faker": "^1.9.1",
38-
"laravel/dusk": "^6.11",
37+
"laravel/dusk": "^7.10",
3938
"mockery/mockery": "^1.0",
40-
"nunomaduro/collision": "^5.0",
39+
"nunomaduro/collision": "^6.1",
4140
"phpunit/phpunit": "^9.0",
4241
"squizlabs/php_codesniffer": "^3.5"
4342
},

0 commit comments

Comments
 (0)