From ed6ca862f575a55002d19037c57012a022616aec Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 19 Feb 2024 09:31:30 +0100 Subject: [PATCH] Apply CS --- src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php | 2 +- .../DataFixtures/IgnoreOriginInstanceRuleFixtures.php | 2 +- .../CoreBundle/DataFixtures/InternalSettingFixtures.php | 2 +- .../CoreBundle/DataFixtures/SiteCredentialFixtures.php | 2 +- src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php | 2 +- src/Wallabag/CoreBundle/Entity/Config.php | 2 +- src/Wallabag/CoreBundle/Entity/User.php | 4 ++-- src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | 2 +- src/Wallabag/CoreBundle/Import/PocketImport.php | 2 +- .../CoreBundle/ParamConverter/UsernameFeedTokenConverter.php | 2 +- src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php b/src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php index cc4134201..26030474e 100644 --- a/src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php +++ b/src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php @@ -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; diff --git a/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php index 1e70763fc..68d5ae792 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php @@ -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; } diff --git a/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php index 6014f4055..ab757c2a5 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php @@ -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; } diff --git a/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php index 07bfb59aa..c7604f828 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php @@ -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; } diff --git a/src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php b/src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php index f80ff5503..e4022acc2 100644 --- a/src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php +++ b/src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php @@ -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; } diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index 4db390166..14bb6d26c 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php @@ -262,7 +262,7 @@ class Config * * @return Config */ - public function setUser(User $user = null) + public function setUser(?User $user = null) { $this->user = $user; diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Wallabag/CoreBundle/Entity/User.php index 2d9815697..b541150e4 100644 --- a/src/Wallabag/CoreBundle/Entity/User.php +++ b/src/Wallabag/CoreBundle/Entity/User.php @@ -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; } diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php index 3214f7148..a92d839fb 100644 --- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php +++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php @@ -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; diff --git a/src/Wallabag/CoreBundle/Import/PocketImport.php b/src/Wallabag/CoreBundle/Import/PocketImport.php index d9e40532f..da5d8eae2 100644 --- a/src/Wallabag/CoreBundle/Import/PocketImport.php +++ b/src/Wallabag/CoreBundle/Import/PocketImport.php @@ -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()); } diff --git a/src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php b/src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php index 6722396fd..08e4a6049 100644 --- a/src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php +++ b/src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php @@ -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; } diff --git a/src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php b/src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php index b991207e2..a12b40b91 100644 --- a/src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php +++ b/src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php @@ -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: