Merge tag '2.0.6'

Maintenance build

Final preprarations for 2.1

Author: discordier

.check-author.yml

@@ -1,35 +1,35 @@
 ignore:
-#  Mini Model <minimodel@metamodel.me>
+  - 'Mini Model <minimodel@metamodel.me>'
 
 exclude:
-  languages
+  - /^contao\/languages/
 
 mapping:
-  "Andreas Isaak <info@andreas-isaak.de>": "Andreas Isaak <andy.jared@googlemail.com>"
-  "Stefan Heimes <stefan_heimes@hotmail.com>":
-    - "Stefan heimes <stefan_heimes@hotmail.com>"
-    - "chibineko <stefan_heimes@hotmail.com>"
-    - "stefanheimes <stefan_heimes@hotmail.com>"
-    - "Stefan Heimes <cms@men-at-work.de>"
-  "David Maack <david.maack@arcor.de>":
-    - "David Maack <maack@men-at-work.de>"
-    - "davidmaack <david.maack@arcor.de>"
-  "Christopher Boelter <christopher@boelter.eu>":
-    - "cogizz <c.boelter@cogizz.de>"
-    - "cboelter <christopher@boelter.eu>"
-    - "Christopher Boelter <c.boelter@cogizz.de>"
-    - "Christopher Bölter <c.boelter@cogizz.de>"
-  "Martin Treml <github@r2pi.net>": "MrTool <github@r2pi.net>"
-  "Andreas Nölke <zero@brothers-project.de>": "Zeromax <zero@brothers-project.de>"
-  "Ondrej Brinkel <Sam256@web.de>": "Ondrej <Sam256@web.de>"
-  "Tim Becker <please.tim@metamodel.me>": "Tim Becker <tim@westwerk.ac>"
-  "Ingolf Steinhardt <info@e-spin.de>":
-    - "xantippe <info@e-spin.de>"
-    - "zonky2 <info@e-spin.de>"
-  "binron <rtb@gmx.ch>": "binron <rtb@gmx.ch>"
-  "Jeremie Constant <j.constant@imi.de>":
-    - "JeremieConstant <j.constant@imi.de>"
+  'Andreas Isaak <info@andreas-isaak.de>': 'Andreas Isaak <andy.jared@googlemail.com>'
+  'Stefan Heimes <stefan_heimes@hotmail.com>':
+    - 'Stefan heimes <stefan_heimes@hotmail.com>'
+    - 'chibineko <stefan_heimes@hotmail.com>'
+    - 'stefanheimes <stefan_heimes@hotmail.com>'
+    - 'Stefan Heimes <cms@men-at-work.de>'
+  'David Maack <david.maack@arcor.de>':
+    - 'David Maack <maack@men-at-work.de>'
+    - 'davidmaack <david.maack@arcor.de>'
+  'Christopher Boelter <christopher@boelter.eu>':
+    - 'cogizz <c.boelter@cogizz.de>'
+    - 'cboelter <christopher@boelter.eu>'
+    - 'Christopher Boelter <c.boelter@cogizz.de>'
+    - 'Christopher Bölter <c.boelter@cogizz.de>'
+  'Martin Treml <github@r2pi.net>': 'MrTool <github@r2pi.net>'
+  'Andreas Nölke <zero@brothers-project.de>': 'Zeromax <zero@brothers-project.de>'
+  'Ondrej Brinkel <Sam256@web.de>': 'Ondrej <Sam256@web.de>'
+  'Tim Becker <please.tim@metamodel.me>': 'Tim Becker <tim@westwerk.ac>'
+  'Ingolf Steinhardt <info@e-spin.de>':
+    - 'xantippe <info@e-spin.de>'
+    - 'zonky2 <info@e-spin.de>'
+  'binron <rtb@gmx.ch>': 'binron <rtb@gmx.ch>'
+  'Jeremie Constant <j.constant@imi.de>':
+    - 'JeremieConstant <j.constant@imi.de>'
 
 copy-left:
-  "Christoph Wiechert <christoph.wiechert@4wardmedia.de>": MetaModels/Widgets/PickerWidget.php
-  "Andreas Nölke <zero@brothers-project.de>": MetaModels/Widgets/PickerWidget.php
+  'Christoph Wiechert <christoph.wiechert@4wardmedia.de>': MetaModels/Widgets/PickerWidget.php
+  'Andreas Nölke <zero@brothers-project.de>': MetaModels/Widgets/PickerWidget.php

.gitattributes

@@ -1,9 +1,10 @@
 .check-author.yml export-ignore
 .gitattributes export-ignore
-.github export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
 build.default.properties export-ignore
 build.xml export-ignore
 phpunit.xml.dist export-ignore
+/.github export-ignore
 /tests export-ignore
+ctb.json export-ignore

.travis.yml

@@ -1,42 +1,39 @@
 language: php
- 
+
 php:
   - "7.2"
   - "7.1"
   - "7.0"
   - "5.6"
 
 env:
