diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed CS

Browse Source
This commit is contained in:
Fabien Potencier 2019-06-13 13:03:18 +02:00
parent 84bc7aba91
commit 9526988eca
51 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bridge/PhpUnit/ClassExistsMock.php
View File

@ -30,17 +30,17 @@ class ClassExistsMock
public static function class_exists($name, $autoload = true)
{
return (bool) (self::$classes[ltrim($name, '\\')] ?? \class_exists($name, $autoload));
return (bool) (self::$classes[ltrim($name, '\\')] ?? class_exists($name, $autoload));
}
public static function interface_exists($name, $autoload = true)
{
return (bool) (self::$classes[ltrim($name, '\\')] ?? \interface_exists($name, $autoload));
return (bool) (self::$classes[ltrim($name, '\\')] ?? interface_exists($name, $autoload));
}
public static function trait_exists($name, $autoload = true)
{
return (bool) (self::$classes[ltrim($name, '\\')] ?? \trait_exists($name, $autoload));
return (bool) (self::$classes[ltrim($name, '\\')] ?? trait_exists($name, $autoload));
}
public static function register($class)

2
src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
View File

@ -46,7 +46,7 @@ class HttpFoundationExtension extends AbstractExtension
$requestContext = null;
if (2 === \func_num_args()) {
$requestContext = \func_get_arg(1);
$requestContext = func_get_arg(1);
if (null !== $requestContext && !$requestContext instanceof RequestContext) {
throw new \TypeError(sprintf('The second argument must be an instance of "%s".', RequestContext::class));
}

12
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -1115,12 +1115,12 @@ class FrameworkExtension extends Extension
$defaultDir = $container->getParameterBag()->resolveValue($config['default_path']);
$rootDir = $container->getParameter('kernel.root_dir');
foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
if (\is_dir($dir = $bundle['path'].'/Resources/translations')) {
if (is_dir($dir = $bundle['path'].'/Resources/translations')) {
$dirs[] = $dir;
} else {
$nonExistingDirs[] = $dir;
}
if (\is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $name))) {
if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $name))) {
@trigger_error(sprintf('Translations directory "%s" is deprecated since Symfony 4.2, use "%s" instead.', $dir, $defaultDir), E_USER_DEPRECATED);
$dirs[] = $dir;
} else {
@ -1129,7 +1129,7 @@ class FrameworkExtension extends Extension
}
foreach ($config['paths'] as $dir) {
if (\is_dir($dir)) {
if (is_dir($dir)) {
$dirs[] = $transPaths[] = $dir;
} else {
throw new \UnexpectedValueException(sprintf('%s defined in translator.paths does not exist or is not a directory', $dir));
@ -1144,13 +1144,13 @@ class FrameworkExtension extends Extension
$container->getDefinition('console.command.translation_update')->replaceArgument(6, $transPaths);
}
if (\is_dir($defaultDir)) {
if (is_dir($defaultDir)) {
$dirs[] = $defaultDir;
} else {
$nonExistingDirs[] = $defaultDir;
}
if (\is_dir($dir = $rootDir.'/Resources/translations')) {
if (is_dir($dir = $rootDir.'/Resources/translations')) {
if ($dir !== $defaultDir) {
@trigger_error(sprintf('Translations directory "%s" is deprecated since Symfony 4.2, use "%s" instead.', $dir, $defaultDir), E_USER_DEPRECATED);
}
@ -1186,7 +1186,7 @@ class FrameworkExtension extends Extension
$translator->getArgument(4),
[
'resource_files' => $files,
'scanned_directories' => \array_merge($dirs, $nonExistingDirs),
'scanned_directories' => array_merge($dirs, $nonExistingDirs),
]
);

2
src/Symfony/Bundle/FrameworkBundle/Test/WebTestAssertionsTrait.php
View File

@ -195,7 +195,7 @@ trait WebTestAssertionsTrait
}
if (!$client instanceof KernelBrowser) {
static::fail(\sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
static::fail(sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
}
return $client;

12
src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
View File

@ -60,7 +60,7 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
$item->metadata[CacheItem::METADATA_TAGS] = $value['tags'] ?? [];
if (isset($value['meta'])) {
// For compactness these values are packed, & expiry is offset to reduce size
$v = \unpack('Ve/Nc', $value['meta']);
$v = unpack('Ve/Nc', $value['meta']);
$item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
$item->metadata[CacheItem::METADATA_CTIME] = $v['c'];
}
@ -96,16 +96,16 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
if ($metadata) {
// For compactness, expiry and creation duration are packed, using magic numbers as separators
$value['meta'] = \pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME]);
$value['meta'] = pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME]);
}
// Extract tag changes, these should be removed from values in doSave()
$value['tag-operations'] = ['add' => [], 'remove' => []];
$oldTags = $item->metadata[CacheItem::METADATA_TAGS] ?? [];
foreach (\array_diff($value['tags'], $oldTags) as $addedTag) {
foreach (array_diff($value['tags'], $oldTags) as $addedTag) {
$value['tag-operations']['add'][] = $getId($tagPrefix.$addedTag);
}
foreach (\array_diff($oldTags, $value['tags']) as $removedTag) {
foreach (array_diff($oldTags, $value['tags']) as $removedTag) {
$value['tag-operations']['remove'][] = $getId($tagPrefix.$removedTag);
}
@ -236,7 +236,7 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
}
try {
if ($this->doDelete(\array_values($ids), $tagData)) {
if ($this->doDelete(array_values($ids), $tagData)) {
return true;
}
} catch (\Exception $e) {
@ -271,7 +271,7 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
}
$tagIds = [];
foreach (\array_unique($tags) as $tag) {
foreach (array_unique($tags) as $tag) {
$tagIds[] = $this->getId(self::TAGS_PREFIX.$tag);
}

2
src/Symfony/Component/Cache/Adapter/FilesystemTagAwareAdapter.php
View File

@ -126,7 +126,7 @@ class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements Prune
}
$valueFile = $itemLink->getRealPath();
if ($valueFile && \file_exists($valueFile)) {
if ($valueFile && file_exists($valueFile)) {
@unlink($valueFile);
}

10
src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
View File

@ -82,7 +82,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
$this->init($redisClient, $namespace, $defaultLifetime, $marshaller);
// Make sure php-redis is 3.1.3 or higher configured for Redis classes
if (!$this->redis instanceof Predis\Client && \version_compare(\phpversion('redis'), '3.1.3', '<')) {
if (!$this->redis instanceof Predis\Client && version_compare(phpversion('redis'), '3.1.3', '<')) {
throw new LogicException('RedisTagAwareAdapter requires php-redis 3.1.3 or higher, alternatively use predis/predis');
}
}
@ -120,7 +120,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
foreach ($results as $id => $result) {
// Skip results of SADD/SREM operations, they'll be 1 or 0 depending on if set value already existed or not
if (\is_numeric($result)) {
if (is_numeric($result)) {
continue;
}
// setEx results
@ -152,7 +152,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
}
foreach ($tagData as $tagId => $idList) {
yield 'sRem' => \array_merge([$tagId], $idList);
yield 'sRem' => array_merge([$tagId], $idList);
}
})->rewind();
@ -178,10 +178,10 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
});
// Flatten generator result from pipeline, ignore keys (tag ids)
$ids = \array_unique(\array_merge(...\iterator_to_array($tagIdSets, false)));
$ids = array_unique(array_merge(...iterator_to_array($tagIdSets, false)));
// Delete cache in chunks to avoid overloading the connection
foreach (\array_chunk($ids, self::BULK_DELETE_LIMIT) as $chunkIds) {
foreach (array_chunk($ids, self::BULK_DELETE_LIMIT) as $chunkIds) {
$this->doDelete($chunkIds);
}

2
src/Symfony/Component/Console/Helper/ProgressBar.php
View File

@ -250,7 +250,7 @@ final class ProgressBar
*/
public function iterate(iterable $iterable, ?int $max = null): iterable
{
$this->start($max ?? (\is_countable($iterable) ? \count($iterable) : 0));
$this->start($max ?? (is_countable($iterable) ? \count($iterable) : 0));
foreach ($iterable as $key => $value) {
yield $key => $value;

4
src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
View File

@ -884,7 +884,7 @@ class ProgressBarTest extends TestCase
{
$bar = new ProgressBar($output = $this->getOutputStream());
$this->assertEquals([1, 2], \iterator_to_array($bar->iterate([1, 2])));
$this->assertEquals([1, 2], iterator_to_array($bar->iterate([1, 2])));
rewind($output->getStream());
$this->assertEquals(
@ -900,7 +900,7 @@ class ProgressBarTest extends TestCase
{
$bar = new ProgressBar($output = $this->getOutputStream());
$this->assertEquals([1, 2], \iterator_to_array($bar->iterate((function () {
$this->assertEquals([1, 2], iterator_to_array($bar->iterate((function () {
yield 1;
yield 2;
})())));

2
src/Symfony/Component/Debug/DebugClassLoader.php
View File

@ -238,7 +238,7 @@ class DebugClassLoader
}
}
if ($refl->isInterface() && false !== \strpos($doc, 'method') && preg_match_all('#\n \* @method\s+(static\s+)?+(?:[\w\|&\[\]\\\]+\s+)?(\w+(?:\s*\([^\)]*\))?)+(.+?([[:punct:]]\s*)?)?(?=\r?\n \*(?: @|/$|\r?\n))#', $doc, $notice, PREG_SET_ORDER)) {
if ($refl->isInterface() && false !== strpos($doc, 'method') && preg_match_all('#\n \* @method\s+(static\s+)?+(?:[\w\|&\[\]\\\]+\s+)?(\w+(?:\s*\([^\)]*\))?)+(.+?([[:punct:]]\s*)?)?(?=\r?\n \*(?: @|/$|\r?\n))#', $doc, $notice, PREG_SET_ORDER)) {
foreach ($notice as $method) {
$static = '' !== $method[1];
$name = $method[2];

4
src/Symfony/Component/Debug/ExceptionHandler.php
View File

@ -457,10 +457,10 @@ EOF;
private function addElementToGhost()
{
if (!isset(self::GHOST_ADDONS[\date('m-d')])) {
if (!isset(self::GHOST_ADDONS[date('m-d')])) {
return '';
}
return '<path d="'.self::GHOST_ADDONS[\date('m-d')].'" fill="#fff" fill-opacity="0.6"></path>';
return '<path d="'.self::GHOST_ADDONS[date('m-d')].'" fill="#fff" fill-opacity="0.6"></path>';
}
}

2
src/Symfony/Component/DependencyInjection/Definition.php
View File

@ -354,7 +354,7 @@ class Definition
if (empty($method)) {
throw new InvalidArgumentException('Method name cannot be empty.');
}
$this->calls[] = 2 < \func_num_args() && \func_get_arg(2) ? [$method, $arguments, true] : [$method, $arguments];
$this->calls[] = 2 < \func_num_args() && func_get_arg(2) ? [$method, $arguments, true] : [$method, $arguments];
return $this;
}

4
src/Symfony/Component/DomCrawler/Crawler.php
View File

@ -566,7 +566,7 @@ class Crawler implements \Countable, \IteratorAggregate
{
if (!$this->nodes) {
if (0 < \func_num_args()) {
return \func_get_arg(0);
return func_get_arg(0);
}
throw new \InvalidArgumentException('The current node list is empty.');
@ -588,7 +588,7 @@ class Crawler implements \Countable, \IteratorAggregate
{
if (!$this->nodes) {
if (0 < \func_num_args()) {
return \func_get_arg(0);
return func_get_arg(0);
}
throw new \InvalidArgumentException('The current node list is empty.');

2
src/Symfony/Component/DomCrawler/Test/Constraint/CrawlerSelectorTextContains.php
View File

@ -45,7 +45,7 @@ final class CrawlerSelectorTextContains extends Constraint
return false;
}
return false !== \mb_strpos($crawler->text(), $this->expectedText);
return false !== mb_strpos($crawler->text(), $this->expectedText);
}
/**

8
src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
View File

@ -140,7 +140,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
}
$currentRequestHash = $this->currentRequestHash = $this->requestStack && ($request = $this->requestStack->getCurrentRequest()) ? spl_object_hash($request) : '';
$eventName = 1 < \func_num_args() ? \func_get_arg(1) : null;
$eventName = 1 < \func_num_args() ? func_get_arg(1) : null;
if (\is_object($event)) {
$eventName = $eventName ?? \get_class($event);
@ -193,7 +193,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
return [];
}
$hash = 1 <= \func_num_args() && null !== ($request = \func_get_arg(0)) ? spl_object_hash($request) : null;
$hash = 1 <= \func_num_args() && null !== ($request = func_get_arg(0)) ? spl_object_hash($request) : null;
$called = [];
foreach ($this->callStack as $listener) {
list($eventName, $requestHash) = $this->callStack->getInfo();
@ -223,7 +223,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
return [];
}
$hash = 1 <= \func_num_args() && null !== ($request = \func_get_arg(0)) ? spl_object_hash($request) : null;
$hash = 1 <= \func_num_args() && null !== ($request = func_get_arg(0)) ? spl_object_hash($request) : null;
$calledListeners = [];
if (null !== $this->callStack) {
@ -258,7 +258,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
*/
public function getOrphanedEvents(/* Request $request = null */): array
{
if (1 <= \func_num_args() && null !== $request = \func_get_arg(0)) {
if (1 <= \func_num_args() && null !== $request = func_get_arg(0)) {
return $this->orphanedEvents[spl_object_hash($request)] ?? [];
}

2
src/Symfony/Component/EventDispatcher/EventDispatcher.php
View File

@ -50,7 +50,7 @@ class EventDispatcher implements EventDispatcherInterface
*/
public function dispatch($event/*, string $eventName = null*/)
{
$eventName = 1 < \func_num_args() ? \func_get_arg(1) : null;
$eventName = 1 < \func_num_args() ? func_get_arg(1) : null;
if (\is_object($event)) {
$eventName = $eventName ?? \get_class($event);

4
src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
View File

@ -32,9 +32,9 @@ class ImmutableEventDispatcher implements EventDispatcherInterface
*/
public function dispatch($event/*, string $eventName = null*/)
{
$eventName = 1 < \func_num_args() ? \func_get_arg(1) : null;
$eventName = 1 < \func_num_args() ? func_get_arg(1) : null;
if (\is_scalar($event)) {
if (is_scalar($event)) {
// deprecated
$swap = $event;
$event = $eventName ?? new Event();

2
src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php
View File

@ -53,7 +53,7 @@ final class LegacyEventDispatcherProxy implements EventDispatcherInterface
*/
public function dispatch($event/*, string $eventName = null*/)
{
$eventName = 1 < \func_num_args() ? \func_get_arg(1) : null;
$eventName = 1 < \func_num_args() ? func_get_arg(1) : null;
if (\is_object($event)) {
$eventName = $eventName ?? \get_class($event);

2
src/Symfony/Component/Finder/SplFileInfo.php
View File

@ -61,7 +61,7 @@ class SplFileInfo extends \SplFileInfo
{
$filename = $this->getFilename();
return \pathinfo($filename, PATHINFO_FILENAME);
return pathinfo($filename, PATHINFO_FILENAME);
}
/**

2
src/Symfony/Component/Form/ButtonBuilder.php
View File

@ -61,7 +61,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
$this->name = $name;
$this->options = $options;
if (\preg_match('/^([^a-z0-9_].*)?(.*[^a-zA-Z0-9_\-:].*)?$/D', $name, $matches)) {
if (preg_match('/^([^a-z0-9_].*)?(.*[^a-zA-Z0-9_\-:].*)?$/D', $name, $matches)) {
if (isset($matches[1])) {
@trigger_error(sprintf('Using names for buttons that do not start with a letter, a digit, or an underscore is deprecated since Symfony 4.3 and will throw an exception in 5.0 ("%s" given).', $name), E_USER_DEPRECATED);
}

2
src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
View File

@ -236,7 +236,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
return;
}
$groupLabels = \is_array($groupLabels) ? \array_map('strval', $groupLabels) : [(string) $groupLabels];
$groupLabels = \is_array($groupLabels) ? array_map('strval', $groupLabels) : [(string) $groupLabels];
foreach ($groupLabels as $groupLabel) {
// Initialize the group views if necessary. Unnecessarily built group

2
src/Symfony/Component/HttpClient/CachingHttpClient.php
View File

@ -109,7 +109,7 @@ class CachingHttpClient implements HttpClientInterface
{
if ($responses instanceof ResponseInterface) {
$responses = [$responses];
} elseif (!\is_iterable($responses)) {
} elseif (!is_iterable($responses)) {
throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of ResponseInterface objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
}

2
src/Symfony/Component/HttpClient/CurlHttpClient.php
View File

@ -284,7 +284,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface
{
if ($responses instanceof CurlResponse) {
$responses = [$responses];
} elseif (!\is_iterable($responses)) {
} elseif (!is_iterable($responses)) {
throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of CurlResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
}

2
src/Symfony/Component/HttpClient/HttpClientTrait.php
View File

@ -200,7 +200,7 @@ trait HttpClientTrait
if (\is_int($name)) {
[$name, $values] = explode(':', $values, 2);
$values = [ltrim($values)];
} elseif (!\is_iterable($values)) {
} elseif (!is_iterable($values)) {
$values = (array) $values;
}

2
src/Symfony/Component/HttpClient/MockHttpClient.php
View File

@ -78,7 +78,7 @@ class MockHttpClient implements HttpClientInterface
{
if ($responses instanceof ResponseInterface) {
$responses = [$responses];
} elseif (!\is_iterable($responses)) {
} elseif (!is_iterable($responses)) {
throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of MockResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
}

2
src/Symfony/Component/HttpClient/NativeHttpClient.php
View File

@ -220,7 +220,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac
{
if ($responses instanceof NativeResponse) {
$responses = [$responses];
} elseif (!\is_iterable($responses)) {
} elseif (!is_iterable($responses)) {
throw new \TypeError(sprintf('%s() expects parameter 1 to be an iterable of NativeResponse objects, %s given.', __METHOD__, \is_object($responses) ? \get_class($responses) : \gettype($responses)));
}

2
src/Symfony/Component/HttpClient/Response/MockResponse.php
View File

@ -44,7 +44,7 @@ class MockResponse implements ResponseInterface
*/
public function __construct($body = '', array $info = [])
{
$this->body = \is_iterable($body) ? $body : (string) $body;
$this->body = is_iterable($body) ? $body : (string) $body;
$this->info = $info + $this->info;
if (!isset($info['response_headers'])) {

2
src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
View File

@ -232,7 +232,7 @@ class HttpClientTraitTest extends TestCase
public function provideFingerprints()
{
foreach (['md5', 'sha1', 'sha256'] as $algo) {
$hash = \hash($algo, $algo);
$hash = hash($algo, $algo);
yield [$hash, [$algo => $hash]];
}

2
src/Symfony/Component/Lock/Store/StoreFactory.php
View File

@ -58,7 +58,7 @@ class StoreFactory
return new FlockStore(substr($connection, 8));
case 'semaphore' === $connection:
return new SemaphoreStore();
case \class_exists(AbstractAdapter::class) && preg_match('#^[a-z]++://#', $connection):
case class_exists(AbstractAdapter::class) && preg_match('#^[a-z]++://#', $connection):
return static::createStore(AbstractAdapter::createConnection($connection));
default:
throw new InvalidArgumentException(sprintf('Unsupported Connection: %s.', $connection));

10
src/Symfony/Component/Lock/Tests/Store/StoreFactoryTest.php
View File

@ -38,23 +38,23 @@ class StoreFactoryTest extends TestCase
public function validConnections()
{
if (\class_exists(\Redis::class)) {
if (class_exists(\Redis::class)) {
yield [$this->createMock(\Redis::class), RedisStore::class];
}
if (\class_exists(RedisProxy::class)) {
if (class_exists(RedisProxy::class)) {
yield [$this->createMock(RedisProxy::class), RedisStore::class];
}
yield [new \Predis\Client(), RedisStore::class];
if (\class_exists(\Memcached::class)) {
if (class_exists(\Memcached::class)) {
yield [new \Memcached(), MemcachedStore::class];
}
if (\class_exists(\Zookeeper::class)) {
if (class_exists(\Zookeeper::class)) {
yield [$this->createMock(\Zookeeper::class), ZookeeperStore::class];
}
if (\extension_loaded('sysvsem')) {
yield ['semaphore', SemaphoreStore::class];
}
if (\class_exists(\Memcached::class) && \class_exists(AbstractAdapter::class)) {
if (class_exists(\Memcached::class) && class_exists(AbstractAdapter::class)) {
yield ['memcached://server.com', MemcachedStore::class];
}

2
src/Symfony/Component/Mailer/Bridge/Amazon/Http/Api/SesTransport.php
View File

@ -76,7 +76,7 @@ class SesTransport extends AbstractApiTransport
if ($email->getAttachments()) {
return [
'Action' => 'SendRawEmail',
'RawMessage.Data' => \base64_encode($email->toString()),
'RawMessage.Data' => base64_encode($email->toString()),
];
}

2
src/Symfony/Component/Mailer/Bridge/Amazon/Http/SesTransport.php
View File

@ -56,7 +56,7 @@ class SesTransport extends AbstractHttpTransport
],
'body' => [
'Action' => 'SendRawEmail',
'RawMessage.Data' => \base64_encode($message->toString()),
'RawMessage.Data' => base64_encode($message->toString()),
],
]);

2
src/Symfony/Component/Mailer/Bridge/Amazon/Smtp/SesTransport.php
View File

@ -27,7 +27,7 @@ class SesTransport extends EsmtpTransport
*/
public function __construct(string $username, string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
{
parent::__construct(\sprintf('email-smtp.%s.amazonaws.com', $region ?: 'eu-west-1'), 587, 'tls', null, $dispatcher, $logger);
parent::__construct(sprintf('email-smtp.%s.amazonaws.com', $region ?: 'eu-west-1'), 587, 'tls', null, $dispatcher, $logger);
$this->setUsername($username);
$this->setPassword($password);

2
src/Symfony/Component/Mailer/Bridge/Sendgrid/Http/Api/SendgridTransport.php
View File

@ -67,7 +67,7 @@ class SendgridTransport extends AbstractApiTransport
}
$personalization = [
'to' => \array_map($addressStringifier, $this->getRecipients($email, $envelope)),
'to' => array_map($addressStringifier, $this->getRecipients($email, $envelope)),
'subject' => $email->getSubject(),
];
if ($emails = array_map($addressStringifier, $email->getCc())) {

6
src/Symfony/Component/Mailer/Transport.php
View File

@ -68,9 +68,9 @@ class Transport
throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a mailer name.', $dsn));
}
$user = \urldecode($parsedDsn['user'] ?? '');
$pass = \urldecode($parsedDsn['pass'] ?? '');
\parse_str($parsedDsn['query'] ?? '', $query);
$user = urldecode($parsedDsn['user'] ?? '');
$pass = urldecode($parsedDsn['pass'] ?? '');
parse_str($parsedDsn['query'] ?? '', $query);
switch ($parsedDsn['host']) {
case 'null':

2
src/Symfony/Component/Mailer/Transport/AbstractTransport.php
View File

@ -93,7 +93,7 @@ abstract class AbstractTransport implements TransportInterface
*/
protected function stringifyAddresses(array $addresses): array
{
return \array_map(function (Address $a) {
return array_map(function (Address $a) {
return $a->toString();
}, $addresses);
}

4
src/Symfony/Component/Mailer/Transport/Http/Api/AbstractApiTransport.php
View File

@ -61,8 +61,8 @@ abstract class AbstractApiTransport extends AbstractTransport
protected function getRecipients(Email $email, SmtpEnvelope $envelope): array
{
return \array_filter($envelope->getRecipients(), function (Address $address) use ($email) {
return false === \in_array($address, \array_merge($email->getCc(), $email->getBcc()), true);
return array_filter($envelope->getRecipients(), function (Address $address) use ($email) {
return false === \in_array($address, array_merge($email->getCc(), $email->getBcc()), true);
});
}
}

2
src/Symfony/Component/Messenger/Envelope.php
View File

@ -88,7 +88,7 @@ final class Envelope
$cloned = clone $this;
foreach ($cloned->stamps as $class => $stamps) {
if ($class === $type || \is_subclass_of($class, $type)) {
if ($class === $type || is_subclass_of($class, $type)) {
unset($cloned->stamps[$class]);
}
}

2
src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
View File

@ -61,7 +61,7 @@ class SendFailedMessageToFailureTransportListener implements EventSubscriberInte
$throwable = $throwable->getNestedExceptions()[0];
}
$flattenedException = \class_exists(FlattenException::class) ? FlattenException::createFromThrowable($throwable) : null;
$flattenedException = class_exists(FlattenException::class) ? FlattenException::createFromThrowable($throwable) : null;
$envelope = $envelope->withoutAll(ReceivedStamp::class)
->withoutAll(TransportMessageIdStamp::class)
->with(new SentToFailureTransportStamp($event->getReceiverName()))

2
src/Symfony/Component/Messenger/Middleware/StackMiddleware.php
View File

@ -38,7 +38,7 @@ class StackMiddleware implements MiddlewareInterface, StackInterface
$this->stack->iterator = $middlewareIterator;
} elseif ($middlewareIterator instanceof MiddlewareInterface) {
$this->stack->stack[] = $middlewareIterator;
} elseif (!\is_iterable($middlewareIterator)) {
} elseif (!is_iterable($middlewareIterator)) {
throw new \TypeError(sprintf('Argument 1 passed to %s() must be iterable of %s, %s given.', __METHOD__, MiddlewareInterface::class, \is_object($middlewareIterator) ? \get_class($middlewareIterator) : \gettype($middlewareIterator)));
} else {
$this->stack->iterator = (function () use ($middlewareIterator) {

2
src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
View File

@ -30,7 +30,7 @@ class ConnectionTest extends TestCase
$stmt = $this->getStatementMock([
'id' => 1,
'body' => '{"message":"Hi"}',
'headers' => \json_encode(['type' => DummyMessage::class]),
'headers' => json_encode(['type' => DummyMessage::class]),
]);
$driverConnection

2
src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineReceiverTest.php
View File

@ -80,7 +80,7 @@ class DoctrineReceiverTest extends TestCase
$connection->method('findAll')->with(50)->willReturn([$doctrineEnvelope1, $doctrineEnvelope2]);
$receiver = new DoctrineReceiver($connection, $serializer);
$actualEnvelopes = \iterator_to_array($receiver->all(50));
$actualEnvelopes = iterator_to_array($receiver->all(50));
$this->assertCount(2, $actualEnvelopes);
$this->assertEquals(new DummyMessage('Hi'), $actualEnvelopes[0]->getMessage());
}

4
src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
View File

@ -123,7 +123,7 @@ class Connection
$this->executeQuery($queryBuilder->getSQL(), [
':body' => $body,
':headers' => \json_encode($headers),
':headers' => json_encode($headers),
':queue_name' => $this->configuration['queue_name'],
':created_at' => self::formatDateTime($now),
':available_at' => self::formatDateTime($availableAt),
@ -155,7 +155,7 @@ class Connection
return null;
}
$doctrineEnvelope['headers'] = \json_decode($doctrineEnvelope['headers'], true);
$doctrineEnvelope['headers'] = json_decode($doctrineEnvelope['headers'], true);
$queryBuilder = $this->driverConnection->createQueryBuilder()
->update($this->configuration['table_name'])

2
src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
View File

@ -124,7 +124,7 @@ class Connection
}
foreach ($messages[$this->stream] ?? [] as $key => $message) {
$redisEnvelope = \json_decode($message['message'], true);
$redisEnvelope = json_decode($message['message'], true);
return [
'id' => $key,

2
src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
View File

@ -110,7 +110,7 @@ class PropertyInfoCacheExtractor implements PropertyInfoExtractorInterface, Prop
}
// Calling rawurlencode escapes special characters not allowed in PSR-6's keys
$encodedMethod = \rawurlencode($method);
$encodedMethod = rawurlencode($method);
if (\array_key_exists($encodedMethod, $this->arrayCache) && \array_key_exists($serializedArguments, $this->arrayCache[$encodedMethod])) {
return $this->arrayCache[$encodedMethod][$serializedArguments];
}

2
src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
View File

@ -173,7 +173,7 @@ abstract class AbstractToken implements TokenInterface
{
$serialized = $this->__serialize();
if (null === $isCalledFromOverridingMethod = \func_num_args() ? \func_get_arg(0) : null) {
if (null === $isCalledFromOverridingMethod = \func_num_args() ? func_get_arg(0) : null) {
$trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2);
$isCalledFromOverridingMethod = isset($trace[1]['function'], $trace[1]['object']) && 'serialize' === $trace[1]['function'] && $this === $trace[1]['object'];
}

6
src/Symfony/Component/Security/Core/Encoder/SodiumPasswordEncoder.php
View File

@ -48,7 +48,7 @@ final class SodiumPasswordEncoder implements PasswordEncoderInterface, SelfSalti
public static function isSupported(): bool
{
if (\class_exists('ParagonIE_Sodium_Compat') && \method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {
if (class_exists('ParagonIE_Sodium_Compat') && method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {
return \ParagonIE_Sodium_Compat::crypto_pwhash_is_available();
}
@ -65,7 +65,7 @@ final class SodiumPasswordEncoder implements PasswordEncoderInterface, SelfSalti
}
if (\function_exists('sodium_crypto_pwhash_str')) {
return \sodium_crypto_pwhash_str($raw, $this->opsLimit, $this->memLimit);
return sodium_crypto_pwhash_str($raw, $this->opsLimit, $this->memLimit);
}
if (\extension_loaded('libsodium')) {
@ -90,7 +90,7 @@ final class SodiumPasswordEncoder implements PasswordEncoderInterface, SelfSalti
}
if (\function_exists('sodium_crypto_pwhash_str_verify')) {
return \sodium_crypto_pwhash_str_verify($encoded, $raw);
return sodium_crypto_pwhash_str_verify($encoded, $raw);
}
if (\extension_loaded('libsodium')) {

2
src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
View File

@ -69,7 +69,7 @@ class AuthenticationException extends RuntimeException
{
$serialized = $this->__serialize();
if (null === $isCalledFromOverridingMethod = \func_num_args() ? \func_get_arg(0) : null) {
if (null === $isCalledFromOverridingMethod = \func_num_args() ? func_get_arg(0) : null) {
$trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2);
$isCalledFromOverridingMethod = isset($trace[1]['function'], $trace[1]['object']) && 'serialize' === $trace[1]['function'] && $this === $trace[1]['object'];
}

2
src/Symfony/Component/Translation/DependencyInjection/TranslatorPathsPass.php
View File

@ -46,7 +46,7 @@ class TranslatorPathsPass extends AbstractRecursivePass
}
foreach ($this->findControllerArguments($container) as $controller => $argument) {
$id = \substr($controller, 0, \strpos($controller, ':') ?: \strlen($controller));
$id = substr($controller, 0, strpos($controller, ':') ?: \strlen($controller));
if ($container->hasDefinition($id)) {
list($locatorRef) = $argument->getValues();
$this->controllers[(string) $locatorRef][$container->getDefinition($id)->getClass()] = true;

2
src/Symfony/Component/Translation/Extractor/PhpExtractor.php
View File

@ -204,7 +204,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
if (\func_num_args() < 3 && __CLASS__ !== \get_class($this) && __CLASS__ !== (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->getName() && !$this instanceof \PHPUnit\Framework\MockObject\MockObject && !$this instanceof \Prophecy\Prophecy\ProphecySubjectInterface) {
@trigger_error(sprintf('The "%s()" method will have a new "string $filename" argument in version 5.0, not defining it is deprecated since Symfony 4.3.', __METHOD__), E_USER_DEPRECATED);
}
$filename = 2 < \func_num_args() ? \func_get_arg(2) : '';
$filename = 2 < \func_num_args() ? func_get_arg(2) : '';
$tokenIterator = new \ArrayIterator($tokens);

2
src/Symfony/Contracts/HttpClient/Test/Fixtures/web/index.php
View File

@ -80,7 +80,7 @@ switch ($vars['REQUEST_URI']) {
case '/post':
$output = json_encode($_POST + ['REQUEST_METHOD' => $vars['REQUEST_METHOD']], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
header('Content-Type: application/json', true);
header('Content-Length: '.\strlen($output));
header('Content-Length: '.strlen($output));
echo $output;
exit;