Merge tag '2.1.1'

Hotfix release 2.1.1

- Update all meta files like git, composer, travis, etc.
- Correct a bunch of errors like php doc, author validation errors and so on

Author: stefanheimes

.check-author.yml

@@ -1,3 +1,14 @@
-# Paths to exclude from scanning (equivalent to cmd line parameter --exclude=...)
+ignore:
+  - "Mini Model <[email protected]>"
+  - "Scrutinizer Auto-Fixer <[email protected]>"
+
 exclude:
-  - contao/languages
+  - /^src\/Resources\/contao\/languages/
+
+
+mapping:
+    "Andreas Dziemba <[email protected]>":
+        - "Andreas Dziemba <[email protected]>"
+        - "Andreas Dziemba <[email protected]>"
+        - "adziemba <[email protected]>"
+        - "Andreas Dziemba <dziemba@men-at-work-de>"

.gitattributes

@@ -2,9 +2,9 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
-travis.php.ini 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

.gitignore

@@ -13,7 +13,7 @@ nbproject/
 
 # composer related
 vendor/
-composer.lock
 
 # build
 build/
+composer.lock

.travis.yml

@@ -1,31 +1,62 @@
+dist: xenial
+
+addons:
+  apt:
+    packages:
+      - ant-optional
+
 language: php
 
 php:
-  - "5.4"
-  - "5.5"
-  - "5.6"
-  - "7.0"
+  - "7.3"
+  - "7.2"
   - "7.1"
 
 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:
-
-sudo: false
-
-before_install:
-  - phpenv config-add travis.php.ini
-
-install:
+  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 update --prefer-dist --no-interaction
-
+  - 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|release)/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
+        && echo ${BASH_REMATCH[2]} \
+        || echo dev-${TRAVIS_BRANCH})
+    fi
+  - echo "Using root version ${COMPOSER_ROOT_VERSION}"
+  - >
+    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
 
 # Hack to make things work again - we can not use a shallow repository.
 git:
   depth: 2147483647
+
+branches:
+  except:
+    - /.*-translation/
+
+cache:
+  directories:
+    - vendor

LICENSE

@@ -162,4 +162,4 @@ General Public License ever published by the Free Software Foundation.
 whether future versions of the GNU Lesser General Public License shall
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
-Library.
+Library.

README.md

