Update to Drupal 8.0-dev-2015-11-17. Commits through da81cd220, Tue Nov 17 15:53:49 2015 +0000, Issue #2617224 by Wim Leers: Move around/fix some documentation.
This commit is contained in:
parent
4afb23bbd3
commit
7784f4c23d
929 changed files with 19798 additions and 5304 deletions
vendor/symfony/dependency-injection
|
@ -31,8 +31,6 @@ use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
|
|||
* ContainerBuilder is a DI container that provides an API to easily describe services.
|
||||
*
|
||||
* @author Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
class ContainerBuilder extends Container implements TaggedContainerInterface
|
||||
{
|
||||
|
@ -127,8 +125,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Registers an extension.
|
||||
*
|
||||
* @param ExtensionInterface $extension An extension instance
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function registerExtension(ExtensionInterface $extension)
|
||||
{
|
||||
|
@ -147,8 +143,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @return ExtensionInterface An extension instance
|
||||
*
|
||||
* @throws LogicException if the extension is not registered
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getExtension($name)
|
||||
{
|
||||
|
@ -167,8 +161,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Returns all registered extensions.
|
||||
*
|
||||
* @return ExtensionInterface[] An array of ExtensionInterface
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getExtensions()
|
||||
{
|
||||
|
@ -181,8 +173,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $name The name of the extension
|
||||
*
|
||||
* @return bool If the extension exists
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function hasExtension($name)
|
||||
{
|
||||
|
@ -193,8 +183,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Returns an array of resources loaded to build this configuration.
|
||||
*
|
||||
* @return ResourceInterface[] An array of resources
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getResources()
|
||||
{
|
||||
|
@ -207,8 +195,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param ResourceInterface $resource A resource instance
|
||||
*
|
||||
* @return ContainerBuilder The current instance
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function addResource(ResourceInterface $resource)
|
||||
{
|
||||
|
@ -227,8 +213,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param ResourceInterface[] $resources An array of resources
|
||||
*
|
||||
* @return ContainerBuilder The current instance
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function setResources(array $resources)
|
||||
{
|
||||
|
@ -247,8 +231,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param object $object An object instance
|
||||
*
|
||||
* @return ContainerBuilder The current instance
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function addObjectResource($object)
|
||||
{
|
||||
|
@ -289,8 +271,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
*
|
||||
* @throws BadMethodCallException When this ContainerBuilder is frozen
|
||||
* @throws \LogicException if the container is frozen
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function loadFromExtension($extension, array $values = array())
|
||||
{
|
||||
|
@ -312,8 +292,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $type The type of compiler pass
|
||||
*
|
||||
* @return ContainerBuilder The current instance
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION)
|
||||
{
|
||||
|
@ -328,8 +306,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Returns the compiler pass config which can then be modified.
|
||||
*
|
||||
* @return PassConfig The compiler pass config
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getCompilerPassConfig()
|
||||
{
|
||||
|
@ -340,8 +316,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Returns the compiler.
|
||||
*
|
||||
* @return Compiler The compiler
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getCompiler()
|
||||
{
|
||||
|
@ -356,8 +330,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Returns all Scopes.
|
||||
*
|
||||
* @return array An array of scopes
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getScopes()
|
||||
{
|
||||
|
@ -368,8 +340,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Returns all Scope children.
|
||||
*
|
||||
* @return array An array of scope children.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getScopeChildren()
|
||||
{
|
||||
|
@ -384,8 +354,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $scope The scope
|
||||
*
|
||||
* @throws BadMethodCallException When this ContainerBuilder is frozen
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function set($id, $service, $scope = self::SCOPE_CONTAINER)
|
||||
{
|
||||
|
@ -421,8 +389,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Removes a service definition.
|
||||
*
|
||||
* @param string $id The service identifier
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function removeDefinition($id)
|
||||
{
|
||||
|
@ -435,8 +401,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $id The service identifier
|
||||
*
|
||||
* @return bool true if the service is defined, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function has($id)
|
||||
{
|
||||
|
@ -459,8 +423,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @throws \Exception
|
||||
*
|
||||
* @see Reference
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
|
||||
{
|
||||
|
@ -524,8 +486,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param ContainerBuilder $container The ContainerBuilder instance to merge.
|
||||
*
|
||||
* @throws BadMethodCallException When this ContainerBuilder is frozen
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function merge(ContainerBuilder $container)
|
||||
{
|
||||
|
@ -558,8 +518,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $name The name of the extension
|
||||
*
|
||||
* @return array An array of configuration
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getExtensionConfig($name)
|
||||
{
|
||||
|
@ -598,8 +556,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* * Parameter values are resolved;
|
||||
* * The parameter bag is frozen;
|
||||
* * Extension loading is disabled.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function compile()
|
||||
{
|
||||
|
@ -640,8 +596,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Adds the service aliases.
|
||||
*
|
||||
* @param array $aliases An array of aliases
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function addAliases(array $aliases)
|
||||
{
|
||||
|
@ -654,8 +608,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Sets the service aliases.
|
||||
*
|
||||
* @param array $aliases An array of aliases
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function setAliases(array $aliases)
|
||||
{
|
||||
|
@ -671,8 +623,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
*
|
||||
* @throws InvalidArgumentException if the id is not a string or an Alias
|
||||
* @throws InvalidArgumentException if the alias is for itself
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function setAlias($alias, $id)
|
||||
{
|
||||
|
@ -697,8 +647,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Removes an alias.
|
||||
*
|
||||
* @param string $alias The alias to remove
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function removeAlias($alias)
|
||||
{
|
||||
|
@ -711,8 +659,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $id The service identifier
|
||||
*
|
||||
* @return bool true if the alias exists, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function hasAlias($id)
|
||||
{
|
||||
|
@ -723,8 +669,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Gets all defined aliases.
|
||||
*
|
||||
* @return Alias[] An array of aliases
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getAliases()
|
||||
{
|
||||
|
@ -739,8 +683,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @return Alias An Alias instance
|
||||
*
|
||||
* @throws InvalidArgumentException if the alias does not exist
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getAlias($id)
|
||||
{
|
||||
|
@ -763,8 +705,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $class The service class
|
||||
*
|
||||
* @return Definition A Definition instance
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function register($id, $class = null)
|
||||
{
|
||||
|
@ -775,8 +715,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Adds the service definitions.
|
||||
*
|
||||
* @param Definition[] $definitions An array of service definitions
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function addDefinitions(array $definitions)
|
||||
{
|
||||
|
@ -789,8 +727,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Sets the service definitions.
|
||||
*
|
||||
* @param Definition[] $definitions An array of service definitions
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function setDefinitions(array $definitions)
|
||||
{
|
||||
|
@ -802,8 +738,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* Gets all service definitions.
|
||||
*
|
||||
* @return Definition[] An array of Definition instances
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getDefinitions()
|
||||
{
|
||||
|
@ -819,8 +753,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @return Definition the service definition
|
||||
*
|
||||
* @throws BadMethodCallException When this ContainerBuilder is frozen
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function setDefinition($id, Definition $definition)
|
||||
{
|
||||
|
@ -841,8 +773,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $id The service identifier
|
||||
*
|
||||
* @return bool true if the service definition exists, false otherwise
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function hasDefinition($id)
|
||||
{
|
||||
|
@ -857,8 +787,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @return Definition A Definition instance
|
||||
*
|
||||
* @throws InvalidArgumentException if the service definition does not exist
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function getDefinition($id)
|
||||
{
|
||||
|
@ -881,8 +809,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @return Definition A Definition instance
|
||||
*
|
||||
* @throws InvalidArgumentException if the service definition does not exist
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function findDefinition($id)
|
||||
{
|
||||
|
@ -1012,7 +938,9 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
public function resolveServices($value)
|
||||
{
|
||||
if (is_array($value)) {
|
||||
$value = array_map(array($this, 'resolveServices'), $value);
|
||||
foreach ($value as $k => $v) {
|
||||
$value[$k] = $this->resolveServices($v);
|
||||
}
|
||||
} elseif ($value instanceof Reference) {
|
||||
$value = $this->get((string) $value, $value->getInvalidBehavior());
|
||||
} elseif ($value instanceof Definition) {
|
||||
|
@ -1041,8 +969,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
|
|||
* @param string $name The tag name
|
||||
*
|
||||
* @return array An array of tags with the tagged service as key, holding a list of attribute arrays.
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
public function findTaggedServiceIds($name)
|
||||
{
|
||||
|
|
Reference in a new issue