8000 minor #12522 [3.0] Update required PHP to 5.5.9 (nicolas-grekas, Grah… · symfony/symfony@479a938 · GitHub
[go: up one dir, main page]
Skip to content

Commit 479a938

Browse files
fabpotfabpot
committed
minor #12522 [3.0] Update required PHP to 5.5.9 (nicolas-grekas, GrahamCampbell)
This PR was merged into the 3.0-dev branch. Discussion ---------- [3.0] Update required PHP to 5.5.9 | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | #13126, #12778 | License | MIT | Doc PR | - This PR upgrades composer.json files to php>=5.5.9 5.5.9 is the lowest version available on Travis and the version shipped with Ubuntu LTS 14.04. We can change the php version later when we'll agree on some other requirement, but currently, this is required to safely merge in master without having some users reporting issues because they have a `dev-master@dev` requirement. Commits ------- 35e0845 [3.0] Removed some old hacks fddcb86 [3.0] Update required PHP to 5.5.9
2 parents f4b498c + 35e0845 commit 479a938

File tree

128 files changed

+371
-1208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+371
-1208
lines changed

‎.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ language: php
22

33
matrix:
44
include:
5-
- php: 5.3.3
5+
- php: 5.5.9
66
env: components=low
77
- php: 5.6
88
env: components=high
9-
- php: 5.3.3
10-
- php: 5.3
11-
- php: 5.4
129
- php: 5.5
1310
- php: 5.6
1411
- php: hhvm-nightly

‎README.md

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,13 @@ README
44
What is Symfony?
55
-----------------
66

7-
Symfony is a PHP 5.3 full-stack web framework. It is written with speed and
7+
Symfony is a PHP full-stack web framework. It is written with speed and
88
flexibility in mind. It allows developers to build better and easy to maintain
99
websites with PHP.
1010

1111
Symfony can be used to develop all kind of websites, from your personal blog
1212
to high traffic ones like Dailymotion or Yahoo! Answers.
1313

