8000 Lazy services - service proxies by Ocramius · Pull Request #7527 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Lazy services - service proxies #7527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 21 commits into from
Closed

Lazy services - service proxies #7527

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f503ad8
First implementation of lazy services via proxy manager
Ocramius Mar 29, 2013
67aef45
Adding basic logic to generate proxy instantiation into a php dumped …
Ocramius Mar 30, 2013
f4a19c7
Compiling proxies into the generated DIC file
Ocramius Mar 30, 2013
d2760f1
Upgrading dependency to ProxyManager 0.3.*
Ocramius Mar 30, 2013
4a13f82
Suggesting ProxyManager in composer.json, removing useless calls
Ocramius Mar 31, 2013
a6a6572
Adding failing test to demonstrate that proxy initialization breaks s…
Ocramius Mar 31, 2013
35fdded
Fixing shared service instance
8000 Ocramius Mar 31, 2013
bec7774
Sharing services in the container should only happen when proxying fa…
Ocramius Mar 31, 2013
468e92e
Adding tests for proxy sharing within dumped containers
Ocramius Mar 31, 2013
4ecd5ad
Fixing shared proxies into the container
Ocramius Mar 31, 2013
11a1da9
Bumping required version of ProxyManager
Ocramius Mar 31, 2013
5870fed
Docblock for ContainerBuilder#shareService
Ocramius Mar 31, 2013
695e3c5
Adding `ContainerBuilder#addClassResource`
Ocramius Mar 31, 2013
c5a5af0
Adding test to check that class resources are registered for lazy ser…
Ocramius Apr 1, 2013
29899ec
Fixing tests, registering class resources for lazy services
Ocramius Apr 1, 2013
b5d0298
Reverting import of global namespace classes
Ocramius Apr 2, 2013
cda390b
Lazier checks on the proxy structure (avoiding whitespace-based test …
Ocramius Apr 25, 2013
1eb4cf7
Getters for proxied services are public for 5.3.3 compatibility
Ocramius Apr 25, 2013
b417969
Enforcing soft dependency to ProxyManager
Ocramius Apr 25, 2013
1e24767
Reverting documentation changes, adding exception types description i…
Ocramius Apr 25, 2013
450635a
Lazier checks on the proxy structure
Ocramius Apr 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Getters for proxied services are public for 5.3.3 compatibility
  • Loading branch information
@Ocramius
Ocramius committed Apr 30, 2013
commit 1eb4cf700e003329aaf8b747a30439b2bbd7e8fb
11 changes: 6 additions & 5 deletions src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,13 +434,14 @@ public function has($id)
* Gets a service.
*
* @param string $id The service identifier
* @param integer $invalidBehavior The behavior when the service does not exist
* @param int $invalidBehavior The behavior when the service does not exist
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should be reverted.

*
* @throws InvalidArgumentException
* @throws InactiveScopeException
* @throws LogicException
* @throws \Excep 8000 tion
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should keep the @throws lines after the @return one like it was before. We also try to document when each exception is thrown.

* @return object The associated service
*
* @throws InvalidArgumentException if the service is not defined
* @throws LogicException if the service has a circular reference to itself
*
* @see Reference
*
* @api
Expand Down Expand Up @@ -1116,7 +1117,7 @@ private function callMethod($service, $call)
* @param mixed $service
* @param string $id
*
* @throws Exception\RuntimeException
* @throws InactiveScopeException
*/
private function shareService(Definition $definition, $service, $id)
{
Expand Down
9 changes: 6 additions & 3 deletions src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,19 +578,22 @@ private function addService($id, $definition)
$lazyInitializationDoc = '';
}

$code = <<<EOF
// with proxies, for 5.3.3 compatibility, the getter must be public to be accessible to the initializer
$isProxyCandidate = $this->isProxyCandidate($definition);
$visibility = $isProxyCandidate ? 'public' : 'protected';
$code = <<<EOF

/**
* Gets the '$id' service.$doc
*$lazyInitializationDoc
* $return
*/
protected function get{$name}Service($lazyInitialization)
{$visibility} function get{$name}Service($lazyInitialization)
{

EOF;

$code .= $this->addProxyLoading($id, $definition);
$code .= $isProxyCandidate ? $this->addProxyLoading($id, $definition) : '';

if (!in_array($scope, array(ContainerInterface::SCOPE_CONTAINER, ContainerInterface::SCOPE_PROTOTYPE))) {
$code .= <<<EOF
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function __construct()
*
* @return stdClass A stdClass instance.
*/
protected function getFooService($lazyLoad = true)
public function getFooService($lazyLoad = true)
{
if ($lazyLoad) {
$container = $this;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/lazy_service_structure.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class ProjectServiceContainer extends Container
*
* @return stdClass A stdClass instance.
*/
protected function getFooService($lazyLoad = true)
public function getFooService($lazyLoad = true)
{
if ($lazyLoad) {
$container = $this;
Expand Down
0