Skip to content

Commit 7cb1e49

Browse files
kenjiskenjis
authored
Merge pull request #681 from kenjis/beta4
1.0.0-beta.4 code
2 parents 5e6d517 + ea9688d commit 7cb1e49

File tree

135 files changed

+3931
-624
lines changed

Some content is hidden

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

135 files changed

+3931
-624
lines changed

‎.github/workflows/deptrac.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,20 @@ jobs:
3131
- name: Set up PHP
3232
uses: shivammathur/setup-php@v2
3333
with:
34-
php-version: '8.0'
34+
php-version: '8.1'
3535
tools: phive
3636
extensions: intl, json, mbstring, xml
3737
coverage: none
3838
env:
39-
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040

4141
- name: Get composer cache directory
42-
id: composer-cache
43-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
42+
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4443

4544
- name: Cache composer dependencies
4645
uses: actions/cache@v3
4746
with:
48-
path: ${{ steps.composer-cache.outputs.dir }}
47+
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
4948
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
5049
restore-keys: ${{ runner.os }}-composer-
5150

‎.github/workflows/docs.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: docs
2+
on:
3+
push:
4+
branches:
5+
- master
6+
jobs:
7+
deploy:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v3
11+
- uses: actions/setup-python@v4
12+
with:
13+
python-version: 3.x
14+
- run: pip install mkdocs-material
15+
- run: mkdocs gh-deploy --force

‎.github/workflows/phpcsfixer.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,15 @@ jobs:
3535
extensions: json, tokenizer
3636
coverage: none
3737
env:
38-
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3939

4040
- name: Get composer cache directory
41-
id: composer-cache
42-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
41+
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4342

4443
- name: Cache composer dependencies
4544
uses: actions/cache@v3
4645
with:
47-
path: ${{ steps.composer-cache.outputs.dir }}
46+
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
4847
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
4948
restore-keys: ${{ runner.os }}-composer-
5049

‎.github/workflows/phpstan.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,15 @@ jobs:
4040
extensions: intl, json, mbstring, xml
4141
coverage: none
4242
env:
43-
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4444

4545
- name: Get composer cache directory
46-
id: composer-cache
47-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
46+
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4847

4948
- name: Cache composer dependencies
5049
uses: actions/cache@v3
5150
with:
52-
path: ${{ steps.composer-cache.outputs.dir }}
51+
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
5352
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
5453
restore-keys: ${{ runner.os }}-composer-
5554

‎.github/workflows/phpunit-lang.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,15 @@ jobs:
3636
extensions: intl, json, mbstring, gd, xdebug, xml, sqlite3
3737
coverage: xdebug
3838
env:
39-
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040

4141
- name: Get composer cache directory
42-
id: composer-cache
43-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
42+
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4443

4544
- name: Cache composer dependencies
4645
uses: actions/cache@v3
4746
with:
48-
path: ${{ steps.composer-cache.outputs.dir }}
47+
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
4948
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
5049
restore-keys: ${{ runner.os }}-composer-
5150

‎.github/workflows/phpunit.yml‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,41 @@ on:
2020

2121
jobs:
2222
main:
23-
name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }}
23+
name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }} - ${{ matrix.dependencies }}
2424
runs-on: ubuntu-latest
2525
if: "!contains(github.event.head_commit.message, '[ci skip]')"
2626
strategy:
2727
matrix:
28-
php-versions: ['7.4', '8.0', '8.1']
29-
db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV', 'OCI8']
30-
mysql-versions: [ '5.7' ]
28+
php-versions: ['7.4', '8.0', '8.1', '8.2']
29+
db-platforms: ['MySQLi', 'SQLite3']
30+
mysql-versions: ['5.7']
31+
dependencies: ['highest']
3132
include:
33+
# MySQL 8.0
3234
- php-versions: '7.4'
3335
db-platforms: MySQLi
3436
mysql-versions: '8.0'
37+
dependencies: 'highest'
38+
# Lowest Dependency
39+
- php-versions: '7.4'
40+
db-platforms: MySQLi
41+
mysql-versions: '5.7'
42+
dependencies: 'lowest'
43+
# Postgre
44+
- php-versions: '7.4'
45+
db-platforms: Postgre
46+
mysql-versions: '5.7'
47+
dependencies: 'highest'
48+
# SQLSRV
49+
- php-versions: '7.4'
50+
db-platforms: SQLSRV
51+
mysql-versions: '5.7'
52+
dependencies: 'highest'
53+
# OCI8
54+
- php-versions: '7.4'
55+
db-platforms: OCI8
56+
mysql-versions: '5.7'
57+
dependencies: 'highest'
3558

3659
services:
3760
mysql:
@@ -109,26 +132,27 @@ jobs:
109132
extensions: intl, json, mbstring, gd, xdebug, xml, sqlite3, sqlsrv, oci8, pgsql
110133
coverage: xdebug
111134
env:
112-
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
135+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
113136

114137
- name: Get composer cache directory
115-
id: composer-cache
116-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
138+
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
117139

118140
- name: Cache composer dependencies
119141
uses: actions/cache@v3
120142
with:
121-
path: ${{ steps.composer-cache.outputs.dir }}
143+
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
122144
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
123145
restore-keys: ${{ runner.os }}-composer-
124146

