Skip to content

Commit 5fe6e6c

Browse files
soyukasoyuka
committed
chore(ci): dev deps phpunit
1 parent 0273166 commit 5fe6e6c

File tree

3 files changed

+53
-49
lines changed

3 files changed

+53
-49
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
env:
88
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99
COVERAGE: '0'
10-
SYMFONY_DEPRECATIONS_HELPER: 'disabled=1'
10+
SYMFONY_DEPRECATIONS_HELPER: disabled=1
1111

1212
jobs:
1313
php-cs-fixer:
@@ -126,9 +126,9 @@ jobs:
126126
path: ${{ steps.composercache.outputs.dir }}
127127
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
128128
restore-keys: ${{ runner.os }}-composer-
129-
# - name: Enable code coverage
130-
# if: matrix.coverage
131-
# run: echo "COVERAGE=1" >> $GITHUB_ENV
129+
- name: Enable code coverage
130+
if: matrix.coverage
131+
run: echo "COVERAGE=1" >> $GITHUB_ENV
132132
- name: Remove Doctrine MongoDB ODM
133133
if: (startsWith(matrix.php, '7.1'))
134134
run: |
@@ -147,30 +147,34 @@ jobs:
147147
- name: Run PHPUnit tests
148148
run: |
149149
mkdir -p build/logs/phpunit
150-
vendor/bin/simple-phpunit --log-junit build/logs/phpunit/junit.xml
151-
# - name: Upload test artifacts
152-
# if: always()
153-
# uses: actions/upload-artifact@v1
154-
# with:
155-
# name: phpunit-logs-php${{ matrix.php }}
156-
# path: build/logs/phpunit
157-
# continue-on-error: true
158-
# - name: Upload coverage results to Codecov
159-
# if: matrix.coverage
160-
# uses: codecov/codecov-action@v1
161-
# with:
162-
# name: phpunit-php${{ matrix.php }}
163-
# flags: phpunit
164-
# fail_ci_if_error: true
165-
# continue-on-error: true
166-
# - name: Upload coverage results to Coveralls
167-
# if: matrix.coverage
168-
# env:
169-
# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
170-
# run: |
171-
# composer global require --prefer-dist --no-interaction --no-progress --ansi cedx/coveralls
172-
# export PATH="$PATH:$HOME/.composer/vendor/bin"
173-
# coveralls build/logs/phpunit/clover.xml
150+
if [ "$COVERAGE" = '1' ]; then
151+
vendor/bin/simple-phpunit --log-junit build/logs/phpunit/junit.xml --coverage-clover build/logs/phpunit/clover.xml
152+
else
153+
vendor/bin/simple-phpunit --log-junit build/logs/phpunit/junit.xml
154+
fi
155+
- name: Upload test artifacts
156+
if: always()
157+
uses: actions/upload-artifact@v1
158+
with:
159+
name: phpunit-logs-php${{ matrix.php }}
160+
path: build/logs/phpunit
161+
continue-on-error: true
162+
- name: Upload coverage results to Codecov
163+
if: matrix.coverage
164+
uses: codecov/codecov-action@v1
165+
with:
166+
name: phpunit-php${{ matrix.php }}
167+
flags: phpunit
168+
fail_ci_if_error: true
169+
continue-on-error: true
170+
- name: Upload coverage results to Coveralls
171+
if: matrix.coverage
172+
env:
173+
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
174+
run: |
175+
composer global require --prefer-dist --no-interaction --no-progress --ansi cedx/coveralls
176+
export PATH="$PATH:$HOME/.composer/vendor/bin"
177+
coveralls build/logs/phpunit/clover.xml
174178
continue-on-error: true
175179

176180
behat:

‎tests/Core/Bridge/Doctrine/Orm/Extension/PaginationExtensionTest.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ public function testGetResult()
938938
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
939939

940940
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
941-
$queryBuilder->select(['o']);
941+
$queryBuilder->select('o');
942942
$queryBuilder->from(Dummy::class, 'o');
943943
$queryBuilder->setFirstResult(0);
944944
$queryBuilder->setMaxResults(42);
@@ -973,7 +973,7 @@ public function testGetResultWithoutDistinct()
973973
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
974974

975975
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
976-
$queryBuilder->select(['o']);
976+
$queryBuilder->select('o');
977977
$queryBuilder->from(Dummy::class, 'o');
978978
$queryBuilder->setFirstResult(0);
979979
$queryBuilder->setMaxResults(42);
@@ -1015,7 +1015,7 @@ public function testLegacyGetResult()
10151015
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
10161016

