contao-community-alliance · baumannsven · Feb 28, 2022 · Jul 18, 2020 · Nov 15, 2021 · Nov 15, 2021
diff --git a/.github/workflows/diagnostics.yml b/.github/workflows/diagnostics.yml
@@ -0,0 +1,49 @@
+name: DC General
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [7.3, 7.4]
+        contao: [~4.4.0, ~4.9.0]
+
+    steps:
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Pull source
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      # see https://github.com/shivammathur/setup-php
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Setup PHP.
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache composer cache directory
+        uses: actions/cache@v1
+        env:
+          cache-name: composer-cache-dir
+        with:
+          path: ~/.cache/composer
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache vendor directory
+        uses: actions/cache@v1
+        env:
+          cache-name: composer-vendor
+        with:
+          path: vendor
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Install composer dependencies
+        run: composer update --prefer-dist --no-interaction --no-suggest
+
+      - name: PHP ${{ matrix.php }} ${{ matrix.contao }} Run tests
+        run: ant -keep-going
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,7 @@ composer.lock
 .sass-cache
 build/
 .phpunit.result.cache
+
+# PHPCQ and related tools
+.php_cs.cache
+build.properties
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/contao-community-alliance/dc-general.png)](https://travis-ci.org/contao-community-alliance/dc-general)
+[![Build Status](https://github.com/contao-community-alliance/dc-general/actions/workflows/diagnostics.yml/badge.svg)](https://github.com/contao-community-alliance/dc-general/actions)
 [![Latest Version tagged](http://img.shields.io/github/tag/contao-community-alliance/dc-general.svg)](https://github.com/contao-community-alliance/dc-general/tags)
 [![Latest Version on Packagist](http://img.shields.io/packagist/v/contao-community-alliance/dc-general.svg)](https://packagist.org/packages/contao-community-alliance/dc-general)
 [![Installations via composer per month](http://img.shields.io/packagist/dm/contao-community-alliance/dc-general.svg)](https://packagist.org/packages/contao-community-alliance/dc-general)

diff --git a/composer.json b/composer.json
@@ -81,5 +81,11 @@
     },
     "scripts": {
         "php-cs-fixer": "php-cs-fixer fix --rules=@PSR2"
+    },
+    "config": {
+        "allow-plugins": {
+            "contao-components/installer": false,
+            "contao/manager-plugin": true
+        }
     }
 }
diff --git a/src/Cache/Http/InvalidCacheTags.php b/src/Cache/Http/InvalidCacheTags.php
@@ -3,7 +3,7 @@
 /**
  * This file is part of contao-community-alliance/dc-general.
  *
- * (c) 2013-2020 Contao Community Alliance.
+ * (c) 2013-2021 Contao Community Alliance.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,8 @@
  *
  * @package    contao-community-alliance/dc-general
  * @author     Sven Baumann <[email protected]>
- * @copyright  2013-2020 Contao Community Alliance.
+ * @author     David Molineus <[email protected]>
+ * @copyright  2013-2021 Contao Community Alliance.
  * @license    https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
@@ -146,7 +147,9 @@ private function addRelatedModelsTag(ModelInterface $model): void
 
         /** @var DefaultCollection $parentModels */
         $parentModels = $dataProvider
-            ->fetchAll($dataProvider->getEmptyConfig()->setFilter($parentCondition->getInverseFilterFor($model)));
+            ->fetchAll(
+                $dataProvider->getEmptyConfig()->setFilter((array) $parentCondition->getInverseFilterFor($model))
+            );
         foreach ($parentModels as $parentModel) {
             $this->addModelTag($parentModel);
         }

diff --git a/src/Contao/Subscriber/FallbackResetSubscriber.php b/src/Contao/Subscriber/FallbackResetSubscriber.php
@@ -3,7 +3,7 @@
 /**
  * This file is part of contao-community-alliance/dc-general.
  *
- * (c) 2013-2019 Contao Community Alliance.
+ * (c) 2013-2021 Contao Community Alliance.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,13 +14,15 @@
  * @author     Christian Schiffler <[email protected]>
  * @author     Sven Baumann <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2013-2019 Contao Community Alliance.
+ * @author     David Molineus <[email protected]>
+ * @copyright  2013-2021 Contao Community Alliance.
  * @license    https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 
 namespace ContaoCommunityAlliance\DcGeneral\Contao\Subscriber;
 
+use ContaoCommunityAlliance\DcGeneral\Controller\ModelCollector;
 use ContaoCommunityAlliance\DcGeneral\Data\ConfigInterface;
 use ContaoCommunityAlliance\DcGeneral\Data\ModelManipulator;
 use ContaoCommunityAlliance\DcGeneral\Event\AbstractModelAwareEvent;
@@ -160,9 +162,11 @@ private function determineFilterConfig(AbstractModelAwareEvent $event)
         );
 
         if (null !== $parentFilter) {
-            $parentConfig   = $dataProvider->getEmptyConfig()->setFilter($parentFilter->getInverseFilterFor($model));
-            $parentProvider = $environment->getDataProvider($parentFilter->getSourceName());
-            $parent         = $parentProvider->fetchAll($parentConfig)->get(0);
+            $parent = (new ModelCollector($environment))->searchParentOf($model);
+            if ($parent === null) {
+                return null;
+            }
+
             return $dataProvider->getEmptyConfig()->setFilter($parentFilter->getFilter($parent));
         }
 

diff --git a/src/Contao/View/Contao2BackendView/ActionHandler/ParentedListViewShowAllHandler.php b/src/Contao/View/Contao2BackendView/ActionHandler/ParentedListViewShowAllHandler.php
@@ -576,7 +576,7 @@ private function getGrandParentId(
         $grandParentProvider = $environment->getDataProvider($grandParentName);
 
         $config = $grandParentProvider->getEmptyConfig();
-        $config->setFilter($relationship->getInverseFilterFor($parentModel));
+        $config->setFilter((array) $relationship->getInverseFilterFor($parentModel));
 
         $parents = $grandParentProvider->fetchAll($config);
 

diff --git a/src/Contao/View/Contao2BackendView/ButtonRenderer.php b/src/Contao/View/Contao2BackendView/ButtonRenderer.php
@@ -4,6 +4,7 @@
  * This file is part of contao-community-alliance/dc-general.
  *
  * (c) 2013-2021 Contao Community Alliance.
+ * (c) 2013-2022 Contao Community Alliance.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +17,8 @@
  * @author     Sven Baumann <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
  * @author     Richard Henkenjohann <[email protected]>
- * @copyright  2013-2021 Contao Community Alliance.
+ * @author     David Molineus <[email protected]>
+ * @copyright  2013-2022 Contao Community Alliance.
  * @license    https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
@@ -124,13 +126,10 @@ public function __construct(EnvironmentInterface $environment)
         $this->circularModelIds = [];
 
         // We must only check for CUT operation here as pasting copy'ed parents is allowed.
-        $cutItems  = \array_filter(
-            $this->clipboardItems,
-            function ($item) {
-                /** @var ItemInterface $item */
-                return $item->getAction() === $item::CUT;
-            }
-        );
+        $cutItems  = \array_filter($this->clipboardItems, function ($item) {
+            /** @var ItemInterface $item */
+            return $item->getAction() === $item::CUT;
+        });
         $cutModels = $controller->getModelsFromClipboardItems($cutItems);
         $collector = new ModelCollector($environment);
         foreach ($cutModels as $model) {

diff --git a/src/Contao/View/Contao2BackendView/Subscriber/WidgetBuilder.php b/src/Contao/View/Contao2BackendView/Subscriber/WidgetBuilder.php
@@ -3,7 +3,7 @@
 /**
  * This file is part of contao-community-alliance/dc-general.
  *
- * (c) 2013-2021 Contao Community Alliance.
+ * (c) 2013-2022 Contao Community Alliance.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +16,7 @@
  * @author     Stefan Heimes <[email protected]>
  * @author     Sven Baumann <[email protected]>
  * @author     Richard Henkenjohann <[email protected]>
- * @copyright  2013-2021 Contao Community Alliance.
+ * @copyright  2013-2022 Contao Community Alliance.
  * @license    https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
@@ -483,9 +483,6 @@ private function prepareWidgetAttributes(ModelInterface $model, PropertyInterfac
             ],
             'options'   => $this->getOptionsForWidget($property, $model),
             'eval'      => $propExtra,
-            // @codingStandardsIgnoreStart
-            // 'foreignKey' => null
-            // @codingStandardsIgnoreEnd
         ];
 
         if (isset($propExtra['reference'])) {

diff --git a/src/Contao/View/Contao2BackendView/TreePicker.php b/src/Contao/View/Contao2BackendView/TreePicker.php
@@ -3,7 +3,7 @@
 /**
  * This file is part of contao-community-alliance/dc-general.
  *
- * (c) 2013-2021 Contao Community Alliance.
+ * (c) 2013-2022 Contao Community Alliance.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +16,9 @@
  * @author     Tristan Lins <[email protected]>
  * @author     Sven Baumann <[email protected]>
  * @author     Richard Henkenjohann <[email protected]>
- * @copyright  2013-2021 Contao Community Alliance.
+ * @author     Ingolf Steinhardt <[email protected]>
+ * @author     David Molineus <[email protected]>
+ * @copyright  2013-2022 Contao Community Alliance.
  * @license    https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */

diff --git a/src/Contao/View/Contao2BackendView/Widget/FileTree.php b/src/Contao/View/Contao2BackendView/Widget/FileTree.php
@@ -3,7 +3,7 @@
 /**
  * This file is part of contao-community-alliance/dc-general.
  *
- * (c) 2013-2021 Contao Community Alliance.
+ * (c) 2013-2022 Contao Community Alliance.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +16,7 @@
  * @author     Stefan Heimes <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
  * @author     Sven Baumann <[email protected]>
- * @copyright  2013-2021 Contao Community Alliance.
+ * @copyright  2013-2022 Contao Community Alliance.
  * @license    https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
@@ -370,19 +370,20 @@ protected function renderIcon($model, $imagesOnly = false, $downloads = false)
             return Image::getHtml($file->icon) . ' ' . $info;
         }
 
-        return $this->generateGalleryImage($model, $file, $info);
+        return $this->generateGalleryImage($file, $info);
     }
 
     /**
      * Generate an image for use as gallery listing.
      *
-     * @param FilesModel $model The file model in use.
      * @param File       $file  The image file being rendered.
      * @param string     $info  The image information.
      *
      * @return string
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function generateGalleryImage($model, File $file, $info)
+    private function generateGalleryImage(File $file, $info)
     {
         if ($file->viewWidth && $file->viewHeight
             && ($file->isSvgImage