-  - CONTAO_VERSION=~3.5.0
+  - CONTAO_VERSION=~3.5.5
 
-sudo: false
- 
 before_script:
   - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - travis_retry composer self-update && composer --version
   - travis_retry composer require contao/core $CONTAO_VERSION --no-update
-  # We have to supply the branch alias here again as travis checks out a commit hash and therefore destroys the
-  # circular dependency metamodels/base-unit-tests -> metamodels/core -> metamodels/base-unit-tests.
   - >
     if [ "x${TRAVIS_TAG}" != "x" ]; then
-      COMPOSER_ROOT_VERSION=${TRAVIS_TAG} travis_retry composer update --prefer-dist --no-interaction;
+      export COMPOSER_ROOT_VERSION=${TRAVIS_TAG}
     else
-      COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ hotfix/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
+      export COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ hotfix/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
         && echo ${BASH_REMATCH[1]} \
-        || echo dev-${TRAVIS_BRANCH}) \
-        travis_retry composer update --prefer-dist --no-interaction;
+        || echo dev-${TRAVIS_BRANCH})
     fi
+  - echo "Using root version ${COMPOSER_ROOT_VERSION}"
+  - travis_retry composer update --prefer-dist --no-interaction
 
 script: ant -keep-going
 
-after_success:
-  - bash <(curl -s https://copilot.blackducksoftware.com/ci/travis/scripts/upload)
-
 # Hack to make things work again - we can not use a shallow repository.
 git:
   depth: 2147483647
 
-# This used to cause corruption due to travis bug travis-ci/travis-ci#4393 - hopefully it works out now.
+branches:
+  except:
+    - /.*-translation/
+
 cache:
   directories:
     - vendor

README.md

@@ -2,7 +2,6 @@
 [![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/core.svg)](https://github.com/MetaModels/core/tags)
 [![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/core.svg)](https://packagist.org/packages/MetaModels/core)
 [![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/core.svg)](https://packagist.org/packages/MetaModels/core)
-[![Dependency Status](https://www.versioneye.com/php/metamodels:core/badge.svg)](https://www.versioneye.com/php/metamodels:core)
 
 MetaModels
 ==========

composer.json

@@ -31,8 +31,8 @@
   },
   "require": {
     "php": "^5.6 || ^7.0",
-    "contao-community-alliance/composer-plugin": "~2.4",
-    "contao-community-alliance/dc-general": "^2.0.0-beta42@beta",
+    "contao-community-alliance/composer-plugin": "^2.4",
+    "contao-community-alliance/dc-general": "^2.0.0-beta49@beta",
     "contao-community-alliance/dependency-container": "^1.8",
     "contao-community-alliance/event-dispatcher": "~1.3",
     "contao-community-alliance/events-contao-bindings": "^3.5",
@@ -44,10 +44,9 @@
     "menatwork/contao-multicolumnwizard": "^3.3.16"
   },
   "require-dev": {
-    "cyberspectrum/contao-toolbox": "~0.7",
     "metamodels/base-unit-tests": "^1.0.4",
     "metamodels/phpunit-contao-database": "^1.0.1",
-    "phpcq/all-tasks": "~1.2"
+    "phpcq/all-tasks": "^1.2"
   },
   "autoload": {
     "psr-0": {
@@ -64,12 +63,6 @@
       "sources": {
         "contao": "system/modules/metamodels"
       },
-      "transifex": {
-        "project": "metamodels",
-        "prefix": "core-",
-        "languages_cto": "contao/languages",
-        "languages_tx": ".tx"
-      },
       "runonce": [
         "runonce/runonce.php"
       ]
@@ -78,5 +71,8 @@
       "dev-master": "2.0.x-dev",
       "dev-develop": "2.1.x-dev"
     }
+  },
+  "config": {
+    "sort-packages": true
   }
 }

contao/config/autoload.php

@@ -10,8 +10,7 @@
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage Core
+ * @package    MetaModels/core
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
  * @author     Andreas Isaak <info@andreas-isaak.de>
  * @author     Christopher Bölter <c.boelter@cogizz.de>

contao/config/config.php

@@ -10,8 +10,7 @@
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage Core
+ * @package    MetaModels/core
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
  * @author     Andreas Isaak <info@andreas-isaak.de>
  * @author     David Maack <david.maack@arcor.de>

contao/config/event_listeners.php

@@ -10,8 +10,7 @@
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage Core
+ * @package    MetaModels/core
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
  * @author     Christopher Boelter <christopher@boelter.eu>
  * @author     Stefan Heimes <stefan_heimes@hotmail.com>

contao/config/services.php

@@ -10,8 +10,7 @@
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage Core
+ * @package    MetaModels/core
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
  * @author     Sven Baumann <baumann.sv@gmail.com>
  * @copyright  2012-2018 The MetaModels team.

contao/dca/tl_content.php

@@ -10,8 +10,7 @@
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage Core
+ * @package    MetaModels/core
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
  * @author     Andreas Isaak <info@andreas-isaak.de>
  * @author     David Maack <david.maack@arcor.de>