Merge tag '2.2.0'

Stable release 2.2.0 This brings full Contao 4.9 support. Additionally there have been performance improvements and various bugfixes. - Overview of supported attributes - see #15 - Possibility of file upload including various parameters such as destination folder, dynamic paths, file name cleanup as well as thumbnails, etc. - Optional Dropzone.js support for one or more files - Support attributes "color picker" and "URL", which are output with two input fields each. - Configuration of input mask buttons in FEE incl. option for redirect page and "Do not save"; option for redirect page can be designed dynamically with "Simple Tokens - Connection of the Notification Center for sending e-mails when creating/copying/editing/deleting records in FEE - Support of "MCW" in FEE with (Vanilla Script) e.g. for attribute text table and multi-widget table for duplicating and sorting rows - Support Min/Max for attribute Text-Table and Multiwidget-Table in FEE - In FEE input mask the widgets have a CSS class consisting of prop-<column name attribute, so they are better arranged/styled by CSS - a clean exception is thrown if a record is not deletable - in the CE/Module "MetaModels Frontend Editing" you can now choose your own template for the wrapper - the default template includes a JavaScript and CSS for updating the mask on view conditions; additionally there is a template to choose from which does not include the two included files
MetaModels · Nov 21, 2022 · 975821c · 975821c
2 parents 9118cbe + d5f31b2
commit 975821c
Show file tree

Hide file tree

Showing 53 changed files with 2,595 additions and 207 deletions.
diff --git a/.check-author.yml b/.check-author.yml
@@ -3,3 +3,10 @@ exclude:
 
 ignore:
   - 'Mini Model <[email protected]>'
