Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 75e71e3

Browse filesBrowse files
committed
bug #36721 [FrameworkBundle] remove getProjectDir method from MicroKernelTrait (garak)
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
2 parents af160e2 + f2f3eba commit 75e71e3
Copy full SHA for 75e71e3

File tree

3 files changed

+6
-9
lines changed
Filter options

3 files changed

+6
-9
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CHANGELOG
99
* Added the `framework.router.default_uri` configuration option to configure the default `RequestContext`
1010
* Made `MicroKernelTrait::configureContainer()` compatible with `ContainerConfigurator`
1111
* Added a new `mailer.message_bus` option to configure or disable the message bus to use to send mails.
12-
* Added flex-compatible default implementations for `MicroKernelTrait::registerBundles()` and `getProjectDir()`
12+
* Added flex-compatible default implementation for `MicroKernelTrait::registerBundles()`
1313
* Deprecated passing a `RouteCollectionBuilder` to `MicroKernelTrait::configureRoutes()`, type-hint `RoutingConfigurator` instead
1414
* The `TemplateController` now accepts context argument
1515
* Deprecated *not* setting the "framework.router.utf8" configuration option as it will default to `true` in Symfony 6.0

‎src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ abstract protected function configureRoutes(RoutingConfigurator $routes);
6060
*/
6161
abstract protected function configureContainer(ContainerConfigurator $c);
6262

63-
/**
64-
* {@inheritdoc}
65-
*/
66-
public function getProjectDir(): string
67-
{
68-
return \dirname((new \ReflectionObject($this))->getFileName(), 2);
69-
}
70-
7163
/**
7264
* {@inheritdoc}
7365
*/

‎src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/flex-style/src/FlexStyleMicroKernel.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/flex-style/src/FlexStyleMicroKernel.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ public function getLogDir(): string
5050
return $this->cacheDir;
5151
}
5252

53+
public function getProjectDir(): string
54+
{
55+
return \dirname((new \ReflectionObject($this))->getFileName(), 2);
56+
}
57+
5358
public function __sleep(): array
5459
{
5560
throw new \BadMethodCallException('Cannot serialize '.__CLASS__);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.