-
-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 3.4: Remove useless phpdoc [DI] Fix the "almost-circular refs" fix [Form] Fix low deps
- Loading branch information
Showing
6 changed files
with
168 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
Tests/Fixtures/php/container_almost_circular_public.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| <?php | ||
|
|
||
| use Symfony\Component\DependencyInjection\Argument\RewindableGenerator; | ||
| use Symfony\Component\DependencyInjection\ContainerInterface; | ||
| use Symfony\Component\DependencyInjection\Container; | ||
| use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; | ||
| use Symfony\Component\DependencyInjection\Exception\LogicException; | ||
| use Symfony\Component\DependencyInjection\Exception\RuntimeException; | ||
| use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag; | ||
|
|
||
| /** | ||
| * This class has been auto-generated | ||
| * by the Symfony Dependency Injection Component. | ||
| * | ||
| * @final since Symfony 3.3 | ||
| */ | ||
| class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container | ||
| { | ||
| private $parameters; | ||
| private $targetDirs = array(); | ||
| private $privates = array(); | ||
|
|
||
| public function __construct() | ||
| { | ||
| $this->services = $this->privates = array(); | ||
| $this->methodMap = array( | ||
| 'bar' => 'getBarService', | ||
| 'foo' => 'getFooService', | ||
| 'foobar' => 'getFoobarService', | ||
| ); | ||
|
|
||
| $this->aliases = array(); | ||
| } | ||
|
|
||
| public function reset() | ||
| { | ||
| $this->privates = array(); | ||
| parent::reset(); | ||
| } | ||
|
|
||
| public function compile() | ||
| { | ||
| throw new LogicException('You cannot compile a dumped container that was already compiled.'); | ||
| } | ||
|
|
||
| public function isCompiled() | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| public function getRemovedIds() | ||
| { | ||
| return array( | ||
| 'Psr\\Container\\ContainerInterface' => true, | ||
| 'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true, | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the public 'bar' shared service. | ||
| * | ||
| * @return \BarCircular | ||
| */ | ||
| protected function getBarService() | ||
| { | ||
| $this->services['bar'] = $instance = new \BarCircular(); | ||
|
|
||
| $instance->addFoobar(($this->services['foobar'] ?? $this->getFoobarService())); | ||
|
|
||
| return $instance; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the public 'foo' shared service. | ||
| * | ||
| * @return \FooCircular | ||
| */ | ||
| protected function getFooService() | ||
| { | ||
| $a = ($this->services['bar'] ?? $this->getBarService()); | ||
|
|
||
| if (isset($this->services['foo'])) { | ||
| return $this->services['foo']; | ||
| } | ||
|
|
||
| return $this->services['foo'] = new \FooCircular($a); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the public 'foobar' shared service. | ||
| * | ||
| * @return \FoobarCircular | ||
| */ | ||
| protected function getFoobarService() | ||
| { | ||
| $a = ($this->services['foo'] ?? $this->getFooService()); | ||
|
|
||
| if (isset($this->services['foobar'])) { | ||
| return $this->services['foobar']; | ||
| } | ||
|
|
||
| return $this->services['foobar'] = new \FoobarCircular($a); | ||
| } | ||
| } |