Pimcore 6.5 compatibility (#131)

* Pimcore 6.5 compatibility
* fix some notice exceptions
* set error level

Author: solverat

.travis.yml

@@ -18,19 +18,20 @@ env:
         - SYMFONY_DEPRECATIONS_HELPER=weak
         - DACHCOM_TEST_SECTION=codeception
         - SYMFONY_VERSION=^4.0
+        - PIMCORE_PHP_ERROR_REPORTING=32767 # E_ALL
 matrix:
     include:
-        -   name: "PHPStan Static Analysis (Pimcore 6.3.x, Symfony ^4.0, PHP 7.3)"
+        -   name: "PHPStan Static Analysis (Pimcore 6.5.x, Symfony ^4.0, PHP 7.4)"
             sudo: required
-            php: 7.3
+            php: 7.4
             env:
-                - PIMCORE_SKELETON_BRANCH="tags/v2.3.0"
+                - PIMCORE_SKELETON_BRANCH="tags/v2.5.0"
                 - DACHCOM_TEST_SECTION=phpstan
-        -   name: "PHP ECS (Pimcore 6.3.x, Symfony ^4.0, PHP 7.3)"
+        -   name: "PHP ECS (Pimcore 6.5.x, Symfony ^4.0, PHP 7.4)"
             sudo: required
-            php: 7.3
+            php: 7.4
             env:
-                - PIMCORE_SKELETON_BRANCH="tags/v2.3.0"
+                - PIMCORE_SKELETON_BRANCH="tags/v2.5.0"
                 - DACHCOM_TEST_SECTION=ecs
         -   name: "Codeception Tests (Pimcore 6.0.x, Symfony ^4.3, PHP 7.3)"
             sudo: required
@@ -50,25 +51,36 @@ matrix:
             env:
                 - SYMFONY_VERSION="~4.3.0"
                 - PIMCORE_SKELETON_BRANCH="tags/v2.2.0"
-        -   name: "Codeception Tests (Pimcore 6.3.x, Symfony ^4.0, PHP 7.2)"
+        -   name: "Codeception Tests (Pimcore 6.3.x, Symfony ^4.0, PHP 7.3)"
             sudo: required
-            php: 7.2
+            php: 7.3
             env:
+                - PIMCORE_PHP_ERROR_REPORTING=30711 # E_ALL & ~E_NOTICE & ~E_STRICT
                 - PIMCORE_SKELETON_BRANCH="tags/v2.3.0"
-        -   name: "Codeception Tests (Pimcore 6.3.x, Symfony ^4.0, PHP 7.3)"
+        -   name: "Codeception Tests (Pimcore 6.4.x, Symfony ^4.0, PHP 7.3)"
             sudo: required
             php: 7.3
             env:
-                - PIMCORE_SKELETON_BRANCH="tags/v2.3.0"
-        -   name: "Codeception Tests (Pimcore 6.3.x, Symfony ^3.4, PHP 7.3)"
+                - PIMCORE_SKELETON_BRANCH="tags/v2.4.0"
+        -   name: "Codeception Tests (Pimcore 6.5.x, Symfony ^4.0, PHP 7.3)"
+            sudo: required
+            php: 7.3
+            env:
+                - PIMCORE_SKELETON_BRANCH="tags/v2.5.0"
+        -   name: "Codeception Tests (Pimcore 6.5.x, Symfony ^3.4, PHP 7.3)"
             sudo: required
             php: 7.3
             env:
                 - SYMFONY_VERSION=^3.4
-                - PIMCORE_SKELETON_BRANCH="tags/v2.3.0"
+                - PIMCORE_SKELETON_BRANCH="tags/v2.5.0"
+        -   name: "Codeception Tests (Pimcore 6.5.x, Symfony ^4.0, PHP 7.4)"
+            sudo: required
+            php: 7.4
+            env:
+                - PIMCORE_SKELETON_BRANCH="tags/v2.5.0"
     allow_failures:
         -   env:
-                - PIMCORE_SKELETON_BRANCH="tags/v2.3.0"
+                - PIMCORE_SKELETON_BRANCH="tags/v2.5.0"
                 - DACHCOM_TEST_SECTION=ecs
     fast_finish: true
 

README.md

@@ -15,15 +15,15 @@ The Toolbox is a Kickstarter for your every day project. It provides some import
 
 | Release | Supported Pimcore Versions        | Supported Symfony Versions | Release Date | Maintained     | Branch     |
 |---------|-----------------------------------|----------------------------|--------------|----------------|------------|
-| **3.x** | `6.0` - `6.3`                     | `3.4`, `^4.0`              | 16.07.2019   | Feature Branch | master     |
+| **3.x** | `6.0` - `6.5`                     | `3.4`, `^4.0`              | 16.07.2019   | Feature Branch | master     |
 | **2.8** | `5.4`, `5.5`, `5.6`, `5.7`, `5.8` | `3.4`                      | 30.06.2019   | Bugfix only    | 2.8        |
 | **1.8** | `4.0`                             | --                         | 28.04.2017   | Unsupported    | pimcore4   |
 
 ### Installation  
 
 ```json
 "require" : {
-    "dachcom-digital/toolbox" : "~3.1.0"
+    "dachcom-digital/toolbox" : "~3.2.0"
 }
 ```
 

UPGRADE.md

@@ -6,6 +6,9 @@
 After every update you should check the pimcore extension manager. 
 Just click the "update" button or execute the migration command to finish the bundle update.
 
+#### Update from Version 3.1.x to Version 3.2.0
+- **[NEW FEATURE]**: Pimcore 6.4.0 and Pimcore 6.5.0 ready
+
 #### Update from Version 3.x to Version 3.1.0
 - **[NEW FEATURE]**: Pimcore 6.3.0 ready
 - **[BUG FIX]**: [Fix wrong index in bootstrap tabs for active element](https://github.com/dachcom-digital/pimcore-toolbox/issues/119)

src/ToolboxBundle/Builder/BrickConfigBuilder.php

@@ -515,13 +515,15 @@ private function checkDependingSystemField($configElementName, $configFields)
 
             $parsedTagConfig = ['reload' => false];
             $additionalConfig = [
-                'type'            => 'columnadjuster',
-                'editmode_hidden' => false,
-                'col_class'       => '',
-                'name'            => 'columnadjuster',
-                'title'           => null,
-                'edit_reload'     => false,
+                'type'                       => 'columnadjuster',
+                'editmode_hidden'            => false,
+                'col_class'                  => '',
+                'name'                       => 'columnadjuster',
+                'title'                      => null,
+                'edit_reload'                => false,
+                'additional_classes_element' => false
             ];
+
             $configFields[] = ['tag_config' => $parsedTagConfig, 'additional_config' => $additionalConfig];
         }
 

src/ToolboxBundle/Controller/AjaxController.php

@@ -50,8 +50,8 @@ public function videoGetTypesAction(Request $request, ConfigManagerInterface $co
                         'name'   => $name,
                         'value'  => $name,
                         'config' => [
-                            'allow_lightbox' => $settings['allow_lightbox'],
-                            'id_label'       => $settings['id_label']
+                            'allow_lightbox' => $settings['allow_lightbox'] ?? false,
+                            'id_label'       => $settings['id_label'] ?? null
                         ]
                     ];
                 }

