8000 minor #16158 [ci] fix phpunit wrapper (nicolas-grekas) · symfony/symfony@65b9adc · GitHub
[go: up one dir, main page]
Skip to content

Commit 65b9adc

Browse files
nicolas-grekasnicolas-grekas
committed
minor #16158 [ci] fix phpunit wrapper (nicolas-grekas)
This PR was merged into the 2.3 branch. Discussion ---------- [ci] fix phpunit wrapper | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Our phpunit wrapper doing the root composer up was a mistake as it breaks testing deps=low. Commits ------- 25fbcc3 [ci] fix phpunit wrapper
2 parents 2dc28ea + 25fbcc3 commit 65b9adc

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

‎appveyor.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ init:
1313
- SET SYMFONY_DEPRECATIONS_HELPER=weak
1414
- SET PHP=1
1515
- SET ANSICON=121x90 (121x90)
16-
- SET PHP_INI_MATRIX=php.ini-min-ext php.ini-max-ext
16+
- SET PHP_INI_MATRIX=php.ini-min php.ini-max
1717

1818
install:
1919
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
@@ -31,18 +31,18 @@ install:
3131
- IF %PHP%==1 7z x php_memcache-3.0.8-5.3-nts-vc9-x86.zip -y > 7z.log
3232
- IF %PHP%==1 cd ..
3333
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
34-
- IF %PHP%==1 copy /Y php.ini-development php.ini-min-ext
35-
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini-min-ext
36-
- IF %PHP%==1 echo extension_dir=ext >> php.ini-min-ext
37-
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-min-ext
38-
- IF %PHP%==1 copy /Y php.ini-min-ext php.ini-max-ext
39-
- IF %PHP%==1 echo extension=php_apc.dll >> php.ini-max-ext
40-
- IF %PHP%==1 echo extension=php_intl.dll >> php.ini-max-ext
41-
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini-max-ext
42-
- IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini-max-ext
43-
- IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini-max-ext
34+
- IF %PHP%==1 copy /Y php.ini-development php.ini-min
35+
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini-min
36+
- IF %PHP%==1 echo extension_dir=ext >> php.ini-min
37+
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-min
38+
- IF %PHP%==1 copy /Y php.ini-min php.ini-max
39+
- IF %PHP%==1 echo extension=php_apc.dll >> php.ini-max
40+
- IF %PHP%==1 echo extension=php_intl.dll >> php.ini-max
41+
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini-max
42+
- IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini-max
43+
- IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini-max
4444
- appveyor DownloadFile https://getcomposer.org/composer.phar
45-
- copy /Y php.ini-max-ext php.ini
45+
- copy /Y php.ini-max php.ini
4646
- cd c:\projects\symfony
4747
- php phpunit install
4848
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)

‎phpunit

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ if (!file_exists($COMPOSER = __DIR__.'/composer.phar')) {
2424
$PHP = ProcessUtils::escapeArgument($PHP);
2525
$COMPOSER = $PHP.' '.ProcessUtils::escapeArgument($COMPOSER);
2626

27-
if (!(isset($argv[1]) && 'install' === $argv[1]) && !file_exists(__DIR__.'/vendor')) {
28-
passthru("$COMPOSER update --no-progress --ansi");
29-
}
30-
3127
if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit")) {
3228
// Build a standalone phpunit without symfony/yaml
3329

0 commit comments

Comments
 (0)
0