+
+mapping:
+  'Ingolf Steinhardt <[email protected]>':
+    - 'Ingolf Steinhardt <[email protected]>'
+    - 'xantippe <[email protected]>'
+    - 'zonky2 <[email protected]>'
+    - 'zonky <[email protected]>'
diff --git a/.github/workflows/diagnostics.yml b/.github/workflows/diagnostics.yml
@@ -0,0 +1,52 @@
+name: MetaModels contao-frontend-editing
+
+on:
+  push:
+    branches-ignore:
+      - '**-translation'
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [7.4]
+        contao: [~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
@@ -2,7 +2,7 @@
 .DS_Store
 Thumbs.db
 
-# IDEs 
+# IDEs
 .buildpath
 .project
 .settings/
@@ -18,3 +18,4 @@ composer.lock
 # build
 build/
 build.properties
+.phpunit.result.cache
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/MetaModels/contao-frontend-editing.png)](https://travis-ci.org/MetaModels/contao-frontend-editing)
+[![Build Status](https://github.com/MetaModels/contao-frontend-editing/actions/workflows/diagnostics.yml/badge.svg)](https://github.com/MetaModels/contao-frontend-editing/actions)
 [![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/contao-frontend-editing.svg)](https://github.com/MetaModels/contao-frontend-editing/tags)
 [![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/contao-frontend-editing.svg)](https://packagist.org/packages/MetaModels/contao-frontend-editing)
 [![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/contao-frontend-editing.svg)](https://packagist.org/packages/MetaModels/contao-frontend-editing)

diff --git a/build.default.properties b/build.default.properties
@@ -7,4 +7,5 @@
 
 phpcs.standard=${basedir}/vendor/phpcq/coding-standard/phpcs/PhpCodeQuality/ruleset.xml
 phpmd.ruleset=${basedir}/vendor/phpcq/coding-standard/phpmd/ruleset.xml
-phpcs.excluded=src/Resources/contao/languages
+phpcs.excluded=src/Resources/contao/languages\
+               ,src/Resources/public
diff --git a/build.xml b/build.xml
@@ -8,4 +8,5 @@ For documentation visit:
 -->
 <project name="metamodels-contao-frontend-editing" default="build">
     <import file="vendor/phpcq/phpcq/phpcq.main.xml" />
+    <target name="phpspec" />
 </project>
diff --git a/composer.json b/composer.json
@@ -1,65 +1,72 @@
 {
-    "name": "metamodels/contao-frontend-editing",
-    "description": "MetaModels frontend editing integrations",
-    "keywords": [
-        "contao",
-        "metamodels",
-        "frontend-editing"
-    ],
-    "type": "contao-bundle",
-    "homepage": "http://now.metamodel.me/",
-    "license": "LGPL-3.0-or-later",
-    "authors": [
-        {
-            "name": "Christian Schiffler",
-            "email": "[email protected]",
-            "homepage": "http://www.cyberspectrum.de",
-            "role": "Developer"
-        },
-        {
-            "name": "Stefan Heimes",
-            "email": "[email protected]",
-            "role": "Developer"
-        }
-    ],
-    "support": {
-        "email": "[email protected]",
-        "issues": "https://github.com/MetaModels/contao-frontend-editing/issues",
-        "wiki": "http://de.contaowiki.org/MetaModels",
-        "irc": "irc://irc.freenode.org/contao.mm",
-        "source": "https://github.com/MetaModels/contao-frontend-editing"
+  "name": "metamodels/contao-frontend-editing",
+  "description": "MetaModels frontend editing integrations",
+  "keywords": [
+    "contao",
+    "metamodels",
+    "frontend-editing"
+  ],
+  "type": "contao-bundle",
+  "homepage": "https://now.metamodel.me/",
+  "license": "LGPL-3.0-or-later",
+  "authors": [
+    {
+      "name": "Christian Schiffler",
+      "email": "[email protected]",
+      "homepage": "https://www.cyberspectrum.de",
+      "role": "Developer"
     },
-    "require": {
-        "php": "^7.1",
-        "contao-community-alliance/dc-general": "^2.1.5",
-        "contao-community-alliance/dc-general-contao-frontend": "^2.1",
-        "contao-community-alliance/url-builder": "^1.3",
-        "contao/core-bundle": "^4.4.8",
-        "menatwork/contao-multicolumnwizard-bundle": "^3.4",
-        "metamodels/core": "^2.1"
-    },
-    "require-dev": {
-        "contao/manager-plugin": "^2.1",
-        "phpcq/all-tasks": "^1.2"
-    },
-    "autoload": {
-        "psr-4": {
-            "MetaModels\\ContaoFrontendEditingBundle\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "MetaModels\\ContaoFrontendEditingBundle\\Test\\": "tests"
-        }
-    },
-    "extra": {
-        "contao-manager-plugin": "MetaModels\\ContaoFrontendEditingBundle\\ContaoManager\\Plugin",
-        "branch-alias": {
-            "dev-master": "2.1.x-dev",
-            "dev-support/2.0": "2.0.x-dev"
-        }
-    },
-    "config": {
-        "sort-packages": true
+    {
+      "name": "Stefan Heimes",
+      "email": "[email protected]",
+      "role": "Developer"
     }
+  ],
+  "support": {
+    "email": "[email protected]",
+    "issues": "https://github.com/MetaModels/contao-frontend-editing/issues",
+    "wiki": "https://de.contaowiki.org/MetaModels",
+    "irc": "irc://irc.freenode.org/contao.mm",
+    "source": "https://github.com/MetaModels/contao-frontend-editing"
+  },
+  "require": {
+    "php": "^7.4",
+    "ext-pdo": "*",
+    "contao-community-alliance/dc-general": "^2.2",
+    "contao-community-alliance/dc-general-contao-frontend": "^2.2.1",
+    "contao-community-alliance/url-builder": "^1.3",
+    "contao/core-bundle": "^4.9.0, <4.13.0",
+    "menatwork/contao-multicolumnwizard-bundle": "^3.4",
+    "metamodels/core": "^2.2",
+    "symfony/http-foundation": "^4.4.6"
+  },
+  "require-dev": {
+    "contao/manager-plugin": "^2.8",
+    "phpcq/all-tasks": "^1.2",
+    "terminal42/notification_center": "^1.5.8"
+  },
+  "autoload": {
+    "psr-4": {
+      "MetaModels\\ContaoFrontendEditingBundle\\": "src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "MetaModels\\ContaoFrontendEditingBundle\\Test\\": "tests"
+    }
+  },
+  "extra": {
+    "contao-manager-plugin": "MetaModels\\ContaoFrontendEditingBundle\\ContaoManager\\Plugin",
+    "branch-alias": {
+      "dev-feature/2.2.0": "2.2.x-dev"
+    }
+  },
+  "config": {
+    "allow-plugins": {
+      "contao-community-alliance/composer-plugin": false,
+      "contao-components/installer": false,
+      "contao/manager-plugin": false
+    },
+    "sort-packages": true
+  }
 }
diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php
@@ -3,7 +3,7 @@
 /**
  * This file is part of MetaModels/contao-frontend-editing.
  *
- * (c) 2012-2019 The MetaModels team.
+ * (c) 2012-2020 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,8 @@
  *
  * @package    MetaModels/contao-frontend-editing
  * @author     Richard Henkenjohann <[email protected]>
- * @copyright  2012-2019 The MetaModels team.
+ * @author     Sven Baumann <[email protected]>
+ * @copyright  2012-2020 The MetaModels team.
  * @license    https://github.com/MetaModels/contao-frontend-editing/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
@@ -39,7 +40,8 @@ public function getBundles(ParserInterface $parser)
             BundleConfig::create(MetaModelsContaoFrontendEditingBundle::class)
                 ->setLoadAfter(
                     [
-                        MetaModelsCoreBundle::class
+                        MetaModelsCoreBundle::class,
+                        'notification_center'
                     ]
                 )
                 ->setReplace(['metamodels-contao-frontend-editing'])

diff --git a/src/DependencyInjection/MetaModelsContaoFrontendEditingExtension.php b/src/DependencyInjection/MetaModelsContaoFrontendEditingExtension.php
@@ -3,7 +3,7 @@
 /**
  * This file is part of MetaModels/contao-frontend-editing.
  *
- * (c) 2012-2019 The MetaModels team.
+ * (c) 2012-2020 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,8 @@
  *
  * @package    MetaModels/contao-frontend-editing
  * @author     Richard Henkenjohann <[email protected]>
- * @copyright  2012-2019 The MetaModels team.
+ * @author     Sven Baumann <[email protected]>
+ * @copyright  2012-2020 The MetaModels team.
  * @license    https://github.com/MetaModels/contao-frontend-editing/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
@@ -36,5 +37,10 @@ public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('listeners.yml');
+
+        if (\array_key_exists('notification_center', $container->getParameter('kernel.bundles'))) {
+            $loader->load('notification/backend_listeners.yml');
+            $loader->load('notification/frontend_listeners.yml');
+        }
     }
 }