src/ToolboxBundle/DependencyInjection/Configuration.php

@@ -245,6 +245,7 @@ public function getConfigNode(NodeDefinition $rootNode)
                     ->end()
                 ->end()
                 ->arrayNode('area_block_configuration')
+                    ->addDefaultsIfNotSet()
                     ->children()
                         ->arrayNode('toolbar')
                             ->children()

src/ToolboxBundle/Manager/AreaManager.php

@@ -180,8 +180,14 @@ private function getAvailableBricks($type = null)
     {
         $areaElements = $this->getActiveBricks();
 
-        // @deprecated: remove in 4.0
-        $disallowedSubAreas = $this->configManager->getConfig('disallowed_subareas');
+        try {
+            // @deprecated: remove in 4.0
+            $disallowedSubAreas = $this->configManager->getConfig('disallowed_subareas');
+        } catch (\Exception $e) {
+            // skip notice exceptions: this node is allowed to be missed!
+            $disallowedSubAreas = [];
+        }
+
         $depElementDisallowed = isset($disallowedSubAreas[$type]) ? $disallowedSubAreas[$type]['disallowed'] : [];
 
         $areaAppearance = $this->configManager->getConfig('areas_appearance');
@@ -229,8 +235,13 @@ private function getAvailableBricksForSnippets($type)
     {
         $areaElements = $this->getActiveBricks();
 
-        // @deprecated: remove in 4.0
-        $disallowedSubAreas = $this->configManager->getConfig('disallowed_content_snippet_areas');
+        try {
+            // @deprecated: remove in 4.0
+            $disallowedSubAreas = $this->configManager->getConfig('disallowed_content_snippet_areas');
+        } catch (\Exception $e) {
+            // skip notice exceptions: this node is allowed to be missed!
+            $disallowedSubAreas = [];
+        }
 
         $areaAppearance = $this->configManager->getConfig('snippet_areas_appearance');
         $elementAllowed = isset($areaAppearance[$type]) ? $areaAppearance[$type]['allowed'] : [];

src/ToolboxBundle/Resources/views/Admin/AreaConfig/Elements/tag.html.twig

@@ -1 +1,2 @@
+{% set editmode = editmode is defined ? editmode : null %}
 {{ toolbox_document_tag(type, tag_name, tag_config) }}

src/ToolboxBundle/Resources/views/Helper/areablock.html.twig

@@ -1,6 +1,7 @@
 {% set block_name = name ? name : 'default' %}
 {% set block_type = type ? type : null %}
 {% set block_config = toolbox_areablock_config(block_type) %}
+{% set editmode = editmode is defined ? editmode : null %}
 
 {% if block_config.allowed|length > 0 %}
     {{ pimcore_areablock('c' ~ block_name, block_config) }}

src/ToolboxBundle/Resources/views/Snippet/teaser-default.html.twig

@@ -5,13 +5,17 @@
 {% set linkTarget = null %}
 
 {% if useDynamicLinks == true %}
-    {% set hasLink = pimcore_dynamiclink('link').isEmpty() == false %}
-    {% set link = hasLink ? pimcore_dynamiclink('link').getHref() : null %}
-    {% set linkTarget = hasLink ? pimcore_dynamiclink('link').getTarget() : null %}
+    {% set linkElement = pimcore_dynamiclink('link') %}
+    {% set hasLink = linkElement.isEmpty() == false %}
+    {% set linkElementData = hasLink ? linkElement.data : [] %}
+    {% set link = hasLink ? linkElement.href : null %}
+    {% set linkTarget = hasLink and linkElementData.target is defined ? linkElement.target : null %}
 {% else %}
-    {% set hasLink = pimcore_link('link', {'class' : 'btn btn-default teaser-link'}).isEmpty() == false %}
-    {% set link = hasLink ? pimcore_link('link').getHref() : null %}
-    {% set linkTarget = hasLink ? pimcore_link('link').getTarget() : null %}
+    {% set linkElement = pimcore_link('link') %}
+    {% set hasLink = linkElement.isEmpty() == false %}
+    {% set linkElementData = hasLink ? linkElement.data : [] %}
+    {% set link = hasLink ? linkElement.href : null %}
+    {% set linkTarget = hasLink and linkElementData.target is defined ? linkElement.target : null %}
 {% endif %}
 
 <div class="single-teaser default {{ useLightBox ? 'light-box' : '' }}">