Merge branch '2.7' into 2.8

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

Author: Tobion

Finder.php

@@ -39,8 +39,6 @@
  * $finder = Finder::create()->files()->name('*.php')->in(__DIR__);
  *
  * @author Fabien Potencier <[email protected]>
- *
- * @api
  */
 class Finder implements \IteratorAggregate, \Countable
 {
@@ -81,8 +79,6 @@ public function __construct()
      * Creates a new Finder.
      *
      * @return Finder A new Finder instance
-     *
-     * @api
      */
     public static function create()
     {
@@ -197,8 +193,6 @@ public function getAdapters()
      * Restricts the matching to directories only.
      *
      * @return Finder The current Finder instance
-     *
-     * @api
      */
     public function directories()
     {
@@ -211,8 +205,6 @@ public function directories()
      * Restricts the matching to files only.
      *
      * @return Finder The current Finder instance
-     *
-     * @api
      */
     public function files()
     {
@@ -235,8 +227,6 @@ public function files()
      *
      * @see DepthRangeFilterIterator
      * @see NumberComparator
-     *
-     * @api
      */
     public function depth($level)
     {
@@ -262,8 +252,6 @@ public function depth($level)
      * @see strtotime
      * @see DateRangeFilterIterator
      * @see DateComparator
-     *
-     * @api
      */
     public function date($date)
     {
@@ -286,8 +274,6 @@ public function date($date)
      * @return Finder The current Finder instance
      *
      * @see FilenameFilterIterator
-     *
-     * @api
      */
     public function name($pattern)
     {
@@ -304,8 +290,6 @@ public function name($pattern)
      * @return Finder The current Finder instance
      *
      * @see FilenameFilterIterator
-     *
-     * @api
      */
     public function notName($pattern)
     {
@@ -415,8 +399,6 @@ public function notPath($pattern)
      *
      * @see SizeRangeFilterIterator
      * @see NumberComparator
-     *
-     * @api
      */
     public function size($size)
     {
@@ -433,8 +415,6 @@ public function size($size)
      * @return Finder The current Finder instance
      *
      * @see ExcludeDirectoryFilterIterator
-     *
-     * @api
      */
     public function exclude($dirs)
     {
@@ -451,8 +431,6 @@ public function exclude($dirs)
      * @return Finder The current Finder instance
      *
      * @see ExcludeDirectoryFilterIterator
-     *
-     * @api
      */
     public function ignoreDotFiles($ignoreDotFiles)
     {
@@ -473,8 +451,6 @@ public function ignoreDotFiles($ignoreDotFiles)
      * @return Finder The current Finder instance
      *
      * @see ExcludeDirectoryFilterIterator
-     *
-     * @api
      */
     public function ignoreVCS($ignoreVCS)
     {
@@ -515,8 +491,6 @@ public static function addVCSPattern($pattern)
      * @return Finder The current Finder instance
      *
      * @see SortableIterator
-     *
-     * @api
      */
     public function sort(\Closure $closure)
     {
@@ -533,8 +507,6 @@ public function sort(\Closure $closure)
      * @return Finder The current Finder instance
      *
      * @see SortableIterator
-     *
-     * @api
      */
     public function sortByName()
     {
@@ -551,8 +523,6 @@ public function sortByName()
      * @return Finder The current Finder instance
      *
      * @see SortableIterator
-     *
-     * @api
      */
     public function sortByType()
     {
@@ -571,8 +541,6 @@ public function sortByType()
      * @return Finder The current Finder instance
      *
      * @see SortableIterator
-     *
-     * @api
      */
     public function sortByAccessedTime()
     {
@@ -593,8 +561,6 @@ public function sortByAccessedTime()
      * @return Finder The current Finder instance
      *
      * @see SortableIterator
-     *
-     * @api
      */
     public function sortByChangedTime()
     {
@@ -613,8 +579,6 @@ public function sortByChangedTime()
      * @return Finder The current Finder instance
      *
      * @see SortableIterator
-     *
-     * @api
      */
     public function sortByModifiedTime()
     {
@@ -634,8 +598,6 @@ public function sortByModifiedTime()
      * @return Finder The current Finder instance
      *
      * @see CustomFilterIterator
-     *
-     * @api
      */
     public function filter(\Closure $closure)
     {
@@ -648,8 +610,6 @@ public function filter(\Closure $closure)
      * Forces the following of symlinks.
      *
      * @return Finder The current Finder instance
-     *
-     * @api
      */
     public function followLinks()
     {
@@ -682,8 +642,6 @@ public function ignoreUnreadableDirs($ignore = true)
      * @return Finder The current Finder instance
      *
      * @throws \InvalidArgumentException if one of the directories does not exist
-     *
-     * @api
      */
     public function in($dirs)
     {