Merge tag '2.0.3'

Maintenance release Code and build cosmetics
MetaModels · Jan 14, 2019 · f5e168c · f5e168c
2 parents f6889e5 + 0bce903
commit f5e168c
Show file tree

Hide file tree

Showing 16 changed files with 145 additions and 118 deletions.
diff --git a/.check-author.yml b/.check-author.yml
@@ -1,19 +1,19 @@
 ignore:
-  - "Mini Model <[email protected]>"
-  - "Scrutinizer Auto-Fixer <[email protected]>"
+  - 'Mini Model <[email protected]>'
+  - 'Scrutinizer Auto-Fixer <[email protected]>'
 
 exclude:
-  languages
+  - /^contao\/languages/
 
 mapping:
-  "Andreas Isaak <[email protected]>": "Andreas Isaak <[email protected]>"
-  "Stefan Heimes <[email protected]>":
-    - "Stefan heimes <[email protected]>"
-    - "chibineko <[email protected]>"
-    - "stefanheimes <[email protected]>"
-    - "Stefan Heimes <[email protected]>"
-  "Christopher Boelter <[email protected]>":
-    - "cogizz <[email protected]>"
-    - "cboelter <[email protected]>"
-    - "Christopher Boelter <[email protected]>"
-    - "Christopher Bölter <[email protected]>"
+  'Andreas Isaak <[email protected]>': 'Andreas Isaak <[email protected]>'
+  'Stefan Heimes <[email protected]>':
+    - 'Stefan heimes <[email protected]>'
+    - 'chibineko <[email protected]>'
+    - 'stefanheimes <[email protected]>'
+    - 'Stefan Heimes <[email protected]>'
+  'Christopher Boelter <[email protected]>':
+    - 'cogizz <[email protected]>'
+    - 'cboelter <[email protected]>'
+    - 'Christopher Boelter <[email protected]>'
+    - 'Christopher Bölter <[email protected]>'
diff --git a/.gitattributes b/.gitattributes
@@ -1,8 +1,10 @@
-.check-author.yml
+.check-author.yml export-ignore
 .gitattributes 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
diff --git a/.travis.yml b/.travis.yml
@@ -1,26 +1,47 @@
+dist: xenial
+
+addons:
+  apt:
+    packages:
+      - ant-optional
+
 language: php
 
 php:
+  - "7.3"
   - "7.2"
   - "7.1"
   - "7.0"
   - "5.6"
 
 env:
- - CONTAO_VERSION=~3.5.5
-
-sudo: false
+  - CONTAO_VERSION=~3.5.5
 
-before_install:
-  - echo "memory_limit = -1" > travis.php.ini && phpenv config-add travis.php.ini
-
-install:
+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
+  - >
+    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]} \
+        || echo dev-${TRAVIS_BRANCH})
+    fi
+  - echo "Using root version ${COMPOSER_ROOT_VERSION}"
   - travis_retry composer update --prefer-dist --no-interaction
 
 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
diff --git a/composer.json b/composer.json
@@ -33,15 +33,14 @@
   },
   "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",
-    "contao-community-alliance/composer-plugin": "~2.0",
-    "contao-community-alliance/dc-general": "~2.0@beta",
-    "metamodels/core": "~2.0@alpha"
+    "metamodels/core": "^2.0"
   },
   "require-dev": {
-    "cyberspectrum/contao-toolbox": "~0.6",
-    "phpcq/all-tasks": "~1.0",
-    "metamodels/base-unit-tests": "~1.0"
+    "metamodels/base-unit-tests": "~1.0",
+    "phpcq/all-tasks": "^1.2"
   },
   "conflict": {
     "contao/core": "3.4.0"
@@ -55,17 +54,14 @@
     "contao": {
       "symlinks": {
         "contao": "system/modules/metamodelsattribute_text"
-      },
-      "transifex": {
-        "project": "metamodels",
-        "prefix": "attribute_text-",
-        "languages_cto": "contao/languages",
-        "languages_tx": ".tx"
       }
     },
     "branch-alias": {
       "dev-master": "2.0.x-dev",
       "dev-develop": "2.1.x-dev"
     }
+  },
+  "config": {
+    "sort-packages": true
   }
 }
