Remove hard-coding of "Resources/public/" path for assets

garak · garak · commit 33ec2d87bd1c · 2019-06-20T15:07:49.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $validAssetDirs = [];
         /** @var BundleInterface $bundle */
         foreach ($kernel->getBundles() as $bundle) {
-            if (!is_dir($originDir = $bundle->getPath().'/Resources/public')) {
+            if (!is_dir($originDir = $bundle->getPath().$bundle->getPublicPath())) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -135,6 +135,11 @@ public function registerCommands(Application $application)
     {
     }
 
+    public function getPublicPath()
+    {
+        return '/Resources/public';
+    }
+
     /**
      * Returns the bundle's container extension class.
      *
diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
@@ -68,4 +68,12 @@ public function getNamespace();
      * @return string The Bundle absolute path
      */
     public function getPath();
+
+    /**
+     * Gets relative path for public assets (with leading slash).
+     * E.g. "/Resources/public".
+     *
+     * @return string The relative path for public assets
+     */
+    public function getPublicPath();
 }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`137`	`137`	`$validAssetDirs = [];`
`138`	`138`	`/** @var BundleInterface $bundle */`
`139`	`139`	`foreach ($kernel->getBundles() as $bundle) {`
`140`		`- if (!is_dir($originDir = $bundle->getPath().'/Resources/public')) {`
	`140`	`+ if (!is_dir($originDir = $bundle->getPath().$bundle->getPublicPath())) {`
`141`	`141`	`continue;`
`142`	`142`	`}`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,11 @@ public function registerCommands(Application $application)`
`135`	`135`	`{`
`136`	`136`	`}`
`137`	`137`
	`138`	`+ public function getPublicPath()`
	`139`	`+ {`
	`140`	`+ return '/Resources/public';`
	`141`	`+ }`
	`142`	`+`
`138`	`143`	`/**`
`139`	`144`	`* Returns the bundle's container extension class.`
`140`	`145`	`*`