@@ -1,10 +1,24 @@
-Translated multi table
-======================
+[![Build Status](https://travis-ci.org/MetaModels/attribute_translatedtablemulti.svg)](https://travis-ci.org/MetaModels/attribute_translatedtablemulti/branches)
+[![Latest Version tagged](http://img.shields.io/github/tag/MetaModels/attribute_translatedtablemulti.svg)](https://github.com/MetaModels/attribute_translatedtablemulti/tags)
+[![Latest Version on Packagist](http://img.shields.io/packagist/v/MetaModels/attribute_translatedtablemulti.svg)](https://packagist.org/packages/MetaModels/attribute_translatedtablemulti)
+[![Installations via composer per month](http://img.shields.io/packagist/dm/MetaModels/attribute_translatedtablemulti.svg)](https://packagist.org/packages/MetaModels/attribute_translatedtablemulti)
 
-The translated multi table attribute.
+# The translated multi attribute table
 
-With this attribute you are able to create complex table structures with the MultiColumnWizard.
-Create a config in the initConfig or somewhere else and write something like this:
+The translated multi attribute table for MetaModels.
+
+
+## Original idea by Byteworks:
+- [Ronny Binder](mailto:[email protected])
+- [Michael Bischof](mailto:[email protected])
+
+
+## The translated table multi attribute.
+
+With this attribute you are able to create complex table structures with the [MultiColumnWizard]( https://github.com/menatwork/contao-multicolumnwizard-bundle).
+Create the configuration in e.g. the app/Resources/contao/config/dcaconfig.php or somewhere else where the config is loaded and write something like this:
+
+The `mm_test` is the name of the table and the `multi_test` is the name of the field.
 
 ```php
 $GLOBALS['TL_CONFIG']['metamodelsattribute_multi']['mm_test']['multi_test'] = array(
@@ -35,13 +49,11 @@ $GLOBALS['TL_CONFIG']['metamodelsattribute_multi']['mm_test']['multi_test'] = ar
             'inputType' => 'text',
             'eval'      => array
             (
-                'style'=>'width:130px', 
+                'style'    =>'width:130px', 
                 'mandatory'=>false, 
-                'rgxp'=>'url'
+                'rgxp'     =>'url'
             )
         ),
     ),
 );
-```
-
-The `mm_test` is the name of the table and the `multi_test` is the name of the field.
+```

build.default.properties

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

build.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  This project is using the PHP code quality project (PHPCQ).
-
  For documentation visit:
    https://github.com/phpcq/phpcq
-
 -->
-<project name="metamodels/attribute_translatedtabletext" default="build">
-    <import file="vendor/phpcq/phpcq/phpcq.main.xml"/>
-</project>
+<project name="metamodels/attribute_translatedtablemulti" default="build">
+    <import file="vendor/phpcq/phpcq/phpcq.main.xml" />
+</project>

composer.json

@@ -1,19 +1,31 @@
 {
-  "name": "menatwork/attribute_translatedmulti",
-  "description": "MetaModels attribute for dynamic translated multi table",
+  "name": "metamodels/attribute_translatedtablemulti",
+  "description": "MetaModels attribute for dynamic translated multi attribute table",
   "keywords": [
     "contao",
     "metamodels",
     "attribute",
-    "text",
-    "tabletext",
+    "multi",
+    "tablemulti",
     "translatable",
     "multicolumnwizard"
   ],
-  "type": "contao-module",
-  "homepage": "http://www.men-at-work.de/",
-  "license": "LGPL-3.0+",
+  "type": "contao-bundle",
+  "homepage": "http://now.metamodel.me/",
+  "license": "LGPL-3.0-or-later",
   "authors": [
+    {
+      "name": "Ronny Binder",
+      "email": "[email protected]",
+      "homepage": "https://www.byteworks.ch",
+      "role": "Originator"
+    },
+    {
+      "name": "Michael Bischof",
+      "email": "[email protected]",
+      "homepage": "https://www.byteworks.ch",
+      "role": "Originator"
+    },
     {
       "name": "Christian Schiffler",
       "email": "[email protected]",
@@ -24,42 +36,49 @@
       "name": "Stefan Heimes",
       "email": "[email protected]",
       "role": "Developer"
+    },
+    {
+      "name": "Andreas Dziemba",
+      "email": "[email protected]",
+      "role": "Developer"
     }
   ],
   "support": {
-    "issues": "https://github.com/menatwork/attribute_translatedmulti/issues",
-    "source": "https://github.com/menatwork/attribute_translatedmulti"
+    "email": "[email protected]",
+    "issues": "https://github.com/MetaModels/attribute_translatedtablemulti/issues",
+    "source": "https://github.com/MetaModels/attribute_translatedtablemulti"
   },
   "require": {
-    "php": ">=5.4",
-    "contao/core": "^3.5.5",
-    "contao-community-alliance/composer-plugin": "~2.0",
-    "contao-community-alliance/dc-general": "~2.0@beta",
-    "metamodels/core": "~2.0@alpha"
+    "php": "^7.1",
+    "contao-community-alliance/dc-general": "^2.1.3",
+    "contao/core-bundle": "^4.4.8",
+    "metamodels/core": "^2.1.1",
+    "symfony/dependency-injection": "^3.3 || ^4.0",
+    "symfony/http-kernel": "^3.3 || ^4.0",
+    "ext-pdo": "*"
   },
   "require-dev": {
-    "cyberspectrum/contao-toolbox": "~0.6",
-    "phpcq/all-tasks": "~1.1",
-    "metamodels/base-unit-tests": "~1.0"
-  },
-  "conflict": {
-    "contao/core": "3.4.0"
+    "contao/manager-plugin": "^2.1",
+    "menatwork/contao-multicolumnwizard-bundle": "^3.4",
+    "phpcq/all-tasks": "^1.2"
   },
   "autoload": {
-    "psr-0": {
-      "MetaModels": "src/"
+    "psr-4": {
+      "MetaModels\\AttributeTranslatedTableMultiBundle\\": "src"
+    },
+    "files": [
+      "src/deprecated-autoload.php"
+    ]
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "MetaModels\\AttributeTranslatedTableMultiBundle\\Test\\": "tests/Test"
     }
   },
   "extra": {
-    "contao": {
-      "symlinks": {
-        "contao": "system/modules/metamodelsattribute_translatedmulti"
-      }
-    },
+    "contao-manager-plugin": "MetaModels\\AttributeTranslatedTableMultiBundle\\ContaoManager\\Plugin",
     "branch-alias": {
-      "dev-master": "2.1.x-dev",
-      "dev-develop": "2.2.x-dev"
+      "dev-master": "2.1.x-dev"
     }
-  },
-  "prefer-stable": true
+  }
 }