Skip to content

Commit

Permalink
[3.0] Various deprecation removal
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed Sep 3, 2015
1 parent eca45b7 commit b1f3d52
Show file tree
Hide file tree
Showing 19 changed files with 15 additions and 253 deletions.
6 changes: 3 additions & 3 deletions src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
View file
Expand Up @@ -90,7 +90,7 @@ public function testCollapsedEntityField()
$this->setMaxRunningTime(1);

for ($i = 0; $i < 40; ++$i) {
$form = $this->factory->create('entity', null, array(
$form = $this->factory->create('Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
'class' => self::ENTITY_CLASS,
));

Expand All @@ -108,7 +108,7 @@ public function testCollapsedEntityFieldWithChoices()
$this->setMaxRunningTime(1);

for ($i = 0; $i < 40; ++$i) {
$form = $this->factory->create('entity', null, array(
$form = $this->factory->create('Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
'class' => self::ENTITY_CLASS,
'choices' => $choices,
));
Expand All @@ -127,7 +127,7 @@ public function testCollapsedEntityFieldWithPreferredChoices()
$this->setMaxRunningTime(1);

for ($i = 0; $i < 40; ++$i) {
$form = $this->factory->create('entity', null, array(
$form = $this->factory->create('Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
'class' => self::ENTITY_CLASS,
'preferred_choices' => $choices,
));
Expand Down
18 changes: 0 additions & 18 deletions src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
View file
Expand Up @@ -40,24 +40,6 @@ public function testCollectWhenAuthenticationTokenIsNull()
$this->assertEmpty($collector->getUser());
}

/**
* @group legacy
*/
public function testLegacyCollectWhenAuthenticationTokenIsNull()
{
$tokenStorage = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface');
$collector = new SecurityDataCollector($tokenStorage, $this->getRoleHierarchy());
$collector->collect($this->getRequest(), $this->getResponse());

$this->assertTrue($collector->isEnabled());
$this->assertFalse($collector->isAuthenticated());
$this->assertNull($collector->getTokenClass());
$this->assertTrue($collector->supportsRoleHierarchy());
$this->assertCount(0, $collector->getRoles());
$this->assertCount(0, $collector->getInheritedRoles());
$this->assertEmpty($collector->getUser());
}

/** @dataProvider provideRoles */
public function testCollectAuthenticationTokenAndRoles(array $roles, array $normalizedRoles, array $inheritedRoles)
{
Expand Down
9 changes: 3 additions & 6 deletions src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
View file
Expand Up @@ -110,13 +110,10 @@ public function getTestCreateMapTests()
'Foo\\TFooBar' => __DIR__.'/Fixtures/php5.4/traits.php',
'Foo\\CBar' => __DIR__.'/Fixtures/php5.4/traits.php',
)),
);

if (PHP_VERSION_ID >= 50500) {
$data[] = array(__DIR__.'/Fixtures/php5.5', array(
array(__DIR__.'/Fixtures/php5.5', array(
'ClassCons\\Foo' => __DIR__.'/Fixtures/php5.5/class_cons.php',
));
}
)),
);

return $data;
}
Expand Down
12 changes: 0 additions & 12 deletions src/Symfony/Component/Config/Definition/Builder/BooleanNodeDefinition.php
View file
Expand Up @@ -30,18 +30,6 @@ public function __construct($name, NodeParentInterface $parent = null)
$this->nullEquivalent = true;
}

/**
* {@inheritdoc}
*
* @deprecated Deprecated since version 2.8, to be removed in 3.0.
*/
public function cannotBeEmpty()
{
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);

return parent::cannotBeEmpty();
}

/**
* Instantiate a Node.
*
Expand Down
12 changes: 0 additions & 12 deletions src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php
View file
Expand Up @@ -58,16 +58,4 @@ public function min($min)

return $this;
}

/**
* {@inheritdoc}
*
* @deprecated Deprecated since version 2.8, to be removed in 3.0.
*/
public function cannotBeEmpty()
{
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);

return parent::cannotBeEmpty();
}
}
2 changes: 1 addition & 1 deletion src/Symfony/Component/Console/Helper/ProgressBar.php
View file
Expand Up @@ -181,7 +181,7 @@ public function getProgress()
/**
* Gets the progress bar step width.
*
* @return int The progress bar step width
* @return int The progress bar step width
*/
private function getStepWidth()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Console/Input/StringInput.php
View file
Expand Up @@ -30,7 +30,7 @@ class StringInput extends ArgvInput
/**
* Constructor.
*
* @param string $input An array of parameters from the CLI (in the argv format)
* @param string $input An array of parameters from the CLI (in the argv format)
*
* @api
*/
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Component/Console/Output/OutputInterface.php
View file
Expand Up @@ -76,28 +76,28 @@ public function setVerbosity($level);
public function getVerbosity();

/**
* Returns whether verbosity is quiet (-q)
* Returns whether verbosity is quiet (-q).
*
* @return bool true if verbosity is set to VERBOSITY_QUIET, false otherwise
*/
public function isQuiet();

