Skip to content

Commit 4332791

Browse files
masaton0216masaton0216
authored
Merge branch '2' into 2.29.0
2 parents 220edfc + 0abbb38 commit 4332791

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3742
-2955
lines changed

‎.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ REDIS_HOST=127.0.0.1
3939
REDIS_PASSWORD=null
4040
REDIS_PORT=6379
4141

42-
MAIL_DRIVER=smtp
42+
MAIL_MAILER=smtp
4343
MAIL_HOST=smtp.mailtrap.io
4444
MAIL_PORT=2525
4545
MAIL_USERNAME=null

‎.gitattributes

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
* text=auto
2-
*.css linguist-vendored
3-
*.scss linguist-vendored
4-
*.js linguist-vendored
1+
* text=auto eol=lf
2+
3+
*.blade.php diff=html
4+
*.css diff=css
5+
*.html diff=html
6+
*.md diff=markdown
7+
*.php diff=php
8+
9+
/.github export-ignore
510
CHANGELOG.md export-ignore
11+
.styleci.yml export-ignore
12+
13+
# Connect-CMS
614
*.bat text eol=crlf

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

Lines changed: 26 additions & 21 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.1', '8.2', '8.3']
2424

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

@@ -45,6 +45,10 @@ jobs:
4545
sed -i -e 's|PDF_THUMBNAIL_API_URL=""|PDF_THUMBNAIL_API_URL="http://localhost:8000"|g' .env
4646
sed -i -e 's|FACE_AI_API_URL=""|FACE_AI_API_URL="http://localhost:8000"|g' .env
4747
# sed -e "$ a MANUAL_PUT_BASE=\"$GITHUB_WORKSPACE/tests/Manual/html/\"" .env
48+
# マニュアル出力しない
49+
sed -i -e 's|#DUSK_NO_MANUAL_ALL=true|DUSK_NO_MANUAL_ALL=true|g' .env
50+
# APIテストを実行しない
51+
sed -i -e 's|#DUSK_NO_API_TEST_ALL=true|DUSK_NO_API_TEST_ALL=true|g' .env
4852
4953
# schedule でphpバージョン指定
5054
# - name: Set if input php_version is empty
@@ -127,9 +131,10 @@ jobs:
127131
- name: Chrome Version
128132
run: /opt/google/chrome/chrome --version
129133

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`
134+
# https://readouble.com/laravel/10.x/ja/dusk.html#managing-chromedriver-installations
135+
- name: Upgrade Chrome Driver
136+
# run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
137+
run: php artisan dusk:chrome-driver --detect
133138

134139
# https://stackoverflow.com/questions/76980975/chrome-driver-failing-in-laravel-dusk-failed-to-open-stream-http-request-fai
135140
# https://voicetechno-jp.secure-web.jp/ChromeDriverV115orNewer.html
@@ -145,24 +150,24 @@ jobs:
145150
# - name: Downgrade Chrome driver to v114
146151
# run: php artisan dusk:chrome-driver 114
147152

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
153+
# - name: Set env CHROME_VERSION
154+
# run: |
155+
# echo CHROME_VERSION=`/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1` >> $GITHUB_ENV
151156

152157
# 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
158+
# - name: Download Chrome and Chrome Driver(use Chrome Driver Only)
159+
# uses: browser-actions/setup-chrome@v1
160+
# id: setup-chrome
161+
# with:
162+
# chrome-version: ${{ env.CHROME_VERSION }}
163+
# install-chromedriver: true
159164

160-
- name: Chrome Driver Copy
161-
run: sudo \cp -f ${{ steps.setup-chrome.outputs.chromedriver-path }} ./vendor/laravel/dusk/bin/chromedriver-linux
165+
# - name: Chrome Driver Copy
166+
# run: sudo \cp -f ${{ steps.setup-chrome.outputs.chromedriver-path }} ./vendor/laravel/dusk/bin/chromedriver-linux
162167

163-
- name: Chrome Driver Permission Denied 対応
164-
run: |
165-
sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux
168+
# - name: Chrome Driver Permission Denied 対応
169+
# run: |
170+
# sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux
166171

167172
- name: Start Chrome Driver
168173
run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &
@@ -175,9 +180,9 @@ jobs:
175180
# - 事前準備用の実行
176181
# ---------------------------------------------
177182

178-
- name: 'Run Dusk データ準備用 - ログ管理 - マニュアルなし'
183+
- name: 'Run Dusk データ準備用 - ログ管理'
179184
if: always()
180-
run: php artisan dusk tests/Browser/Manage/LogManageTest.php no_manual
185+
run: php artisan dusk tests/Browser/Manage/LogManageTest.php
181186

182187
# ---------------------------------------------
183188
# - 設計 ①
@@ -345,7 +350,7 @@ jobs:
345350

346351
- name: 'Run Dusk スライドショー'
347352
if: always()
348-
run: php artisan dusk tests/Browser/User/SlideshowsPluginTest.php no_api_test
353+
run: php artisan dusk tests/Browser/User/SlideshowsPluginTest.php
349354

350355
- name: 'Run Dusk 開館カレンダー'
351356
if: always()

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

Lines changed: 21 additions & 26 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.1', '8.2', '8.3']
2424

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

@@ -44,6 +44,8 @@ jobs:
4444
sed -i -e 's|TRANSLATE_API_URL=""|TRANSLATE_API_URL="http://localhost:8000"|g' .env
4545
sed -i -e 's|PDF_THUMBNAIL_API_URL=""|PDF_THUMBNAIL_API_URL="http://localhost:8000"|g' .env
4646
sed -i -e 's|FACE_AI_API_URL=""|FACE_AI_API_URL="http://localhost:8000"|g' .env
47+
sed -i -e 's|#DUSK_NO_MANUAL_ALL=true|DUSK_NO_MANUAL_ALL=true|g' .env
48+
sed -i -e 's|#DUSK_NO_API_TEST_ALL=true|DUSK_NO_API_TEST_ALL=true|g' .env
4749
# sed -e "$ a MANUAL_PUT_BASE=\"$GITHUB_WORKSPACE/tests/Manual/html/\"" .env
4850
4951
# schedule でphpバージョン指定
@@ -127,9 +129,21 @@ jobs:
127129
- name: Chrome Version
128130
run: /opt/google/chrome/chrome --version
129131

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`
132+
# https://readouble.com/laravel/10.x/ja/dusk.html#managing-chromedriver-installations
133+
# https://readouble.com/laravel/10.x/ja/dusk.html#running-tests-on-github-actions
134+
# Chrome Version と Chrome Driverを同じにする
135+
- name: Upgrade Chrome Driver
136+
run: php artisan dusk:chrome-driver --detect
137+
# run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
138+
# run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3`
139+
140+
# - name: Chrome Driver Copy
141+
# run: sudo \cp -f ./vendor/laravel/dusk/bin/chromedriver-linux64/chromedriver ./vendor/laravel/dusk/bin/chromedriver-linux
142+
143+
# - name: Chrome Driver Permission Denied 対応
144+
# run: |
145+
# sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux64/chromedriver
146+
# sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux
133147

