Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 28f4c09

Browse filesBrowse files
Merge branch '3.4' into 4.3
* 3.4: Sort components on CI fix parameter type declaration and make fabbot happy Upgraded CI Composer bumped Symfony version to 3.4.32 updated VERSION for 3.4.31 update CONTRIBUTORS for 3.4.31 updated CHANGELOG for 3.4.31
2 parents e1e5a46 + c08b42a commit 28f4c09
Copy full SHA for 28f4c09

File tree

Expand file treeCollapse file tree

5 files changed

+84
-44
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+84
-44
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ install:
4242
- echo extension=php_curl.dll >> php.ini-max
4343
- copy /Y php.ini-max php.ini
4444
- cd c:\projects\symfony
45-
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.7.1/composer.phar)
45+
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
4646
- php composer.phar self-update
4747
- copy /Y .composer\* %APPDATA%\Composer\
4848
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ before_install:
7676
export PHPUNIT=$(readlink -f ./phpunit)
7777
export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
7878
export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
79-
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n')
79+
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
8080
find ~/.phpenv -name xdebug.ini -delete
8181
8282
if [[ $TRAVIS_PHP_VERSION = 7.4* && $deps ]]; then
@@ -229,15 +229,15 @@ install:
229229
SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
230230
git fetch origin $SYMFONY_VERSION &&
231231
git checkout -m FETCH_HEAD &&
232-
COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n')
232+
COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
233233
else
234234
SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
235235
fi
236236
237237
- |
238238
# Skip the phpunit-bridge on not-master branches when $deps is empty
239239
if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then
240-
COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n')
240+
COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
241241
fi
242242
243243
- |

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.