125147
- name: Install dependencies
126148
run: |
127149
if [ -f composer.lock ]; then
128-
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
150+
composer install ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader
129151
else
130-
composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
152+
composer update ${{ env.COMPOSER_UPDATE_FLAGS }} --no-progress --no-interaction --prefer-dist --optimize-autoloader
131153
fi
154+
env:
155+
COMPOSER_UPDATE_FLAGS: ${{ matrix.dependencies == 'lowest' && '--prefer-lowest' || '' }}
132156

133157
- name: Test with PHPUnit
134158
run: vendor/bin/phpunit --verbose --coverage-text --testsuite main

‎.github/workflows/psalm.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,15 @@ jobs:
3636
extensions: intl, json, mbstring, xml
3737
coverage: none
3838
env:
39-
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040

4141
- name: Get composer cache directory
42-
id: composer-cache
43-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
42+
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4443

4544
- name: Cache composer dependencies
4645
uses: actions/cache@v3
4746
with:
48-
path: ${{ steps.composer-cache.outputs.dir }}
47+
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
4948
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
5049
restore-keys: ${{ runner.os }}-composer-
5150

‎.github/workflows/rector.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,15 @@ jobs:
4040
extensions: intl, json, mbstring, xml
4141
coverage: none
4242
env:
43-
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4444

4545
- name: Get composer cache directory
46-
id: composer-cache
47-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
46+
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4847

4948
- name: Cache composer dependencies
5049
uses: actions/cache@v3
5150
with:
52-
path: ${{ steps.composer-cache.outputs.dir }}
51+
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
5352
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
5453
restore-keys: ${{ runner.os }}-composer-
5554

@@ -63,5 +62,5 @@ jobs:
6362
6463
- name: Analyze for refactoring
6564
run: |
66-
composer global require --dev rector/rector:^0.13.3
65+
composer global require --dev rector/rector:^0.15.1
6766
rector process --dry-run --no-progress-bar

‎.github/workflows/unused.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,15 @@ jobs:
3434
extensions: intl, json, mbstring, xml
3535
coverage: none
3636
env:
37-
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3838

3939
- name: Get composer cache directory
40-
id: composer-cache
41-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
40+
run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
4241

4342
- name: Cache composer dependencies
4443
uses: actions/cache@v3
4544
with:
46-
path: ${{ steps.composer-cache.outputs.dir }}
45+
path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
4746
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
4847
restore-keys: ${{ runner.os }}-composer-
4948

‎.gitignore‎

Lines changed: 104 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,107 @@
1-
vendor/
2-
build/
3-
phpunit*.xml
1+
#-------------------------
2+
# Operating Specific Junk Files
3+
#-------------------------
4+
5+
# OS X
6+
.DS_Store
7+
.AppleDouble
8+
.LSOverride
9+
10+
# OS X Thumbnails
11+
._*
12+
13+
# Windows image file caches
14+
Thumbs.db
15+
ehthumbs.db
16+
Desktop.ini
17+
18+
# Recycle Bin used on file shares
19+
$RECYCLE.BIN/
20+
21+
# Windows Installer files
22+
*.cab
23+
*.msi
24+
*.msm
25+
*.msp
26+
27+
# Windows shortcuts
28+
*.lnk
29+
30+
# Linux
31+
*~
32+
33+
# KDE directory preferences
34+
.directory
35+
36+
# Linux trash folder which might appear on any partition or disk
37+
.Trash-*
38+
39+
#-------------------------
40+
# Environment Files
41+
#-------------------------
42+
# These should never be under version control,
43+
# as it poses a security risk.
44+
.env
45+
.vagrant
46+
Vagrantfile
47+
48+
#-------------------------
49+
# Temporary Files
50+
#-------------------------
51+
php_errors.log
52+
53+
#-------------------------
54+
# Test Files
55+
#-------------------------
56+
tests/coverage*
57+
58+
# Don't save phpunit under version control.
459
phpunit
5-
*.cache
60+
61+
#-------------------------
62+
# Composer
63+
#-------------------------
64+
vendor/
665
composer.lock
7-
.DS_Store
66+
67+
#-------------------------
68+
# IDE / Development Files
69+
#-------------------------
70+
71+
# Modules Testing
72+
_modules/*
73+
74+
# phpenv local config
75+
.php-version
76+
77+
# Jetbrains editors (PHPStorm, etc)
878
.idea/
79+
*.iml
80+
81+
# Netbeans
82+
nbproject/
83+
build/
84+
nbbuild/
85+
dist/
86+
nbdist/
87+
nbactions.xml
88+
nb-configuration.xml
89+
.nb-gradle/
90+
91+
# Sublime Text
92+
*.tmlanguage.cache
93+
*.tmPreferences.cache
94+
*.stTheme.cache
95+
*.sublime-workspace
96+
*.sublime-project
97+
.phpintel
98+
/api/
99+
100+
# Visual Studio Code
101+
.vscode/
102+
103+
/results/
104+
/phpunit*.xml
105+
/.phpunit.*.cache
106+
107+
/.php-cs-fixer.php

0 commit comments

Comments
 (0)