134148
# https://stackoverflow.com/questions/76980975/chrome-driver-failing-in-laravel-dusk-failed-to-open-stream-http-request-fai
135149
# https://voicetechno-jp.secure-web.jp/ChromeDriverV115orNewer.html
@@ -145,25 +159,6 @@ jobs:
145159
# - name: Downgrade Chrome driver to v114
146160
# run: php artisan dusk:chrome-driver 114
147161

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-
167162
- name: Start Chrome Driver
168163
run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &
169164

@@ -175,9 +170,9 @@ jobs:
175170
# - 事前準備用の実行
176171
# ---------------------------------------------
177172

178-
- name: 'Run Dusk データ準備用 - ログ管理 - マニュアルなし'
173+
- name: 'Run Dusk データ準備用 - ログ管理'
179174
if: always()
180-
run: php artisan dusk tests/Browser/Manage/LogManageTest.php no_manual
175+
run: php artisan dusk tests/Browser/Manage/LogManageTest.php
181176

182177
# ---------------------------------------------
183178
# - 設計 ①
@@ -345,7 +340,7 @@ jobs:
345340

346341
- name: 'Run Dusk スライドショー'
347342
if: always()
348-
run: php artisan dusk tests/Browser/User/SlideshowsPluginTest.php no_api_test
343+
run: php artisan dusk tests/Browser/User/SlideshowsPluginTest.php
349344

350345
- name: 'Run Dusk 開館カレンダー'
351346
if: always()

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

Lines changed: 33 additions & 38 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'
17-
- '8.0'
1815
- '8.1'
1916
- '8.2'
20-
default: '7.4'
17+
- '8.3'
18+
default: '8.1'
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.1'
2826
# IS_OUTPUT_MANUAL_DEFAULT: 'false'
2927

