diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md index 5183fab4d2..b28bb6e84a 100644 --- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md +++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md @@ -8,8 +8,8 @@ CHANGELOG * added "container.service_locator" tag for defining service-locator services * added anonymous services support in YAML configuration files using the `!service` tag. * added "TypedReference" and "ServiceClosureArgument" for creating service-locator services - * [EXPERIMENTAL] added "instanceof" section for local interface-defined configs - * [EXPERIMENTAL] added prototype services for PSR4-based discovery and registration + * added "instanceof" section for local interface-defined configs + * added prototype services for PSR4-based discovery and registration * added `ContainerBuilder::getReflectionClass()` for retrieving and tracking reflection class info * deprecated `ContainerBuilder::getClassResource()`, use `ContainerBuilder::getReflectionClass()` or `ContainerBuilder::addObjectResource()` instead * added `ContainerBuilder::fileExists()` for checking and tracking file or directory existence diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php index e20dadb214..e06d996a86 100644 --- a/src/Symfony/Component/DependencyInjection/Definition.php +++ b/src/Symfony/Component/DependencyInjection/Definition.php @@ -335,8 +335,6 @@ class Definition * Sets the definition templates to conditionally apply on the current definition, keyed by parent interface/class. * * @param $instanceof ChildDefinition[] - * - * @experimental in version 3.3 */ public function setInstanceofConditionals(array $instanceof) { @@ -349,8 +347,6 @@ class Definition * Gets the definition templates to conditionally apply on the current definition, keyed by parent interface/class. * * @return ChildDefinition[] - * - * @experimental in version 3.3 */ public function getInstanceofConditionals() { diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php index bb9dc214e6..243bced03d 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php @@ -46,8 +46,6 @@ abstract class FileLoader extends BaseFileLoader * @param Definition $prototype A definition to use as template * @param string $namespace The namespace prefix of classes in the scanned directory * @param string $resource The directory to look for classes, glob-patterns allowed - * - * @experimental in version 3.3 */ public function registerClasses(Definition $prototype, $namespace, $resource) { @@ -68,7 +66,10 @@ abstract class FileLoader extends BaseFileLoader } /** - * @experimental in version 3.3 + * Registers a definition in the container with its instanceof-conditionals. + * + * @param string $id + * @param Definition $definition */ protected function setDefinition($id, Definition $definition) { diff --git a/src/Symfony/Component/Yaml/Tag/TaggedValue.php b/src/Symfony/Component/Yaml/Tag/TaggedValue.php index 09051d0f09..000c1d992c 100644 --- a/src/Symfony/Component/Yaml/Tag/TaggedValue.php +++ b/src/Symfony/Component/Yaml/Tag/TaggedValue.php @@ -14,8 +14,6 @@ namespace Symfony\Component\Yaml\Tag; /** * @author Nicolas Grekas * @author Guilhem N. - * - * @experimental in version 3.3 */ final class TaggedValue { diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php index 8ac6ecb967..84f749b560 100644 --- a/src/Symfony/Component/Yaml/Yaml.php +++ b/src/Symfony/Component/Yaml/Yaml.php @@ -29,14 +29,10 @@ class Yaml const DUMP_OBJECT_AS_MAP = 64; const DUMP_MULTI_LINE_LITERAL_BLOCK = 128; const PARSE_CONSTANT = 256; + const PARSE_CUSTOM_TAGS = 512; const DUMP_EMPTY_ARRAY_AS_SEQUENCE = 1024; const PARSE_KEYS_AS_STRINGS = 2048; - /** - * @experimental in version 3.3 - */ - const PARSE_CUSTOM_TAGS = 512; - /** * Parses YAML into a PHP value. *