diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 4533519ff6..77b120c80a 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -12,6 +12,7 @@
 ;
 
 return (new PhpCsFixer\Config())
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRiskyAllowed(false)
     ->setRules([
         '@Symfony' => true,
diff --git a/phpstan.neon b/phpstan.neon
index 7225b544e8..7f10903149 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -15,6 +15,7 @@ parameters:
         - src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle
         - src/Kunstmaan/CookieBundle/Resources/skeleton
         - src/Kunstmaan/CacheBundle # Temporary excluded for full rework
+        - src/Kunstmaan/FixturesBundle # Temporary excluded for full rework
         # Excluded deprecated classes/files
         - src/Kunstmaan/AdminBundle/Composer/ScriptHandler.php
         - src/Kunstmaan/AdminBundle/EventListener/ConsoleExceptionListener.php
diff --git a/src/Kunstmaan/AdminBundle/EventListener/ToolbarListener.php b/src/Kunstmaan/AdminBundle/EventListener/ToolbarListener.php
index 47ff6a8d20..207c974d83 100644
--- a/src/Kunstmaan/AdminBundle/EventListener/ToolbarListener.php
+++ b/src/Kunstmaan/AdminBundle/EventListener/ToolbarListener.php
@@ -87,7 +87,7 @@ public function __construct(
         ContainerInterface $container,
         AdminRouteHelper $adminRouteHelper,
         array $providerKeys,
-        $adminFirewallName = 'main'
+        $adminFirewallName = 'main',
     ) {
         $this->twig = $twig;
         $this->urlGenerator = $urlGenerator;
diff --git a/src/Kunstmaan/AdminBundle/Helper/AdminPanel/AdminPanelAction.php b/src/Kunstmaan/AdminBundle/Helper/AdminPanel/AdminPanelAction.php
index 952d7ca7a8..a7ec9f3984 100644
--- a/src/Kunstmaan/AdminBundle/Helper/AdminPanel/AdminPanelAction.php
+++ b/src/Kunstmaan/AdminBundle/Helper/AdminPanel/AdminPanelAction.php
@@ -34,7 +34,7 @@ public function __construct(
         array $url,
         $label,
         $icon = null,
-        $template = null
+        $template = null,
     ) {
         $this->url = $url;
         $this->label = $label;
diff --git a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php
index 13ec779ba0..41d5b78037 100644
--- a/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php
+++ b/src/Kunstmaan/AdminBundle/Helper/Security/Acl/Permission/PermissionAdmin.php
@@ -96,7 +96,7 @@ public function __construct(
         ObjectIdentityRetrievalStrategyInterface $oidRetrievalStrategy,
         EventDispatcherInterface $eventDispatcher,
         Shell $shellHelper,
-        KernelInterface $kernel
+        KernelInterface $kernel,
     ) {
         $this->em = $em;
         $this->tokenStorage = $tokenStorage;
diff --git a/src/Kunstmaan/AdminBundle/Helper/VersionCheck/VersionChecker.php b/src/Kunstmaan/AdminBundle/Helper/VersionCheck/VersionChecker.php
index 456944af3d..f076c54a87 100644
--- a/src/Kunstmaan/AdminBundle/Helper/VersionCheck/VersionChecker.php
+++ b/src/Kunstmaan/AdminBundle/Helper/VersionCheck/VersionChecker.php
@@ -47,7 +47,7 @@ public function __construct(
         int $cacheTimeframe,
         bool $enabled,
         string $projectDir,
-        string $websiteTitle
+        string $websiteTitle,
     ) {
         $this->cache = $cache;
         $this->translator = $translator;
diff --git a/src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractAdminListConfigurator.php b/src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractAdminListConfigurator.php
index a15029d3a5..eb608dccad 100644
--- a/src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractAdminListConfigurator.php
+++ b/src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractAdminListConfigurator.php
@@ -398,7 +398,7 @@ public function addFilter(
         $columnName,
         ?FilterTypeInterface $type = null,
         $filterName = null,
-        array $options = []
+        array $options = [],
     ) {
         $this->getFilterBuilder()->add($columnName, $type, $filterName, $options);
 
diff --git a/src/Kunstmaan/AdminListBundle/Tests/AdminList/Configurator/AbstractAdminListConfiguratorTest.php b/src/Kunstmaan/AdminListBundle/Tests/AdminList/Configurator/AbstractAdminListConfiguratorTest.php
index 3bd613edd8..d265df737a 100644
--- a/src/Kunstmaan/AdminListBundle/Tests/AdminList/Configurator/AbstractAdminListConfiguratorTest.php
+++ b/src/Kunstmaan/AdminListBundle/Tests/AdminList/Configurator/AbstractAdminListConfiguratorTest.php
@@ -25,7 +25,7 @@ class AbstractAdminListConfiguratorTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->adminListConfigurator = new class() extends AbstractAdminListConfigurator {
+        $this->adminListConfigurator = new class extends AbstractAdminListConfigurator {
             public function buildFields()
             {
                 $this->addField('hello', 'hello', true);
@@ -123,7 +123,7 @@ public function testGetViewUrlFor()
         $this->assertEquals('999', $viewUrl['params']['id']);
 
         // from object
-        $item = new class() {
+        $item = new class {
             public function getId()
             {
                 return 3;
@@ -145,7 +145,7 @@ public function testGetIndexUrl()
 
     public function testGetAdminTypeExistsInEntity()
     {
-        $entity = new class() {
+        $entity = new class {
             public function getAdminType()
             {
                 return 'TestType';
@@ -315,7 +315,7 @@ public function testGetValue()
         $this->assertEquals('bar', $this->adminListConfigurator->getValue(['foo' => 'bar'], $columnName));
         $this->assertEquals('', $this->adminListConfigurator->getValue(['foz' => 'bar'], $columnName));
 
-        $item = new class() {
+        $item = new class {
             public function getFoo()
             {
                 return 'bar';
@@ -350,13 +350,13 @@ public function testgetStringValue()
         ;
 
         $value = new PersistentCollection($emMock, 'ClassName', new ArrayCollection());
-        $value->add(new class() {
+        $value->add(new class {
             public function getName()
             {
                 return 'bar';
             }
         });
-        $value->add(new class() {
+        $value->add(new class {
             public function getName()
             {
                 return 'baz';
diff --git a/src/Kunstmaan/AdminListBundle/Tests/AdminList/Configurator/AbstractDoctrineORMAdminListConfiguratorTest.php b/src/Kunstmaan/AdminListBundle/Tests/AdminList/Configurator/AbstractDoctrineORMAdminListConfiguratorTest.php
index 83efd8e6b6..8017acb49e 100644
--- a/src/Kunstmaan/AdminListBundle/Tests/AdminList/Configurator/AbstractDoctrineORMAdminListConfiguratorTest.php
+++ b/src/Kunstmaan/AdminListBundle/Tests/AdminList/Configurator/AbstractDoctrineORMAdminListConfiguratorTest.php
@@ -84,7 +84,7 @@ public function testGetEditUrl()
     {
         $abstractMock = $this->setUpAdminlistConfigurator();
 
-        $item = new class() {
+        $item = new class {
             public function getId()
             {
                 return 747;
@@ -103,7 +103,7 @@ public function testGetDeleteUrl()
     {
         $abstractMock = $this->setUpAdminlistConfigurator();
 
-        $item = new class() {
+        $item = new class {
             public function getId()
             {
                 return 747;
diff --git a/src/Kunstmaan/ArticleBundle/Tests/Entity/AbstractArticleOverviewPageTest.php b/src/Kunstmaan/ArticleBundle/Tests/Entity/AbstractArticleOverviewPageTest.php
index c4bff6603a..0f5658277e 100644
--- a/src/Kunstmaan/ArticleBundle/Tests/Entity/AbstractArticleOverviewPageTest.php
+++ b/src/Kunstmaan/ArticleBundle/Tests/Entity/AbstractArticleOverviewPageTest.php
@@ -9,7 +9,7 @@ class AbstractArticleOverviewPageTest extends TestCase
 {
     public function testGettersAndSetters()
     {
-        $entity = new class() extends AbstractArticleOverviewPage {
+        $entity = new class extends AbstractArticleOverviewPage {
             public function getArticleRepository($em)
             {
                 return null;
diff --git a/src/Kunstmaan/ArticleBundle/Tests/Entity/AbstractAuthorTest.php b/src/Kunstmaan/ArticleBundle/Tests/Entity/AbstractAuthorTest.php
index 4feaee6ccc..02179ae758 100644
--- a/src/Kunstmaan/ArticleBundle/Tests/Entity/AbstractAuthorTest.php
+++ b/src/Kunstmaan/ArticleBundle/Tests/Entity/AbstractAuthorTest.php
@@ -9,7 +9,7 @@ class AbstractAuthorTest extends TestCase
 {
     public function testGettersAndSetters()
     {
-        $entity = new class() extends AbstractAuthor {
+        $entity = new class extends AbstractAuthor {
         };
         $entity->setId(666);
         $entity->setLink('https://nasa.gov');
diff --git a/src/Kunstmaan/ConfigBundle/Controller/ConfigController.php b/src/Kunstmaan/ConfigBundle/Controller/ConfigController.php
index 188805081e..ebd99edbfa 100644
--- a/src/Kunstmaan/ConfigBundle/Controller/ConfigController.php
+++ b/src/Kunstmaan/ConfigBundle/Controller/ConfigController.php
@@ -52,7 +52,7 @@ public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
         EntityManagerInterface $em,
         array $configuration,
-        FormFactoryInterface $formFactory
+        FormFactoryInterface $formFactory,
     ) {
         $this->router = $router;
         $this->twig = $twig;
diff --git a/src/Kunstmaan/FixturesBundle/Builder/PageBuilder.php b/src/Kunstmaan/FixturesBundle/Builder/PageBuilder.php
index eac5144656..e06bf920d1 100644
--- a/src/Kunstmaan/FixturesBundle/Builder/PageBuilder.php
+++ b/src/Kunstmaan/FixturesBundle/Builder/PageBuilder.php
@@ -43,7 +43,7 @@ public function __construct(
         Populator $populator,
         Slugifier $slugifier,
         PagesConfiguration $pagesConfiguration,
-        string $userClass
+        string $userClass,
     ) {
         $this->manager = $em;
         $this->nodeRepo = $em->getRepository(Node::class);
diff --git a/src/Kunstmaan/FormBundle/Helper/FormHandler.php b/src/Kunstmaan/FormBundle/Helper/FormHandler.php
index 14e893808d..1da5c69969 100644
--- a/src/Kunstmaan/FormBundle/Helper/FormHandler.php
+++ b/src/Kunstmaan/FormBundle/Helper/FormHandler.php
@@ -35,7 +35,7 @@ public function __construct(
         ?EntityManagerInterface $em,
         ?FormFactoryInterface $formFactory,
         ?RouterInterface $router,
-        ?EventDispatcherInterface $eventDispatcher
+        ?EventDispatcherInterface $eventDispatcher,
     ) {
         $this->container = $container;
         $this->em = $em;
diff --git a/src/Kunstmaan/GeneratorBundle/Command/GenerateAdminListCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GenerateAdminListCommand.php
index 68fa12e888..1700c3ca0c 100644
--- a/src/Kunstmaan/GeneratorBundle/Command/GenerateAdminListCommand.php
+++ b/src/Kunstmaan/GeneratorBundle/Command/GenerateAdminListCommand.php
@@ -138,7 +138,7 @@ protected function updateRouting(
         InputInterface $input,
         OutputInterface $output,
         Bundle $bundle,
-        $entityClass
+        $entityClass,
     ) {
         $adminKey = $this->getContainer()->getParameter('kunstmaan_admin.admin_prefix');
         $auto = true;
diff --git a/src/Kunstmaan/GeneratorBundle/Command/KunstmaanGenerateCommand.php b/src/Kunstmaan/GeneratorBundle/Command/KunstmaanGenerateCommand.php
index b8394f5658..57d729814f 100644
--- a/src/Kunstmaan/GeneratorBundle/Command/KunstmaanGenerateCommand.php
+++ b/src/Kunstmaan/GeneratorBundle/Command/KunstmaanGenerateCommand.php
@@ -215,7 +215,7 @@ protected function askForBundleName(
         $objectName,
         $namespace = null,
         $questionMoreBundles = "\nIn which bundle do you want to create the %s",
-        $questionOneBundle = "The %s will be created for the <comment>%s</comment> bundle.\n"
+        $questionOneBundle = "The %s will be created for the <comment>%s</comment> bundle.\n",
     ) {
         return new Sf4AppBundle($this->getContainer()->getParameter('kernel.project_dir'));
     }
@@ -235,7 +235,7 @@ protected function askForSections(
         BundleInterface $bundle,
         $multiple = false,
         $context = null,
-        $defaultSections = []
+        $defaultSections = [],
     ) {
         $allSections = $this->getAvailableSections($bundle, $context, $defaultSections);
         $sections = [];
@@ -589,7 +589,7 @@ protected function getEntityFields(
         $maxHeight = null,
         $minWidth = null,
         $maxWidth = null,
-        $mimeTypes = null
+        $mimeTypes = null,
     ) {
         $fields = [];
         switch ($type) {
diff --git a/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/UserFixtures.php b/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/UserFixtures.php
index d0cc6bd736..d8321a8a2f 100644
--- a/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/UserFixtures.php
+++ b/src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/UserFixtures.php
@@ -78,7 +78,7 @@ private function createUser(
         array $roles = [],
         array $groups = [],
         $enabled = false,
-        $changed = false
+        $changed = false,
     ) {
         $user = $this->userManager->createUser();
         $user->setUsername($username);
diff --git a/src/Kunstmaan/GeneratorBundle/Generator/FormPageGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/FormPageGenerator.php
index 55d252b06f..71acc82e80 100644
--- a/src/Kunstmaan/GeneratorBundle/Generator/FormPageGenerator.php
+++ b/src/Kunstmaan/GeneratorBundle/Generator/FormPageGenerator.php
@@ -77,7 +77,7 @@ public function generate(
         $template,
         array $sections,
         array $parentPages,
-        $generateFormPageParts
+        $generateFormPageParts,
     ) {
         $this->bundle = $bundle;
         $this->entity = $entity;
diff --git a/src/Kunstmaan/GeneratorBundle/Generator/KunstmaanGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/KunstmaanGenerator.php
index 3d985a058a..8b0f62ada9 100644
--- a/src/Kunstmaan/GeneratorBundle/Generator/KunstmaanGenerator.php
+++ b/src/Kunstmaan/GeneratorBundle/Generator/KunstmaanGenerator.php
@@ -61,7 +61,7 @@ public function __construct(
         ManagerRegistry $registry,
         $skeletonDir,
         CommandAssistant $assistant,
-        ?ContainerInterface $container = null
+        ?ContainerInterface $container = null,
     ) {
         $this->filesystem = $filesystem;
         $this->registry = $registry;
@@ -105,7 +105,7 @@ protected function generateEntity(
         $namePrefix,
         $dbPrefix,
         $extendClass = null,
-        $withRepository = false
+        $withRepository = false,
     ) {
         // configure the bundle (needed if the bundle does not contain any Entities yet)
         $config = $this->registry->getManager(null)->getConfiguration();
@@ -187,7 +187,7 @@ protected function generateEntityAdminType(
         $entityName,
         $entityPrefix,
         array $fields,
-        $extendClass = '\Symfony\Component\Form\AbstractType'
+        $extendClass = '\Symfony\Component\Form\AbstractType',
     ) {
         $className = $entityName . 'AdminType';
         $savePath = $bundle->getPath() . '/Form/' . $entityPrefix . '/' . $className . '.php';
diff --git a/src/Kunstmaan/GeneratorBundle/Generator/PageGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/PageGenerator.php
index 3748681689..0a167e2c38 100644
--- a/src/Kunstmaan/GeneratorBundle/Generator/PageGenerator.php
+++ b/src/Kunstmaan/GeneratorBundle/Generator/PageGenerator.php
@@ -64,7 +64,7 @@ public function generate(
         array $fields,
         $template,
         array $sections,
-        array $parentPages
+        array $parentPages,
     ) {
         $this->bundle = $bundle;
         $this->entity = $entity;
diff --git a/src/Kunstmaan/GeneratorBundle/Generator/SearchPageGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/SearchPageGenerator.php
index 315e946106..73b8570db3 100644
--- a/src/Kunstmaan/GeneratorBundle/Generator/SearchPageGenerator.php
+++ b/src/Kunstmaan/GeneratorBundle/Generator/SearchPageGenerator.php
@@ -55,7 +55,7 @@ public function generate(
         $prefix,
         $rootDir,
         $createPage,
-        OutputInterface $output
+        OutputInterface $output,
     ) {
         $parameters = [
             'namespace' => $bundle->getNamespace(),
@@ -81,7 +81,7 @@ public function generateTemplates(
         BundleInterface $bundle,
         array $parameters,
         $rootDir,
-        OutputInterface $output
+        OutputInterface $output,
     ) {
         $dirPath = $this->rootDir . '/templates';
         $fullSkeletonDir = $this->skeletonDir . '/Resources/views';
@@ -107,7 +107,7 @@ public function generateTemplates(
     public function generateEntities(
         BundleInterface $bundle,
         array $parameters,
-        OutputInterface $output
+        OutputInterface $output,
     ) {
         $dirPath = sprintf(
             '%s/Entity/Pages/',
@@ -141,7 +141,7 @@ public function generateEntities(
     public function generateFixtures(
         BundleInterface $bundle,
         array $parameters,
-        OutputInterface $output
+        OutputInterface $output,
     ) {
         $dirPath = $bundle->getPath() . '/DataFixtures/ORM/SearchPageGenerator/';
         $skeletonDir = $this->skeletonDir . '/DataFixtures/ORM/SearchPageGenerator/';
@@ -173,7 +173,7 @@ private function generateSkeletonBasedClass(
         $fullSkeletonDir,
         $dirPath,
         $className,
-        array $parameters
+        array $parameters,
     ) {
         $classPath = sprintf('%s/%s.php', $dirPath, $className);
         if (file_exists($classPath)) {
diff --git a/src/Kunstmaan/GeneratorBundle/Helper/CommandAssistant.php b/src/Kunstmaan/GeneratorBundle/Helper/CommandAssistant.php
index eeee567f2f..38712e601f 100644
--- a/src/Kunstmaan/GeneratorBundle/Helper/CommandAssistant.php
+++ b/src/Kunstmaan/GeneratorBundle/Helper/CommandAssistant.php
@@ -89,7 +89,7 @@ public function writeLine($text, $type = OutputInterface::OUTPUT_NORMAL)
     public function write(
         $text,
         $newLine = false,
-        $type = OutputInterface::OUTPUT_NORMAL
+        $type = OutputInterface::OUTPUT_NORMAL,
     ) {
         $this->output->write($text, $newLine, $type);
     }
@@ -111,7 +111,7 @@ public function askAndValidate(
         $question,
         $validator,
         $defaultValue = null,
-        ?array $autoComplete = null
+        ?array $autoComplete = null,
     ) {
         $validationQuestion = new Question(
             $this->getQuestionHelper()->getQuestion($question, $defaultValue),
@@ -131,7 +131,7 @@ public function askConfirmation(
         $question,
         $defaultString,
         $separator = '?',
-        $defaultValue = true
+        $defaultValue = true,
     ) {
         $confirmationQuestion = new ConfirmationQuestion(
             $this->getQuestionHelper()->getQuestion(
@@ -167,7 +167,7 @@ public function askSelect(
         $choices,
         $default = null,
         $multiSelect = false,
-        $errorMessage = 'Value "%s" is invalid'
+        $errorMessage = 'Value "%s" is invalid',
     ) {
         $bundleQuestion = new ChoiceQuestion(
             $this->getQuestionHelper()->getQuestion($question, $default),
diff --git a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
index 0d24db01f2..b94af6bf6a 100644
--- a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
+++ b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
@@ -48,7 +48,7 @@ public function __construct(
         EntityManager $em,
         MediaManager $mediaManager,
         Folder $folder,
-        Request $request
+        Request $request,
     ) {
         parent::__construct($em);
 
diff --git a/src/Kunstmaan/MediaBundle/Controller/FolderController.php b/src/Kunstmaan/MediaBundle/Controller/FolderController.php
index a7283e2716..a6629a5e20 100644
--- a/src/Kunstmaan/MediaBundle/Controller/FolderController.php
+++ b/src/Kunstmaan/MediaBundle/Controller/FolderController.php
@@ -41,7 +41,7 @@ public function __construct(
         AdminListFactory $adminListFactory,
         RequestStack $requestStack,
         TranslatorInterface $translator,
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->mediaManager = $mediaManager;
         $this->folderManager = $folderManager;
diff --git a/src/Kunstmaan/MediaBundle/Repository/FolderRepository.php b/src/Kunstmaan/MediaBundle/Repository/FolderRepository.php
index 4273fbddd3..482406b95b 100644
--- a/src/Kunstmaan/MediaBundle/Repository/FolderRepository.php
+++ b/src/Kunstmaan/MediaBundle/Repository/FolderRepository.php
@@ -189,7 +189,7 @@ public function childrenQueryBuilder(
         $direct = false,
         $sortByField = null,
         $direction = 'ASC',
-        $includeNode = false
+        $includeNode = false,
     ) {
         /** @var QueryBuilder $qb */
         $qb = parent::childrenQueryBuilder($node, $direct, $sortByField, $direction, $includeNode);
@@ -241,7 +241,7 @@ public function getNodesHierarchyQueryBuilder(
         $node = null,
         $direct = false,
         array $options = [],
-        $includeNode = false
+        $includeNode = false,
     ) {
         /** @var QueryBuilder $qb */
         $qb = parent::getNodesHierarchyQueryBuilder($node, $direct, $options, $includeNode);
diff --git a/src/Kunstmaan/MediaBundle/Validator/Constraints/Media.php b/src/Kunstmaan/MediaBundle/Validator/Constraints/Media.php
index 02bed4f93e..ceaba85aee 100644
--- a/src/Kunstmaan/MediaBundle/Validator/Constraints/Media.php
+++ b/src/Kunstmaan/MediaBundle/Validator/Constraints/Media.php
@@ -86,7 +86,7 @@ public function __construct(
         ?string $maxHeightMessage = null,
         ?string $minWidthMessage = null,
         ?string $maxWidthMessage = null,
-        ?string $mimeTypesMessage = null
+        ?string $mimeTypesMessage = null,
     ) {
         parent::__construct($options, $groups, $payload);
 
diff --git a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php
index 25426521eb..fe9ae1709a 100644
--- a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php
+++ b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php
@@ -963,7 +963,7 @@ private function isNodeVersionLocked(NodeTranslation $nodeTranslation, $isPublic
     private function createDraftVersion(
         HasNodeInterface $page,
         NodeTranslation $nodeTranslation,
-        NodeVersion $nodeVersion
+        NodeVersion $nodeVersion,
     ) {
         $publicPage = $this->container->get('kunstmaan_admin.clone.helper')
             ->deepCloneAndSave($page);
@@ -1025,7 +1025,7 @@ private function deleteNodeChildren(
         EntityManager $em,
         BaseUser $user,
         $locale,
-        ArrayCollection $children
+        ArrayCollection $children,
     ) {
         /* @var Node $childNode */
         foreach ($children as $childNode) {
diff --git a/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php b/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php
index 25ea0687a1..101fcb11cd 100644
--- a/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php
+++ b/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php
@@ -44,7 +44,7 @@ public function __construct(
         LoggerInterface $logger,
         SlugifierInterface $slugifier,
         DomainConfigurationInterface $domainConfiguration,
-        PagesConfiguration $pagesConfiguration
+        PagesConfiguration $pagesConfiguration,
     ) {
         $this->requestStack = $requestStack;
         $this->logger = $logger;
diff --git a/src/Kunstmaan/NodeBundle/EventListener/SlugSecurityListener.php b/src/Kunstmaan/NodeBundle/EventListener/SlugSecurityListener.php
index 569a885832..b7c29c8457 100644
--- a/src/Kunstmaan/NodeBundle/EventListener/SlugSecurityListener.php
+++ b/src/Kunstmaan/NodeBundle/EventListener/SlugSecurityListener.php
@@ -36,7 +36,7 @@ public function __construct(
         EntityManager $entityManager,
         AuthorizationCheckerInterface $authorizationChecker,
         NodeMenu $nodeMenu,
-        $permissionsEnabled = true
+        $permissionsEnabled = true,
     ) {
         $this->em = $entityManager;
         $this->authorizationChecker = $authorizationChecker;
diff --git a/src/Kunstmaan/NodeBundle/Helper/Menu/ActionsMenuBuilder.php b/src/Kunstmaan/NodeBundle/Helper/Menu/ActionsMenuBuilder.php
index 20de4b6d10..6cf0c21165 100644
--- a/src/Kunstmaan/NodeBundle/Helper/Menu/ActionsMenuBuilder.php
+++ b/src/Kunstmaan/NodeBundle/Helper/Menu/ActionsMenuBuilder.php
@@ -78,7 +78,7 @@ public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
         PagesConfiguration $pagesConfiguration,
         $enableExportPageTemplate = true,
-        bool $showDuplicateWithChildren = false
+        bool $showDuplicateWithChildren = false,
     ) {
         $this->factory = $factory;
         $this->em = $em;
diff --git a/src/Kunstmaan/NodeBundle/Helper/Menu/PageMenuAdaptor.php b/src/Kunstmaan/NodeBundle/Helper/Menu/PageMenuAdaptor.php
index 400160a6b2..b9b18d5f83 100644
--- a/src/Kunstmaan/NodeBundle/Helper/Menu/PageMenuAdaptor.php
+++ b/src/Kunstmaan/NodeBundle/Helper/Menu/PageMenuAdaptor.php
@@ -58,7 +58,7 @@ public function __construct(
         EntityManagerInterface $em,
         AclNativeHelper $aclNativeHelper,
         PagesConfiguration $pagesConfiguration,
-        DomainConfigurationInterface $domainConfiguration
+        DomainConfigurationInterface $domainConfiguration,
     ) {
         $this->em = $em;
         $this->aclNativeHelper = $aclNativeHelper;
@@ -128,7 +128,7 @@ private function getTreeNodes(
         $lang,
         $permission,
         AclNativeHelper $aclNativeHelper,
-        $includeHiddenFromNav
+        $includeHiddenFromNav,
     ) {
         if (null === $this->treeNodes) {
             $repo = $this->em->getRepository(Node::class);
@@ -193,7 +193,7 @@ private function processNodes(
         array &$children,
         array $nodes,
         ?MenuItem $parent,
-        array $activeNodeIds
+        array $activeNodeIds,
     ) {
         foreach ($nodes as $child) {
             $menuItem = new MenuItem($menu);
diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php b/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php
index 8fc4c552e1..96a69a3625 100644
--- a/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php
+++ b/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php
@@ -65,7 +65,7 @@ public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
         EventDispatcherInterface $eventDispatcher,
         CloneHelper $cloneHelper,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
     ) {
         $this->em = $em;
         $this->tokenStorage = $tokenStorage;
@@ -233,7 +233,7 @@ public function createPublicVersion(
         HasNodeInterface $page,
         NodeTranslation $nodeTranslation,
         NodeVersion $nodeVersion,
-        BaseUser $user
+        BaseUser $user,
     ) {
         $newPublicPage = $this->cloneHelper->deepCloneAndSave($page);
         $newNodeVersion = $this->em->getRepository(NodeVersion::class)->createNodeVersionFor(
diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeHelper.php b/src/Kunstmaan/NodeBundle/Helper/NodeHelper.php
index 0384289dd0..55227d3de4 100644
--- a/src/Kunstmaan/NodeBundle/Helper/NodeHelper.php
+++ b/src/Kunstmaan/NodeBundle/Helper/NodeHelper.php
@@ -41,7 +41,7 @@ public function __construct(
         NodeAdminPublisher $nodeAdminPublisher,
         TokenStorageInterface $tokenStorage,
         CloneHelper $cloneHelper,
-        EventDispatcherInterface $eventDispatcher
+        EventDispatcherInterface $eventDispatcher,
     ) {
         $this->em = $em;
         $this->nodeAdminPublisher = $nodeAdminPublisher;
@@ -60,7 +60,7 @@ public function __construct(
     public function createDraftVersion(
         HasNodeInterface $page,
         NodeTranslation $nodeTranslation,
-        NodeVersion $nodeVersion
+        NodeVersion $nodeVersion,
     ) {
         $user = $this->getAdminUser();
         $publicPage = $this->cloneHelper->deepCloneAndSave($page);
@@ -139,7 +139,7 @@ public function updatePage(
         NodeVersion $nodeVersion,
         HasNodeInterface $page,
         $isStructureNode,
-        ?TabPane $tabPane = null
+        ?TabPane $tabPane = null,
     ) {
         $this->eventDispatcher->dispatch(
             new NodeEvent($node, $nodeTranslation, $nodeVersion, $page),
diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php b/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php
index 7cc3b45ec0..df997c82b8 100644
--- a/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php
+++ b/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php
@@ -105,7 +105,7 @@ public function __construct(
         EntityManagerInterface $em,
         TokenStorageInterface $tokenStorage,
         AclHelper $aclHelper,
-        DomainConfigurationInterface $domainConfiguration
+        DomainConfigurationInterface $domainConfiguration,
     ) {
         $this->em = $em;
         $this->tokenStorage = $tokenStorage;
@@ -454,7 +454,7 @@ public function getNodeBySlug(NodeTranslation $parentNode, $slug)
     public function getNodeByInternalName(
         $internalName,
         $parent = null,
-        $includeOffline = null
+        $includeOffline = null,
     ) {
         $this->init();
         $resultNode = null;
diff --git a/src/Kunstmaan/NodeBundle/Repository/NodeRepository.php b/src/Kunstmaan/NodeBundle/Repository/NodeRepository.php
index d15d510443..b1e4a1314b 100644
--- a/src/Kunstmaan/NodeBundle/Repository/NodeRepository.php
+++ b/src/Kunstmaan/NodeBundle/Repository/NodeRepository.php
@@ -34,7 +34,7 @@ public function getTopNodes(
         $lang,
         $permission,
         AclHelper $aclHelper,
-        $includeHiddenFromNav = false
+        $includeHiddenFromNav = false,
     ) {
         $result = $this->getChildNodes(
             null,
@@ -65,7 +65,7 @@ public function getChildNodes(
         AclHelper $aclHelper,
         $includeHiddenFromNav = false,
         $includeHiddenWithInternalName = false,
-        $rootNode = null
+        $rootNode = null,
     ) {
         $qb = $this->createQueryBuilder('b')
             ->select('b', 't', 'v')
@@ -199,7 +199,7 @@ public function createNodeFor(
         HasNodeInterface $hasNode,
         $lang,
         BaseUser $owner,
-        $internalName = null
+        $internalName = null,
     ) {
         $em = $this->getEntityManager();
         $node = new Node();
@@ -264,7 +264,7 @@ public function getAllMenuNodes(
         $permission,
         AclNativeHelper $aclNativeHelper,
         $includeHiddenFromNav = false,
-        ?Node $rootNode = null
+        ?Node $rootNode = null,
     ) {
         $connection = $this->_em->getConnection();
         $qb = $connection->createQueryBuilder();
@@ -272,7 +272,7 @@ public function getAllMenuNodes(
         $createIfStatement = static function (
             $expression,
             $trueValue,
-            $falseValue
+            $falseValue,
         ) use ($databasePlatform) {
             $defaultStatement = 'IF(%s, %s, %s)';
             if (null === $databasePlatform) {
@@ -467,7 +467,7 @@ public function getNodesByInternalName(
         $internalName,
         $lang,
         $parentId = false,
-        $includeOffline = false
+        $includeOffline = false,
     ) {
         $qb = $this->createQueryBuilder('n')
             ->select('n', 't', 'v')
diff --git a/src/Kunstmaan/NodeBundle/Repository/NodeTranslationRepository.php b/src/Kunstmaan/NodeBundle/Repository/NodeTranslationRepository.php
index 213ef657d6..0ada902782 100644
--- a/src/Kunstmaan/NodeBundle/Repository/NodeTranslationRepository.php
+++ b/src/Kunstmaan/NodeBundle/Repository/NodeTranslationRepository.php
@@ -220,7 +220,7 @@ public function getNodeTranslationFor(HasNodeInterface $hasNode)
      */
     public function getNodeTranslationForSlug(
         $slug,
-        ?NodeTranslation $parentNode = null
+        ?NodeTranslation $parentNode = null,
     ) {
         if (empty($slug)) {
             return $this->getNodeTranslationForSlugPart(null, $slug);
@@ -245,7 +245,7 @@ public function getNodeTranslationForSlug(
      */
     private function getNodeTranslationForSlugPart(
         ?NodeTranslation $parentNode = null,
-        $slugPart = ''
+        $slugPart = '',
     ) {
         $qb = $this->createQueryBuilder('t')
             ->select('t', 'v', 'n')
@@ -298,7 +298,7 @@ public function getAllNodeTranslationsForUrl(
         $locale = '',
         $includeDeleted = false,
         ?NodeTranslation $toExclude = null,
-        ?Node $rootNode = null
+        ?Node $rootNode = null,
     ) {
         $qb = $this->createQueryBuilder('b')
             ->select('b', 'v')
@@ -363,7 +363,7 @@ public function getNodeTranslationForUrl(
         $locale = '',
         $includeDeleted = false,
         ?NodeTranslation $toExclude = null,
-        ?Node $rootNode = null
+        ?Node $rootNode = null,
     ) {
         $translations = $this->getAllNodeTranslationsForUrl($urlSlug, $locale, $includeDeleted, $toExclude, $rootNode);
 
@@ -413,7 +413,7 @@ public function createNodeTranslationFor(
         HasNodeInterface $hasNode,
         $lang,
         Node $node,
-        BaseUser $owner
+        BaseUser $owner,
     ) {
         $em = $this->getEntityManager();
         $className = ClassLookup::getClass($hasNode);
@@ -464,7 +464,7 @@ public function addDraftNodeVersionFor(
         HasNodeInterface $hasNode,
         $lang,
         Node $node,
-        BaseUser $owner
+        BaseUser $owner,
     ) {
         $em = $this->getEntityManager();
         $className = ClassLookup::getClass($hasNode);
@@ -535,7 +535,7 @@ public function getBestMatchForUrl($urlSlug, $locale)
      */
     public function hasParentNodeTranslationsForLanguage(
         NodeTranslation $nodeTranslation,
-        $language
+        $language,
     ) {
         $parentNode = $nodeTranslation->getNode()->getParent();
         if ($parentNode !== null) {
@@ -568,7 +568,7 @@ public function hasParentNodeTranslationsForLanguage(
      */
     public function getNodeTranslationByLanguageAndInternalName(
         $language,
-        $internalName
+        $internalName,
     ) {
         $qb = $this->createQueryBuilder('nt')
             ->select('nt', 'v')
diff --git a/src/Kunstmaan/NodeBundle/Repository/NodeVersionRepository.php b/src/Kunstmaan/NodeBundle/Repository/NodeVersionRepository.php
index 7b74c3e2db..35ec0e45fa 100644
--- a/src/Kunstmaan/NodeBundle/Repository/NodeVersionRepository.php
+++ b/src/Kunstmaan/NodeBundle/Repository/NodeVersionRepository.php
@@ -43,7 +43,7 @@ public function createNodeVersionFor(
         BaseUser $owner,
         ?NodeVersion $origin = null,
         $type = 'public',
-        $created = null
+        $created = null,
     ) {
         $em = $this->getEntityManager();
 
diff --git a/src/Kunstmaan/NodeBundle/Router/SlugRouter.php b/src/Kunstmaan/NodeBundle/Router/SlugRouter.php
index 070fa0947c..41211af5f6 100644
--- a/src/Kunstmaan/NodeBundle/Router/SlugRouter.php
+++ b/src/Kunstmaan/NodeBundle/Router/SlugRouter.php
@@ -56,7 +56,7 @@ public function __construct(
         DomainConfigurationInterface $domainConfiguration,
         RequestStack $requestStack,
         EntityManagerInterface $em,
-        string $adminKey
+        string $adminKey,
     ) {
         $this->slugPattern = "[a-zA-Z0-9\-_\/]*";
         $this->domainConfiguration = $domainConfiguration;
diff --git a/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php b/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php
index 1e5dadf1c6..7c50fd35df 100644
--- a/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php
+++ b/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php
@@ -43,7 +43,7 @@ public function __construct(
         EntityManagerInterface $em,
         UrlGeneratorInterface $generator,
         NodeMenu $nodeMenu,
-        RequestStack $requestStack
+        RequestStack $requestStack,
     ) {
         $this->em = $em;
         $this->generator = $generator;
diff --git a/src/Kunstmaan/NodeSearchBundle/Configuration/NodePagesConfiguration.php b/src/Kunstmaan/NodeSearchBundle/Configuration/NodePagesConfiguration.php
index 6548fa853d..5841260cc9 100644
--- a/src/Kunstmaan/NodeSearchBundle/Configuration/NodePagesConfiguration.php
+++ b/src/Kunstmaan/NodeSearchBundle/Configuration/NodePagesConfiguration.php
@@ -377,7 +377,7 @@ protected function addPageToIndex(
         NodeTranslation $nodeTranslation,
         Node $node,
         NodeVersion $publicNodeVersion,
-        HasNodeInterface $page
+        HasNodeInterface $page,
     ) {
         $rootNode = $this->currentTopNode;
         if (!$rootNode) {
diff --git a/src/Kunstmaan/NodeSearchBundle/Tests/Entity/AbstractSearchPageTest.php b/src/Kunstmaan/NodeSearchBundle/Tests/Entity/AbstractSearchPageTest.php
index a1ac56b65a..9edebc167a 100644
--- a/src/Kunstmaan/NodeSearchBundle/Tests/Entity/AbstractSearchPageTest.php
+++ b/src/Kunstmaan/NodeSearchBundle/Tests/Entity/AbstractSearchPageTest.php
@@ -12,7 +12,7 @@ class AbstractSearchPageTest extends TestCase
 
     public function testGetters()
     {
-        $page = new class() extends AbstractSearchPage {};
+        $page = new class extends AbstractSearchPage {};
         $this->assertEquals('@KunstmaanNodeSearch/AbstractSearchPage/view.html.twig', $page->getDefaultView());
         $this->assertEquals('kunstmaan_node_search.search.node', $page->getSearcher());
         $this->assertFalse($page->isIndexable());
diff --git a/src/Kunstmaan/NodeSearchBundle/Twig/KunstmaanNodeSearchTwigExtension.php b/src/Kunstmaan/NodeSearchBundle/Twig/KunstmaanNodeSearchTwigExtension.php
index 15427e8991..2a1358c079 100644
--- a/src/Kunstmaan/NodeSearchBundle/Twig/KunstmaanNodeSearchTwigExtension.php
+++ b/src/Kunstmaan/NodeSearchBundle/Twig/KunstmaanNodeSearchTwigExtension.php
@@ -65,7 +65,7 @@ public function renderIndexablePageParts(
         array $twigContext,
         HasPagePartsInterface $page,
         $contextName = 'main',
-        array $parameters = []
+        array $parameters = [],
     ) {
         $template = $env->load('@KunstmaanNodeSearch/PagePart/view.html.twig');
         $pageparts = $this->indexablePagePartsService->getIndexablePageParts($page, $contextName);
diff --git a/src/Kunstmaan/PagePartBundle/EventListener/CloneListener.php b/src/Kunstmaan/PagePartBundle/EventListener/CloneListener.php
index 9810d15edb..846e4efb0d 100644
--- a/src/Kunstmaan/PagePartBundle/EventListener/CloneListener.php
+++ b/src/Kunstmaan/PagePartBundle/EventListener/CloneListener.php
@@ -34,7 +34,7 @@ class CloneListener
     public function __construct(
         EntityManagerInterface $em,
         PagePartConfigurationReaderInterface $pagePartReader,
-        PageTemplateConfigurationService $pageTemplateConfiguratiorService
+        PageTemplateConfigurationService $pageTemplateConfiguratiorService,
     ) {
         $this->em = $em;
         $this->pagePartReader = $pagePartReader;
diff --git a/src/Kunstmaan/PagePartBundle/EventListener/NodeListener.php b/src/Kunstmaan/PagePartBundle/EventListener/NodeListener.php
index 49db5db6d4..4edecf7270 100644
--- a/src/Kunstmaan/PagePartBundle/EventListener/NodeListener.php
+++ b/src/Kunstmaan/PagePartBundle/EventListener/NodeListener.php
@@ -50,7 +50,7 @@ public function __construct(
         PagePartAdminFactory $pagePartAdminFactory,
         PageTemplateConfigurationReaderInterface $templateReader,
         PagePartConfigurationReaderInterface $pagePartReader,
-        PageTemplateConfigurationService $pageTemplateConfiguratiorService
+        PageTemplateConfigurationService $pageTemplateConfiguratiorService,
     ) {
         $this->em = $em;
         $this->pagePartAdminFactory = $pagePartAdminFactory;
diff --git a/src/Kunstmaan/PagePartBundle/Helper/FormWidgets/PageTemplateWidget.php b/src/Kunstmaan/PagePartBundle/Helper/FormWidgets/PageTemplateWidget.php
index e9361f5e5e..c7a37fab63 100644
--- a/src/Kunstmaan/PagePartBundle/Helper/FormWidgets/PageTemplateWidget.php
+++ b/src/Kunstmaan/PagePartBundle/Helper/FormWidgets/PageTemplateWidget.php
@@ -72,7 +72,7 @@ public function __construct(
         PagePartAdminFactory $pagePartAdminFactory,
         PageTemplateConfigurationReaderInterface $templateReader,
         PagePartConfigurationReaderInterface $pagePartReader,
-        PageTemplateConfigurationService $pageTemplateConfigurationService
+        PageTemplateConfigurationService $pageTemplateConfigurationService,
     ) {
         parent::__construct();
 
diff --git a/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php b/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php
index b0937cf54c..087e0e65f7 100644
--- a/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php
+++ b/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php
@@ -49,7 +49,7 @@ public function __construct(
         ParameterBagInterface $parameterBag,
         UserManager $userManager,
         EventDispatcherInterface $eventDispatcher,
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->translator = $translator;
         $this->adminListFactory = $adminListFactory;