10171017
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
1018-
$queryBuilder->select(['o']);
1018+
$queryBuilder->select('o');
10191019
$queryBuilder->from(Dummy::class, 'o');
10201020
$queryBuilder->setFirstResult(0);
10211021
$queryBuilder->setMaxResults(42);
@@ -1056,7 +1056,7 @@ public function testGetResultWithFetchJoinCollection(array $attributes, array $c
10561056
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
10571057

10581058
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
1059-
$queryBuilder->select(['o']);
1059+
$queryBuilder->select('o');
10601060
$queryBuilder->from(Dummy::class, 'o');
10611061
$queryBuilder->setFirstResult(0);
10621062
$queryBuilder->setMaxResults(42);
@@ -1112,7 +1112,7 @@ public function testLegacyGetResultWithFetchJoinCollectionDisabled()
11121112
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
11131113

11141114
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
1115-
$queryBuilder->select(['o']);
1115+
$queryBuilder->select('o');
11161116
$queryBuilder->from(Dummy::class, 'o');
11171117
$queryBuilder->setFirstResult(0);
11181118
$queryBuilder->setMaxResults(42);
@@ -1159,7 +1159,7 @@ public function testGetResultWithUseOutputWalkers(array $attributes, array $cont
11591159
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
11601160

11611161
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
1162-
$queryBuilder->select(['o']);
1162+
$queryBuilder->select('o');
11631163
$queryBuilder->from(Dummy::class, 'o');
11641164
$queryBuilder->setFirstResult(0);
11651165
$queryBuilder->setMaxResults(42);
@@ -1215,7 +1215,7 @@ public function testLegacyGetResultWithUseOutputWalkersDisabled()
12151215
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
12161216

12171217
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
1218-
$queryBuilder->select(['o']);
1218+
$queryBuilder->select('o');
12191219
$queryBuilder->from(Dummy::class, 'o');
12201220
$queryBuilder->setFirstResult(0);
12211221
$queryBuilder->setMaxResults(42);
@@ -1259,7 +1259,7 @@ public function testGetResultWithPartial()
12591259
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
12601260

12611261
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
1262-
$queryBuilder->select(['o']);
1262+
$queryBuilder->select('o');
12631263
$queryBuilder->from(Dummy::class, 'o');
12641264
$queryBuilder->setFirstResult(0);
12651265
$queryBuilder->setMaxResults(42);
@@ -1299,7 +1299,7 @@ public function testLegacyGetResultWithPartial()
12991299
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
13001300

13011301
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
1302-
$queryBuilder->select(['o']);
1302+
$queryBuilder->select('o');
13031303
$queryBuilder->from(Dummy::class, 'o');
13041304
$queryBuilder->setFirstResult(0);
13051305
$queryBuilder->setMaxResults(42);
@@ -1337,7 +1337,7 @@ public function testSimpleGetResult()
13371337
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
13381338

13391339
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
1340-
$queryBuilder->select(['o']);
1340+
$queryBuilder->select('o');
13411341
$queryBuilder->from(Dummy::class, 'o');
13421342
$queryBuilder->setFirstResult(0);
13431343
$queryBuilder->setMaxResults(42);
@@ -1376,7 +1376,7 @@ public function testLegacySimpleGetResult()
13761376
$entityManagerProphecy->getClassMetadata(Dummy::class)->willReturn($dummyMetadata);
13771377

13781378
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
1379-
$queryBuilder->select(['o']);
1379+
$queryBuilder->select('o');
13801380
$queryBuilder->from(Dummy::class, 'o');
13811381
$queryBuilder->setFirstResult(0);
13821382
$queryBuilder->setMaxResults(42);

‎tests/Core/Bridge/Doctrine/Orm/Util/QueryCheckerTest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function testHasOrderByOnFetchJoinedToManyAssociationWithoutJoin()
122122
$entityManagerProphecy = $this->prophesize(EntityManagerInterface::class);
123123

124124
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
125-
$queryBuilder->select(['d']);
125+
$queryBuilder->select('d');
126126
$queryBuilder->from(Dummy::class, 'd');
127127
$queryBuilder->orderBy('d.name', 'ASC');
128128

@@ -136,7 +136,7 @@ public function testHasOrderByOnFetchJoinedToManyAssociationWithoutOrderBy()
136136
$entityManagerProphecy = $this->prophesize(EntityManagerInterface::class);
137137

138138
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
139-
$queryBuilder->select(['d', 'a_1']);
139+
$queryBuilder->select('d', 'a_1');
140140
$queryBuilder->from(Dummy::class, 'd');
141141
$queryBuilder->leftJoin('d.relatedDummies', 'a_1');
142142

@@ -164,7 +164,7 @@ public function testHasOrderByOnFetchJoinedToManyAssociationNotFetchJoined()
164164
$entityManagerProphecy->getClassMetadata(RelatedDummy::class)->willReturn($relatedDummyMetadata);
165165

166166
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
167-
$queryBuilder->select(['d', 'a_2']);
167+
$queryBuilder->select('d', 'a_2');
168168
$queryBuilder->from(Dummy::class, 'd');
169169
$queryBuilder->leftJoin('d.relatedDummies', 'a_1');
170170
$queryBuilder->leftJoin('d.relatedDummy', 'a_2');
@@ -192,7 +192,7 @@ public function testHasOrderByOnFetchJoinedToManyAssociationWithJoinByAssociatio
192192
$entityManagerProphecy->getClassMetadata(RelatedDummy::class)->willReturn($relatedDummyMetadata);
193193

194194
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
195-
$queryBuilder->select(['d', 'a_1']);
195+
$queryBuilder->select('d', 'a_1');
196196
$queryBuilder->from(Dummy::class, 'd');
197197
$queryBuilder->leftJoin('d.relatedDummies', 'a_1');
198198
$queryBuilder->orderBy('a_1.name', 'ASC');
@@ -213,7 +213,7 @@ public function testHasOrderByOnToManyJoinWithoutJoin()
213213
$entityManagerProphecy = $this->prophesize(EntityManagerInterface::class);
214214

215215
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
216-
$queryBuilder->select(['d']);
216+
$queryBuilder->select('d');
217217
$queryBuilder->from(Dummy::class, 'd');
218218
$queryBuilder->orderBy('d.name', 'ASC');
219219

@@ -231,7 +231,7 @@ public function testHasOrderByOnToManyJoinWithoutOrderBy()
231231
$entityManagerProphecy = $this->prophesize(EntityManagerInterface::class);
232232

233233
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
234-
$queryBuilder->select(['d', 'a_1']);
234+
$queryBuilder->select('d', 'a_1');
235235
$queryBuilder->from(Dummy::class, 'd');
236236
$queryBuilder->leftJoin('d.relatedDummies', 'a_1');
237237

@@ -263,7 +263,7 @@ public function testHasOrderByOnToManyJoinNotFetchJoined()
263263
$entityManagerProphecy->getClassMetadata(RelatedDummy::class)->willReturn($relatedDummyMetadata);
264264

265265
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
266-
$queryBuilder->select(['d', 'a_2']);
266+
$queryBuilder->select('d', 'a_2');
267267
$queryBuilder->from(Dummy::class, 'd');
268268
$queryBuilder->leftJoin('d.relatedDummies', 'a_1');
269269
$queryBuilder->leftJoin('d.relatedDummy', 'a_2');
@@ -295,7 +295,7 @@ public function testHasOrderByOnToManyWithJoinByAssociation()
295295
$entityManagerProphecy->getClassMetadata(RelatedDummy::class)->willReturn($relatedDummyMetadata);
296296

297297
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
298-
$queryBuilder->select(['d', 'a_1']);
298+
$queryBuilder->select('d', 'a_1');
299299
$queryBuilder->from(Dummy::class, 'd');
300300
$queryBuilder->leftJoin('d.relatedDummies', 'a_1');
301301
$queryBuilder->orderBy('a_1.name', 'ASC');
@@ -312,7 +312,7 @@ public function testHasJoinedToManyAssociationWithoutJoin()
312312
$entityManagerProphecy = $this->prophesize(EntityManagerInterface::class);
313313

314314
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
315-
$queryBuilder->select(['d']);
315+
$queryBuilder->select('d');
316316
$queryBuilder->from(Dummy::class, 'd');
317317

318318
$managerRegistryProphecy = $this->prophesize(ManagerRegistry::class);
@@ -335,7 +335,7 @@ public function testHasJoinedToManyAssociationWithJoinByAssociation()
335335
$entityManagerProphecy->getClassMetadata(RelatedDummy::class)->willReturn($relatedDummyMetadata);
336336

337337
$queryBuilder = new QueryBuilder($entityManagerProphecy->reveal());
338-
$queryBuilder->select(['d']);
338+
$queryBuilder->select('d');
339339
$queryBuilder->from(Dummy::class, 'd');
340340
$queryBuilder->leftJoin('d.relatedDummies', 'a_1');
341341

0 commit comments

Comments
 (0)