/**
* Returns whether verbosity is verbose (-v)
* Returns whether verbosity is verbose (-v).
*
* @return bool true if verbosity is set to VERBOSITY_VERBOSE, false otherwise
*/
public function isVerbose();

/**
* Returns whether verbosity is very verbose (-vv)
* Returns whether verbosity is very verbose (-vv).
*
* @return bool true if verbosity is set to VERBOSITY_VERY_VERBOSE, false otherwise
*/
public function isVeryVerbose();

/**
* Returns whether verbosity is debug (-vvv)
* Returns whether verbosity is debug (-vvv).
*
* @return bool true if verbosity is set to VERBOSITY_DEBUG, false otherwise
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Debug/ExceptionHandler.php
View file
Expand Up @@ -122,7 +122,7 @@ public function handle(\Exception $exception)

$caughtLength = $this->caughtLength = 0;

ob_start(function($buffer) {
ob_start(function ($buffer) {
$this->caughtBuffer = $buffer;

return '';
Expand All @@ -133,7 +133,7 @@ public function handle(\Exception $exception)
// Empty loop, everything is in the condition
}
if (isset($this->caughtBuffer[0])) {
ob_start(function($buffer) {
ob_start(function ($buffer) {
if ($this->caughtLength) {
// use substr_replace() instead of substr() for mbstring overloading resistance
$cleanBuffer = substr_replace($buffer, '', 0, $this->caughtLength);
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/EventDispatcher/Tests/EventTest.php
View file
Expand Up @@ -12,7 +12,6 @@
namespace Symfony\Component\EventDispatcher\Tests;

use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventDispatcher;

/**
* Test class for Event.
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
View file
Expand Up @@ -13,7 +13,6 @@

use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy;
use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;

Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
View file
Expand Up @@ -16,7 +16,6 @@
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
use Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy;
use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;

/**
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
View file
Expand Up @@ -91,7 +91,6 @@ public function testIsWrapper()
*/
public function testIsActive()
{

$this->assertFalse($this->proxy->isActive());
session_start();
$this->assertTrue($this->proxy->isActive());
Expand Down
16 changes: 0 additions & 16 deletions src/Symfony/Component/Routing/Annotation/Route.php
View file
Expand Up @@ -86,22 +86,6 @@ public function getName()

public function setRequirements($requirements)
{
if (isset($requirements['_method'])) {
if (0 === count($this->methods)) {
$this->methods = explode('|', $requirements['_method']);
}

@trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" option instead.', E_USER_DEPRECATED);
}

if (isset($requirements['_scheme'])) {
if (0 === count($this->schemes)) {
$this->schemes = explode('|', $requirements['_scheme']);
}

@trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" option instead.', E_USER_DEPRECATED);
}

$this->requirements = $requirements;
}

Expand Down
18 changes: 0 additions & 18 deletions src/Symfony/Component/Routing/Loader/XmlFileLoader.php
View file
Expand Up @@ -122,24 +122,6 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, $p

list($defaults, $requirements, $options, $condition) = $this->parseConfigs($node, $path);

if (isset($requirements['_method'])) {
if (0 === count($methods)) {
$methods = explode('|', $requirements['_method']);
}

unset($requirements['_method']);
@trigger_error(sprintf('The "_method" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" attribute instead.', $id, $path), E_USER_DEPRECATED);
}

if (isset($requirements['_scheme'])) {
if (0 === count($schemes)) {
$schemes = explode('|', $requirements['_scheme']);
}

unset($requirements['_scheme']);
@trigger_error(sprintf('The "_scheme" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" attribute instead.', $id, $path), E_USER_DEPRECATED);
}

$route = new Route($node->getAttribute('path'), $defaults, $requirements, $options, $node->getAttribute('host'), $schemes, $methods, $condition);
$collection->add($id, $route);
}
Expand Down
18 changes: 0 additions & 18 deletions src/Symfony/Component/Routing/Loader/YamlFileLoader.php
View file
Expand Up @@ -116,24 +116,6 @@ protected function parseRoute(RouteCollection $collection, $name, array $config,
$methods = isset($config['methods']) ? $config['methods'] : array();
$condition = isset($config['condition']) ? $config['condition'] : null;

if (isset($requirements['_method'])) {
if (0 === count($methods)) {
$methods = explode('|', $requirements['_method']);
}

unset($requirements['_method']);
@trigger_error(sprintf('The "_method" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" option instead.', $name, $path), E_USER_DEPRECATED);
}

if (isset($requirements['_scheme'])) {
if (0 === count($schemes)) {
$schemes = explode('|', $requirements['_scheme']);
}

unset($requirements['_scheme']);
@trigger_error(sprintf('The "_scheme" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" option instead.', $name, $path), E_USER_DEPRECATED);
}

$route = new Route($config['path'], $defaults, $requirements, $options, $host, $schemes, $methods, $condition);

$collection->add($name, $route);
Expand Down

0 comments on commit b1f3d52

Please sign in to comment.