Merge branch '7.0' into 7.1

* 7.0:
  [AdminListBundle] Fix doctrine related unit tests
  Apply nullable_type_declaration_for_default_null_value and skip fully_qualified_strict_types

.php-cs-fixer.dist.php

@@ -21,5 +21,6 @@
         'yoda_style' => false,
         'visibility_required' => ['elements' => ['property', 'method']],
         'phpdoc_separation' =>  ['skip_unlisted_annotations' => true],
+        'fully_qualified_strict_types' => false,
     ])
     ->setFinder($finder);

src/Kunstmaan/AdminBundle/AdminList/ExceptionAdminListConfigurator.php

@@ -13,7 +13,7 @@
 
 class ExceptionAdminListConfigurator extends AbstractDoctrineORMAdminListConfigurator
 {
-    public function __construct(EntityManager $em, AclHelper $aclHelper = null)
+    public function __construct(EntityManager $em, ?AclHelper $aclHelper = null)
     {
         parent::__construct($em, $aclHelper);
     }

src/Kunstmaan/AdminBundle/Entity/BaseUser.php

@@ -562,7 +562,7 @@ public function getLastLogin()
     /**
      * @return static
      */
-    public function setLastLogin(\DateTime $lastLogin = null)
+    public function setLastLogin(?\DateTime $lastLogin = null)
     {
         $this->lastLogin = $lastLogin;
 

src/Kunstmaan/AdminBundle/Entity/UserInterface.php

@@ -115,7 +115,7 @@ public function setConfirmationToken($confirmationToken);
      *
      * @return static
      */
-    public function setLastLogin(\DateTime $time = null);
+    public function setLastLogin(?\DateTime $time = null);
 
     /**
      * Never use this to check if this user has access to anything!

src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php

@@ -72,7 +72,7 @@ public function onKernelRequest(RequestEvent $event)
         }
     }
 
-    private function isAdminToken($providerKey, TokenInterface $token = null): bool
+    private function isAdminToken($providerKey, ?TokenInterface $token = null): bool
     {
         if (null === $token) {
             return false;

src/Kunstmaan/AdminBundle/Helper/AdminPanel/AdminPanelLogoutAction.php

@@ -15,7 +15,7 @@ final class AdminPanelLogoutAction implements AdminPanelActionInterface
     /** @var string */
     private $template = '@KunstmaanAdmin/AdminPanel/_admin_panel_logout_action.html.twig';
 
-    public function __construct(string $url, string $label, string $icon = null, string $template = null)
+    public function __construct(string $url, string $label, ?string $icon = null, ?string $template = null)
     {
         $this->logoutUrl = $url;
         $this->label = $label;

src/Kunstmaan/AdminBundle/Helper/AdminPanel/DefaultAdminPanelAdaptor.php

@@ -12,7 +12,7 @@ class DefaultAdminPanelAdaptor implements AdminPanelAdaptorInterface
     /** @var LogoutUrlGenerator */
     private $logoutUrlGenerator;
 
-    public function __construct(TokenStorageInterface $tokenStorage, LogoutUrlGenerator $logoutUrlGenerator)
+    public function __construct(TokenStorageInterface $tokenStorage, ?LogoutUrlGenerator $logoutUrlGenerator)
     {
         $this->tokenStorage = $tokenStorage;
         $this->logoutUrlGenerator = $logoutUrlGenerator;

src/Kunstmaan/AdminBundle/Helper/Menu/MenuAdaptorInterface.php

@@ -20,5 +20,5 @@ interface MenuAdaptorInterface
      *
      * @return void
      */
-    public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $parent = null, Request $request = null);
+    public function adaptChildren(MenuBuilder $menu, array &$children, ?MenuItem $parent = null, ?Request $request = null);
 }

src/Kunstmaan/AdminBundle/Helper/Menu/MenuBuilder.php

@@ -136,7 +136,7 @@ public function getTopChildren()
      *
      * @return MenuItem[]
      */
-    public function getChildren(MenuItem $parent = null)
+    public function getChildren(?MenuItem $parent = null)
     {
         if ($parent === null) {
             return $this->getTopChildren();

src/Kunstmaan/AdminBundle/Helper/Menu/MenuItem.php

@@ -180,7 +180,7 @@ public function getParent()
      *
      * @return MenuItem
      */
-    public function setParent(MenuItem $parent = null)
+    public function setParent(?MenuItem $parent = null)
     {
         $this->parent = $parent;
 

src/Kunstmaan/AdminBundle/Helper/Menu/ModulesMenuAdaptor.php

@@ -9,7 +9,7 @@
  */
 class ModulesMenuAdaptor implements MenuAdaptorInterface
 {
-    public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $parent = null, Request $request = null)
+    public function adaptChildren(MenuBuilder $menu, array &$children, ?MenuItem $parent = null, ?Request $request = null)
     {
         if (\is_null($parent)) {
             $menuItem = new TopMenuItem($menu);

src/Kunstmaan/AdminBundle/Helper/Menu/SettingsMenuAdaptor.php

@@ -29,7 +29,7 @@ public function __construct(AuthorizationCheckerInterface $authorizationChecker,
         $this->exceptionLoggingEnabled = $exceptionLoggingEnabled;
     }
 
-    public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $parent = null, Request $request = null)
+    public function adaptChildren(MenuBuilder $menu, array &$children, ?MenuItem $parent = null, ?Request $request = null)
     {
         if (\is_null($parent)) {
             $menuItem = new TopMenuItem($menu);

src/Kunstmaan/AdminBundle/Helper/Menu/SimpleMenuAdaptor.php

@@ -23,7 +23,7 @@ public function __construct(AuthorizationCheckerInterface $authorizationChecker,
         $this->menuItems = $menuItems;
     }
 
-    public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $parent = null, Request $request = null)
+    public function adaptChildren(MenuBuilder $menu, array &$children, ?MenuItem $parent = null, ?Request $request = null)
     {
         foreach ($this->menuItems as $item) {
             if (false === $this->parentMatches($parent, $item)) {

src/Kunstmaan/AdminBundle/Helper/Security/Acl/Voter/AclVoter.php

@@ -29,7 +29,7 @@ class AclVoter extends BaseAclVoter
     /** @var bool */
     private $permissionsEnabled;
 
-    public function __construct(AclProviderInterface $aclProvider, ObjectIdentityRetrievalStrategyInterface $oidRetrievalStrategy, SecurityIdentityRetrievalStrategyInterface $sidRetrievalStrategy, PermissionMapInterface $permissionMap, LoggerInterface $logger = null, $allowIfObjectIdentityUnavailable = true, $permissionsEnabled = true)
+    public function __construct(AclProviderInterface $aclProvider, ObjectIdentityRetrievalStrategyInterface $oidRetrievalStrategy, SecurityIdentityRetrievalStrategyInterface $sidRetrievalStrategy, PermissionMapInterface $permissionMap, ?LoggerInterface $logger = null, $allowIfObjectIdentityUnavailable = true, $permissionsEnabled = true)
     {
         parent::__construct($aclProvider, $oidRetrievalStrategy, $sidRetrievalStrategy, $permissionMap, $logger, $allowIfObjectIdentityUnavailable);
         $this->permissionsEnabled = $permissionsEnabled;

src/Kunstmaan/AdminBundle/Tests/DependencyInjection/KunstmaanAdminExtensionTest.php

@@ -91,7 +91,7 @@ public function testExceptionExcludesFromExceptionLoggingConfig()
         $this->assertContainerBuilderHasParameter('kunstmaan_admin.admin_exception_excludes', ['test_exclude_new_config']);
     }
 
-    private function getRequiredConfig(string $excludeKey = null)
+    private function getRequiredConfig(?string $excludeKey = null)
     {
         $requiredConfig = [
             'website_title' => 'Example title',

src/Kunstmaan/AdminBundle/Tests/Helper/VersionCheck/VersionCheckTest.php

@@ -37,7 +37,7 @@ public function setUp(): void
     /**
      * @return \PHPUnit\Framework\MockObject\MockObject|VersionChecker
      */
-    public function setUpVersionCheckerMock(?array $methods, string $projectDir = null)
+    public function setUpVersionCheckerMock(?array $methods, ?string $projectDir = null)
     {
         $versionCheckerMock = $this->getMockBuilder(VersionChecker::class)
             ->setConstructorArgs([$this->cache, $this->translator, $this->requestStack, 'url', 300, true, $projectDir ?? 'project_dir', 'website_title'])

src/Kunstmaan/AdminBundle/Toolbar/BundleVersionDataCollector.php

@@ -51,7 +51,7 @@ public function collectData()
     /**
      * @return void
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null)
     {
         if (!$this->isEnabled()) {
             $this->data = [];

src/Kunstmaan/AdminBundle/Toolbar/ExceptionDataCollector.php

@@ -46,7 +46,7 @@ public function collectData()
     /**
      * @return void
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null)
     {
         if (false === $this->isEnabled()) {
             $this->data = false;

src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractAdminListConfigurator.php

@@ -372,7 +372,7 @@ public function canExport()
      *
      * @return AbstractAdminListConfigurator
      */
-    public function addField($name, $header, $sort, $template = null, FieldAlias $alias = null)
+    public function addField($name, $header, $sort, $template = null, ?FieldAlias $alias = null)
     {
         $this->fields[] = new Field($name, $header, $sort, $template, $alias);
 
@@ -387,7 +387,7 @@ public function addField($name, $header, $sort, $template = null, FieldAlias $al
      *
      * @return AbstractAdminListConfigurator
      */
-    public function addExportField($name, $header, $template = null, FieldAlias $alias = null)
+    public function addExportField($name, $header, $template = null, ?FieldAlias $alias = null)
     {
         $this->exportFields[] = new Field($name, $header, false, $template, $alias);
 
@@ -404,7 +404,7 @@ public function addExportField($name, $header, $template = null, FieldAlias $ali
      */
     public function addFilter(
         $columnName,
-        FilterTypeInterface $type = null,
+        ?FilterTypeInterface $type = null,
         $filterName = null,
         array $options = []
     ) {

src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractDoctrineORMAdminListConfigurator.php

@@ -43,7 +43,7 @@ abstract class AbstractDoctrineORMAdminListConfigurator extends AbstractAdminLis
      */
     protected $aclHelper;
 
-    public function __construct(EntityManagerInterface $em, AclHelper $aclHelper = null)
+    public function __construct(EntityManagerInterface $em, ?AclHelper $aclHelper = null)
     {
         $this->em = $em;
         $this->aclHelper = $aclHelper;

src/Kunstmaan/AdminListBundle/AdminList/Field.php

@@ -38,7 +38,7 @@ class Field
      * @param string     $template The template
      * @param FieldAlias $alias    The alias
      */
-    public function __construct($name, $header, $sort = false, $template = null, FieldAlias $alias = null)
+    public function __construct($name, $header, $sort = false, $template = null, ?FieldAlias $alias = null)
     {
         $this->name = $name;
         $this->header = $header;

src/Kunstmaan/AdminListBundle/AdminList/FilterBuilder.php

@@ -31,7 +31,7 @@ class FilterBuilder
      *
      * @return FilterBuilder
      */
-    public function add($columnName, FilterTypeInterface $type = null, $filterName = null, array $options = [])
+    public function add($columnName, ?FilterTypeInterface $type = null, $filterName = null, array $options = [])
     {
         $this->filterDefinitions[$columnName] = [
             'type' => $type,

src/Kunstmaan/AdminListBundle/Controller/AbstractAdminListController.php

@@ -74,7 +74,7 @@ protected function doIndexAction(AdminListConfiguratorInterface $configurator, R
      *
      * @throws AccessDeniedHttpException
      */
-    protected function doExportAction(AdminListConfiguratorInterface $configurator, $_format, Request $request = null)
+    protected function doExportAction(AdminListConfiguratorInterface $configurator, $_format, ?Request $request = null)
     {
         if (!$configurator->canExport()) {
             throw $this->createAccessDeniedException('You do not have sufficient rights to access this page.');

src/Kunstmaan/AdminListBundle/Event/AdminListEvent.php

@@ -32,7 +32,7 @@ final class AdminListEvent extends Event
     /**
      * @param object $entity
      */
-    public function __construct($entity, Request $request, FormInterface $form = null)
+    public function __construct($entity, Request $request, ?FormInterface $form = null)
     {
         $this->entity = $entity;
         $this->request = $request;

src/Kunstmaan/AdminListBundle/Exception/ExportException.php

@@ -10,7 +10,7 @@ class ExportException extends \RuntimeException
      * @param string $message
      * @param int    $code
      */
-    public function __construct($message, $data, $code = 0, \Throwable $previous = null)
+    public function __construct($message, $data, $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
         $this->data = $data;

src/Kunstmaan/AdminListBundle/Repository/EntityVersionLockRepository.php

@@ -18,7 +18,7 @@ class EntityVersionLockRepository extends EntityRepository
      *
      * @return LockableEntity[]
      */
-    public function getLocksForLockableEntity(LockableEntity $entity, $threshold, UserInterface $userToExclude = null)
+    public function getLocksForLockableEntity(LockableEntity $entity, $threshold, ?UserInterface $userToExclude = null)
     {
         $qb = $this->createQueryBuilder('evl')
             ->select('evl')

src/Kunstmaan/AdminListBundle/Service/EntityVersionLockService.php

@@ -96,7 +96,7 @@ protected function createEntityVersionLock(UserInterface $user, LockableEntity $
     /**
      * @return array
      */
-    public function getUsersWithEntityVersionLock(LockableEntityInterface $entity, UserInterface $userToExclude = null)
+    public function getUsersWithEntityVersionLock(LockableEntityInterface $entity, ?UserInterface $userToExclude = null)
     {
         /** @var LockableEntity $lockable */
         $lockable = $this->getLockableEntity($entity);
@@ -125,7 +125,7 @@ protected function removeExpiredLocks(LockableEntity $entity)
      *
      * @return EntityVersionLock[]
      */
-    protected function getEntityVersionLocksByLockableEntity(LockableEntity $entity, UserInterface $userToExclude = null)
+    protected function getEntityVersionLocksByLockableEntity(LockableEntity $entity, ?UserInterface $userToExclude = null)
     {
         /** @var EntityVersionLockRepository $objectRepository */
         $objectRepository = $this->objectManager->getRepository(EntityVersionLock::class);

src/Kunstmaan/AdminListBundle/Tests/AdminList/Configurator/AbstractDoctrineDBALAdminListConfiguratorTest.php

@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ForwardCompatibility\DriverStatement;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Statement;
@@ -24,6 +25,7 @@ class AbstractDoctrineDBALAdminListConfiguratorTest extends TestCase
     public function setUp(): void
     {
         $this->connectionMock = $this->createMock(Connection::class);
+        $this->connectionMock->method('getDatabasePlatform')->willReturn(new MySQLPlatform());
         $this->connectionMock
             ->expects($this->any())
             ->method('executeQuery')

src/Kunstmaan/AdminListBundle/Tests/AdminList/FilterType/DBAL/BaseDbalFilterTest.php

@@ -3,6 +3,7 @@
 namespace Kunstmaan\AdminListBundle\Tests\AdminList\FilterType\DBAL;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 use Doctrine\DBAL\Query\QueryBuilder;
 use PHPUnit\Framework\TestCase;
@@ -14,6 +15,10 @@ public function getQueryBuilder()
         $conn = $this->createMock(Connection::class);
         $expressionBuilder = new ExpressionBuilder($conn);
 
+        $conn->method('getDatabasePlatform')->willReturn(new MySQLPlatform());
+        if (method_exists(Connection::class, 'createExpressionBuilder')) {
+            $conn->method('createExpressionBuilder')->willReturn($expressionBuilder);
+        }
         $conn->method('getExpressionBuilder')->willReturn($expressionBuilder);
 
         return new QueryBuilder($conn);

src/Kunstmaan/CacheBundle/Helper/Menu/VarnishMenuAdaptor.php

@@ -9,7 +9,7 @@
 
 class VarnishMenuAdaptor implements MenuAdaptorInterface
 {
-    public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $parent = null, Request $request = null)
+    public function adaptChildren(MenuBuilder $menu, array &$children, ?MenuItem $parent = null, ?Request $request = null)
     {
         if (!is_null($parent) && 'KunstmaanAdminBundle_settings' == $parent->getRoute()) {
             $menuItem = new MenuItem($menu);

src/Kunstmaan/ConfigBundle/Helper/Menu/ConfigMenuAdaptor.php

@@ -29,7 +29,7 @@ public function __construct($configuration, AuthorizationCheckerInterface $autho
         $this->authorizationChecker = $authorizationChecker;
     }
 
-    public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $parent = null, Request $request = null)
+    public function adaptChildren(MenuBuilder $menu, array &$children, ?MenuItem $parent = null, ?Request $request = null)
     {
         if (!\is_null($parent) && 'KunstmaanAdminBundle_settings' == $parent->getRoute()) {
             // Load all the kunstmaan_config entities and create a menu item for them.

src/Kunstmaan/CookieBundle/AdminList/CookieAdminListConfigurator.php

@@ -24,7 +24,7 @@ class CookieAdminListConfigurator extends AbstractDoctrineORMAdminListConfigurat
      */
     private $domainConfiguration;
 
-    public function __construct(EntityManager $em, AclHelper $aclHelper = null, DomainConfigurationInterface $domainConfiguration = null)
+    public function __construct(EntityManager $em, ?AclHelper $aclHelper = null, ?DomainConfigurationInterface $domainConfiguration = null)
     {
         parent::__construct($em, $aclHelper);
 

src/Kunstmaan/CookieBundle/AdminList/CookieTypeAdminListConfigurator.php

@@ -18,7 +18,7 @@ class CookieTypeAdminListConfigurator extends AbstractDoctrineORMAdminListConfig
      * @param EntityManager $em        The entity manager
      * @param AclHelper     $aclHelper The acl helper
      */
-    public function __construct(EntityManager $em, AclHelper $aclHelper = null)
+    public function __construct(EntityManager $em, ?AclHelper $aclHelper = null)
     {
         parent::__construct($em, $aclHelper);
         $this->setAdminType(CookieTypeAdminType::class);

src/Kunstmaan/CookieBundle/Entity/Cookie.php

@@ -98,7 +98,7 @@ public function getDescription()
     /**
      * @return Cookie
      */
-    public function setType(CookieType $type = null)
+    public function setType(?CookieType $type = null)
     {
         $this->type = $type;
 

src/Kunstmaan/CookieBundle/Helper/Menu/CookieMenuAdaptor.php

@@ -22,7 +22,7 @@ class CookieMenuAdaptor implements MenuAdaptorInterface
      * @param MenuItem    $parent    The parent Menu item
      * @param Request     $request   The Request
      */
-    public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $parent = null, Request $request = null)
+    public function adaptChildren(MenuBuilder $menu, array &$children, ?MenuItem $parent = null, ?Request $request = null)
     {
         if (null !== $parent && 'KunstmaanAdminBundle_modules' === $parent->getRoute()) {
             $this->addMenuItem(
@@ -63,7 +63,7 @@ public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $par
      * @param string $uniqueId
      * @param string $label
      */
-    private function addMenuItem(MenuBuilder $menu, array &$children, MenuItem $parent, Request $request = null, $route, $uniqueId, $label)
+    private function addMenuItem(MenuBuilder $menu, array &$children, MenuItem $parent, ?Request $request = null, $route, $uniqueId, $label)
     {
         $menuItem = new TopMenuItem($menu);
         $menuItem

src/Kunstmaan/FixturesBundle/Loader/FixtureLoader.php

@@ -93,7 +93,7 @@ public function getProviders()
      *
      * @api
      */
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(?ContainerInterface $container = null)
     {
         $this->container = $container;
     }

src/Kunstmaan/FormBundle/Helper/FormHandler.php

@@ -32,10 +32,10 @@ class FormHandler implements FormHandlerInterface
 
     public function __construct(
         ContainerInterface $container,
-        EntityManagerInterface $em,
-        FormFactoryInterface $formFactory,
-        RouterInterface $router,
-        EventDispatcherInterface $eventDispatcher
+        ?EntityManagerInterface $em,
+        ?FormFactoryInterface $formFactory,
+        ?RouterInterface $router,
+        ?EventDispatcherInterface $eventDispatcher
     ) {
         $this->container = $container;
         $this->em = $em;

src/Kunstmaan/FormBundle/Helper/Menu/FormSubmissionsMenuAdaptor.php

@@ -10,7 +10,7 @@
 
 class FormSubmissionsMenuAdaptor implements MenuAdaptorInterface
 {
-    public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $parent = null, Request $request = null)
+    public function adaptChildren(MenuBuilder $menu, array &$children, ?MenuItem $parent = null, ?Request $request = null)
     {
         if (!is_null($parent) && 'KunstmaanAdminBundle_modules' == $parent->getRoute()) {
             $menuitem = new TopMenuItem($menu);