Merge remote branch 'vicb/resource_path'

* vicb/resource_path: Update for Bundle names long again (= include the 'Bundle' suffix) [Kernel] Make locateResource() throws an exception when a resource from a Bundle hides a custom resource [Kernel] Make resources overriding consistent across bundle directories and resource directories [Kernel] Improve test semantic [Kernel] Update tests with shorter bundle names [Kernel] Restore the tests for the locateResource method Resource paths should use the full bundle name (with the 'Bundle' postfix)

Author: fabpot

src/Symfony/Component/HttpKernel/Kernel.php

@@ -204,15 +204,17 @@ public function getBundle($name, $first = true)
  *
  * The resource name must follow the following pattern:
  *
- * @BundleName/path/to/a/file.something
+ * @<BundleName>/path/to/a/file.something
  *
  * where BundleName is the name of the bundle
  * and the remaining part is the relative path in the bundle.
  *
- * If $dir is passed, and the first segment of the path is Resources,
+ * If $dir is passed, and the first segment of the path is "Resources",
  * this method will look for a file named:
  *
- * $dir/BundleName/path/without/Resources
+ * $dir/<BundleName>/path/without/Resources
+ *
+ * before looking in the bundle resource folder.
  *
  * @param string $name A resource name to locate
  * @param string $dir A directory where to look for the resource first
@@ -221,7 +223,8 @@ public function getBundle($name, $first = true)
  * @return string|array The absolute path of the resource or an array if $first is false
  *
  * @throws \InvalidArgumentException if the file cannot be found or the name is not valid
- * @throws \RuntimeException if the name contains invalid/unsafe characters
+ * @throws \RuntimeException if the name contains invalid/unsafe
+ * @throws \RuntimeException if a custom resource is hidden by a resource in a derived bundle
  */
  public function locateResource($name, $dir = null, $first = true)
  {
@@ -234,30 +237,41 @@ public function locateResource($name, $dir = null, $first = true)
  }
 
  $name = substr($name, 1);
- list($bundle, $path) = explode('/', $name, 2);
-
- $isResource = 0 === strpos($path, 'Resources');
+ list($bundleName, $path) = explode('/', $name, 2);
+
+ $isResource = 0 === strpos($path, 'Resources') && null !== $dir;
+ $overridePath = substr($path, 9);
+ $resourceBundle = null;
+ $bundles = $this->getBundle($bundleName, false);
+ 
+ foreach ($bundles as $bundle) {
+ if ($isResource && file_exists($file = $dir.'/'.$bundle->getName().$overridePath)) {
+ if (null !== $resourceBundle) {
+ throw new \RuntimeException(sprintf('"%s" resource is hidden by a resource from the "%s" derived bundle. ' .
+ 'Create a "%s" file to override the bundle resource.',
+ $file,
+ $resourceBundle,
+ $dir.'/'.$bundles[0]->getName().$overridePath
+ ));
+ }
 
- $files = array();
- if (true === $isResource && null !== $dir && file_exists($file = $dir.'/'.$bundle.'/'.substr($path, 10))) {
- if ($first) {
- return $file;
+  if ($first) {
+  return $file;
+  }
+ $files[] = $file;
  }
 
- $files[] = $file;
- }
-
- foreach ($this->getBundle($bundle, false) as $bundle) {
  if (file_exists($file = $bundle->getPath().'/'.$path)) {
- if ($first) {
+ if ($first && !$isResource) {
  return $file;
  }
  $files[] = $file;
+ $resourceBundle = $bundle->getName();
  }
  }
 
- if ($files) {
- return $files;
+ if (count($files) > 0) {
+ return $first && $isResource ? $files[0] : $files;
  }
 
  throw new \InvalidArgumentException(sprintf('Unable to find file "@%s".', $name));