8000 [HttpKernel] Fix kernel.project_dir extensibility by chalasr · Pull Request #22728 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[HttpKernel] Fix kernel.project_dir extensibility #22728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2017
Merged

[HttpKernel] Fix kernel.project_dir extensibility #22728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix kernel.project_dir extensibility
  • Loading branch information
@chalasr
chalasr committed May 18, 2017
commit 3230fc7e700f19649a17fbb3258d66c84f066565
3 changes: 1 addition & 2 deletions src/Symfony/Component/HttpKernel/Kernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ public function __construct($environment, $debug)
$this->environment = $environment;
$this->debug = (bool) $debug;
$this->rootDir = $this->getRootDir();
$this->projectDir = $this->getProjectDir();
$this->name = $this->getName();

if ($this->debug) {
Expand Down Expand Up @@ -604,7 +603,7 @@ protected function getKernelParameters()
return array_merge(
array(
'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir,
'kernel.project_dir' => realpath($this->projectDir) ?: $this->projectDir,
'kernel.project_dir' => realpath($this->getProjectDir()) ?: $this->getProjectDir(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use the getter variant for other params too, while at it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea I think, I'll do it separately for lower branches once this merged

'kernel.environment' => $this->environment,
'kernel.debug' => $this->debug,
'kernel.name' => $this->name,
Expand Down
41 changes: 41 additions & 0 deletions src/Symfony/Component/HttpKernel/Tests/KernelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests;

use PHPUnit\Framework\TestCase;
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
use Symfony\Component\HttpKernel\Config\EnvParametersResource;
Expand Down Expand Up @@ -761,6 +762,15 @@ public function testSymfonyEnvironmentVariables()
unset($_SERVER['SYMFONY__FOO__BAR']);
}

public function testProjectDirExtension()
{
$kernel = new CustomProjectDirKernel('test', true);
$kernel->boot();

$this->assertSame('foo', $kernel->getProjectDir());
$this->assertSame('foo', $kernel->getContainer()->getParameter('kernel.project_dir'));
}

/**
* Returns a mock for the BundleInterface.
*
Expand Down Expand Up @@ -857,3 +867,34 @@ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch =
{
}
}

class CustomProjectDirKernel extends Kernel
{
private $baseDir;

public function __construct()
{
parent::__construct('test', false);

$this->baseDir = 'foo';
}

public function registerBundles()
{
return array();
}

public function registerContainerConfiguration(LoaderInterface $loader)
{
}

public function getProjectDir()
{
return $this->baseDir;
}

public function getRootDir()
{
return __DIR__.'/Fixtures';
}
}
0