8000 Merge branch '2.7' · symfony/symfony@481a014 · GitHub
[go: up one dir, main page]
Skip to content

Commit 481a014

Browse files
fabpotfabpot
committed
Merge branch '2.7'
* 2.7: (23 commits) [FrameworkBundle] Removed the use of TableHelper Spanish translation for the ```checkDNS``` option introduced in #12956. use Table instead of the deprecated TableHelper [2.3] fix failing test Fixes more deprecation notices as per @stof review. Fixed some deprecations according to @stof feedbacks. Normalizes deprecation notice messages. [Validator] fixes UuidValidator deprecated class namespace. [Form] adds more deprecation notices. [Validator] adds more deprecation notices. [Form] Adds a way to trigger deprecation notice on demand for VirtualFormAwareIterator class. Fixes more deprecation notices. Normalized @deprecated annotations. Removed deprecation notices from test files. Fixes deprecation notices. Reverted trigger_error() function calls on deprecated interfaces to prevent breaking third party projects implementing them. Adds deprecation notices for structures to be removed in 3.0. fixed typo Escape annotations in comments, refs #13089. [2.3] missing cleanup for legacy test ... Conflicts: .travis.yml src/Symfony/Bridge/Monolog/Logger.php src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Helper/DialogHelper.php src/Symfony/Component/Console/Helper/ProgressHelper.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/Form/Deprecated/FormEvents.php src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php src/Symfony/Component/Form/FormEvents.php src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/KernelInterface.php src/Symfony/Component/OptionsResolver/Tests/LegacyOptionsTest.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php src/Symfony/Component/Yaml/Yaml.php
2 parents b11429a + e7bdb5b commit 481a014

File tree

172 files changed

+874
-474
lines changed

Some content is hidden

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

172 files changed

+874
-474
lines changed

