minor #28901 [HttpKernel] Introduce KernelInterface::getProjectDir() (ro0NL)

fabpot · fabpot · commit dd432c4f1e5d · 2018-10-17T11:43:15.000+02:00
This PR was merged into the 4.2-dev branch. Discussion ---------- [HttpKernel] Introduce KernelInterface::getProjectDir() | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no  | Deprecations? | not yet | Tests pass? | yes  | Fixed tickets | #28897 (comment) | License | MIT | Doc PR | symfony/symfony-docs#...  Removes the last call to getParameter('kernel.project_dir') during runtime in core. Yay :) cc @fabpot @nicolas-grekas Commits ------- b046f41 [HttpKernel] Introduce KernelInterface::getProjectDir()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -60,7 +60,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         /** @var KernelInterface $kernel */
         $kernel = $this->getApplication()->getKernel();
-        $projectDir = $kernel->getContainer()->getParameter('kernel.project_dir');
 
         $rows = array(
             array('<info>Symfony</>'),
@@ -75,8 +74,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             array('Environment', $kernel->getEnvironment()),
             array('Debug', $kernel->isDebug() ? 'true' : 'false'),
             array('Charset', $kernel->getCharset()),
-            array('Cache directory', self::formatPath($kernel->getCacheDir(), $projectDir).' (<comment>'.self::formatFileSize($kernel->getCacheDir()).'</>)'),
-            array('Log directory', self::formatPath($kernel->getLogDir(), $projectDir).' (<comment>'.self::formatFileSize($kernel->getLogDir()).'</>)'),
+            array('Cache directory', self::formatPath($kernel->getCacheDir(), $kernel->getProjectDir()).' (<comment>'.self::formatFileSize($kernel->getCacheDir()).'</>)'),
+            array('Log directory', self::formatPath($kernel->getLogDir(), $kernel->getProjectDir()).' (<comment>'.self::formatFileSize($kernel->getLogDir()).'</>)'),
             new TableSeparator(),
             array('<info>PHP</>'),
             new TableSeparator(),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -22,6 +22,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
  * Command that places bundle web assets into a given directory.
@@ -89,11 +90,12 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        /** @var KernelInterface $kernel */
         $kernel = $this->getApplication()->getKernel();
         $targetArg = rtrim($input->getArgument('target'), '/');
 
         if (!is_dir($targetArg)) {
-            $targetArg = $kernel->getContainer()->getParameter('kernel.project_dir').'/'.$targetArg;
+            $targetArg = $kernel->getProjectDir().'/'.$targetArg;
 
             if (!is_dir($targetArg)) {
                 throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $input->getArgument('target')));
diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php
@@ -21,6 +21,8 @@
  * It manages an environment made of application kernel and bundles.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @method string getProjectDir() Gets the project dir (path of the project's composer file) - not defining it is deprecated since Symfony 4.2
  */
 interface KernelInterface extends HttpKernelInterface, \Serializable
 {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`* It manages an environment made of application kernel and bundles.`
`22`	`22`	`*`
`23`	`23`	`* @author Fabien Potencier <[email protected]>`
	`24`	`+ *`
	`25`	`+ * @method string getProjectDir() Gets the project dir (path of the project's composer file) - not defining it is deprecated since Symfony 4.2`
`24`	`26`	`*/`
`25`	`27`	`interface KernelInterface extends HttpKernelInterface, \Serializable`
`26`	`28`	`{`