8000 minor #24108 [travis] update to trusty (nicolas-grekas) · symfony/symfony@cf4f832 · GitHub
[go: up one dir, main page]
Skip to content

Commit cf4f832

Browse files
nicolas-grekasnicolas-grekas
committed
minor #24108 [travis] update to trusty (nicolas-grekas)
This PR was merged into the 2.7 branch. Discussion ---------- [travis] update to trusty | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Precise is dying, see https://blog.travis-ci.com/2017-08-31-trusty-as-default-status Commits ------- cfc9346 [travis] update to trusty
2 parents a819038 + cfc9346 commit cf4f832

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

‎.travis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: php
22

3-
dist: precise
3+
dist: trusty
44
sudo: false
55

66
git:
@@ -13,17 +13,14 @@ addons:
1313

1414
env:
1515
global:
16-
- MIN_PHP=5.3.9
16+
- MIN_PHP=5.4.9
1717
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/5.6/bin/php
1818

1919
matrix:
2020
include:
21-
# Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
2221
- php: hhvm-3.18
2322
sudo: required
24-
dist: trusty
2523
group: edge
26-
- php: 5.3
2724
- php: 5.4
2825
- php: 5.5
2926
- php: 5.6
@@ -99,7 +96,6 @@ before_install:
9996
echo opcache.enable_cli = 1 >> $INI
10097
echo hhvm.jit = 0 >> $INI
10198
echo apc.enable_cli = 1 >> $INI
102-
echo extension = ldap.so >> $INI
10399
[[ $PHP = 5.* ]] && echo extension = memcache.so >> $INI
104100
if [[ $PHP = 5.* ]]; then
105101
echo extension = mongo.so >> $INI

‎appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ init:
1717
install:
1818
- mkdir c:\php && cd c:\php
1919
- appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/cacert.pem
20-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-5.3.11-nts-Win32-VC9-x86.zip
21-
- 7z x php-5.3.11-nts-Win32-VC9-x86.zip -y >nul
20+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-5.3.9-nts-Win32-VC9-x86.zip
21+
- 7z x php-5.3.9-nts-Win32-VC9-x86.zip -y >nul
2222
- appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/ICU-51.2-dlls.zip
2323
- 7z x ICU-51.2-dlls.zip -y >nul
2424
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
@@ -61,7 +61,7 @@ test_script:
6161
- cd c:\php && 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul && copy /Y php.ini-min php.ini
6262
- cd c:\projects\symfony
6363
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
64-
- cd c:\php && 7z x php-5.3.11-nts-Win32-VC9-x86.zip -y >nul && copy /Y php.ini-min php.ini
64+
- cd c:\php && 7z x php-5.3.9-nts-Win32-VC9-x86.zip -y >nul && copy /Y php.ini-min php.ini
6565
- cd c:\projects\symfony
6666
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
6767
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323
"symfony/http-kernel": "~2.7"
2424
},
2525
"require-dev": {
26-
"symfony/browser-kit": "~2.4",
26+
"symfony/browser-kit": "~2.7",
2727
"symfony/console": "~2.7",
28-
"symfony/css-selector": "^2.0.5",
29-
"symfony/dependency-injection": "^2.6.6",
30-
"symfony/dom-crawler": "^2.0.5",
28+
"symfony/css-selector": "^2.7",
29+
"symfony/dependency-injection": "^2.7",
30+
"symfony/dom-crawler": "^2.7",
3131
"symfony/form": "~2.7.15|^2.8.8",
3232
"symfony/framework-bundle": "~2.7.25|^2.8.18",
3333
"symfony/http-foundation": "~2.7",
3434
"symfony/twig-bundle": "~2.7",
3535
"symfony/twig-bridge": "^2.7.4",
36-
"symfony/process": "^2.0.5",
37-
"symfony/validator": "~2.5",
38-
"symfony/yaml": "^2.0.5",
39-
"symfony/expression-language": "~2.6",
36+
"symfony/process": "^2.7",
37+
"symfony/validator": "~2.7",
38+
"symfony/yaml": "^2.7",
39+
"symfony/expression-language": "~2.7",
4040
"doctrine/doctrine-bundle": "~1.2",
4141
"twig/twig": "~1.34|~2.4",
4242
"ircmaxell/password-compat": "~1.0"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function setData($data = array())
121121
$data = json_encode($data, $this->encodingOptions);
122122
} else {
123123
try {
124-
if (\PHP_VERSION_ID < 50400) {
124+
if (!interface_exists('JsonSerializable', false)) {
125125
// PHP 5.3 triggers annoying warnings for some
126126
// types that can't be serialized as JSON (INF, resources, etc.)
127127
// but doesn't provide the JsonSerializable interface.
@@ -153,7 +153,7 @@ public function setData($data = array())
153153
if (\PHP_VERSION_ID < 50500) {
154154
restore_error_handler();
155155
}
156-
if (\PHP_VERSION_ID >= 50400 && 'Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
156+
if (interface_exists('JsonSerializable', false) && 'Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
157157
throw $e->getPrevious() ?: $e;
158158
}
159159
throw $e;

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,13 @@ public function testSetContent()
206206
/**
207207
* @expectedException \Exception
208208
* @expectedExceptionMessage This error is expected
209-
* @requires PHP 5.4
210209
*/
211210
public function testSetContentJsonSerializeError()
212211
{
212+
if (!interface_exists('JsonSerializable', false)) {
213+
$this->markTestSkipped('JsonSerializable is required.');
214+
}
215+
213216
$serializable = new JsonSerializableObject();
214217

215218
JsonResponse::create($serializable);
@@ -224,7 +227,7 @@ public function testSetComplexCallback()
224227
}
225228
}
226229

227-
if (interface_exists('JsonSerializable')) {
230+
if (interface_exists('JsonSerializable', false)) {
228231
class JsonSerializableObject implements \JsonSerializable
229232
{
230233
public function jsonSerialize()

0 commit comments

Comments
 (0)
0