mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 11:01:04 +00:00
Merge pull request #7228 from wallabag/dependabot/composer/friendsofphp/php-cs-fixer-3.49.0
Bump friendsofphp/php-cs-fixer from 3.48.0 to 3.49.0
This commit is contained in:
commit
3414a80d0f
12 changed files with 30 additions and 30 deletions
36
composer.lock
generated
36
composer.lock
generated
|
@ -13510,16 +13510,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/stopwatch",
|
||||
"version": "v5.4.21",
|
||||
"version": "v5.4.35",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/stopwatch.git",
|
||||
"reference": "f83692cd869a6f2391691d40a01e8acb89e76fee"
|
||||
"reference": "887762aa99ff16f65dc8b48aafead415f942d407"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/f83692cd869a6f2391691d40a01e8acb89e76fee",
|
||||
"reference": "f83692cd869a6f2391691d40a01e8acb89e76fee",
|
||||
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/887762aa99ff16f65dc8b48aafead415f942d407",
|
||||
"reference": "887762aa99ff16f65dc8b48aafead415f942d407",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -13552,7 +13552,7 @@
|
|||
"description": "Provides a way to profile code",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/stopwatch/tree/v5.4.21"
|
||||
"source": "https://github.com/symfony/stopwatch/tree/v5.4.35"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
@ -13568,7 +13568,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-02-14T08:03:56+00:00"
|
||||
"time": "2024-01-23T13:51:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/string",
|
||||
|
@ -16313,16 +16313,16 @@
|
|||
},
|
||||
{
|
||||
"name": "friendsofphp/php-cs-fixer",
|
||||
"version": "v3.48.0",
|
||||
"version": "v3.49.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
|
||||
"reference": "a92472c6fb66349de25211f31c77eceae3df024e"
|
||||
"reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a92472c6fb66349de25211f31c77eceae3df024e",
|
||||
"reference": "a92472c6fb66349de25211f31c77eceae3df024e",
|
||||
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/8742f7aa6f72a399688b65e4f58992c2d4681fc2",
|
||||
"reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -16392,7 +16392,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
|
||||
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.48.0"
|
||||
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.49.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
@ -16400,7 +16400,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2024-01-19T21:44:39+00:00"
|
||||
"time": "2024-02-02T00:41:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "friendsoftwig/twigcs",
|
||||
|
@ -19003,16 +19003,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/process",
|
||||
"version": "v5.4.34",
|
||||
"version": "v5.4.35",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/process.git",
|
||||
"reference": "8fa22178dfc368911dbd513b431cd9b06f9afe7a"
|
||||
"reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/8fa22178dfc368911dbd513b431cd9b06f9afe7a",
|
||||
"reference": "8fa22178dfc368911dbd513b431cd9b06f9afe7a",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/cbc28e34015ad50166fc2f9c8962d28d0fe861eb",
|
||||
"reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -19045,7 +19045,7 @@
|
|||
"description": "Executes commands in sub-processes",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/process/tree/v5.4.34"
|
||||
"source": "https://github.com/symfony/process/tree/v5.4.35"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
@ -19061,7 +19061,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-12-02T08:41:43+00:00"
|
||||
"time": "2024-01-23T13:51:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/web-profiler-bundle",
|
||||
|
|
|
@ -20,7 +20,7 @@ abstract class AbstractConsumer
|
|||
protected $eventDispatcher;
|
||||
protected $logger;
|
||||
|
||||
public function __construct(EntityManagerInterface $em, UserRepository $userRepository, AbstractImport $import, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null)
|
||||
public function __construct(EntityManagerInterface $em, UserRepository $userRepository, AbstractImport $import, EventDispatcherInterface $eventDispatcher, ?LoggerInterface $logger = null)
|
||||
{
|
||||
$this->em = $em;
|
||||
$this->userRepository = $userRepository;
|
||||
|
|
|
@ -15,7 +15,7 @@ class IgnoreOriginInstanceRuleFixtures extends Fixture implements ContainerAware
|
|||
*/
|
||||
private $container;
|
||||
|
||||
public function setContainer(ContainerInterface $container = null)
|
||||
public function setContainer(?ContainerInterface $container = null)
|
||||
{
|
||||
$this->container = $container;
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ class InternalSettingFixtures extends Fixture implements ContainerAwareInterface
|
|||
*/
|
||||
private $container;
|
||||
|
||||
public function setContainer(ContainerInterface $container = null)
|
||||
public function setContainer(?ContainerInterface $container = null)
|
||||
{
|
||||
$this->container = $container;
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ class SiteCredentialFixtures extends Fixture implements DependentFixtureInterfac
|
|||
*/
|
||||
private $container;
|
||||
|
||||
public function setContainer(ContainerInterface $container = null)
|
||||
public function setContainer(?ContainerInterface $container = null)
|
||||
{
|
||||
$this->container = $container;
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ abstract class WallabagMigration extends AbstractMigration implements ContainerA
|
|||
{
|
||||
}
|
||||
|
||||
public function setContainer(ContainerInterface $container = null)
|
||||
public function setContainer(?ContainerInterface $container = null)
|
||||
{
|
||||
$this->container = $container;
|
||||
}
|
||||
|
|
|
@ -262,7 +262,7 @@ class Config
|
|||
*
|
||||
* @return Config
|
||||
*/
|
||||
public function setUser(User $user = null)
|
||||
public function setUser(?User $user = null)
|
||||
{
|
||||
$this->user = $user;
|
||||
|
||||
|
|
|
@ -252,7 +252,7 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
|
|||
*
|
||||
* @return User
|
||||
*/
|
||||
public function setConfig(Config $config = null)
|
||||
public function setConfig(?Config $config = null)
|
||||
{
|
||||
$this->config = $config;
|
||||
|
||||
|
@ -333,7 +333,7 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
|
|||
$this->googleAuthenticatorSecret = $googleAuthenticatorSecret;
|
||||
}
|
||||
|
||||
public function setBackupCodes(array $codes = null)
|
||||
public function setBackupCodes(?array $codes = null)
|
||||
{
|
||||
$this->backupCodes = $codes;
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ class PreparePagerForEntries
|
|||
*
|
||||
* @return Pagerfanta
|
||||
*/
|
||||
public function prepare(AdapterInterface $adapter, User $user = null)
|
||||
public function prepare(AdapterInterface $adapter, ?User $user = null)
|
||||
{
|
||||
if (null === $user) {
|
||||
$user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
|
||||
|
|
|
@ -141,7 +141,7 @@ class PocketImport extends AbstractImport
|
|||
/**
|
||||
* Set the Http client.
|
||||
*/
|
||||
public function setClient(ClientInterface $client, RequestFactoryInterface $requestFactory = null, StreamFactoryInterface $streamFactory = null)
|
||||
public function setClient(ClientInterface $client, ?RequestFactoryInterface $requestFactory = null, ?StreamFactoryInterface $streamFactory = null)
|
||||
{
|
||||
$this->client = new HttpMethodsClient(new PluginClient($client, [new ErrorPlugin()]), $requestFactory ?: Psr17FactoryDiscovery::findRequestFactory(), $streamFactory ?: Psr17FactoryDiscovery::findStreamFactory());
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ class UsernameFeedTokenConverter implements ParamConverterInterface
|
|||
/**
|
||||
* @param ManagerRegistry $registry Manager registry
|
||||
*/
|
||||
public function __construct(ManagerRegistry $registry = null)
|
||||
public function __construct(?ManagerRegistry $registry = null)
|
||||
{
|
||||
$this->registry = $registry;
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@ class ClientRepository extends ServiceEntityRepository
|
|||
parent::__construct($registry, Client::class);
|
||||
}
|
||||
|
||||
public function findOneBy(array $criteria, array $orderBy = null)
|
||||
public function findOneBy(array $criteria, ?array $orderBy = null)
|
||||
{
|
||||
if (!empty($criteria['id'])) {
|
||||
// cast client id to be an integer to avoid postgres error:
|
||||
|
|
Loading…
Reference in a new issue