Merge branch '3.3' into 3.4
* 3.3: fixed CS fixed CS
This commit is contained in:
commit
f46d324d63
@ -14,7 +14,6 @@ namespace Symfony\Bridge\Twig\Tests\Extension;
|
||||
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;
|
||||
|
@ -255,7 +255,7 @@ EOT
|
||||
* @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)
|
||||
{
|
||||
|
@ -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;
|
||||
|
||||
|
@ -67,7 +67,7 @@ trait RedisTrait
|
||||
* @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
|
||||
*/
|
||||
|
@ -487,7 +487,7 @@ class Command
|
||||
}
|
||||
|
||||
/**
|
||||
* @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()
|
||||
{
|
||||
|
@ -137,8 +137,8 @@ class CommandTester
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
|
@ -703,7 +703,7 @@ class Definition
|
||||
*
|
||||
* @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)
|
||||
{
|
||||
|
@ -11,8 +11,6 @@
|
||||
|
||||
namespace Symfony\Component\DependencyInjection\Loader;
|
||||
|
||||
use Symfony\Component\Config\Resource\DirectoryResource;
|
||||
|
||||
/**
|
||||
* DirectoryLoader is a recursive loader to go through directories.
|
||||
*
|
||||
|
@ -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;
|
||||
|
||||
|
@ -11,8 +11,6 @@
|
||||
|
||||
namespace Symfony\Component\DependencyInjection\Loader;
|
||||
|
||||
use Symfony\Component\Config\Resource\FileResource;
|
||||
|
||||
/**
|
||||
* PhpFileLoader loads service definitions from a PHP file.
|
||||
*
|
||||
|
@ -62,7 +62,7 @@ class DateIntervalToArrayTransformer implements DataTransformerInterface
|
||||
*
|
||||
* @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 @@ class DateIntervalToArrayTransformer implements DataTransformerInterface
|
||||
*
|
||||
* @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)
|
||||
{
|
||||
|
@ -46,7 +46,7 @@ class DateIntervalToStringTransformer implements DataTransformerInterface
|
||||
*
|
||||
* @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 @@ class DateIntervalToStringTransformer implements DataTransformerInterface
|
||||
*
|
||||
* @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)
|
||||
{
|
||||
|
@ -271,7 +271,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
|
||||
*
|
||||
* @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)
|
||||
{
|
||||
|
@ -150,7 +150,7 @@ class JsonResponse extends Response
|
||||
try {
|
||||
$data = @json_encode($data, $this->encodingOptions);
|
||||
} finally {
|
||||
restore_error_handler();
|
||||
restore_error_handler();
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
|
@ -704,7 +704,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
|
||||
*
|
||||
* @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 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
|
||||
*
|
||||
* @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)
|
||||
{
|
||||
|
@ -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);
|
||||
|
||||
|
@ -43,6 +43,6 @@ PHP
|
||||
$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());
|
||||
}
|
||||
}
|
||||
|
@ -182,7 +182,7 @@ EOF;
|
||||
*
|
||||
* @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
|
||||
*/
|
||||
|
@ -225,7 +225,7 @@ class StaticPrefixCollection
|
||||
*
|
||||
* @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)
|
||||
{
|
||||
|
@ -145,7 +145,7 @@ class LogoutUrlGenerator
|
||||
*
|
||||
* @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)
|
||||
{
|
||||
|
@ -59,7 +59,7 @@ abstract class FileLoader extends ArrayLoader
|
||||
*
|
||||
* @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);
|
||||
}
|
||||
|
@ -164,7 +164,7 @@ class ConstraintViolationList implements \IteratorAggregate, ConstraintViolation
|
||||
*
|
||||
* @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)
|
||||
{
|
||||
|
@ -275,8 +275,8 @@ interface ExecutionContextInterface
|
||||
* 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();
|
||||
|
||||
|
@ -34,7 +34,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string The type of the value.
|
||||
* @return string the type of the value
|
||||
*/
|
||||
public function getType()
|
||||
{
|
||||
@ -61,9 +61,9 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
|
||||
}
|
||||
|
||||
/**
|
||||
* @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)
|
||||
{
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user