Merge branch '7.2' into url-chooser

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [acrobat]

.github/dependabot.yml

@@ -2,6 +2,6 @@ version: 2
 updates:
     -   package-ecosystem: "github-actions"
         directory: "/"
-        target-branch: "6.3"
+        target-branch: "7.1"
         schedule:
             interval: "daily"

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ['8.1', '8.2']
+                php: ['8.1', '8.2', '8.3']
                 deps: ['stable']
                 symfony: [''] # Don't lock to a specific symfony version by default
                 include:
@@ -24,7 +24,7 @@ jobs:
 
                     # Test latest php with LTS versions.
                     -   deps: 'lts'
-                        php: '8.2'
+                        php: '8.3'
                         symfony: '^6.4'
 
         steps:
@@ -45,7 +45,7 @@ jobs:
                 id: composer-cache
                 run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-            -   uses: actions/cache@v4.0.2
+            -   uses: actions/cache@v4.1.2
                 with:
                     path: ${{ steps.composer-cache.outputs.dir }}
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/subtree-split.yml

@@ -31,15 +31,15 @@ jobs:
                     user_email: '[email protected]'
 
             -   name: Cache splitsh-lite
-                uses: actions/cache@v4.0.2
+                uses: actions/cache@v4.1.2
                 with:
                     path: |
                         ./splitsh
                         ./splitsh.db
                     key: '${{ runner.os }}-splitsh-v101'
 
             -   name: Subtree split
-                uses: acrobat/[email protected].4
+                uses: acrobat/[email protected].5
                 with:
                     config-path: .build/subtree-splitter-config.json
                     batch-size: 1

CHANGELOG-7.0.md

@@ -6,6 +6,15 @@ This changelog references the relevant changes (bug and security fixes) done in
 To get the diff for a specific change, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/compare/7.0.0...7.0.1
 
