Escape annotations in comments, refs #13089.

This commit is contained in:
cmfcmf 2015-01-04 19:14:50 +01:00
parent 7d15c1d9db
commit 0cb17f3dd2
2 changed files with 7 additions and 31 deletions

View File

@ -242,35 +242,9 @@ abstract class Kernel implements KernelInterface, TerminableInterface
}
/**
* Returns the file path for a given resource.
* {@inheritDoc}
*
* A Resource can be a file or a directory.
*
* The resource name must follow the following pattern:
*
* @<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",
* this method will look for a file named:
*
* $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
* @param bool $first Whether to return the first path or paths for all matching bundles
*
* @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
* @throws \RuntimeException if a custom resource is hidden by a resource in a derived bundle
*
* @api
* @throws \RuntimeException if a custom resource is hidden by a resource in a derived bundle
*/
public function locateResource($name, $dir = null, $first = true)
{

View File

@ -101,15 +101,17 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
*
* 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