8000 [3.0] Update required PHP to 5.5.9 by nicolas-grekas · Pull Request #12522 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

[3.0] Update required PHP to 5.5.9 #12522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 30, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ language: php

matrix:
include:
- php: 5.3.3
- php: 5.5.9
env: components=low
- php: 5.6
env: components=high
- php: 5.3.3
- php: 5.3
- php: 5.4
- php: 5.5
- php: 5.6
- php: hhvm-nightly
Expand Down
21 changes: 1 addition & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,13 @@ README
What is Symfony?
-----------------

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

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

Requirements
------------

Symfony is only supported on PHP 5.3.3 and up.

Be warned that PHP versions before 5.3.8 are known to be buggy and might not
work for you:

* before PHP 5.3.4, if you get "Notice: Trying to get property of
non-object", you've hit a known PHP bug (see
https://bugs.php.net/bug.php?id=52083 and
https://bugs.php.net/bug.php?id=50027);

* before PHP 5.3.8, if you get an error involving annotations, you've hit a
known PHP bug (see https://bugs.php.net/bug.php?id=55156).

* PHP 5.3.16 has a major bug in the Reflection subsystem and is not suitable to
run Symfony (https://bugs.php.net/bug.php?id=62715)

Installation
------------

Expand Down
6 changes: 3 additions & 3 deletions autoload.php.dist
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

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

Expand Down
29 changes: 14 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,55 +16,55 @@
}
],
"require": {
"php": ">=5.3.3",
"php": ">=5.5.9",
"doctrine/common": "~2.3",
"twig/twig": "~1.12,>=1.12.3",
"psr/log": "~1.0"
},
"replace": {
"symfony/browser-kit": "self.version",
"symfony/class-loader": "self.version",
"symfony/config": "self.version",
"symfony/console": "self.version",
"symfony/config": "2.99.99",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For my information, what purpose has this version?

"symfony/console": "2.99.99",
"symfony/css-selector": "self.version",
"symfony/dependency-injection": "self.version",
"symfony/dependency-injection": "2.99.99",
"symfony/debug": "self.version",
"symfony/debug-bundle": "self.version",
"symfony/doctrine-bridge": "self.version",
"symfony/doctrine-bridge": "2.99.99",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks to these 2.99.99 instead of self.version, composer now succeeds at satisfying the doctrine/doctrine-bundle dependencies, and tests are run again.

"symfony/dom-crawler": "self.version",
"symfony/event-dispatcher": "self.version",
"symfony/expression-language": "self.version",
"symfony/filesystem": "self.version",
"symfony/event-dispatcher": "2.99.99",
"symfony/expression-language": "2.99.99",
"symfony/filesystem": "2.99.99",
"symfony/finder": "self.version",
"symfony/form": "self.version",
"symfony/framework-bundle": "self.version",
"symfony/framework-bundle": "2.99.99",
"symfony/http-foundation": "self.version",
"symfony/http-kernel": "self.version",
"symfony/intl": "self.version",
"symfony/locale": "self.version",
"symfony/monolog-bridge": "self.version",
"symfony/options-resolver": "self.version",
"symfony/process": "self.version",
"symfony/process": "2.99.99",
"symfony/propel1-bridge": "self.version",
"symfony/property-access": "self.version",
"symfony/proxy-manager-bridge": "self.version",
"symfony/routing": "self.version",
"symfony/security": "self.version",
"symfony/security": "2.99.99",
"symfony/security-acl": "self.version",
"symfony/security-core": "self.version",
"symfony/security-csrf": "self.version",
"symfony/security-http": "self.version",
"symfony/security-bundle": "self.version",
"symfony/serializer": "self.version",
"symfony/stopwatch": "self.version",
"symfony/stopwatch": "2.99.99",
"symfony/templating": "self.version",
"symfony/translation": "self.version",
"symfony/twig-bridge": "self.version",
"symfony/twig-bundle": "self.version",
"symfony/validator": "self.version",
"symfony/validator": "2.99.99",
"symfony/var-dumper": "self.version",
"symfony/web-profiler-bundle": "self.version",
"symfony/yaml": "self.version"
"symfony/yaml": "2.99.99"
},
"require-dev": {
"doctrine/data-fixtures": "1.0.*",
Expand All @@ -73,7 +73,6 @@
"doctrine/doctrine-bundle": "~1.2",
"monolog/monolog": "~1.11",
"propel/propel1": "~1.6",
"ircmaxell/password-compat": "~1.0",
"ocramius/proxy-manager": "~0.4|~1.0",
"egulias/email-validator": "~1.2"
},
Expand Down

This file was deleted.

This file was deleted.

