From d779845c3b54fd17b5edb2dec8e601e4b12d541e Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 4 Oct 2017 18:30:17 +0200 Subject: [PATCH] [DI] remove inheritdoc from dumped container --- .../DependencyInjection/Dumper/PhpDumper.php | 27 ------------------- .../Tests/Fixtures/php/services1-1.php | 9 ------- .../Tests/Fixtures/php/services1.php | 9 ------- .../Tests/Fixtures/php/services10.php | 21 --------------- .../Tests/Fixtures/php/services12.php | 21 --------------- .../Tests/Fixtures/php/services13.php | 9 ------- .../Tests/Fixtures/php/services19.php | 9 ------- .../Tests/Fixtures/php/services24.php | 9 ------- .../Tests/Fixtures/php/services26.php | 21 --------------- .../Tests/Fixtures/php/services31.php | 9 ------- .../Tests/Fixtures/php/services33.php | 9 ------- .../Tests/Fixtures/php/services8.php | 21 --------------- .../Tests/Fixtures/php/services9_as_files.txt | 24 ----------------- .../Tests/Fixtures/php/services9_compiled.php | 21 --------------- .../Fixtures/php/services_array_params.php | 21 --------------- .../Fixtures/php/services_base64_env.php | 21 --------------- .../Fixtures/php/services_legacy_privates.php | 9 ------- .../Tests/Fixtures/php/services_locator.php | 9 ------- .../Fixtures/php/services_private_frozen.php | 9 ------- .../php/services_private_in_expression.php | 9 ------- .../Tests/Fixtures/php/services_rot13_env.php | 21 --------------- .../Fixtures/php/services_subscriber.php | 9 ------- .../php/services_uninitialized_ref.php | 9 ------- 23 files changed, 336 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index e08e385e35..c8a4d5cd3a 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -899,25 +899,16 @@ EOF; if ($this->container->isCompiled()) { $code .= <<docStar} - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /*{$this->docStar} - * {@inheritdoc} - */ public function isCompiled() { return true; } - /*{$this->docStar} - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -931,9 +922,6 @@ EOF; if ($this->asFiles) { $code .= <<docStar} - * {@inheritdoc} - */ protected function load(\$file, \$lazyLoad = true) { return require \$file; @@ -1125,9 +1113,6 @@ EOF; if ($this->container->isCompiled()) { $code .= <<<'EOF' - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -1144,9 +1129,6 @@ EOF; return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -1154,17 +1136,11 @@ EOF; return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { @@ -1179,9 +1155,6 @@ EOF; } EOF; - if ('' === $this->docStar) { - $code = str_replace('/**', '/*', $code); - } if ($dynamicPhp) { $loadedDynamicParameters = $this->exportParameters(array_combine(array_keys($dynamicPhp), array_fill(0, count($dynamicPhp), false)), '', 8); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php index b791398c13..e696dec6ae 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php @@ -28,25 +28,16 @@ class Container extends AbstractContainer $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php index 44c052c0a9..c339856f02 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php @@ -26,25 +26,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php index 4353f7b065..219cf3431b 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php @@ -31,25 +31,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -67,9 +58,6 @@ class ProjectServiceContainer extends Container return $this->services['test'] = new \stdClass(array('only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end')); } - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -86,9 +74,6 @@ class ProjectServiceContainer extends Container return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -96,17 +81,11 @@ class ProjectServiceContainer extends Container return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php index 9017441bd6..2bd134a9f8 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php @@ -35,25 +35,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -71,9 +62,6 @@ class ProjectServiceContainer extends Container return $this->services['test'] = new \stdClass(('wiz'.$this->targetDirs[1]), array(('wiz'.$this->targetDirs[1]) => ($this->targetDirs[2].'/'))); } - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -90,9 +78,6 @@ class ProjectServiceContainer extends Container return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -100,17 +85,11 @@ class ProjectServiceContainer extends Container return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php index a7fe891692..4cc353ca27 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php @@ -29,25 +29,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php index e6870bcc45..0a6b97e65d 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php @@ -30,25 +30,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php index 7cff4f35bb..7546b1765a 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services24.php @@ -29,25 +29,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php index c802c9ae09..7dc51d12af 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php @@ -35,25 +35,16 @@ class Symfony_DI_PhpDumper_Test_EnvParameters extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -73,9 +64,6 @@ class Symfony_DI_PhpDumper_Test_EnvParameters extends Container return $this->services['test'] = new $class($this->getEnv('Bar'), 'foo'.$this->getEnv('string:FOO').'baz', $this->getEnv('int:Baz')); } - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -92,9 +80,6 @@ class Symfony_DI_PhpDumper_Test_EnvParameters extends Container return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -102,17 +87,11 @@ class Symfony_DI_PhpDumper_Test_EnvParameters extends Container return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php index 51d9626372..ffc76d8922 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services31.php @@ -30,25 +30,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php index af310ce2bd..e36cdcaedb 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services33.php @@ -34,25 +34,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php index f9de309827..357b8aa697 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php @@ -28,25 +28,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -54,9 +45,6 @@ class ProjectServiceContainer extends Container return true; } - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -73,9 +61,6 @@ class ProjectServiceContainer extends Container return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -83,17 +68,11 @@ class ProjectServiceContainer extends Container return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt index ced52118cf..3795ade480 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt @@ -322,25 +322,16 @@ class Container%s extends Container ); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -348,9 +339,6 @@ class Container%s extends Container return true; } - /** - * {@inheritdoc} - */ protected function load($file, $lazyLoad = true) { return require $file; @@ -366,9 +354,6 @@ class Container%s extends Container return new \Bar\FooClass(${($_ = isset($this->services['deprecated_service']) ? $this->services['deprecated_service'] : $this->load(__DIR__.'/getDeprecatedServiceService.php')) && false ?: '_'}); } - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -385,9 +370,6 @@ class Container%s extends Container return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -395,17 +377,11 @@ class Container%s extends Container return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php index c75138447d..7ec609ca5e 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php @@ -58,25 +58,16 @@ class ProjectServiceContainer extends Container ); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -374,9 +365,6 @@ class ProjectServiceContainer extends Container return $this->services['tagged_iterator_foo'] = new \Bar(); } - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -393,9 +381,6 @@ class ProjectServiceContainer extends Container return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -403,17 +388,11 @@ class ProjectServiceContainer extends Container return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php index 9c6f55d259..e5159861b4 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php @@ -35,25 +35,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -75,9 +66,6 @@ class ProjectServiceContainer extends Container return $instance; } - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -94,9 +82,6 @@ class ProjectServiceContainer extends Container return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -104,17 +89,11 @@ class ProjectServiceContainer extends Container return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php index 49fcf6e458..8513e25d2e 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php @@ -28,25 +28,16 @@ class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -54,9 +45,6 @@ class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container return true; } - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -73,9 +61,6 @@ class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -83,17 +68,11 @@ class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php index bedf268d47..fad546d7fc 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_legacy_privates.php @@ -55,25 +55,16 @@ class Symfony_DI_PhpDumper_Test_Legacy_Privates extends Container ); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php index 87c8b58003..74e2a8ce09 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php @@ -40,25 +40,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php index bbb0e9e00e..c7ea243ae8 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_frozen.php @@ -34,25 +34,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php index 8f3e7aa7fc..8269736c0b 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php @@ -33,25 +33,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php index 0d2bb22b75..3b26928577 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php @@ -35,25 +35,16 @@ class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); @@ -83,9 +74,6 @@ class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container })); } - /** - * {@inheritdoc} - */ public function getParameter($name) { if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) { @@ -102,9 +90,6 @@ class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container return $this->parameters[$name]; } - /** - * {@inheritdoc} - */ public function hasParameter($name) { $name = $this->normalizeParameterName($name); @@ -112,17 +97,11 @@ class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters); } - /** - * {@inheritdoc} - */ public function setParameter($name, $value) { throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); } - /** - * {@inheritdoc} - */ public function getParameterBag() { if (null === $this->parameterBag) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php index 400b28ca97..a4ab454e3e 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php @@ -38,25 +38,16 @@ class ProjectServiceContainer extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php index ef70ffb76c..c47e7c15d1 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php @@ -35,25 +35,16 @@ class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container $this->aliases = array(); } - /** - * {@inheritdoc} - */ public function compile() { throw new LogicException('You cannot compile a dumped container that was already compiled.'); } - /** - * {@inheritdoc} - */ public function isCompiled() { return true; } - /** - * {@inheritdoc} - */ public function isFrozen() { @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the isCompiled() method instead.', __METHOD__), E_USER_DEPRECATED);