[HttpKernel] deprecated bundle inheritance

fabpot · fabpot · commit cad7f614e484 · 2017-09-11T11:39:02.000-07:00
diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
@@ -173,6 +173,8 @@ FrameworkBundle
 HttpKernel
 ----------
 
+ * Bundle inheritance has been deprecated.
+
  * Relying on convention-based commands discovery has been deprecated and
    won't be supported in 4.0. Use PSR-4 based service discovery instead.
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -493,6 +493,8 @@ HttpFoundation
 HttpKernel
 ----------
 
+ * Bundle inheritance has been removed.
+
  * Relying on convention-based commands discovery is not supported anymore.
    Use PSR-4 based service discovery instead.
 
diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
@@ -56,6 +56,8 @@ public function getContainerExtension();
      * bundle.
      *
      * @return string The Bundle name it overrides or null if no parent
+     *
+     * @deprecated This method is deprecated as of 3.4 and will be removed in 4.0.
      */
     public function getParent();
 
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * deprecated bundle inheritance
  * added `RebootableInterface` and implemented it in `Kernel`
  * deprecated commands auto registration
  * added `AddCacheClearerPass`
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -468,6 +468,8 @@ protected function initializeBundles()
             $this->bundles[$name] = $bundle;
 
             if ($parentName = $bundle->getParent()) {
+                @trigger_error('Bundle inheritance is deprecated as of 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+
                 if (isset($directChildren[$parentName])) {
                     throw new \LogicException(sprintf('Bundle "%s" is directly extended by two bundles "%s" and "%s".', $parentName, $name, $directChildren[$parentName]));
                 }

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ public function getContainerExtension();`
`56`	`56`	`* bundle.`
`57`	`57`	`*`
`58`	`58`	`* @return string The Bundle name it overrides or null if no parent`
	`59`	`+ *`
	`60`	`+ * @deprecated This method is deprecated as of 3.4 and will be removed in 4.0.`
`59`	`61`	`*/`
`60`	`62`	`public function getParent();`
`61`	`63`
Original file line number	Diff line number	Diff line change
`@@ -468,6 +468,8 @@ protected function initializeBundles()`
`468`	`468`	`$this->bundles[$name] = $bundle;`
`469`	`469`
`470`	`470`	`if ($parentName = $bundle->getParent()) {`
	`471`	`+ @trigger_error('Bundle inheritance is deprecated as of 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);`
	`472`	`+`
`471`	`473`	`if (isset($directChildren[$parentName])) {`
`472`	`474`	`throw new \LogicException(sprintf('Bundle "%s" is directly extended by two bundles "%s" and "%s".', $parentName, $name, $directChildren[$parentName]));`
`473`	`475`	`}`