Dynamic bundle assets

garak · fabpot · commit c16fcc93e206 · 2019-07-09T08:12:54.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -137,7 +137,13 @@ 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 (!method_exists($bundle, 'getPublicPath')) {
+                @trigger_error('Not defining "getPublicPath()" method is deprecated since Symfony 4.4 and will not be supported in 5.0.', E_USER_DEPRECATED);
+                $publicPath = 'Resources/public';
+            } else {
+                $publicPath = $bundle->getPublicPath();
+            }
+            if (!is_dir($originDir = $bundle->getPath().\DIRECTORY_SEPARATOR.$publicPath)) {
                 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(): string
+    {
+        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
@@ -19,6 +19,8 @@
  * BundleInterface.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @method string getPublicPath() Returns relative path for public assets
  */
 interface BundleInterface extends ContainerAwareInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -627,7 +627,7 @@ protected function getBundle($dir = null, $parent = null, $className = null, $bu
     {
         $bundle = $this
             ->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')
-            ->setMethods(['getPath', 'getParent', 'getName'])
+            ->setMethods(['getPath', 'getPublicPath', 'getParent', 'getName'])
             ->disableOriginalConstructor()
         ;
 
@@ -649,6 +649,12 @@ protected function getBundle($dir = null, $parent = null, $className = null, $bu
             ->willReturn($dir)
         ;
 
+        $bundle
+            ->expects($this->any())
+            ->method('getPublicPath')
+            ->willReturn('Resources/public')
+        ;
+
         $bundle
             ->expects($this->any())
             ->method('getParent')

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(): string`
	`139`	`+ {`
	`140`	`+ return 'Resources/public';`
	`141`	`+ }`
	`142`	`+`
`138`	`143`	`/**`
`139`	`144`	`* Returns the bundle's container extension class.`
`140`	`145`	`*`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`* BundleInterface.`
`20`	`20`	`*`
`21`	`21`	`* @author Fabien Potencier <[email protected]>`
	`22`	`+ *`
	`23`	`+ * @method string getPublicPath() Returns relative path for public assets`
`22`	`24`	`*/`
`23`	`25`	`interface BundleInterface extends ContainerAwareInterface`
`24`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,7 @@ protected function getBundle($dir = null, $parent = null, $className = null, $bu`
`627`	`627`	`{`
`628`	`628`	`$bundle = $this`
`629`	`629`	`->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')`
`630`		`- ->setMethods(['getPath', 'getParent', 'getName'])`
	`630`	`+ ->setMethods(['getPath', 'getPublicPath', 'getParent', 'getName'])`
`631`	`631`	`->disableOriginalConstructor()`
`632`	`632`	`;`
`633`	`633`
`@@ -649,6 +649,12 @@ protected function getBundle($dir = null, $parent = null, $className = null, $bu`
`649`	`649`	`->willReturn($dir)`
`650`	`650`	`;`
`651`	`651`
	`652`	`+ $bundle`
	`653`	`+ ->expects($this->any())`
	`654`	`+ ->method('getPublicPath')`
	`655`	`+ ->willReturn('Resources/public')`
	`656`	`+ ;`
	`657`	`+`
`652`	`658`	`$bundle`
`653`	`659`	`->expects($this->any())`
`654`	`660`	`->method('getParent')`