bug #36721 [FrameworkBundle] remove getProjectDir method from MicroKernelTrait (garak)

fabpot · fabpot · commit 75e71e3bbeff · 2020-05-06T13:28:34.000+02:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [FrameworkBundle] remove getProjectDir method from MicroKernelTrait | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #36719 | License | MIT | Doc PR | not needed Remove method added in trait, to be able to use same method in base kernel class. Commits ------- f2f3eba remove getProjectDir method from MicroKernelTrait
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -9,7 +9,7 @@ CHANGELOG
  * Added the `framework.router.default_uri` configuration option to configure the default `RequestContext`
  * Made `MicroKernelTrait::configureContainer()` compatible with `ContainerConfigurator`
  * Added a new `mailer.message_bus` option to configure or disable the message bus to use to send mails.
- * Added flex-compatible default implementations for `MicroKernelTrait::registerBundles()` and `getProjectDir()`
+ * Added flex-compatible default implementation for `MicroKernelTrait::registerBundles()`
  * Deprecated passing a `RouteCollectionBuilder` to `MicroKernelTrait::configureRoutes()`, type-hint `RoutingConfigurator` instead
  * The `TemplateController` now accepts context argument
  * Deprecated *not* setting the "framework.router.utf8" configuration option as it will default to `true` in Symfony 6.0
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -60,14 +60,6 @@ abstract protected function configureRoutes(RoutingConfigurator $routes);
      */
     abstract protected function configureContainer(ContainerConfigurator $c);
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProjectDir(): string
-    {
-        return \dirname((new \ReflectionObject($this))->getFileName(), 2);
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/flex-style/src/FlexStyleMicroKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/flex-style/src/FlexStyleMicroKernel.php
@@ -50,6 +50,11 @@ public function getLogDir(): string
         return $this->cacheDir;
     }
 
+    public function getProjectDir(): string
+    {
+        return \dirname((new \ReflectionObject($this))->getFileName(), 2);
+    }
+
     public function __sleep(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,11 @@ public function getLogDir(): string`
`50`	`50`	`return $this->cacheDir;`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ public function getProjectDir(): string`
	`54`	`+ {`
	`55`	`+ return \dirname((new \ReflectionObject($this))->getFileName(), 2);`
	`56`	`+ }`
	`57`	`+`
`53`	`58`	`public function __sleep(): array`
`54`	`59`	`{`
`55`	`60`	`throw new \BadMethodCallException('Cannot serialize '.__CLASS__);`