Skip to content

Commit ecd774a

Browse files
stakoviczstakovicz
authored
Merge branch 'symfony:2.x' into main
2 parents a8c730c + e4ab138 commit ecd774a

File tree

172 files changed

+8292
-4944
lines changed

Some content is hidden

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

172 files changed

+8292
-4944
lines changed

‎.github/workflows/test-turbo.yml‎

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,9 @@ jobs:
1717
php-version: '8.0'
1818
extensions: zip
1919

20-
- name: Get composer cache directory
21-
id: composercache
22-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
23-
24-
- name: Cache dependencies
25-
uses: actions/cache@v2
20+
- uses: ramsey/composer-install@v2
2621
with:
27-
path: ${{ steps.composercache.outputs.dir }}
28-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
29-
restore-keys: ${{ runner.os }}-composer-
30-
31-
- name: Install dependencies
32-
working-directory: src/Turbo
33-
run: composer install --prefer-dist
22+
working-directory: src/Turbo
3423

3524
- name: Install PHPUnit dependencies
3625
working-directory: src/Turbo
@@ -71,20 +60,9 @@ jobs:
7160
php-version: ${{ matrix.php-versions }}
7261
extensions: zip, pdo_sqlite
7362

74-
- name: Get composer cache directory
75-
id: composercache
76-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
77-
78-
- name: Cache PHP dependencies
79-
uses: actions/cache@v2
63+
- uses: ramsey/composer-install@v2
8064
with:
81-
path: ${{ steps.composercache.outputs.dir }}
82-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
83-
restore-keys: ${{ runner.os }}-composer-
84-
85-
- name: Install PHP dependencies
86-
working-directory: src/Turbo
87-
run: composer install --prefer-dist
65+
working-directory: src/Turbo
8866

8967
- name: Get yarn cache directory path
9068
id: yarn-cache-dir-path
@@ -143,20 +121,10 @@ jobs:
143121
php-version: '8.0'
144122
extensions: zip, pdo_sqlite
145123

146-
- name: Get composer cache directory
147-
id: composercache
148-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
149-
150-
- name: Cache PHP dependencies
151-
uses: actions/cache@v2
124+
- uses: ramsey/composer-install@v2
152125
with:
153-
path: ${{ steps.composercache.outputs.dir }}
154-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
155-
restore-keys: ${{ runner.os }}-composer-
156-
157-
- name: Install PHP dependencies
158-
working-directory: src/Turbo
159-
run: composer update --prefer-dist --prefer-lowest --prefer-stable
126+
working-directory: src/Turbo
127+
dependency-versions: lowest
160128

161129
- name: Get yarn cache directory path
162130
id: yarn-cache-dir-path

‎.github/workflows/test.yaml‎

Lines changed: 151 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,97 @@ jobs:
99
- uses: actions/checkout@master
1010
- uses: shivammathur/setup-php@v2
1111
with:
12-
php-version: '7.4'
12+
php-version: '8.0'
13+
tools: php-cs-fixer, cs2pr
1314
- name: php-cs-fixer
14-
run: |
15-
wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.18.2/php-cs-fixer.phar -q
16-
php php-cs-fixer.phar fix --dry-run --diff
15+
run: php-cs-fixer fix --dry-run --format=checkstyle | cs2pr
1716

1817
coding-style-js:
1918
runs-on: ubuntu-latest
2019
steps:
2120
- uses: actions/checkout@master
21+
- name: Get yarn cache directory path
22+
id: yarn-cache-dir-path
23+
run: echo "::set-output name=dir::$(yarn cache dir)"
24+
- uses: actions/cache@v2
25+
id: yarn-cache
26+
with:
27+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
28+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
29+
restore-keys: |
30+
${{ runner.os }}-yarn-
2231
- run: yarn
2332
- run: yarn check-lint
2433
- run: yarn check-format
2534

