8000 Merge branch '2.3' into 2.5 · symfony/symfony@7c42995 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7c42995

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.3' into 2.5
* 2.3: [travis] reorder matrix + prevent "Killed" jobs [HttpFoundation] removed wrong HTTP header
2 parents d7bd259 + e10024e commit 7c42995

File tree

3 files changed

+14
-19
lines changed

3 files changed

+14
-19
lines changed

‎.travis.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
language: php
22

3-
php:
4-
- 5.3.3
5-
- 5.3
6-
- 5.4
7-
- 5.5
8-
- 5.6
9-
- hhvm-nightly
10-
113
matrix:
12-
allow_failures:
13-
- php: hhvm-nightly
144
include:
15-
- php: 5.5
16-
env: components=high
175
- php: 5.3.3
186
env: components=low
7+
- php: 5.6
8+
env: components=high
9+
- php: 5.3.3
10+
- php: 5.3
11+
- php: 5.4
12+
- php: 5.5
13+
- php: 5.6
14+
- php: hhvm-nightly
15+
allow_failures:
16+
- php: hhvm-nightly
17+
fast_finish: true
1918

2019
services: mongodb
2120

@@ -26,12 +25,12 @@ env:
2625
before_install:
2726
- travis_retry sudo apt-get install parallel
2827
- composer self-update
29-
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;
30-
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi;
28+
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then phpenv config-rm xdebug.ini; fi;
3129
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
3230
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
3331
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then pecl install -f memcached-2.1.0; fi;
3432
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
33+
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then php -i; fi;
3534
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
3635
# - if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;
3736

@@ -42,4 +41,4 @@ script:
4241
- if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark,intl-data {};'; fi;
4342
- if [ "$components" = "no" ]; then echo "Running tests requiring tty"; phpunit --group tty; fi;
4443
- if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order 'echo "Running {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark,intl-data;'; fi;
45-
- if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order 'echo "Running {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data;'; fi;
44+
- if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j50% 'echo "Running {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data;'; fi;

‎src/Symfony/Component/HttpFoundation/BinaryFileResponse.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ public function prepare(Request $request)
170170
{
171171
$this->headers->set('Content-Length', $this->file->getSize());
172172
$this->headers->set('Accept-Ranges', 'bytes');
173-
$this->headers->set('Content-Transfer-Encoding', 'binary');
174173

175174
if (!$this->headers->has('Content-Type')) {
176175
$this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream');

‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public function testRequests($requestRange, $offset, $length, $responseRange)
7777
$response->sendContent();
7878

7979
$this->assertEquals(206, $response->getStatusCode());
80-
$this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding'));
8180
$this->assertEquals($responseRange, $response->headers->get('Content-Range'));
8281
}
8382

@@ -113,7 +112,6 @@ public function testFullFileRequests($requestRange)
113112
$response->sendContent();
114113

115114
$this->assertEquals(200, $response->getStatusCode());
116-
$this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding'));
117115
}
118116

119117
public function provideFullFileRanges()
@@ -144,7 +142,6 @@ public function testInvalidRequests($requestRange)
144142
$response->sendContent();
145143

146144
$this->assertEquals(416, $response->getStatusCode());
147-
$this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding'));
148145
#$this->assertEquals('', $response->headers->get('Content-Range'));
149146
}
150147

0 commit comments

Comments
 (0)
0