Merge branch '3.3' into 3.4

fabpot · fabpot · commit f46d324d632c · 2017-09-11T14:23:16.000-07:00
* 3.3:
  fixed CS
  fixed CS
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php
@@ -14,7 +14,6 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Twig\Extension\WorkflowExtension;
 use Symfony\Component\Workflow\Definition;
-use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\SupportStrategy\ClassInstanceSupportStrategy;
 use Symfony\Component\Workflow\Transition;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -255,7 +255,7 @@ private function absoluteSymlinkWithFallback($originDir, $targetDir)
      * @param string $targetDir
      * @param bool   $relative
      *
-     * @throws IOException If link can not be created.
+     * @throws IOException if link can not be created
      */
     private function symlink($originDir, $targetDir, $relative = false)
     {
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\SecurityBundle\Security;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Bundle\SecurityBundle\Security\FirewallContext;
 use Symfony\Component\Security\Http\FirewallMapInterface;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -67,7 +67,7 @@ public function init($redisClient, $namespace = '', $defaultLifetime = 0)
      * @param string $dsn
      * @param array  $options See self::$defaultConnectionOptions
      *
-     * @throws InvalidArgumentException When the DSN is invalid.
+     * @throws InvalidArgumentException when the DSN is invalid
      *
      * @return \Redis|\Predis\Client According to the "class" option
      */
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -487,7 +487,7 @@ public function setHidden($hidden)
     }
 
     /**
-     * @return bool Whether the command should be publicly shown or not.
+     * @return bool whether the command should be publicly shown or not
      */
     public function isHidden()
     {
diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php
@@ -137,8 +137,8 @@ public function getStatusCode()
     /**
      * Sets the user inputs.
      *
-     * @param array An array of strings representing each input
-     *              passed to the command input stream.
+     * @param array an array of strings representing each input
+     *              passed to the command input stream
      *
      * @return CommandTester
      */
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -703,7 +703,7 @@ public function isAbstract()
      *
      * @return $this
      *
-     * @throws InvalidArgumentException When the message template is invalid.
+     * @throws InvalidArgumentException when the message template is invalid
      */
     public function setDeprecated($status = true, $template = null)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php b/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\DirectoryResource;
-
 /**
  * DirectoryLoader is a recursive loader to go through directories.
  *
diff --git a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Util\XmlUtils;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\FileResource;
-
 /**
  * PhpFileLoader loads service definitions from a PHP file.
  *
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php
@@ -62,7 +62,7 @@ public function __construct(array $fields = null, $pad = false)
      *
      * @return array Interval array
      *
-     * @throws UnexpectedTypeException If the given value is not a \DateInterval instance.
+     * @throws UnexpectedTypeException if the given value is not a \DateInterval instance
      */
     public function transform($dateInterval)
     {
@@ -108,8 +108,8 @@ public function transform($dateInterval)
      *
      * @return \DateInterval Normalized date interval
      *
-     * @throws UnexpectedTypeException       If the given value is not an array.
-     * @throws TransformationFailedException If the value could not be transformed.
+     * @throws UnexpectedTypeException       if the given value is not an array
+     * @throws TransformationFailedException if the value could not be transformed
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php
@@ -46,7 +46,7 @@ public function __construct($format = 'P%yY%mM%dDT%hH%iM%sS', $parseSigned = fal
      *
      * @return string An ISO 8601 or relative date string like date interval presentation
      *
-     * @throws UnexpectedTypeException If the given value is not a \DateInterval instance.
+     * @throws UnexpectedTypeException if the given value is not a \DateInterval instance
      */
     public function transform($value)
     {
@@ -67,8 +67,8 @@ public function transform($value)
      *
      * @return \DateInterval An instance of \DateInterval
      *
-     * @throws UnexpectedTypeException       If the given value is not a string.
-     * @throws TransformationFailedException If the date interval could not be parsed.
+     * @throws UnexpectedTypeException       if the given value is not a string
+     * @throws TransformationFailedException if the date interval could not be parsed
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php
@@ -271,7 +271,7 @@ public function seek($position)
      *
      * @param string|string[] $codes The codes to find
      *
-     * @return static New instance which contains only specific errors.
+     * @return static new instance which contains only specific errors
      */
     public function findByCodes($codes)
     {
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -150,7 +150,7 @@ public function setData($data = array())
                 try {
                     $data = @json_encode($data, $this->encodingOptions);
                 } finally {
-                     restore_error_handler();
+                    restore_error_handler();
                 }
             } else {
                 try {
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -704,7 +704,7 @@ private function getTraceKey(Request $request)
      *
      * @param Response $entry
      *
-     * @return bool True when the stale response may be served, false otherwise.
+     * @return bool true when the stale response may be served, false otherwise
      */
     private function mayServeStaleWhileRevalidate(Response $entry)
     {
@@ -722,7 +722,7 @@ private function mayServeStaleWhileRevalidate(Response $entry)
      *
      * @param Request $request The request to wait for
      *
-     * @return bool True if the lock was released before the internal timeout was hit; false if the wait timeout was exceeded.
+     * @return bool true if the lock was released before the internal timeout was hit; false if the wait timeout was exceeded
      */
     private function waitForLock(Request $request)
     {
diff --git a/src/Symfony/Component/Ldap/LdapInterface.php b/src/Symfony/Component/Ldap/LdapInterface.php
@@ -31,7 +31,7 @@ interface LdapInterface
      * @param string $dn       A LDAP dn
      * @param string $password A password
      *
-     * @throws ConnectionException If dn / password could not be bound.
+     * @throws ConnectionException if dn / password could not be bound
      */
     public function bind($dn = null, $password = null);
 
diff --git a/src/Symfony/Component/Process/Tests/PhpProcessTest.php b/src/Symfony/Component/Process/Tests/PhpProcessTest.php
@@ -43,6 +43,6 @@ public function testCommandLine()
         $process->wait();
         $this->assertContains($commandLine, $process->getCommandLine(), '::getCommandLine() returns the command line of PHP after wait');
 
-        $this->assertSame(phpversion().PHP_SAPI, $process->getOutput());
+        $this->assertSame(PHP_VERSION.PHP_SAPI, $process->getOutput());
     }
 }
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -182,7 +182,7 @@ private function buildStaticPrefixCollection(DumperCollection $collection)
      *
      * @param StaticPrefixCollection $collection           A StaticPrefixCollection instance
      * @param bool                   $supportsRedirections Whether redirections are supported by the base class
-     * @param string                 $ifOrElseIf           Either "if" or "elseif" to influence chaining.
+     * @param string                 $ifOrElseIf           either "if" or "elseif" to influence chaining
      *
      * @return string PHP code
      */
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/StaticPrefixCollection.php
@@ -225,7 +225,7 @@ private function shouldBeInlined()
      *
      * @param string $prefix
      *
-     * @throws \LogicException When a prefix does not belong in a group.
+     * @throws \LogicException when a prefix does not belong in a group
      */
     private function guardAgainstAddingNotAcceptedRoutes($prefix)
     {
diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
@@ -145,7 +145,7 @@ private function generateLogoutUrl($key, $referenceType)
      *
      * @return array The logout listener found
      *
-     * @throws \InvalidArgumentException if no LogoutListener is registered for the key or could not be found automatically.
+     * @throws \InvalidArgumentException if no LogoutListener is registered for the key or could not be found automatically
      */
     private function getListener($key)
     {
diff --git a/src/Symfony/Component/Translation/Loader/FileLoader.php b/src/Symfony/Component/Translation/Loader/FileLoader.php
@@ -59,7 +59,7 @@ public function load($resource, $locale, $domain = 'messages')
      *
      * @return array
      *
-     * @throws InvalidResourceException If stream content has an invalid format.
+     * @throws InvalidResourceException if stream content has an invalid format
      */
     abstract protected function loadResource($resource);
 }
diff --git a/src/Symfony/Component/Validator/ConstraintViolationList.php b/src/Symfony/Component/Validator/ConstraintViolationList.php
@@ -164,7 +164,7 @@ public function offsetUnset($offset)
      *
      * @param string|string[] $codes The codes to find
      *
-     * @return static New instance which contains only specific errors.
+     * @return static new instance which contains only specific errors
      */
     public function findByCodes($codes)
     {
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php b/src/Symfony/Component/Validator/Context/ExecutionContextInterface.php
@@ -275,8 +275,8 @@ public function getValue();
      * has been called with a plain value and constraint, this method returns
      * null.
      *
-     * @return MetadataInterface|null The metadata of the currently validated
-     *                                value.
+     * @return MetadataInterface|null the metadata of the currently validated
+     *                                value
      */
     public function getMetadata();
 
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -34,7 +34,7 @@ public function __construct(array $data)
     }
 
     /**
-     * @return string The type of the value.
+     * @return string the type of the value
      */
     public function getType()
     {
@@ -61,9 +61,9 @@ public function getType()
     }
 
     /**
-     * @param bool $recursive Whether values should be resolved recursively or not.
+     * @param bool $recursive whether values should be resolved recursively or not
      *
-     * @return scalar|array|null|Data[] A native representation of the original value.
+     * @return scalar|array|null|Data[] a native representation of the original value
      */
     public function getValue($recursive = false)
     {
diff --git a/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php b/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\WebLink\Tests;
 
-use Fig\Link\GenericLinkProvider;
 use Fig\Link\Link;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\WebLink\HttpHeaderSerializer;

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ private function absoluteSymlinkWithFallback($originDir, $targetDir)`
`255`	`255`	`* @param string $targetDir`
`256`	`256`	`* @param bool $relative`
`257`	`257`	`*`
`258`		`- * @throws IOException If link can not be created.`
	`258`	`+ * @throws IOException if link can not be created`
`259`	`259`	`*/`
`260`	`260`	`private function symlink($originDir, $targetDir, $relative = false)`
`261`	`261`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function init($redisClient, $namespace = '', $defaultLifetime = 0)`
`67`	`67`	`* @param string $dsn`
`68`	`68`	`* @param array $options See self::$defaultConnectionOptions`
`69`	`69`	`*`
`70`		`- * @throws InvalidArgumentException When the DSN is invalid.`
	`70`	`+ * @throws InvalidArgumentException when the DSN is invalid`
`71`	`71`	`*`
`72`	`72`	`* @return \Redis\|\Predis\Client According to the "class" option`
`73`	`73`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ public function setHidden($hidden)`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`/**`
`490`		`- * @return bool Whether the command should be publicly shown or not.`
	`490`	`+ * @return bool whether the command should be publicly shown or not`
`491`	`491`	`*/`
`492`	`492`	`public function isHidden()`
`493`	`493`	`{`
Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ public function getStatusCode()`
`137`	`137`	`/**`
`138`	`138`	`* Sets the user inputs.`
`139`	`139`	`*`
`140`		`- * @param array An array of strings representing each input`
`141`		`- * passed to the command input stream.`
	`140`	`+ * @param array an array of strings representing each input`
	`141`	`+ * passed to the command input stream`
`142`	`142`	`*`
`143`	`143`	`* @return CommandTester`
`144`	`144`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,7 @@ public function isAbstract()`
`703`	`703`	`*`
`704`	`704`	`* @return $this`
`705`	`705`	`*`
`706`		`- * @throws InvalidArgumentException When the message template is invalid.`
	`706`	`+ * @throws InvalidArgumentException when the message template is invalid`
`707`	`707`	`*/`
`708`	`708`	`public function setDeprecated($status = true, $template = null)`
`709`	`709`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Loader;`
`13`	`13`
`14`		`-use Symfony\Component\Config\Resource\DirectoryResource;`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* DirectoryLoader is a recursive loader to go through directories.`
`18`	`16`	`*`