‎.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ language: php
33
matrix:
44
include:
55
- php: 5.5.9
6+
- php: 5.5
7+
- php: 5.6
68
env: components=low
79
- php: 5.6
810
env: components=high
9-
- php: 5.5
10-
- php: 5.6
1111
- php: hhvm-nightly
1212
allow_failures:
1313
- php: hhvm-nightly
@@ -29,13 +29,14 @@ before_install:
2929
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
3030
- if [ "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]; then php -i; fi;
3131
- sudo locale-gen fr_FR.UTF-8 && sudo update-locale
32-
# - if [ "$TRAVIS_PHP_VERSION" != "5.3.3" ]; then phpunit --self-update; fi;
32+
# Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
33+
- if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
3334

3435
install:
35-
- if [ "$components" = "no" ]; then COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; fi;
36+
- if [ "$components" = "no" ]; then composer --prefer-source --dev install; fi;
3637

3738
script:
3839
- if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
3940
- if [ "$components" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
40-
- if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
41-
- if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
41+
- if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --dev update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
42+
- if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;

‎UPGRADE-2.5.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
UPGRADE FROM 2.4 to 2.5
22
=======================
33

4+
FrameworkBundle
5+
---------------
6+
7+
* The `Symfony\Bundle\FrameworkBundle\Console\Descriptor\Descriptor::renderTable()`
8+
method expects the table to be an instance of `Symfony\Component\Console\Helper\Table`
9+
instead of `Symfony\Component\Console\Helper\TableHelper`.
10+
411
Routing
512
-------
613

‎src/Symfony/Bridge/Doctrine/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
2.4.0
5+
-----
6+
7+
* deprecated DoctrineOrmTestCase class
8+
49
2.2.0
510
-----
611

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,12 @@ public function getValuesForChoices(array $entities)
296296
*
297297
* @see ChoiceListInterface
298298
*
299-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
299+
* @deprecated since version 2.4, to be removed in 3.0.
300300
*/
301301
public function getIndicesForChoices(array $entities)
302302
{
303+
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
304+
303305
// Performance optimization
304306
if (empty($entities)) {
305307
return array();
@@ -338,10 +340,12 @@ public function getIndicesForChoices(array $entities)
338340
*
339341
* @see ChoiceListInterface
340342
*
341-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
343+
* @deprecated since version 2.4, to be removed in 3.0.
342344
*/
343345
public function getIndicesForValues(array $values)
344346
{
347+
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
348+
345349
// Performance optimization
346350
if (empty($values)) {
347351
return array();

‎src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,21 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests;
1313

14+
trigger_error('The '.__NAMESPACE__.'\DoctrineOrmTestCase class is deprecated since version 2.4 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper class instead.', E_USER_DEPRECATED);
15+
16+
use Doctrine\ORM\EntityManager;
1417
use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
1518

1619
/**
1720
* Class DoctrineOrmTestCase.
1821
*
19-
* @deprecated Deprecated as of Symfony 2.3, to be removed in Symfony 3.0.
22+
* @deprecated since version 2.4, to be removed in 3.0.
2023
* Use {@link DoctrineTestHelper} instead.
2124
*/
2225
abstract class DoctrineOrmTestCase extends \PHPUnit_Framework_TestCase
2326
{
2427
/**
25-
* @return \Doctrine\ORM\EntityManager
28+
* @return EntityManager
2629
*/
2730
public static function createTestEntityManager()
2831
{

‎src/Symfony/Bridge/Monolog/Logger.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,41 +24,41 @@ class Logger extends BaseLogger implements LoggerInterface, DebugLoggerInterface
2424
{
2525
/**
2626
* @see Symfony\Component\HttpKernel\Log\DebugLoggerInterface
27-
* @deprecated since 2.2, to be removed in 3.0. Use emergency() which is PSR-3 compatible.
27+
* @deprecated since version 2.2, to be removed in 3.0. Use emergency() which is PSR-3 compatible.
2828
*/
2929
public function emerg($message, array $context = array())
3030
{
31-
trigger_error('The emerg() method of the Monolog Logger was removed. You should use the new method emergency() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
31+
trigger_error('The '.__METHOD__.' method inherited from the Symfony\Component\HttpKernel\Log\LoggerInterface interface is deprecated since version 2.2 and will be removed in 3.0. Use the emergency() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
3232

3333
return parent::addRecord(BaseLogger::EMERGENCY, $message, $context);
3434
}
3535

3636
/**
37-
* @deprecated since 2.2, to be removed in 3.0. Use critical() which is PSR-3 compatible.
37+
* @deprecated since version 2.2, to be removed in 3.0. Use critical() which is PSR-3 compatible.
3838
*/
3939
public function crit($message, array $context = array())
4040
{
41-
trigger_error('The crit() method of the Monolog Logger was removed. You should use the new method critical() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
41+
trigger_error('The '.__METHOD__.' method inherited from the Symfony\Component\HttpKernel\Log\LoggerInterface interface is deprecated since version 2.2 and will be removed in 3.0. Use the method critical() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
4242

4343
return parent::addRecord(BaseLogger::CRITICAL, $message, $context);
4444
}
4545

4646
/**
47-
* @deprecated since 2.2, to be removed in 3.0. Use error() which is PSR-3 compatible.
47+
* @deprecated since version 2.2, to be removed in 3.0. Use error() which is PSR-3 compatible.
4848
*/
4949
public function err($message, array $context = array())
5050
{
51-
trigger_error('The err() method of the Monolog Logger was removed. You should use the new method error() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
51+
trigger_error('The '.__METHOD__.' method inherited from the Symfony\Component\HttpKernel\Log\LoggerInterface interface is deprecated since version 2.2 and will be removed in 3.0. Use the error() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
5252

5353
return parent::addRecord(BaseLogger::ERROR, $message, $context);
5454
}
5555

5656
/**
57-
* @deprecated since 2.2, to be removed in 3.0. Use warning() which is PSR-3 compatible.
57+
* @deprecated since version 2.2, to be removed in 3.0. Use warning() which is PSR-3 compatible.
5858
*/
5959
public function warn($message, array $context = array())
6060
{
61-
trigger_error('The warn() method of the Monolog Logger was removed. You should use the new method warning() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
61+
trigger_error('The '.__METHOD__.' method inherited from the Symfony\Component\HttpKernel\Log\LoggerInterface interface is deprecated since version 2.2 and will be removed in 3.0. Use the warning() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
6262

6363
return parent::addRecord(BaseLogger::WARNING, $message, $context);
6464
}

‎src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php

Lines changed: 7 additions & 3 deletions
10000
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,12 @@ public function getValuesForChoices(array $models)
300300
/**
301301
* {@inheritdoc}
302302
*
303-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
303+
* @deprecated since version 2.4, to be removed in 3.0.
304304
*/
305305
public function getIndicesForChoices(array $models)
306306
{
307+
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
308+
307309
if (empty($models)) {
308310
return array();
309311
}
@@ -319,7 +321,7 @@ public function getIndicesForChoices(array $models)
319321
* but if they originated from different queries, there are not the same object within the code.
320322
*
321323
* This happens when using m:n relations with either sides model as data_class of the form.
322-
* The choicelist will retrieve the list of available related models with a different query, resulting in different objects.
324+
* The choice list will retrieve the list of available related models with a different query, resulting in different objects.
323325
*/
324326
$choices = $this->fixChoices($models);
325327
foreach ($choices as $i => $givenChoice) {
@@ -346,10 +348,12 @@ public function getIndicesForChoices(array $models)
346348
/**
347349
* {@inheritdoc}
348350
*
349-
* @deprecated Deprecated since version 2.4, to be removed in 3.0.
351+
* @deprecated since version 2.4, to be removed in 3.0.
350352
*/
351353
public function getIndicesForValues(array $values)
352354
{
355+
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
356+
353357
if (empty($values)) {
354358
return array();
355359
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Console\Descriptor;
1313

1414
use Symfony\Component\Console\Descriptor\DescriptorInterface;
15+
use Symfony\Component\Console\Helper\Table;
1516
use Symfony\Component\Console\Output\OutputInterface;
1617
use Symfony\Component\DependencyInjection\Alias;
1718
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -77,6 +78,16 @@ public function describe(OutputInterface $output, $object, array $options = arra
7778
}
7879
}
7980

81+
/**
82+
* Returns the output.
83+
*
84+
* @return OutputInterface The output
85+
*/
86+
protected function getOutput()
87+
{
88+
return $this->output;
89+
}
90+
8091
/**
8192
* Writes content to output.
8293
*

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class TextDescriptor extends Descriptor
3030
*/
3131
protected function describeRouteCollection(RouteCollection $routes, array $options = array())
3232
{
33-
$table = new Table($this->output);
34-
3533
$showControllers = isset($options['show_controllers']) && $options['show_controllers'];
3634
$headers = array('Name', 'Method', 'Scheme', 'Host', 'Path');
35+
36+
$table = new Table($this->output);
3737
$table->setHeaders($showControllers ? array_merge($headers, array('Controller')) : $headers);
3838

3939
foreach ($routes->all() as $name => $route) {
@@ -322,6 +322,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
322322
foreach ($eventListeners as $order => $eventListener) {
323323
$table->addRow(array(sprintf('#%d', $order + 1), $this->formatCallable($eventListener)));
324324
}
325+
325326
$table->render();
326327
}
327328
}

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private function addCsrfSection(ArrayNodeDefinition $rootNode)
116116
->children()
117117
->scalarNode('field_name')
118118
->defaultValue('_token')
119-
->info('Deprecated since 2.4, to be removed in 3.0. Use form.csrf_protection.field_name instead')
119+
->info('Deprecated since version 2.4, to be removed in 3.0. Use form.csrf_protection.field_name instead')
120120
->end()
121121
->end()
122122
->end()

‎src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Templating;
1313

14+
trigger_error('The '.__NAMESPACE__.'\Debugger class is deprecated since version 2.4 and will be removed in 3.0. Use the Psr\Log\LoggerInterface interface instead.', E_USER_DEPRECATED);
15+
1416
use Symfony\Component\Templating\DebuggerInterface;
1517
use Psr\Log\LoggerInterface;
1618

@@ -19,7 +21,8 @@
1921
*
2022
* @author Fabien Potencier <fabien@symfony.com>
2123
*
22-
* @deprecated Deprecated in 2.4, to be removed in 3.0. Use Psr\Log\LoggerInterface instead.
24+
* @deprecated since version 2.4, to be removed in 3.0.
25+
* Use Psr\Log\LoggerInterface instead.
2326
*/
2427
class Debugger implements DebuggerInterface
2528
{

‎src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@ public function __construct(ContainerInterface $container)
3737
/**
3838
* Returns the security context service.
3939
*
40-
* @deprecated Deprecated since version 2.6, to be removed in 3.0.
40+
* @deprecated since version 2.6, to be removed in 3.0.
41+
*
4142
* @return SecurityContext|null The security context
4243
*/
4344
public function getSecurity()
4445
{
46+
trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
47+
4548
if ($this->container->has('security.context')) {
4649
return $this->container->get('security.context');
4750
}

‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php

-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ class RequestHelper extends Helper
3030
*
3131
* @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
3232
*
33-
* @deprecated since 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0
33+
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
3434
*/
3535
public function __construct($requestStack)
3636
{
3737
if ($requestStack instanceof Request) {
38+
trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);
3839
$this->request = $requestStack;
3940
} elseif ($requestStack instanceof RequestStack) {
4041
$this->requestStack = $requestStack;

‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ class SessionHelper extends Helper
3030
*
3131
* @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
3232
*
33-
* @deprecated since 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0
33+
* @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
3434
*/
3535
public function __construct($requestStack)
3636
{
3737
if ($requestStack instanceof Request) {
38+
trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);
3839
$this->session = $requestStack->getSession();
3940
} elseif ($requestStack instanceof RequestStack) {
4041
$this->requestStack = $requestStack;

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@
3232
"doctrine/annotations": "~1.0"
3333
},
3434
"require-dev": {
35-
"symfony/browser-kit": "~2.7|~3.0",
36-
"symfony/console": "~2.7|~3.0",
37-
"symfony/css-selector": "~2.7|~3.0",
38-
"symfony/dom-crawler": "~2.7|~3.0",
39-
"symfony/finder": "~2.7|~3.0",
40-
"symfony/intl": "~2.7|~3.0",
41-
"symfony/security": "~2.7|~3.0",
42-
"symfony/form": "~2.7|~3.0",
43-
"symfony/class-loader": "~2.7|~3.0",
44-
"symfony/expression-language": "~2.7|~3.0",
45-
"symfony/process": "~2.7|~3.0",
46-
"symfony/validator": "~2.7|~3.0",
47-
"symfony/yaml": "~2.7|~3.0"
35+
"symfony/browser-kit": "~2.4|~3.0.0",
36+
"symfony/console": "~2.6|~3.0.0",
37+
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
38+
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
39+
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
40+
"symfony/intl": "~2.3|~3.0.0",
41+
"symfony/security": "~2.6|~3.0.0",
42+
"symfony/form": "~2.6|~3.0.0",
43+
"symfony/class-loader": "~2.1|~3.0.0",
44+
"symfony/expression-language": "~2.6|~3.0.0",
45+
"symfony/process": "~2.0,>=2.0.5|~3.0.0",
46+
"symfony/validator": "~2.5|~3.0.0",
47+
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
4848
},
4949
"suggest": {
5050
"symfony/console": "For using the console commands",

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private function addFormSection(ArrayNodeDefinition $rootNode)
6161
->end()
6262
->children()
6363
->arrayNode('form')
64-
->info('Deprecated since 2.6, to be removed in 3.0. Use twig.form_themes instead')
64+
->info('Deprecated since version 2.6, to be removed in 3.0. Use twig.form_themes instead')
6565
->addDefaultsIfNotSet()
6666
->fixXmlConfig('resource')
6767
->children()

‎src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @author Fabien Potencier <fabien@symfony.com>
2222
*
23-
* @deprecated Deprecated in 2.2, to be removed in 3.0.
23+
* @deprecated since version 2.2, to be removed in 3.0.
2424
*/
2525
class ActionsExtension extends \Twig_Extension
2626
{
@@ -29,14 +29,14 @@ class ActionsExtension extends \Twig_Extension
2929
/**
3030
* @param FragmentHandler|ContainerInterface $handler
3131
*
32-
* @deprecated Passing a ContainerInterface as a first argument is deprecated as of 2.7 and will be removed in 3.0.
32+
* @deprecated Passing a ContainerInterface as a first argument is deprecated since 2.7 and will be removed in 3.0.
3333
*/
3434
public function __construct($handler)
3535
{
3636
if ($handler instanceof FragmentHandler) {
3737
$this->handler = $handler;
3838
} elseif ($handler instanceof ContainerInterface) {
39-
trigger_error(sprintf('The ability to pass a ContainerInterface instance as a first argument to %s was deprecated in 2.7 and will be removed in 3.0. Please, pass a FragmentHandler instance instead.', __METHOD__), E_USER_DEPRECATED);
39+
trigger_error('The ability to pass a ContainerInterface instance as a first argument to '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0. Pass a FragmentHandler instance instead.', E_USER_DEPRECATED);
4040

4141
$this->handler = $handler->get('fragment.handler');
4242
} else {

‎src/Symfony/Bundle/TwigBundle/Resources/config/schema/twig-1.0.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<xsd:complexType name="config">
1111
<xsd:sequence>
12-
<!-- @deprecated since 2.6, to be removed in 3.0 -->
12+
<!-- @deprecated since version 2.6, to be removed in 3.0 -->
1313
<xsd:element name="form" type="form" minOccurs="0" maxOccurs="1" />
1414
<xsd:element name="form-theme" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
1515
<xsd:element name="global" type="global" minOccurs="0" maxOccurs="unbounded" />

0 commit comments

Comments
 (0)
0