3028
jobs:
@@ -52,6 +50,10 @@ jobs:
5250
sed -i -e 's|PDF_THUMBNAIL_API_URL=""|PDF_THUMBNAIL_API_URL="http://localhost:8000"|g' .env
5351
sed -i -e 's|FACE_AI_API_URL=""|FACE_AI_API_URL="http://localhost:8000"|g' .env
5452
# sed -e "$ a MANUAL_PUT_BASE=\"$GITHUB_WORKSPACE/tests/Manual/html/\"" .env
53+
# マニュアル出力しない
54+
sed -i -e 's|#DUSK_NO_MANUAL_ALL=true|DUSK_NO_MANUAL_ALL=true|g' .env
55+
# APIテストを実行しない
56+
sed -i -e 's|#DUSK_NO_API_TEST_ALL=true|DUSK_NO_API_TEST_ALL=true|g' .env
5557
5658
# schedule でphpバージョン指定
5759
- name: Set if input php_version is empty
@@ -85,14 +87,14 @@ jobs:
8587
run: |
8688
mysql --user="root" --password="root" -e "SELECT user, host, plugin FROM mysql.user;"
8789
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 }}
90+
# - name: PHP 7.3 changes database user authentication method
91+
# run: |
92+
# if [[ "$PHP_VERSION" = "7.3" ]]; then
93+
# mysql --user="root" --password="root" -e "alter user 'root'@'localhost' identified with mysql_native_password by 'root';"
94+
# mysql --user="root" --password="root" -e "SELECT user, host, plugin FROM mysql.user;"
95+
# fi
96+
# env:
97+
# PHP_VERSION: ${{ env.PHP_VERSION }}
9698

9799
# Composer
98100
- name: Validate composer.json and composer.lock
@@ -134,9 +136,21 @@ jobs:
134136
- name: Chrome Version
135137
run: /opt/google/chrome/chrome --version
136138

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`
139+
# https://readouble.com/laravel/10.x/ja/dusk.html#managing-chromedriver-installations
140+
# https://readouble.com/laravel/10.x/ja/dusk.html#running-tests-on-github-actions
141+
# Chrome Version と Chrome Driverを同じにする
142+
- name: Upgrade Chrome Driver
143+
run: php artisan dusk:chrome-driver --detect
144+
# run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
145+
# run: php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3`
146+
147+
# - name: Chrome Driver Copy
148+
# run: sudo \cp -f ./vendor/laravel/dusk/bin/chromedriver-linux64/chromedriver ./vendor/laravel/dusk/bin/chromedriver-linux
149+
150+
# - name: Chrome Driver Permission Denied 対応
151+
# run: |
152+
# sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux64/chromedriver
153+
# sudo chmod +x ./vendor/laravel/dusk/bin/chromedriver-linux
140154

141155
# https://stackoverflow.com/questions/76980975/chrome-driver-failing-in-laravel-dusk-failed-to-open-stream-http-request-fai
142156
# https://voicetechno-jp.secure-web.jp/ChromeDriverV115orNewer.html
@@ -152,25 +166,6 @@ jobs:
152166
# - name: Downgrade Chrome driver to v114
153167
# run: php artisan dusk:chrome-driver 114
154168

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-
174169
- name: Start Chrome Driver
175170
run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=9515 &
176171

@@ -182,9 +177,9 @@ jobs:
182177
# - 事前準備用の実行
183178
# ---------------------------------------------
184179

185-
- name: 'Run Dusk データ準備用 - ログ管理 - マニュアルなし'
180+
- name: 'Run Dusk データ準備用 - ログ管理'
186181
if: always()
187-
run: php artisan dusk tests/Browser/Manage/LogManageTest.php no_manual
182+
run: php artisan dusk tests/Browser/Manage/LogManageTest.php
188183

189184
# ---------------------------------------------
190185
# - 設計 ①
@@ -352,7 +347,7 @@ jobs:
352347

353348
- name: 'Run Dusk スライドショー'
354349
if: always()
355-
run: php artisan dusk tests/Browser/User/SlideshowsPluginTest.php no_api_test
350+
run: php artisan dusk tests/Browser/User/SlideshowsPluginTest.php
356351

357352
- name: 'Run Dusk 開館カレンダー'
358353
if: always()

‎.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.1'
2525

2626
jobs:
2727
phpcs:

‎.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
/.phpunit.cache
12
/node_modules
23
/public/debug
4+
/public/build
35
/public/hot
46
/public/storage
57
/public/themes/Users/*
@@ -11,16 +13,22 @@
1113
/vendor
1214
.env
1315
.env.backup
16+
.env.production
1417
.env.testing
1518
.env.dusk.*
1619
.phpunit.result.cache
1720
Homestead.json
1821
Homestead.yaml
22+
Homestead.json
23+
Homestead.yaml
24+
auth.json
1925
npm-debug.log
2026
yarn-error.log
27+
/.fleet
28+
/.idea
29+
/.vscode
2130
!.gitkeep
2231
/connect-cms.code-workspace
23-
.vscode/
2432
composer.phar
2533
migration_config.ini
2634
migration_config_nc3.ini

0 commit comments

Comments
 (0)