feature #15347 [DependencyInjection][3.0] Add initialized to container interface (znerol)

fabpot · fabpot · commit 23919abdc683 · 2015-07-26T20:08:13.000+02:00
This PR was merged into the 3.0-dev branch. Discussion ---------- [DependencyInjection][3.0] Add initialized to container interface | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15346 | License | MIT | Doc PR | - Commits ------- bfddac3 [DependencyInjection] Add initialized() to the ContainerInterface
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -61,7 +61,7 @@
  *
  * @api
  */
-class Container implements IntrospectableContainerInterface, ResettableContainerInterface
+class Container implements ResettableContainerInterface
 {
     /**
      * @var ParameterBagInterface
diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -72,6 +72,15 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
      */
     public function has($id);
 
+    /**
+     * Check for whether or not a service has been initialized.
+     *
+     * @param string $id
+     *
+     * @return bool true if the service has been initialized, false otherwise
+     */
+    public function initialized($id);
+
     /**
      * Gets a parameter.
      *
diff --git a/src/Symfony/Component/DependencyInjection/IntrospectableContainerInterface.php b/src/Symfony/Component/DependencyInjection/IntrospectableContainerInterface.php
@@ -16,15 +16,10 @@
  * for containers, allowing logic to be implemented based on a Container's state.
  *
  * @author Evan Villemez <evillemez@gmail.com>
+ *
+ * @deprecated Since version 3.0, to be removed in 4.0. Use ContainerInterface
+ *             instead.
  */
 interface IntrospectableContainerInterface extends ContainerInterface
 {
-    /**
-     * Check for whether or not a service has been initialized.
-     *
-     * @param string $id
-     *
-     * @return bool true if the service has been initialized, false otherwise
-     */
-    public function initialized($id);
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`*`
`62`	`62`	`* @api`
`63`	`63`	`*/`
`64`		`-class Container implements IntrospectableContainerInterface, ResettableContainerInterface`
	`64`	`+class Container implements ResettableContainerInterface`
`65`	`65`	`{`
`66`	`66`	`/**`
`67`	`67`	`* @var ParameterBagInterface`
Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,10 @@`
`16`	`16`	`* for containers, allowing logic to be implemented based on a Container's state.`
`17`	`17`	`*`
`18`	`18`	`* @author Evan Villemez <evillemez@gmail.com>`
	`19`	`+ *`
	`20`	`+ * @deprecated Since version 3.0, to be removed in 4.0. Use ContainerInterface`
	`21`	`+ * instead.`
`19`	`22`	`*/`
`20`	`23`	`interface IntrospectableContainerInterface extends ContainerInterface`
`21`	`24`	`{`
`22`		`- /**`
`23`		`- * Check for whether or not a service has been initialized.`
`24`		`- *`
`25`		`- * @param string $id`
`26`		`- *`
`27`		`- * @return bool true if the service has been initialized, false otherwise`
`28`		`- */`
`29`		`- public function initialized($id);`
`30`	`25`	`}`