Merge branch '2.7' into 2.8

Tobion · Tobion · commit bffe39a5fa50 · 2015-09-29T14:32:55.000+02:00
Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/Console/Formatter/OutputFormatter.php
	src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
	src/Symfony/Component/Console/Input/Input.php
	src/Symfony/Component/Console/Input/InputArgument.php
	src/Symfony/Component/Console/Input/InputDefinition.php
	src/Symfony/Component/Console/Input/InputOption.php
	src/Symfony/Component/Console/Output/OutputInterface.php
	src/Symfony/Component/Console/Output/StreamOutput.php
	src/Symfony/Component/CssSelector/CssSelector.php
	src/Symfony/Component/DependencyInjection/Container.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/DependencyInjection/ContainerInterface.php
	src/Symfony/Component/DependencyInjection/Definition.php
	src/Symfony/Component/DependencyInjection/Scope.php
	src/Symfony/Component/DependencyInjection/ScopeInterface.php
	src/Symfony/Component/Validator/Constraints/Currency.php
	src/Symfony/Component/Validator/Constraints/CurrencyValidator.php
diff --git a/DataCollectorTranslator.php b/DataCollectorTranslator.php
@@ -66,8 +66,6 @@ public function transChoice($id, $number, array $parameters = array(), $domain =
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function setLocale($locale)
     {
@@ -76,8 +74,6 @@ public function setLocale($locale)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function getLocale()
     {
diff --git a/Exception/ExceptionInterface.php b/Exception/ExceptionInterface.php
@@ -15,8 +15,6 @@
  * Exception interface for all exceptions thrown by the component.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 interface ExceptionInterface
 {
diff --git a/Exception/InvalidResourceException.php b/Exception/InvalidResourceException.php
@@ -15,8 +15,6 @@
  * Thrown when a resource cannot be loaded.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class InvalidResourceException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/Exception/NotFoundResourceException.php b/Exception/NotFoundResourceException.php
@@ -15,8 +15,6 @@
  * Thrown when a resource does not exist.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class NotFoundResourceException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/IdentityTranslator.php b/IdentityTranslator.php
@@ -15,8 +15,6 @@
  * IdentityTranslator does not translate anything.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class IdentityTranslator implements TranslatorInterface
 {
@@ -27,8 +25,6 @@ class IdentityTranslator implements TranslatorInterface
      * Constructor.
      *
      * @param MessageSelector|null $selector The message selector for pluralization
-     *
-     * @api
      */
     public function __construct(MessageSelector $selector = null)
     {
@@ -37,8 +33,6 @@ public function __construct(MessageSelector $selector = null)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function setLocale($locale)
     {
@@ -47,8 +41,6 @@ public function setLocale($locale)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function getLocale()
     {
@@ -57,8 +49,6 @@ public function getLocale()
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function trans($id, array $parameters = array(), $domain = null, $locale = null)
     {
@@ -67,8 +57,6 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
diff --git a/Loader/ArrayLoader.php b/Loader/ArrayLoader.php
@@ -17,15 +17,11 @@
  * ArrayLoader loads translations from a PHP array.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class ArrayLoader implements LoaderInterface
 {
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function load($resource, $locale, $domain = 'messages')
     {
diff --git a/Loader/CsvFileLoader.php b/Loader/CsvFileLoader.php
@@ -17,8 +17,6 @@
  * CsvFileLoader loads translations from CSV files.
  *
  * @author Saša Stamenković <umpirsky@gmail.com>
- *
- * @api
  */
 class CsvFileLoader extends FileLoader
 {
diff --git a/Loader/LoaderInterface.php b/Loader/LoaderInterface.php
@@ -19,8 +19,6 @@
  * LoaderInterface is the interface implemented by all translation loaders.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 interface LoaderInterface
 {
@@ -33,8 +31,6 @@ interface LoaderInterface
      *
      * @return MessageCatalogue A MessageCatalogue instance
      *
-     * @api
-     *
      * @throws NotFoundResourceException when the resource cannot be found
      * @throws InvalidResourceException  when the resource cannot be loaded
      */
diff --git a/Loader/PhpFileLoader.php b/Loader/PhpFileLoader.php
@@ -15,8 +15,6 @@
  * PhpFileLoader loads translations from PHP files returning an array of translations.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class PhpFileLoader extends FileLoader
 {
diff --git a/Loader/QtFileLoader.php b/Loader/QtFileLoader.php
@@ -21,15 +21,11 @@
  * QtFileLoader loads translations from QT Translations XML files.
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
- *
- * @api
  */
 class QtFileLoader implements LoaderInterface
 {
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function load($resource, $locale, $domain = 'messages')
     {
diff --git a/Loader/XliffFileLoader.php b/Loader/XliffFileLoader.php
@@ -21,15 +21,11 @@
  * XliffFileLoader loads translations from XLIFF files.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class XliffFileLoader implements LoaderInterface
 {
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function load($resource, $locale, $domain = 'messages')
     {
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -19,8 +19,6 @@
  * YamlFileLoader loads translations from Yaml files.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class YamlFileLoader extends FileLoader
 {
diff --git a/LoggingTranslator.php b/LoggingTranslator.php
@@ -66,8 +66,6 @@ public function transChoice($id, $number, array $parameters = array(), $domain =
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function setLocale($locale)
     {
@@ -76,8 +74,6 @@ public function setLocale($locale)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function getLocale()
     {
diff --git a/MessageCatalogue.php b/MessageCatalogue.php
@@ -17,8 +17,6 @@
  * MessageCatalogue.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
  */
 class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterface
 {
@@ -34,8 +32,6 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf
      *
      * @param string $locale   The locale
      * @param array  $messages An array of messages classified by domain
-     *
-     * @api
      */
     public function __construct($locale, array $messages = array())
     {
@@ -45,8 +41,6 @@ public function __construct($locale, array $messages = array())
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function getLocale()
     {
@@ -55,8 +49,6 @@ public function getLocale()
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function getDomains()
     {
@@ -65,8 +57,6 @@ public function getDomains()
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function all($domain = null)
     {
@@ -79,8 +69,6 @@ public function all($domain = null)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function set($id, $translation, $domain = 'messages')
     {
@@ -89,8 +77,6 @@ public function set($id, $translation, $domain = 'messages')
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function has($id, $domain = 'messages')
     {
@@ -115,8 +101,6 @@ public function defines($id, $domain = 'messages')
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function get($id, $domain = 'messages')
     {
@@ -133,8 +117,6 @@ public function get($id, $domain = 'messages')
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function replace($messages, $domain = 'messages')
     {
@@ -145,8 +127,6 @@ public function replace($messages, $domain = 'messages')
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function add($messages, $domain = 'messages')
     {
@@ -159,8 +139,6 @@ public function add($messages, $domain = 'messages')
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function addCatalogue(MessageCatalogueInterface $catalogue)
     {
@@ -184,8 +162,6 @@ public function addCatalogue(MessageCatalogueInterface $catalogue)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function addFallbackCatalogue(MessageCatalogueInterface $catalogue)
     {
@@ -214,8 +190,6 @@ public function addFallbackCatalogue(MessageCatalogueInterface $catalogue)
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function getFallbackCatalogue()
     {
@@ -224,8 +198,6 @@ public function getFallbackCatalogue()
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function getResources()
     {
@@ -234,8 +206,6 @@ public function getResources()
 
     /**
      * {@inheritdoc}
-     *
-     * @api
      */
     public function addResource(ResourceInterface $resource)
     {
diff --git a/MessageCatalogueInterface.php b/MessageCatalogueInterface.php
diff --git a/MessageSelector.php b/MessageSelector.php
diff --git a/Translator.php b/Translator.php
diff --git a/TranslatorInterface.php b/TranslatorInterface.php

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@`
`15`	`15`	`* Exception interface for all exceptions thrown by the component.`
`16`	`16`	`*`
`17`	`17`	`* @author Fabien Potencier <[email protected]>`
`18`		`- *`
`19`		`- * @api`
`20`	`18`	`*/`
`21`	`19`	`interface ExceptionInterface`
`22`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,11 @@`
`17`	`17`	`* ArrayLoader loads translations from a PHP array.`
`18`	`18`	`*`
`19`	`19`	`* @author Fabien Potencier <[email protected]>`
`20`		`- *`
`21`		`- * @api`
`22`	`20`	`*/`
`23`	`21`	`class ArrayLoader implements LoaderInterface`
`24`	`22`	`{`
`25`	`23`	`/**`
`26`	`24`	`* {@inheritdoc}`
`27`		`- *`
`28`		`- * @api`
`29`	`25`	`*/`
`30`	`26`	`public function load($resource, $locale, $domain = 'messages')`
`31`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`	`* CsvFileLoader loads translations from CSV files.`
`18`	`18`	`*`
`19`	`19`	`* @author Saša Stamenković <[email protected]>`
`20`		`- *`
`21`		`- * @api`
`22`	`20`	`*/`
`23`	`21`	`class CsvFileLoader extends FileLoader`
`24`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@`
`19`	`19`	`* LoaderInterface is the interface implemented by all translation loaders.`
`20`	`20`	`*`
`21`	`21`	`* @author Fabien Potencier <[email protected]>`
`22`		`- *`
`23`		`- * @api`
`24`	`22`	`*/`
`25`	`23`	`interface LoaderInterface`
`26`	`24`	`{`
`@@ -33,8 +31,6 @@ interface LoaderInterface`
`33`	`31`	`*`
`34`	`32`	`* @return MessageCatalogue A MessageCatalogue instance`
`35`	`33`	`*`
`36`		`- * @api`
`37`		`- *`
`38`	`34`	`* @throws NotFoundResourceException when the resource cannot be found`
`39`	`35`	`* @throws InvalidResourceException when the resource cannot be loaded`
`40`	`36`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,11 @@`
`21`	`21`	`* QtFileLoader loads translations from QT Translations XML files.`
`22`	`22`	`*`
`23`	`23`	`* @author Benjamin Eberlei <[email protected]>`
`24`		`- *`
`25`		`- * @api`
`26`	`24`	`*/`
`27`	`25`	`class QtFileLoader implements LoaderInterface`
`28`	`26`	`{`
`29`	`27`	`/**`
`30`	`28`	`* {@inheritdoc}`
`31`		`- *`
`32`		`- * @api`
`33`	`29`	`*/`
`34`	`30`	`public function load($resource, $locale, $domain = 'messages')`
`35`	`31`	`{`