Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 8a95ec5

Browse filesBrowse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: [2.7] Fix tests pass triggerDeprecationError arg to parent class remove default null value for asset version remove duplicated value [DependencyInjection] simplify the BC layer Change couple of occurences of a public setUp() method to protected
2 parents 5dd453f + 8c0b48f commit 8a95ec5
Copy full SHA for 8a95ec5

File tree

Expand file treeCollapse file tree

9 files changed

+12
-14
lines changed
Filter options
Expand file treeCollapse file tree

9 files changed

+12
-14
lines changed

‎src/Symfony/Bridge/Twig/Tests/AppVariableTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AppVariableTest extends \PHPUnit_Framework_TestCase
1313
*/
1414
protected $appVariable;
1515

16-
public function setUp()
16+
protected function setUp()
1717
{
1818
$this->appVariable = new AppVariable();
1919
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,6 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode)
600600
->fixXmlConfig('base_url')
601601
->children()
602602
->scalarNode('version')
603-
->defaultNull()
604603
->beforeNormalization()
605604
->ifTrue(function ($v) { return '' === $v; })
606605
->then(function ($v) { return; })

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Resources/fragment.html.php renamed to ‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Resources/views/fragment.html.php

Copy file name to clipboard
File renamed without changes.

‎src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
2121
protected function setUp()
2222
{
2323
if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
24-
apcu_clear_cache('user');
24+
apcu_clear_cache();
2525
} else {
2626
$this->markTestSkipped('APC is not enabled.');
2727
}
@@ -30,7 +30,7 @@ protected function setUp()
3030
protected function tearDown()
3131
{
3232
if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
33-
apcu_clear_cache('user');
33+
apcu_clear_cache();
3434
}
3535
}
3636

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ public function process(ContainerBuilder $container)
4444
$definition->setMethodCalls($this->processArguments($definition->getMethodCalls()));
4545
$definition->setProperties($this->processArguments($definition->getProperties()));
4646
$definition->setFactory($this->processFactory($definition->getFactory()));
47-
48-
if (null !== $factoryService = $definition->getFactoryService(false)) {
49-
$definition->setFactoryService($this->processFactoryService($factoryService));
50-
}
47+
$definition->setFactoryService($this->processFactoryService($definition->getFactoryService(false)), false);
5148
}
5249

5350
foreach ($container->getAliases() as $id => $alias) {

‎src/Symfony/Component/DependencyInjection/Definition.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Definition.php
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,11 @@ public function getFactoryMethod($triggerDeprecationError = true)
200200
*
201201
* @deprecated since version 2.6, to be removed in 3.0.
202202
*/
203-
public function setFactoryService($factoryService)
203+
public function setFactoryService($factoryService, $triggerDeprecationError = true)
204204
{
205-
@trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
205+
if ($triggerDeprecationError) {
206+
@trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
207+
}
206208

207209
$this->factoryService = $factoryService;
208210

‎src/Symfony/Component/DependencyInjection/DefinitionDecorator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ public function setFactoryMethod($method)
9999
/**
100100
* {@inheritdoc}
101101
*/
102-
public function setFactoryService($service)
102+
public function setFactoryService($service, $triggerDeprecationError = true)
103103
{
104104
$this->changes['factory_service'] = true;
105105

106-
return parent::setFactoryService($service);
106+
return parent::setFactoryService($service, $triggerDeprecationError);
107107
}
108108

109109
/**

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ExtensionCompilerPassTest extends \PHPUnit_Framework_TestCase
2121
private $container;
2222
private $pass;
2323

24-
public function setUp()
24+
protected function setUp()
2525
{
2626
$this->container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
2727
$this->pass = new ExtensionCompilerPass();

‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ public function configureOptions(OptionsResolver $resolver)
416416
$resolver->setAllowedTypes('choice_value', array('null', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
417417
$resolver->setAllowedTypes('choice_attr', array('null', 'array', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
418418
$resolver->setAllowedTypes('preferred_choices', array('array', '\Traversable', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
419-
$resolver->setAllowedTypes('group_by', array('null', 'array', '\Traversable', 'string', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
419+
$resolver->setAllowedTypes('group_by', array('null', 'array', '\Traversable', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
420420
}
421421

422422
/**

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.