.travis.yml

@@ -12,25 +12,34 @@ sudo: false
 env:
   global:
     - COMPOSER_ALLOW_XDEBUG=0
-    - SYMFONY_DEPRECATIONS_HELPER=weak
+    - SYMFONY_DEPRECATIONS_HELPER='weak_vendors'
 
 matrix:
   include:
+    # Latest dependencies with all PHP versions
     - php: 5.6
     - php: 7.0
     - php: 7.1
     - php: 7.2
+
+    # Generate the coverage with the latest PHP version
     - php: 7.2
+      env: COVERAGE='--exclude-group contao3 --coverage-clover build/logs/clover.xml'
+
+    # Lowest dependencies with the oldest and latest PHP versions
+    - php: 5.6
       env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
     - php: 7.2
-      env: COVERAGE='--exclude-group contao3 --coverage-clover build/logs/clover.xml'
+      env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable'
   fast_finish: true
 
 before_install:
-  - composer selfupdate
+ - if [[ ! $COVERAGE ]]; then phpenv config-rm xdebug.ini || true; fi
 
-before_script:
-  - travis_wait composer update $COMPOSER_FLAGS --no-interaction
+install:
+  # To be removed when this is resolved: https://github.com/composer/composer/issues/5355
+  - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --no-interaction --quiet; fi
+  - composer update $COMPOSER_FLAGS --no-interaction
 
 script:
   - if [[ $COVERAGE ]]; then mkdir -p build/logs; fi

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Contao core bundle change log
 
+### 4.4.13 (2018-01-23)
+
+ * Quote reserved words in database queries (see #1262).
+
 ### 4.4.12 (2018-01-03)
 
  * Do not resend activation mails for active members (see #1234).

composer.json

@@ -2,7 +2,7 @@
     "name": "contao/core-bundle",
     "type": "symfony-bundle",
     "description": "Contao 4 core bundle",
-    "license": "LGPL-3.0+",
+    "license": "LGPL-3.0-or-later",
     "authors": [
         {
             "name": "Leo Feyer",
@@ -14,39 +14,6 @@
         "ext-dom": "*",
         "ext-gd": "*",
         "ext-pcre": "*",
-        "symfony/console": "^3.3.7",
-        "symfony/filesystem": "^3.3",
-        "symfony/finder": "^3.3",
-        "symfony/framework-bundle": "^3.3",
-        "symfony/http-foundation": "^3.3.5",
-        "symfony/security": "^3.3",
-        "symfony/yaml": "^3.3",
-        "sensio/framework-extra-bundle": "^3.0.2",
-        "symfony/swiftmailer-bundle": "^2.3",
-        "doctrine/dbal": "^2.5",
-        "doctrine/doctrine-bundle": "^1.6",
-        "doctrine/doctrine-cache-bundle": "^1.3",
-        "imagine/imagine": "^0.6|^0.7",
-        "knplabs/knp-menu-bundle": "^2.1",
-        "knplabs/knp-time-bundle": "^1.5.2",
-        "leafo/scssphp": "^0.6",
-        "league/uri": "^4.0",
-        "matthiasmullie/minify": "^1.3",
-        "michelf/php-markdown": "^1.4",
-        "nelmio/cors-bundle": "^1.5.3",
-        "oyejorge/less.php": "^1.7",
-        "patchwork/utf8": "^1.2",
-        "phpspec/php-diff": "^1.0",
-        "phpunit/php-token-stream": "^1.4",
-        "psr/log": "^1.0",
-        "simplepie/simplepie": "^1.3",
-        "tecnickcom/tcpdf": "^6.0",
-        "true/punycode": "^2.1",
-        "terminal42/header-replay-bundle": "^1.2",
-        "twig/twig": "^1.26",
-        "webmozart/path-util": "^2.0",
-        "contao/image": "^0.3.1",
-        "contao/imagine-svg": "^0.1.2|^0.2",
         "contao-components/ace": "^1.2",
         "contao-components/chosen": "^1.1.6",
         "contao-components/colorbox": "^1.6",
@@ -67,7 +34,47 @@
         "contao-components/swipe": "^2.0.3",
         "contao-components/tablesort": "^3.4.5",
         "contao-components/tablesorter": "^2.0.5.3",
-        "contao-components/tinymce4": "4.6.*"
+        "contao-components/tinymce4": "4.6.*",
+        "contao/image": "^0.3.1",
+        "contao/imagine-svg": "^0.1.2|^0.2",
+        "doctrine/dbal": "^2.5",
+        "doctrine/doctrine-bundle": "^1.6",
+        "doctrine/doctrine-cache-bundle": "^1.3",
+        "imagine/imagine": "^0.6|^0.7",
+        "knplabs/knp-menu-bundle": "^2.1",
+        "knplabs/knp-time-bundle": "^1.5.2",
+        "leafo/scssphp": "^0.6",
+        "league/uri": "^4.0",
+        "matthiasmullie/minify": "^1.3",
+        "michelf/php-markdown": "^1.4",
+        "nelmio/cors-bundle": "^1.5.3",
+        "oyejorge/less.php": "^1.7",
+        "patchwork/utf8": "^1.2",
+        "phpspec/php-diff": "^1.0",
+        "phpunit/php-token-stream": "^1.4",
+        "psr/log": "^1.0",
+        "sensio/framework-extra-bundle": "^3.0.2",
+        "simplepie/simplepie": "^1.3",
+        "symfony/console": "^3.3.7",
+        "symfony/filesystem": "^3.3",
+        "symfony/finder": "^3.3",
+        "symfony/framework-bundle": "^3.3",
+        "symfony/http-foundation": "^3.3.5",
+        "symfony/security": "^3.3",
+        "symfony/swiftmailer-bundle": "^2.3",
+        "symfony/yaml": "^3.3",
+        "tecnickcom/tcpdf": "^6.0",
+        "terminal42/header-replay-bundle": "1.3.*",
+        "true/punycode": "^2.1",
+        "twig/twig": "^1.26",
+        "webmozart/path-util": "^2.0"
+    },
+    "conflict": {
+        "contao/core": "*",
+        "contao/manager-plugin": "<2.0 || >=3.0",
+        "doctrine/doctrine-migrations-bundle": "<1.1",
+        "doctrine/orm": "<2.4",
+        "symfony/swiftmailer-bundle": "2.6.* <2.6.2"
     },
     "require-dev": {
         "ext-fileinfo": "*",
@@ -76,24 +83,25 @@
         "doctrine/doctrine-migrations-bundle": "^1.1",
         "doctrine/orm": "^2.5",
         "friendsofphp/php-cs-fixer": "^2.0",
-        "lexik/maintenance-bundle": "^2.0",
+        "lexik/maintenance-bundle": "^2.1.3",
         "monolog/monolog": "^1.22",
-        "phpunit/phpunit": "^5.7.11",
         "php-http/guzzle6-adapter": "^1.1",
         "php-http/message-factory": "^1.0.2",
+        "phpunit/phpunit": "^5.7.26",
         "satooshi/php-coveralls": "^1.0",
         "symfony/phpunit-bridge": "^3.3.11"
     },
     "suggest": {
         "lexik/maintenance-bundle": "To put the application into maintenance mode"
     },
-    "conflict": {
-        "contao/core": "*",
-        "contao/manager-plugin": "<2.0 || >=3.0",
-        "doctrine/orm": "<2.4",
-        "doctrine/doctrine-migrations-bundle": "<1.1",
-        "swiftmailer/swiftmailer": "<5.4.5",
-        "symfony/swiftmailer-bundle": "2.6.* <2.6.2"
+    "config": {
+        "preferred-install": "dist"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-4.4": "4.4.x-dev"
+        },
+        "contao-manager-plugin": "Contao\\CoreBundle\\ContaoManager\\Plugin"
     },
     "autoload": {
         "psr-4": {
@@ -102,16 +110,16 @@
         "classmap": [
             "src/Resources/contao/"
         ],
+        "files": [
+            "src/Resources/functions/utf8_bootup.php"
+        ],
         "exclude-from-classmap": [
             "src/Resources/contao/config/",
             "src/Resources/contao/dca/",
             "src/Resources/contao/helper/",
             "src/Resources/contao/languages/",
             "src/Resources/contao/templates/",
             "src/Resources/contao/themes/"
-        ],
-        "files": [
-            "src/Resources/functions/utf8_bootup.php"
         ]
     },
     "autoload-dev": {
@@ -120,19 +128,10 @@
             "Contao\\TestBundle\\": "tests/Fixtures/vendor/contao/test-bundle/"
         }
     },
-    "config": {
-        "preferred-install": "dist"
-    },
     "support": {
-        "docs": "https://docs.contao.org",
-        "forum": "https://community.contao.org",
         "issues": "https://github.com/contao/core-bundle/issues",
-        "source": "https://github.com/contao/core-bundle"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-4.4": "4.4.x-dev"
-        },
-        "contao-manager-plugin": "Contao\\CoreBundle\\ContaoManager\\Plugin"
+        "forum": "https://community.contao.org",
+        "source": "https://github.com/contao/core-bundle",
+        "docs": "https://docs.contao.org"
     }
 }

src/Analyzer/HtaccessAnalyzer.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Cache/ContaoCacheClearer.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Cache/ContaoCacheWarmer.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Command/AbstractLockedCommand.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Command/AutomatorCommand.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Command/DoctrineMigrationsDiffCommand.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Command/FilesyncCommand.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Command/InstallCommand.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Command/SymlinksCommand.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Command/UserPasswordCommand.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Command/VersionCommand.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Composer/ScriptHandler.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Config/Dumper/CombinedFileDumper.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Config/Dumper/DumperInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Config/Loader/PhpFileLoader.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Config/Loader/XliffFileLoader.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Config/ResourceFinder.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/Config/ResourceFinderInterface.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */

src/ContaoCoreBundle.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Contao.
  *
- * Copyright (c) 2005-2017 Leo Feyer
+ * Copyright (c) 2005-2018 Leo Feyer
  *
  * @license LGPL-3.0+
  */