Merge tag '2.1.0' into master

This is a maintenance release.

Reveled to #28

Author: baumannsven

.check-author.yml

@@ -1,6 +1,5 @@
-exclude:
-  - contao/languages
-  - /^contao\/languages/
-
 ignore:
   - 'Mini Model <minimodel@metamodel.me>'
+
+exclude:
+  - /^src\/Resources\/contao\/languages/

.travis.yml

@@ -11,26 +11,42 @@ php:
   - "7.3"
   - "7.2"
   - "7.1"
-  - "7.0"
-  - "5.6"
 
 env:
-  - CONTAO_VERSION=~3.5.5
+  - CONTAO_VERSION=~4.7.0
+  - CONTAO_VERSION=~4.6.0
+  - CONTAO_VERSION=~4.5.0
+  - CONTAO_VERSION=~4.4.0
+
+# Exclude impossible Contao Version combinations.
+matrix:
+  exclude:
+  fast_finish: true
+  allow_failures:
+    - env: CONTAO_VERSION=~4.7.0
+    - env: CONTAO_VERSION=~4.6.0
+    - env: CONTAO_VERSION=~4.5.0
 
 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
+  - travis_retry composer require contao/core-bundle $CONTAO_VERSION --no-update
   - >
     if [ "x${TRAVIS_TAG}" != "x" ]; then
       export COMPOSER_ROOT_VERSION=${TRAVIS_TAG}
     else
-      export COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ hotfix/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
-        && echo ${BASH_REMATCH[1]} \
+      export COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ (hotfix|release)/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
+        && echo ${BASH_REMATCH[2]} \
         || echo dev-${TRAVIS_BRANCH})
     fi
   - echo "Using root version ${COMPOSER_ROOT_VERSION}"
-  - travis_retry composer update --prefer-dist --no-interaction
+  - >
+    echo "PHP version: ${TRAVIS_PHP_VERSION}";
+    if [ "x${TRAVIS_PHP_VERSION}" == "xnightly" ]; then
+      travis_retry composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-suggest
+    else
+      travis_retry composer update --prefer-dist --no-interaction --no-suggest
+    fi
 
 script: ant -keep-going
 

build.default.properties

@@ -7,3 +7,4 @@
 
 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

composer.json

@@ -8,7 +8,7 @@
     "file",
     "translatable"
   ],
-  "type": "contao-module",
+  "type": "contao-bundle",
   "homepage": "http://now.metamodel.me/",
   "license": "LGPL-3.0-or-later",
   "authors": [
@@ -32,33 +32,38 @@
     "source": "https://github.com/MetaModels/attribute_translatedfile"
   },
   "require": {
-    "php": "^5.6 || ^7.0",
-    "contao-community-alliance/composer-plugin": "^2.4",
-    "contao-community-alliance/dc-general": "^2.0.0",
-    "contao/core": "^3.5.5",
-    "metamodels/core": "^2.0"
+    "php": "^7.1",
+    "contao-community-alliance/dc-general": "^2.1.3",
+    "contao/core-bundle": "^4.4.8",
+    "metamodels/core": "^2.1.1",
+    "metamodels/attribute_file": "^2.1.1",
+    "symfony/dependency-injection": "^3.3 || ^4.0",
+    "symfony/http-kernel": "^3.3 || ^4.0"
   },
   "require-dev": {
-    "metamodels/base-unit-tests": "^1.0.4",
+    "contao/manager-plugin": "^2.1",
+    "menatwork/contao-multicolumnwizard-bundle": "^3.4",
     "phpcq/all-tasks": "^1.2"
   },
   "autoload": {
-    "psr-0": {
-      "MetaModels": "src/"
+    "psr-4": {
+      "MetaModels\\AttributeTranslatedFileBundle\\": "src"
+    },
+    "files": [
+      "src/deprecated-autoload.php"
+    ]
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "MetaModels\\AttributeTranslatedFileBundle\\Test\\": "tests"
     }
   },
   "extra": {
-    "contao": {
-      "symlinks": {
-        "contao": "system/modules/metamodelsattribute_translatedfile"
-      }
-    },
+    "contao-manager-plugin": "MetaModels\\AttributeTranslatedFileBundle\\ContaoManager\\Plugin",
     "branch-alias": {
-      "dev-master": "2.0.x-dev",
-      "dev-develop": "2.1.x-dev"
+      "dev-master": "2.1.x-dev"
     }
   },
-  "prefer-stable": true,
   "config": {
     "sort-packages": true
   }

contao/config/autoload.ini

@@ -2,7 +2,7 @@
   "transifex": {
     "project": "metamodels",
     "prefix": "attribute_translatedfile-",
-    "languages_cto": "contao/languages",
+    "languages_cto": "src/Resources/contao/languages",
     "languages_tx": ".tx",
     "php-file-header": [
       "This file is part of MetaModels/attribute_translatedfile.",