14-
Requirements
15-
------------
16-
17-
Symfony is only supported on PHP 5.3.3 and up.
18-
19-
Be warned that PHP versions before 5.3.8 are known to be buggy and might not
20-
work for you:
21-
22-
* before PHP 5.3.4, if you get "Notice: Trying to get property of
23-
non-object", you've hit a known PHP bug (see
24-
https://bugs.php.net/bug.php?id=52083 and
25-
https://bugs.php.net/bug.php?id=50027);
26-
27-
* before PHP 5.3.8, if you get an error involving annotations, you've hit a
28-
known PHP bug (see https://bugs.php.net/bug.php?id=55156).
29-
30-
* PHP 5.3.16 has a major bug in the Reflection subsystem and is not suitable to
31-
run Symfony (https://bugs.php.net/bug.php?id=62715)
32-
3314
Installation
3415
------------
3516

‎autoload.php.dist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
if (PHP_VERSION_ID >= 50400 && gc_enabled()) {
4-
// Disabling Zend Garbage Collection to prevent segfaults with PHP5.4+
5-
// https://bugs.php.net/bug.php?id=53976
3+
// Disabling Zend Garbage Collection to prevent segfaults
4+
// https://bugs.php.net/bug.php?id=53976
5+
if (gc_enabled()) {
66
gc_disable();
77
}
88

‎composer.json

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,55 +16,55 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.3",
19+
"php": ">=5.5.9",
2020
"doctrine/common": "~2.3",
2121
"twig/twig": "~1.12,>=1.12.3",
2222
"psr/log": "~1.0"
2323
},
2424
"replace": {
2525
"symfony/browser-kit": "self.version",
2626
"symfony/class-loader": "self.version",
27-
"symfony/config": "self.version",
28-
"symfony/console": "self.version",
27+
"symfony/config": "2.99.99",
28+
"symfony/console": "2.99.99",
2929
"symfony/css-selector": "self.version",
30-
"symfony/dependency-injection": "self.version",
30+
"symfony/dependency-injection": "2.99.99",
3131
"symfony/debug": "self.version",
3232
"symfony/debug-bundle": "self.version",
33-
"symfony/doctrine-bridge": "self.version",
33+
"symfony/doctrine-bridge": "2.99.99",
3434
"symfony/dom-crawler": "self.version",
35-
"symfony/event-dispatcher": "self.version",
36-
"symfony/expression-language": "self.version",
37-
"symfony/filesystem": "self.version",
35+
"symfony/event-dispatcher": "2.99.99",
36+
"symfony/expression-language": "2.99.99",
37+
"symfony/filesystem": "2.99.99",
3838
"symfony/finder": "self.version",
3939
"symfony/form": "self.version",
40-
"symfony/framework-bundle": "self.version",
40+
"symfony/framework-bundle": "2.99.99",
4141
"symfony/http-foundation": "self.version",
4242
"symfony/http-kernel": "self.version",
4343
"symfony/intl": "self.version",
4444
"symfony/locale": "self.version",
4545
"symfony/monolog-bridge": "self.version",
4646
"symfony/options-resolver": "self.version",
47-
"symfony/process": "self.version",
47+
"symfony/process": "2.99.99",
4848
"symfony/propel1-bridge": "self.version",
4949
"symfony/property-access": "self.version",
5050
"symfony/proxy-manager-bridge": "self.version",
5151
"symfony/routing": "self.version",
52-
"symfony/security": "self.version",
52+
"symfony/security": "2.99.99",
5353
"symfony/security-acl": "self.version",
5454
"symfony/security-core": "self.version",
5555
"symfony/security-csrf": "self.version",
5656
"symfony/security-http": "self.version",
5757
"symfony/security-bundle": "self.version",
5858
"symfony/serializer": "self.version",
59-
"symfony/stopwatch": "self.version",
59+
"symfony/stopwatch": "2.99.99",
6060
"symfony/templating": "self.version",
6161
"symfony/translation": "self.version",
6262
"symfony/twig-bridge": "self.version",
6363
"symfony/twig-bundle": "self.version",
64-
"symfony/validator": "self.version",
64+
"symfony/validator": "2.99.99",
6565
"symfony/var-dumper": "self.version",
6666
"symfony/web-profiler-bundle": "self.version",
67-
"symfony/yaml": "self.version"
67+
"symfony/yaml": "2.99.99"
6868
},
6969
"require-dev": {
7070
"doctrine/data-fixtures": "1.0.*",
@@ -73,7 +73,6 @@
7373
"doctrine/doctrine-bundle": "~1.2",
7474
"monolog/monolog": "~1.11",
7575
"propel/propel1": "~1.6",
76-
"ircmaxell/password-compat": "~1.0",
7776
"ocramius/proxy-manager": "~0.4|~1.0",
7877
"egulias/email-validator": "~1.2"
7978
},

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidator2Dot4ApiTest.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.3",
19+
"php": ">=5.5.9",
2020
"doctrine/common": "~2.3"
2121
},
2222
"require-dev": {
23-
"symfony/stopwatch": "~2.2|~3.0.0",
24-
"symfony/dependency-injection": "~2.2|~3.0.0",
25-
"symfony/form": "~2.3,>=2.3.8|~3.0.0",
26-
"symfony/http-kernel": "~2.2|~3.0.0",
27-
"symfony/property-access": "~2.3|~3.0.0",
28-
"symfony/security": "~2.2|~3.0.0",
29-
"symfony/expression-language": "~2.2|~3.0.0",
30-
"symfony/validator": "~2.5,>=2.5.5|~3.0.0",
31-
"symfony/translation": "~2.0,>=2.0.5|~3.0.0",
23+
"symfony/stopwatch": "~2.7|~3.0",
24+
"symfony/dependency-injection": "~2.7|~3.0",
25+
"symfony/form": "~2.7|~3.0",
26+
"symfony/http-kernel": "~2.7|~3.0",
27+
"symfony/property-access": "~2.7|~3.0",
28+
"symfony/security": "~2.7|~3.0",
29+
"symfony/expression-language": "~2.7|~3.0",
30+
"symfony/validator": "~2.7|~3.0",
31+
"symfony/translation": "~2.7|~3.0",
3232
"doctrine/data-fixtures": "1.0.*",
3333
"doctrine/dbal": "~2.2",
3434
"doctrine/orm": "~2.2,>=2.2.3"

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.3",
19+
"php": ">=5.5.9",
2020
"monolog/monolog": "~1.11"
2121
},
2222
"require-dev": {
23-
"symfony/http-kernel": "~2.4|~3.0.0",
24-
"symfony/console": "~2.4|~3.0.0",
25-
"symfony/event-dispatcher": "~2.2|~3.0.0"
23+
"symfony/http-kernel": "~2.7|~3.0",
24+
"symfony/console": "~2.7|~3.0",
25+
"symfony/event-dispatcher": "~2.7|~3.0"
2626
},
2727
"suggest": {
2828
"symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",

‎src/Symfony/Bridge/Propel1/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.3",
20-
"symfony/http-foundation": "~2.0,>=2.0.5|~3.0.0",
21-
"symfony/http-kernel": "~2.0,>=2.0.5|~3.0.0",
22-
"symfony/form": "~2.3,>=2.3.8|~3.0.0",
23-
"symfony/property-access": "~2.3|~3.0.0",
19+
"php": ">=5.5.9",
20+
"symfony/http-foundation": "~2.7|~3.0",
21+
"symfony/http-kernel": "~2.7|~3.0",
22+
"symfony/form": "~2.7|~3.0",
23+
"symfony/property-access": "~2.7|~3.0",
2424
"propel/propel1": "~1.6,>=1.6.5"
2525
},
2626
"require-dev": {
27-
"symfony/stopwatch": "~2.2|~3.0.0"
27+
"symfony/stopwatch": "~2.7|~3.0"
2828
},
2929
"autoload": {
3030
"psr-0": { "Symfony\\Bridge\\Propel1\\": "" }

‎src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.3.3",
20-
"symfony/dependency-injection": "~2.3|~3.0.0",
19+
"php": ">=5.5.9",
20+
"symfony/dependency-injection": "~2.7|~3.0",
2121
"ocramius/proxy-manager": "~0.4|~1.0"
2222
},
2323
"require-dev": {
24-
"symfony/config": "~2.3|~3.0.0"
24+
"symfony/config": "~2.7|~3.0"
2525
},
2626
"autoload": {
2727
"psr-0": {

‎src/Symfony/Bridge/Twig/Command/LintCommand.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
namespace Symfony\Bridge\Twig\Command;
1313

14-
if (!defined('JSON_PRETTY_PRINT')) {
15-
define('JSON_PRETTY_PRINT', 128);
16-
}
17-
1814
use Symfony\Component\Console\Command\Command;
1915
use Symfony\Component\Console\Input\InputInterface;
2016
use Symfony\Component\Console\Input\InputOption;

‎src/Symfony/Bridge/Twig/Extension/CodeExtension.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,7 @@ public function formatFile($file, $line, $text = null)
174174
$text = "$text at line $line";
175175

176176
if (false !== $link = $this->getFileLink($file, $line)) {
177-
if (PHP_VERSION_ID >= 50400) {
178-
$flags = ENT_QUOTES | ENT_SUBSTITUTE;
179-
} else {
180-
$flags = ENT_QUOTES;
181-
}
177+
$flags = ENT_QUOTES | ENT_SUBSTITUTE;
182178

183179
return sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', htmlspecialchars($link, $flags, $this->charset), $text);
184180
}

‎src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function testOneVar()
5656
}
5757

5858
EOTXT;
59-
$expected = preg_replace('/%(.*?)%/', version_compare(PHP_VERSION, '5.4.0') >= 0 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);
59+
$expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);
6060

6161
$this->assertSame($expected, $compiler->compile($node)->getSource());
6262
}
@@ -82,7 +82,7 @@ public function testMultiVars()
8282
}
8383