20 changes: 10 additions & 10 deletions src/Symfony/Bridge/Doctrine/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
}
],
"require": {
"php": ">=5.3.3",
"php": ">=5.5.9",
"doctrine/common": "~2.3"
},
"require-dev": {
"symfony/stopwatch": "~2.2|~3.0.0",
"symfony/dependency-injection": "~2.2|~3.0.0",
"symfony/form": "~2.3,>=2.3.8|~3.0.0",
"symfony/http-kernel": "~2.2|~3.0.0",
"symfony/property-access": "~2.3|~3.0.0",
"symfony/security": "~2.2|~3.0.0",
"symfony/expression-language": "~2.2|~3.0.0",
"symfony/validator": "~2.5,>=2.5.5|~3.0.0",
"symfony/translation": "~2.0,>=2.0.5|~3.0.0",
"symfony/stopwatch": "~2.7|~3.0",
"symfony/dependency-injection": "~2.7|~3.0",
"symfony/form": "~2.7|~3.0",
"symfony/http-kernel": "~2.7|~3.0",
"symfony/property-access": "~2.7|~3.0",
"symfony/security": "~2.7|~3.0",
"symfony/expression-language": "~2.7|~3.0",
"symfony/validator": "~2.7|~3.0",
"symfony/translation": "~2.7|~3.0",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.2",
"doctrine/orm": "~2.2,>=2.2.3"
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Bridge/Monolog/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
}
],
"require": {
"php": ">=5.3.3",
"php": ">=5.5.9",
"monolog/monolog": "~1.11"
},
"require-dev": {
"symfony/http-kernel": "~2.4|~3.0.0",
"symfony/console": "~2.4|~3.0.0",
"symfony/event-dispatcher": "~2.2|~3.0.0"
"symfony/http-kernel": "~2.7|~3.0",
"symfony/console": "~2.7|~3.0",
"symfony/event-dispatcher": "~2.7|~3.0"
},
"suggest": {
"symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",
Expand Down
12 changes: 6 additions & 6 deletions src/Symfony/Bridge/Propel1/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
}
],
"require": {
"php": ">=5.3.3",
"symfony/http-foundation": "~2.0,>=2.0.5|~3.0.0",
"symfony/http-kernel": "~2.0,>=2.0.5|~3.0.0",
"symfony/form": "~2.3,>=2.3.8|~3.0.0",
"symfony/property-access": "~2.3|~3.0.0",
"php": ">=5.5.9",
"symfony/http-foundation": "~2.7|~3.0",
"symfony/http-kernel": "~2.7|~3.0",
"symfony/form": "~2.7|~3.0",
"symfony/property-access": "~2.7|~3.0",
"propel/propel1": "~1.6,>=1.6.5"
},
"require-dev": {
"symfony/stopwatch": "~2.2|~3.0.0"
"symfony/stopwatch": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Bridge\\Propel1\\": "" }
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Bridge/ProxyManager/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
}
],
"require": {
"php": ">=5.3.3",
"symfony/dependency-injection": "~2.3|~3.0.0",
"php": ">=5.5.9",
"symfony/dependency-injection": "~2.7|~3.0",
"ocramius/proxy-manager": "~0.4|~1.0"
},
"require-dev": {
"symfony/config": "~2.3|~3.0.0"
"symfony/config": "~2.7|~3.0"
},
"autoload": {
"psr-0": {
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Bridge/Twig/Command/LintCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@

namespace Symfony\Bridge\Twig\Command;

if (!defined('JSON_PRETTY_PRINT')) {
define('JSON_PRETTY_PRINT', 128);
}

use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
Expand Down
6 changes: 1 addition & 5 deletions src/Symfony/Bridge/Twig/Extension/CodeExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,7 @@ public function formatFile($file, $line, $text = null)
$text = "$text at line $line";

if (false !== $link = $this->getFileLink($file, $line)) {
if (PHP_VERSION_ID >= 50400) {
$flags = ENT_QUOTES | ENT_SUBSTITUTE;
} else {
$flags = ENT_QUOTES;
}
$flags = ENT_QUOTES | ENT_SUBSTITUTE;

return sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', htmlspecialchars($link, $flags, $this->charset), $text);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function testOneVar()
}

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

$this->assertSame($expected, $compiler->compile($node)->getSource());
}
Expand All @@ -82,7 +82,7 @@ public function testMultiVars()
}

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

$this->assertSame($expected, $compiler->compile($node)->getSource());
}
Expand Down
6 changes: 1 addition & 5 deletions src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ public function testCompile()

protected function getVariableGetter($name)
{
if (PHP_VERSION_ID >= 50400) {
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
}

return sprintf('$this->getContext($context, "%s")', $name);
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,6 @@ public function testCompileLabelWithLabelThatEvaluatesToNullAndAttributes()

protected function getVariableGetter($name)
{
if (PHP_VERSION_ID >= 50400) {
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
}

return sprintf('$this->getContext($context, "%s")', $name);
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
}
}
12 changes: 2 additions & 10 deletions src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,11 @@ public function testCompileStrict()
}
protected function getVariableGetterWithoutStrictCheck($name)
{
if (PHP_VERSION_ID >= 50400) {
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
}

return sprintf('$this->getContext($context, "%s", true)', $name);
return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
}

protected function getVariableGetterWithStrictCheck($name)
{
if (PHP_VERSION_ID >= 50400) {
return sprintf('(isset($context["%s"]) ? $context["%s"] : $this->getContext($context, "%s"))', $name, $name, $name);
}

return sprintf('$this->getContext($context, "%s")', $name);
return sprintf('(isset($context["%s"]) ? $context["%s"] : $this->getContext($context, "%s"))', $name, $name, $name);
}
}
Loading
0