35+
js-dist-current:
36+
runs-on: ubuntu-latest
37+
steps:
38+
- uses: actions/checkout@master
39+
- name: Get yarn cache directory path
40+
id: yarn-cache-dir-path
41+
run: echo "::set-output name=dir::$(yarn cache dir)"
42+
- uses: actions/cache@v2
43+
id: yarn-cache
44+
with:
45+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
46+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
47+
restore-keys: |
48+
${{ runner.os }}-yarn-
49+
- run: yarn && yarn build
50+
- name: Check if js dist files are current
51+
id: changes
52+
uses: UnicornGlobal/[email protected]
53+
54+
- name: Ensure no changes
55+
if: steps.changes.outputs.changed == 1
56+
run: |
57+
echo "JS dist files need to be rebuilt"
58+
exit 1
59+
2660
tests-php-low-deps:
2761
runs-on: ubuntu-latest
2862
steps:
2963
- uses: actions/checkout@master
3064
- uses: shivammathur/setup-php@v2
3165
with:
3266
php-version: '7.2'
33-
- name: Chartjs
34-
run: |
35-
cd src/Chartjs
36-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
37-
php vendor/bin/simple-phpunit
38-
- name: Cropperjs
39-
run: |
40-
cd src/Cropperjs
41-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
42-
php vendor/bin/simple-phpunit
43-
- name: Dropzone
44-
run: |
45-
cd src/Dropzone
46-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
47-
php vendor/bin/simple-phpunit
48-
- name: LazyImage
49-
run: |
50-
cd src/LazyImage
51-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
52-
php vendor/bin/simple-phpunit
67+
68+
- name: Chartjs Dependencies
69+
uses: ramsey/composer-install@v2
70+
with:
71+
working-directory: src/Chartjs
72+
dependency-versions: lowest
73+
- name: Chartjs Tests
74+
run: php vendor/bin/simple-phpunit
75+
working-directory: src/Chartjs
76+
77+
- name: Cropperjs Dependencies
78+
uses: ramsey/composer-install@v2
79+
with:
80+
working-directory: src/Cropperjs
81+
dependency-versions: lowest
82+
- name: Cropperjs Tests
83+
run: php vendor/bin/simple-phpunit
84+
working-directory: src/Cropperjs
85+
86+
- name: Dropzone Dependencies
87+
uses: ramsey/composer-install@v2
88+
with:
89+
working-directory: src/Dropzone
90+
dependency-versions: lowest
91+
- name: Dropzone Tests
92+
run: php vendor/bin/simple-phpunit
93+
working-directory: src/Dropzone
94+
95+
- name: LazyImage Dependencies
96+
uses: ramsey/composer-install@v2
97+
with:
98+
working-directory: src/LazyImage
99+
dependency-versions: lowest
100+
- name: LazyImage Tests
101+
run: php vendor/bin/simple-phpunit
102+
working-directory: src/LazyImage
53103

54104
tests-php8-low-deps:
55105
runs-on: ubuntu-latest
@@ -58,17 +108,24 @@ jobs:
58108
- uses: shivammathur/setup-php@v2
59109
with:
60110
php-version: '8.0'
61-
- name: TwigComponent
62-
run: |
63-
cd src/TwigComponent
64-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
65-
php vendor/bin/simple-phpunit
66-
- name: LiveComponent
67-
run: |
68-
cd src/LiveComponent
69-
php ../../.github/build-packages.php
70-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
71-
php vendor/bin/simple-phpunit
111+
112+
- name: TwigComponent Dependencies
113+
uses: ramsey/composer-install@v2
114+
with:
115+
working-directory: src/TwigComponent
116+
dependency-versions: lowest
117+
- name: TwigComponent Tests
118+
run: php vendor/bin/simple-phpunit
119+
working-directory: src/TwigComponent
120+
121+
- name: LiveComponent Dependencies
122+
uses: ramsey/composer-install@v2
123+
with:
124+
working-directory: src/LiveComponent
125+
dependency-versions: lowest
126+
- name: LiveComponent Tests
127+
working-directory: src/LiveComponent
128+
run: php vendor/bin/simple-phpunit
72129