8484
EOTXT;
85-
$expected = preg_replace('/%(.*?)%/', version_compare(PHP_VERSION, '5.4.0') >= 0 ? '(isset($context["$1"]) ? $context["$1"] : null)' : '$this->getContext($context, "$1")', $expected);
85+
$expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);
8686

8787
$this->assertSame($expected, $compiler->compile($node)->getSource());
8888
}

‎src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ public function testCompile()
6666

6767
protected function getVariableGetter($name)
6868
{
69-
if (PHP_VERSION_ID >= 50400) {
70-
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
71-
}
72-
73-
return sprintf('$this->getContext($context, "%s")', $name);
69+
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
7470
}
7571
}

‎src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,6 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()
263263

264264
protected function getVariableGetter($name)
265265
{
266-
if (PHP_VERSION_ID >= 50400) {
267-
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
268-
}
269-
270-
return sprintf('$this->getContext($context, "%s")', $name);
266+
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
271267
}
272268
}

‎src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,11 @@ public function testCompileStrict()
3838
}
3939
protected function getVariableGetterWithoutStrictCheck($name)
4040
{
41-
if (PHP_VERSION_ID >= 50400) {
42-
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
43-
}
44-
45-
return sprintf('$this->getContext($context, "%s", true)', $name);
41+
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
4642
}
4743

4844
protected function getVariableGetterWithStrictCheck($name)
4945
{
50-
if (PHP_VERSION_ID >= 50400) {
51-
return sprintf('(isset($context["%s"]) ? $context["%s"] : $this->getContext($context, "%s"))', $name, $name, $name);
52-
}
53-
54-
return sprintf('$this->getContext($context, "%s")', $name);
46+
return sprintf('(isset($context["%s"]) ? $context["%s"] : $this->getContext($context, "%s"))', $name, $name, $name);
5547
}
5648
}

0 commit comments

Comments
 (0)
0