+## 7.0.5 / 2024-11-01
+
+* [PagePartBundle] Delete nested (non-entity) sub-items [#3423](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3423) ([@jverdeyen](https://github.com/jverdeyen))
+* [MenuBundle] Override getPathByConvention function in MenuItemAdminListConfigurator [#3420](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3420) ([@KevinSleegers](https://github.com/KevinSleegers))
+* [MultidomainBundle] Fix getCurrentFullHost return type [#3419](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3419) ([@dannyvw](https://github.com/dannyvw))
+* [TranslatorBundle] Fixed MessageCatalogue strict type (string) parameters in Translator Loader [#3415](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3415) ([@jverdeyen](https://github.com/jverdeyen))
+* [AdminBundle] fixed base route name for exception admin lists [#3414](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3414) ([@virtualize](https://github.com/virtualize))
+* [NodeBundle] Fix node reorder parents [#3413](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3413) ([@dannyvw](https://github.com/dannyvw))
+
 ## 7.0.4 / 2024-04-20
 
 * [NodeBundle] Fix node reorder [#3408](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3408) ([@dannyvw](https://github.com/dannyvw))

CHANGELOG-7.1.md

@@ -6,6 +6,16 @@ This changelog references the relevant changes (bug and security fixes) done in
 To get the diff for a specific change, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/compare/7.1.0...7.1.1
 
+## 7.1.2 / 2024-11-01
+
+* [FormBundle] Fix form submission export [#3421](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3421) ([@dannyvw](https://github.com/dannyvw))
+* [PagePartBundle] Delete nested (non-entity) sub-items [#3423](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3423) ([@jverdeyen](https://github.com/jverdeyen))
+* [MenuBundle] Override getPathByConvention function in MenuItemAdminListConfigurator [#3420](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3420) ([@KevinSleegers](https://github.com/KevinSleegers))
+* [MultidomainBundle] Fix getCurrentFullHost return type [#3419](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3419) ([@dannyvw](https://github.com/dannyvw))
+* [TranslatorBundle] Fixed MessageCatalogue strict type (string) parameters in Translator Loader [#3415](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3415) ([@jverdeyen](https://github.com/jverdeyen))
+* [AdminBundle] fixed base route name for exception admin lists [#3414](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3414) ([@virtualize](https://github.com/virtualize))
+* [NodeBundle] Fix node reorder parents [#3413](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3413) ([@dannyvw](https://github.com/dannyvw))
+
 ## 7.1.1 / 2024-04-20
 
 * [NodeBundle] Fix node reorder [#3408](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3408) ([@dannyvw](https://github.com/dannyvw))

UPGRADE-7.2.md

@@ -6,7 +6,19 @@ FormBundle
 
 - The frontendformobject view variable of form pagepart templates is deprecated and will be removed in 8.0. There is no replacement for this variable.
 
+GeneratorBundle
+---------------
+
+- All classes in the generator bundle are marked internal. If you are using or extending these classes, please be aware that they can change in any release.
+
 PagePartBundle
 --------------
 
 - Not passing a HasPagePartsInterface as second parameter in PagePartEvent is deprecated and will be required in 8.0.
+
+
+NodeBundle
+-----------------
+
+- The node-bundle/multidomain-bundle has now some improved logic in the router itself. Using the old router logic is deprecated and the new will be the default in 8.0.
+  To enable the new and improved router, set the `kunstmaan_node.enable_improved_router` config to `true`.

composer.json

@@ -88,8 +88,8 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.2.1",
         "symfony/phpunit-bridge": "^7.0",
         "phpunit/phpunit": "^9.5.5",
-        "phpstan/phpstan": "^1.1",
-        "phpstan/phpstan-doctrine": "^1.0",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-doctrine": "^2.0",
         "php-cs-fixer/shim": "^3.11"
     },
     "replace": {

phpstan.neon

@@ -17,12 +17,6 @@ parameters:
         - 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
-        - src/Kunstmaan/GeneratorBundle/Helper/Sf4AppBundle.php # BC layer
-        - src/Kunstmaan/TranslatorBundle/Command/MigrationsDiffCommand.php
-        - src/Kunstmaan/TranslatorBundle/Service/Command/DiffCommand.php
-        - src/Kunstmaan/*/Event/*.php # Ignore the event classes until we get rid of the BC layer. The BC layer causes a weird phpstan error.
         - src/Kunstmaan/GeneratorBundle/Helper/Sf4AppBundle.php # BC layer
 
     ignoreErrors:

src/Kunstmaan/FixturesBundle/Loader/FixtureLoader.php

@@ -24,7 +24,7 @@ abstract class FixtureLoader implements FixtureInterface, ContainerAwareInterfac
     /**
      * Load data fixtures with the passed EntityManager
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $this->manager = $manager;
         $options = $this->getOptions();

src/Kunstmaan/FormBundle/Resources/views/FormSubmissions/list.html.twig

@@ -13,9 +13,17 @@
                         {% set exportparams = adminlist.filterbuilder.currentparameters|merge(adminlist.getExportUrl()[("params")]) %}
                         {% for name, ext in supported_export_extensions() %}
                             {% set exportparams = exportparams|merge({"_format": ext}) %}
+                            {% set iconName = name|lower %}
+                            {% if iconName == 'csv' %}
+                                {% set icon = 'fa-file-code' %}
+                            {% elseif iconName == 'excel' %}
+                                {% set icon = 'fa-file-excel' %}
+                            {% else %}
+                                {% set icon = 'fa-file' %}
+                            {% endif %}
                             <li>
                                 <a href="{{ path(adminlist.getExportUrl()["path"], exportparams) }}">
-                                    <i class="fa fa-file-{{ name|lower }}"></i>
+                                    <i class="fa {{ icon }}"></i>
                                     {{ name }}
                                 </a>
                             </li>

src/Kunstmaan/FormBundle/Tests/Form/AbstractFormPageAdminTypeTest.php

@@ -25,7 +25,7 @@ class FormPage extends AbstractFormPage
 {
     public function getPossibleChildTypes(): array
     {
-        return null;
+        return [];
     }
 
     public function getPagePartAdminConfigurations(): array
@@ -83,7 +83,7 @@ public function testFormType()
         }
     }
 
-    protected function getExtensions()
+    protected function getExtensions(): array
     {
         $mediaTokenTransformer = $this->createMock(MediaTokenTransformer::class);
         $mediaTokenTransformer->expects($this->once())

src/Kunstmaan/GeneratorBundle/Command/GenerateAdminListCommand.php

@@ -16,7 +16,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Generates a KunstmaanAdminList
+ * @internal
  */
 class GenerateAdminListCommand extends GenerateDoctrineCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GenerateAdminTestsCommand.php

@@ -11,7 +11,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
- * GenerateAdminTestsCommand
+ * @internal
  */
 class GenerateAdminTestsCommand extends GeneratorCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GenerateArticleCommand.php

@@ -10,6 +10,8 @@
 
 /**
  * Generates classes based on the AbstractArticle classes from KunstmaanArticleBundle
+ *
+ * @internal
  */
 class GenerateArticleCommand extends KunstmaanGenerateCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GenerateConfigCommand.php

@@ -7,7 +7,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
- * Generates config files
+ * @internal
  */
 class GenerateConfigCommand extends KunstmaanGenerateCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultPagePartsCommand.php

@@ -9,7 +9,7 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * Generates the default pageparts
+ * @internal
  */
 class GenerateDefaultPagePartsCommand extends KunstmaanGenerateCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GenerateDefaultSiteCommand.php

@@ -11,7 +11,7 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * Generates a default website based on Kunstmaan bundles
+ * @internal
  */
 class GenerateDefaultSiteCommand extends KunstmaanGenerateCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GenerateFormPageCommand.php

@@ -10,7 +10,7 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * Generates a new formPage
+ * @internal
  */
 class GenerateFormPageCommand extends KunstmaanGenerateCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GenerateFormPagePartsCommand.php

@@ -9,7 +9,7 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * Generates the default form pageparts
+ * @internal
  */
 class GenerateFormPagePartsCommand extends KunstmaanGenerateCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GenerateLayoutCommand.php

@@ -8,7 +8,7 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * Generates de default layout
+ * @internal
  */
 class GenerateLayoutCommand extends KunstmaanGenerateCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GeneratePageCommand.php

@@ -8,7 +8,7 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * Generates a new page
+ * @internal
  */
 class GeneratePageCommand extends KunstmaanGenerateCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GeneratePagePartCommand.php

@@ -8,7 +8,7 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * Generates a new pagepart
+ * @internal
  */
 class GeneratePagePartCommand extends KunstmaanGenerateCommand
 {

src/Kunstmaan/GeneratorBundle/Command/GenerateSearchPageCommand.php

@@ -13,7 +13,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 
 /**
- * Generates a SearchPage based on the KunstmaanNodeSearchBundle
+ * @internal
  */
 class GenerateSearchPageCommand extends GenerateDoctrineCommand
 {

src/Kunstmaan/GeneratorBundle/Command/InstallCommand.php

@@ -14,7 +14,7 @@
 use Symfony\Component\Process\Process;
 
 /**
- * Kunstmaan installer
+ * @internal
  */
 final class InstallCommand extends GeneratorCommand
 {

src/Kunstmaan/GeneratorBundle/Command/KunstmaanGenerateCommand.php

@@ -21,6 +21,9 @@
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml;
 
+/**
+ * @internal
+ */
 abstract class KunstmaanGenerateCommand extends GenerateDoctrineCommand
 {
     /**

src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/GroupFixtures.php

@@ -19,7 +19,7 @@ class GroupFixtures extends AbstractFixture implements OrderedFixtureInterface
     /**
      * Load data fixtures with the passed EntityManager
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $group1 = $this->createGroup($manager, 'Administrators', [
             $this->getReference(RoleFixtures::REFERENCE_PERMISSIONMANAGER_ROLE),

src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/RoleFixtures.php

@@ -22,7 +22,7 @@ class RoleFixtures extends AbstractFixture implements OrderedFixtureInterface
     /**
      * Load data fixtures with the passed EntityManager
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $role1 = $this->createRole($manager, 'ROLE_PERMISSIONMANAGER');
         $role2 = $this->createRole($manager, 'ROLE_ADMIN');

src/Kunstmaan/GeneratorBundle/DataFixtures/ORM/UserFixtures.php

@@ -28,7 +28,7 @@ public function __construct(UserManager $userManager, string $defaultAdminLocale
     /**
      * Load data fixtures with the passed EntityManager
      */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $password = substr(rtrim(strtr(base64_encode(random_bytes(32)), '+/', '-_'), '='), 0, 8);
 

src/Kunstmaan/GeneratorBundle/Generator/AdminListGenerator.php

@@ -9,7 +9,7 @@
 use Symfony\Component\HttpKernel\Kernel;
 
 /**
- * Generates all classes for an admin list
+ * @internal
  */
 class AdminListGenerator extends \Sensio\Bundle\GeneratorBundle\Generator\Generator
 {

src/Kunstmaan/GeneratorBundle/Generator/AdminTestsGenerator.php

@@ -12,6 +12,8 @@
 
 /**
  * Generates tests to test the admin backend generated by the default-site generator
+ *
+ * @interal
  */
 class AdminTestsGenerator extends Generator
 {

src/Kunstmaan/GeneratorBundle/Generator/ArticleGenerator.php

@@ -12,7 +12,7 @@
 use Symfony\Component\HttpKernel\Kernel;
 
 /**
- * Generates an Article section
+ * @internal
  */
 class ArticleGenerator extends KunstmaanGenerator
 {

src/Kunstmaan/GeneratorBundle/Generator/ConfigGenerator.php

@@ -9,7 +9,7 @@
 use Symfony\Component\Security\Http\Authenticator\AccessTokenAuthenticator;
 
 /**
- * Generates all config files
+ * @internal
  */
 class ConfigGenerator extends KunstmaanGenerator
 {

src/Kunstmaan/GeneratorBundle/Generator/DefaultPagePartGenerator.php

@@ -12,7 +12,7 @@
 use Symfony\Component\Yaml\Yaml;
 
 /**
- * Generates all classes/files for a new pagepart
+ * @internal
  */
 class DefaultPagePartGenerator extends KunstmaanGenerator
 {

src/Kunstmaan/GeneratorBundle/Generator/DefaultSiteGenerator.php

@@ -13,6 +13,8 @@
 
 /**
  * Generates a default website using several Kunstmaan bundles using default templates and assets
+ *
+ * @interal
  */
 class DefaultSiteGenerator extends KunstmaanGenerator
 {

src/Kunstmaan/GeneratorBundle/Generator/FormPageGenerator.php

@@ -6,7 +6,7 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * Generates all classes/files for a new formpage
+ * @internal
  */
 class FormPageGenerator extends KunstmaanGenerator
 {