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 64c1890

Browse filesBrowse files
xabbuhxabbuh
committed
remove deprecated features
1 parent 73ef4a9 commit 64c1890
Copy full SHA for 64c1890

File tree

Expand file treeCollapse file tree

13 files changed

+46
-352
lines changed
Filter options
Expand file treeCollapse file tree

13 files changed

+46
-352
lines changed

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,6 @@ private function createFirewalls($config, ContainerBuilder $container)
187187
$customUserChecker = true;
188188
}
189189

190-
if (!isset($firewall['logout_on_user_change']) || !$firewall['logout_on_user_change']) {
191-
@trigger_error('Setting logout_on_user_change to false is deprecated as of 3.4 and will always be true in 4.0. Set logout_on_user_change to true in your firewall configuration.', E_USER_DEPRECATED);
192-
}
193-
194190
$contextListenerDefinition->addMethodCall('setLogoutOnUserChange', array($firewall['logout_on_user_change']));
195191

196192
$configId = 'security.firewall.map.config.'.$name;

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
-25Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -123,31 +123,6 @@ public function testDisableRoleHierarchyVoter()
123123
$this->assertFalse($container->hasDefinition('security.access.role_hierarchy_voter'));
124124
}
125125

126-
/**
127-
* @group legacy
128-
* @expectedDeprecation Setting logout_on_user_change to false is deprecated as of 3.4 and will always be true in 4.0. Set logout_on_user_change to true in your firewall configuration.
129-
*/
130-
public function testDeprecationForUserLogout()
131-
{
132-
$container = $this->getRawContainer();
133-
134-
$container->loadFromExtension('security', array(
135-
'providers' => array(
136-
'default' => array('id' => 'foo'),
137-
),
138-
139-
'firewalls' => array(
140-
'some_firewall' => array(
141-
'pattern' => '/.*',
142-
'http_basic' => null,
143-
'logout_on_user_change' => false,
144-
),
145-
),
146-
));
147-
148-
$container->compile();
149-
}
150-
151126
protected function getRawContainer()
152127
{
153128
$container = new ContainerBuilder();

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php
-74Lines changed: 0 additions & 74 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-12Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,6 @@ public function __construct($throwOnAutowireException = true)
4141
$this->throwOnAutowiringException = $throwOnAutowireException;
4242
}
4343

44-
/**
45-
* @deprecated since version 3.4, to be removed in 4.0.
46-
*
47-
* @return AutowiringFailedException[]
48-
*/
49-
public function getAutowiringExceptions()
50-
{
51-
@trigger_error('Calling AutowirePass::getAutowiringExceptions() is deprecated since Symfony 3.4 and will be removed in 4.0. Use Definition::getErrors() instead.', E_USER_DEPRECATED);
52-
53-
return $this->autowiringExceptions;
54-
}
55-
5644
/**
5745
* {@inheritdoc}
5846
*/

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
-16Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,6 @@ public function setRepeatedPass(RepeatedPass $repeatedPass)
3333
$this->repeatedPass = $repeatedPass;
3434
}
3535

36-
/**
37-
* Returns an array of all services inlined by this pass.
38-
*
39-
* The key is the inlined service id and its value is the list of services it was inlined into.
40-
*
41-
* @deprecated since version 3.4, to be removed in 4.0.
42-
*
43-
* @return array
44-
*/
45-
public function getInlinedServiceIds()
46-
{
47-
@trigger_error('Calling InlineServiceDefinitionsPass::getInlinedServiceIds() is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
48-
49-
return $this->inlinedServiceIds;
50-
}
51-
5236
/**
5337
* {@inheritdoc}
5438
*/

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php
-145Lines changed: 0 additions & 145 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
-18Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,24 +131,6 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()
131131
$this->assertEquals(DInterface::class, (string) $container->getDefinition('h')->getArgument(1));
132132
}
133133

134-
/**
135-
* @group legacy
136-
*/
137-
public function testExceptionsAreStored()
138-
{
139-
$container = new ContainerBuilder();
140-
141-
$container->register('c1', __NAMESPACE__.'\CollisionA');
142-
$container->register('c2', __NAMESPACE__.'\CollisionB');
143-
$container->register('c3', __NAMESPACE__.'\CollisionB');
144-
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
145-
$aDefinition->setAutowired(true);
146-
147-
$pass = new AutowirePass(false);
148-
$pass->process($container);
149-
$this->assertCount(1, $pass->getAutowiringExceptions());
150-
}
151-
152134
/**
153135
* @expectedException \Symfony\Component\DependencyInjection\Exception\AutowiringFailedException
154136
* @expectedExceptionMessage Invalid service "private_service": constructor of class "Symfony\Component\DependencyInjection\Tests\Compiler\PrivateConstructor" must be public.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
-27Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -252,33 +252,6 @@ public function testProcessDoesNotSetLazyArgumentValuesAfterInlining()
252252
$this->assertSame('inline', (string) $values[0]);
253253
}
254254

255-
/**
256-
* @group legacy
257-
*/
258-
public function testGetInlinedServiceIdData()
259-
{
260-
$container = new ContainerBuilder();
261-
$container
262-
->register('inlinable.service')
263-
->setPublic(false)
264-
;
265-
$container
266-
->register('non_inlinable.service')
267-
->setPublic(true)
268-
;
269-
270-
$container
271-
->register('other_service')
272-
->setArguments(array(new Reference('inlinable.service')))
273-
;
274-
275-
$inlinePass = new InlineServiceDefinitionsPass();
276-
$repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), $inlinePass));
277-
$repeatedPass->process($container);
278-
279-
$this->assertEquals(array('inlinable.service' => array('other_service')), $inlinePass->getInlinedServiceIds());
280-
}
281-
282255
protected function process(ContainerBuilder $container)
283256
{
284257
$repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), new InlineServiceDefinitionsPass()));

‎src/Symfony/Component/Filesystem/Exception/InvalidArgumentException.php

Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Filesystem\Exception;
13+
14+
/**
15+
* @author Christian Flothmann <christian.flothmann@sensiolabs.de>
16+
*/
17+
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
18+
{
19+
}

0 commit comments

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