[DependencyInjection] changed the order of priority when a service is both defined with setService() and with a getXXXService() method

fabpot · fabpot · commit 2ac6faaa0b72 · 2010-01-22T07:58:49.000+01:00
diff --git a/src/Symfony/Components/DependencyInjection/Container.php b/src/Symfony/Components/DependencyInjection/Container.php
@@ -194,14 +194,14 @@ public function getService($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_RE
       throw new \InvalidArgumentException(sprintf('A service id should be a string (%s given).', str_replace("\n", '', var_export($id, true))));
     }
 
-    if (isset($this->services[$id]))
+    if (method_exists($this, $method = 'get'.self::camelize($id).'Service'))
     {
-      return $this->services[$id];
+      return $this->$method();
     }
 
-    if (method_exists($this, $method = 'get'.self::camelize($id).'Service'))
+    if (isset($this->services[$id]))
     {
-      return $this->$method();
+      return $this->services[$id];
     }
 
     if (self::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior)
diff --git a/tests/unit/Symfony/Components/DependencyInjection/ContainerTest.php b/tests/unit/Symfony/Components/DependencyInjection/ContainerTest.php
@@ -155,7 +155,7 @@ protected function getFoo_BazService()
 $t->ok($sc->hasService('bar'), '->hasService() returns true if the service has been defined as a getXXXService() method');
 
 $sc->setService('bar', $bar = new stdClass());
-$t->is(spl_object_hash($sc->getService('bar')), spl_object_hash($bar), '->getService() prefers to return a service defined with setService() than one defined with a getXXXService() method');
+$t->isnt(spl_object_hash($sc->getService('bar')), spl_object_hash($bar), '->getService() prefers to return a service defined with a getXXXService() method than one defined with setService()');
 
 try
 {

Original file line number	Diff line number	Diff line change
`@@ -194,14 +194,14 @@ public function getService($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_RE`
`194`	`194`	`throw new \InvalidArgumentException(sprintf('A service id should be a string (%s given).', str_replace("\n", '', var_export($id, true))));`
`195`	`195`	`}`
`196`	`196`
`197`		`- if (isset($this->services[$id]))`
	`197`	`+ if (method_exists($this, $method = 'get'.self::camelize($id).'Service'))`
`198`	`198`	`{`
`199`		`- return $this->services[$id];`
	`199`	`+ return $this->$method();`
`200`	`200`	`}`
`201`	`201`
`202`		`- if (method_exists($this, $method = 'get'.self::camelize($id).'Service'))`
	`202`	`+ if (isset($this->services[$id]))`
`203`	`203`	`{`
`204`		`- return $this->$method();`
	`204`	`+ return $this->services[$id];`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`if (self::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior)`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ protected function getFoo_BazService()`
`155`	`155`	`$t->ok($sc->hasService('bar'), '->hasService() returns true if the service has been defined as a getXXXService() method');`
`156`	`156`
`157`	`157`	`$sc->setService('bar', $bar = new stdClass());`
`158`		`-$t->is(spl_object_hash($sc->getService('bar')), spl_object_hash($bar), '->getService() prefers to return a service defined with setService() than one defined with a getXXXService() method');`
	`158`	`+$t->isnt(spl_object_hash($sc->getService('bar')), spl_object_hash($bar), '->getService() prefers to return a service defined with a getXXXService() method than one defined with setService()');`
`159`	`159`
`160`	`160`	`try`
`161`	`161`	`{`