73130
tests-php-high-deps:
74131
runs-on: ubuntu-latest
@@ -77,41 +134,69 @@ jobs:
77134
- uses: shivammathur/setup-php@v2
78135
with:
79136
php-version: '8.0'
80-
- name: Chartjs
81-
run: |
82-
cd src/Chartjs
83-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
84-
php vendor/bin/simple-phpunit
85-
- name: Cropperjs
86-
run: |
87-
cd src/Cropperjs
88-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
89-
php vendor/bin/simple-phpunit
90-
- name: Dropzone
91-
run: |
92-
cd src/Dropzone
93-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
94-
php vendor/bin/simple-phpunit
95-
- name: LazyImage
96-
run: |
97-
cd src/LazyImage
98-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
99-
php vendor/bin/simple-phpunit
100-
- name: TwigComponent
101-
run: |
102-
cd src/TwigComponent
103-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
104-
php vendor/bin/simple-phpunit
105-
- name: LiveComponent
106-
run: |
107-
cd src/LiveComponent
108-
php ../../.github/build-packages.php
109-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
110-
php vendor/bin/simple-phpunit
137+
- run: php .github/build-packages.php
138+
139+
- name: Chartjs Dependencies
140+
uses: ramsey/composer-install@v2
141+
with:
142+
working-directory: src/Chartjs
143+
- name: Chartjs Tests
144+
run: php vendor/bin/simple-phpunit
145+
working-directory: src/Chartjs
146+
147+
- name: Cropperjs Dependencies
148+
uses: ramsey/composer-install@v2
149+
with:
150+
working-directory: src/Cropperjs
151+
- name: Cropperjs Tests
152+
run: php vendor/bin/simple-phpunit
153+
working-directory: src/Cropperjs
154+
155+
- name: Dropzone Dependencies
156+
uses: ramsey/composer-install@v2
157+
with:
158+
working-directory: src/Dropzone
159+
- name: Dropzone Tests
160+
run: php vendor/bin/simple-phpunit
161+
working-directory: src/Dropzone
162+
163+
- name: LazyImage Dependencies
164+
uses: ramsey/composer-install@v2
165+
with:
166+
working-directory: src/LazyImage
167+
- name: LazyImage Tests
168+
run: php vendor/bin/simple-phpunit
169+
working-directory: src/LazyImage
170+
171+
- name: TwigComponent Dependencies
172+
uses: ramsey/composer-install@v2
173+
with:
174+
working-directory: src/TwigComponent
175+
- name: TwigComponent Tests
176+
run: php vendor/bin/simple-phpunit
177+
working-directory: src/TwigComponent
178+
179+
- name: LiveComponent Dependencies
180+
uses: ramsey/composer-install@v2
181+
with:
182+
working-directory: src/LiveComponent
183+
- name: LiveComponent Tests
184+
working-directory: src/LiveComponent
185+
run: php vendor/bin/simple-phpunit
111186

112187
tests-js:
113188
runs-on: ubuntu-latest
114189
steps:
115190
- uses: actions/checkout@master
191+
- name: Get yarn cache directory path
192+
id: yarn-cache-dir-path
193+
run: echo "::set-output name=dir::$(yarn cache dir)"
194+
- uses: actions/cache@v2
195+
id: yarn-cache
196+
with:
197+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
198+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
199+
restore-keys: |
200+
${{ runner.os }}-yarn-
116201
- run: yarn
117202
- run: yarn test

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.php_cs.cache
1+
.php-cs-fixer.cache
22
node_modules
33
yarn.lock
44
yarn-error.log

‎.php_cs.dist‎ renamed to ‎.php-cs-fixer.dist.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
exit(0);
55
}
66

7-
return PhpCsFixer\Config::create()
7+
return (new PhpCsFixer\Config())
88
->setRules([
99
'@Symfony' => true,
1010
'@Symfony:risky' => true,
@@ -16,6 +16,9 @@
1616
'native_constant_invocation' => true,
1717
'combine_nested_dirname' => true,
1818
'list_syntax' => ['syntax' => 'short'],
19+
'ordered_imports' => [
20+
'imports_order' => ['const', 'class', 'function'],
21+
],
1922
])
2023
->setRiskyAllowed(true)
2124
->setFinder(
@@ -24,6 +27,7 @@
2427
->append([__FILE__])
2528
->notPath('#/Fixtures/#')
2629
->notPath('#/app/var/#')
30+
->notPath('#/var/cache/#')
2731
->notPath('Turbo/Attribute/Broadcast.php') // Need https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4702
2832
)
2933
;

0 commit comments

Comments
 (0)