diff --git a/contao/config/autoload.php b/contao/config/autoload.php
@@ -3,20 +3,19 @@
 /**
  * This file is part of MetaModels/attribute_text.
  *
- * (c) 2012-2017 The MetaModels team.
+ * (c) 2012-2019 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage AttributeText
+ * @package    MetaModels/attribute_text
  * @author     Christian Schiffler <[email protected]>
  * @author     Andreas Isaak <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2012-2017 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0
+ * @copyright  2012-2019 The MetaModels team.
+ * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 

diff --git a/contao/config/event_listeners.php b/contao/config/event_listeners.php
@@ -3,19 +3,18 @@
 /**
  * This file is part of MetaModels/attribute_text.
  *
- * (c) 2012-2017 The MetaModels team.
+ * (c) 2012-2019 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage AttributeText
+ * @package    MetaModels/attribute_text
  * @author     Christopher Boelter <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2012-2017 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0
+ * @copyright  2012-2019 The MetaModels team.
+ * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 

diff --git a/contao/dca/tl_metamodel_attribute.php b/contao/dca/tl_metamodel_attribute.php
@@ -3,21 +3,20 @@
 /**
  * This file is part of MetaModels/attribute_text.
  *
- * (c) 2012-2017 The MetaModels team.
+ * (c) 2012-2019 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage AttributeText
+ * @package    MetaModels/attribute_text
  * @author     Christian Schiffler <[email protected]>
  * @author     Andreas Isaak <[email protected]>
  * @author     Christopher Boelter <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2012-2017 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0
+ * @copyright  2012-2019 The MetaModels team.
+ * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 

diff --git a/contao/dca/tl_metamodel_dcasetting.php b/contao/dca/tl_metamodel_dcasetting.php
@@ -3,22 +3,21 @@
 /**
  * This file is part of MetaModels/attribute_text.
  *
- * (c) 2012-2018 The MetaModels team.
+ * (c) 2012-2019 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage AttributeText
+ * @package    MetaModels/attribute_text
  * @author     Christian Schiffler <[email protected]>
  * @author     Stefan Heimes <[email protected]>
  * @author     Andreas Isaak <[email protected]>
  * @author     Christopher Boelter <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2012-2018 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0
+ * @copyright  2012-2019 The MetaModels team.
+ * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 

diff --git a/ctb.json b/ctb.json
@@ -0,0 +1,28 @@
+{
+  "transifex": {
+    "project": "metamodels",
+    "prefix": "attribute_text-",
+    "languages_cto": "contao/languages",
+    "languages_tx": ".tx",
+    "php-file-header": [
+      "This file is part of MetaModels/attribute_text.",
+      "",
+      "(c) 2012-$$year$$ The MetaModels team.",
+      "",
+      "For the full copyright and license information, please view the LICENSE",
+      "file that was distributed with this source code.",
+      "",
+      "This project is provided in good faith and hope to be usable by anyone.",
+      "",
+      "Translations are managed automatically using Transifex. To create a new translation",
+      "or to help to maintain an existing one, please register at transifex.com.",
+      "",
+      "Last-updated: $$lastchanged$$",
+      "",
+      "@copyright 2012-$$year$$ The MetaModels team.",
+      "@license   https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0-or-later",
+      "@link      https://www.transifex.com/metamodels/public/",
+      "@link      https://www.transifex.com/signup/?join_project=metamodels"
+    ]
+  }
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,31 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-		 backupStaticAttributes="false"
-		 colors="true"
-		 convertErrorsToExceptions="true"
-		 convertNoticesToExceptions="true"
-		 convertWarningsToExceptions="true"
-		 processIsolation="false"
-		 stopOnFailure="false"
-		 syntaxCheck="false"
-		 bootstrap="tests/bootstrap.php"
-		>
-	<testsuites>
-		<testsuite name="MetaModels attribute text tests">
-			<directory>./tests/MetaModels/</directory>
-		</testsuite>
-	</testsuites>
-
-	<groups>
-		<exclude>
-			<group>slow</group>
-		</exclude>
-	</groups>
-
-	<filter>
-		<whitelist>
-			<directory>./src/MetaModels/</directory>
-		</whitelist>
-	</filter>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
+         colors="true"
+         forceCoversAnnotation="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         beStrictAboutChangesToGlobalState="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutResourceUsageDuringSmallTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         bootstrap="vendor/autoload.php"
+>
+    <testsuites>
+        <testsuite name="MetaModels attribute for text tests">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>./src</directory>
+        </whitelist>
+    </filter>
 </phpunit>
diff --git a/src/MetaModels/Attribute/Text/AttributeTypeFactory.php b/src/MetaModels/Attribute/Text/AttributeTypeFactory.php
@@ -3,19 +3,18 @@
 /**
  * This file is part of MetaModels/attribute_text.
  *
- * (c) 2012-2017 The MetaModels team.
+ * (c) 2012-2019 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage AttributeText
+ * @package    MetaModels/attribute_text
  * @author     Christopher Boelter <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2012-2017 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0
+ * @copyright  2012-2019 The MetaModels team.
+ * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 

diff --git a/src/MetaModels/Attribute/Text/BackendSubscriber.php b/src/MetaModels/Attribute/Text/BackendSubscriber.php
@@ -3,19 +3,18 @@
 /**
  * This file is part of MetaModels/attribute_text.
  *
- * (c) 2012-2017 The MetaModels team.
+ * (c) 2012-2019 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * This project is provided in good faith and hope to be usable by anyone.
  *
- * @package    MetaModels
- * @subpackage AttributeText
+ * @package    MetaModels/attribute_text
  * @author     Christopher Boelter <[email protected]>
  * @author     Ingolf Steinhardt <[email protected]>
- * @copyright  2012-2017 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0
+ * @copyright  2012-2019 The MetaModels team.
+ * @license    https://github.com/MetaModels/attribute_text/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */