Skip to content

Commit ea58a15

Browse files
Merge branch '5.2' into 5.x
* 5.2: [travis] remove cache of composer.lock for deps=low Fix comment with typo
2 parents 8975f83 + 36cc161 commit ea58a15

File tree

3 files changed

+2
-170
lines changed

3 files changed

+2
-170
lines changed

.github/rm-invalid-lowest-lock-files.php

-164
This file was deleted.

.travis.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,7 @@ install:
279279
280280
[[ ! $X ]] || (exit 1)
281281
elif [[ $deps = low ]]; then
282-
[[ -e ~/php-ext/composer-lowest.lock.tar ]] && tar -xf ~/php-ext/composer-lowest.lock.tar
283-
tar -cf ~/php-ext/composer-lowest.lock.tar --files-from /dev/null
284-
php .github/rm-invalid-lowest-lock-files.php $COMPONENTS
285-
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
286-
echo "$COMPONENTS" | xargs -n1 -I{} tar --append -f ~/php-ext/composer-lowest.lock.tar {}/composer.lock
282+
echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT_X'"
287283
else
288284
if [[ $PHP = 8.0* ]]; then
289285
# add return types before running the test suite

src/Symfony/Component/Filesystem/Tests/FilesystemTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1762,7 +1762,7 @@ public function testCopyShouldKeepExecutionPermission()
17621762
}
17631763

17641764
/**
1765-
* Normalize the given path (transform each blackslash into a real directory separator).
1765+
* Normalize the given path (transform each forward slash into a real directory separator).
17661766
*/
17671767
private function normalize(string $path): string
17681768
{

0 commit comments

Comments
 (0)