Skip to content

Commit b45f002

Browse files
Disable the PhpUnit bridge when testing it
1 parent 7173d6c commit b45f002

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ install:
244244
export SYMFONY_DEPRECATIONS_HELPER=weak &&
245245
cp composer.json composer.json.orig &&
246246
echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json &&
247-
php .github/build-packages.php HEAD^ $(find src/Symfony -mindepth 3 -type f -name composer.json -printf '%h\n' | sort) &&
247+
php .github/build-packages.php HEAD^ $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | sort) &&
248248
mv composer.json composer.json.phpunit &&
249249
mv composer.json.orig composer.json
250250
fi
@@ -268,7 +268,7 @@ install:
268268
- |
269269
# Skip the phpunit-bridge on bugfix-only branches when $deps is empty
270270
if [[ ! $deps && ! $TRAVIS_BRANCH = *.x ]]; then
271-
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
271+
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
272272
fi
273273
274274
- |

phpunit

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,8 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
2424
if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
2525
putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
2626
}
27+
if (getcwd() === realpath(__DIR__.'/src/Symfony/Bridge/PhpUnit')) {
28+
putenv('SYMFONY_DEPRECATIONS_HELPER=disabled');
29+
}
2730
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
2831
require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';

0 commit comments

Comments
 (0)