[BUGFIX] Fix doctrine dependencies and pin to dbal 2.7 13/57613/10
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Mon, 16 Jul 2018 14:57:30 +0000 (16:57 +0200)
committerAndreas Wolf <andreas.wolf@typo3.org>
Wed, 18 Jul 2018 19:18:45 +0000 (21:18 +0200)
Since our code does not work with doctrine/dbal 2.8.0
we for now pin to the previous minor release.

A hidden dependency to doctrine/collections is also
removed by using the ExpressionBuilder constant instead.

Used command:

composer require doctrine/dbal ~2.7.0

Resolves: #85575
Related: #85552
Releases: master
Change-Id: Icc8d41c566cf39d15a4eae500b8b216a44689dce
Reviewed-on: https://review.typo3.org/57613
Reviewed-by: Helmut Hummel <typo3@helhum.io>
Tested-by: Helmut Hummel <typo3@helhum.io>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Andreas Wolf <andreas.wolf@typo3.org>
Tested-by: Andreas Wolf <andreas.wolf@typo3.org>
composer.json
composer.lock
typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
typo3/sysext/core/composer.json

index a2b87e0..7a09394 100644 (file)
@@ -38,7 +38,7 @@
                "ext-xml": "*",
                "cogpowered/finediff": "~0.3.1",
                "doctrine/annotations": "^1.3",
-               "doctrine/dbal": "^2.7",
+               "doctrine/dbal": "~2.7.0",
                "doctrine/instantiator": "~1.0.4",
                "doctrine/lexer": "^1.0",
                "guzzlehttp/guzzle": "^6.3.0",
index 3401a01..de4c5bc 100644 (file)
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "aaf1db876f7b24fb81c6bfba76365511",
+    "content-hash": "1ab1ed9fd305d2ea65bd018ab16745e1",
     "packages": [
         {
             "name": "cogpowered/finediff",
         },
         {
             "name": "doctrine/dbal",
-            "version": "v2.7.1",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "11037b4352c008373561dc6fc836834eed80c3b5"
+                "reference": "c0e5736016a51b427a8cba8bc470fbea78165819"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/11037b4352c008373561dc6fc836834eed80c3b5",
-                "reference": "11037b4352c008373561dc6fc836834eed80c3b5",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/c0e5736016a51b427a8cba8bc470fbea78165819",
+                "reference": "c0e5736016a51b427a8cba8bc470fbea78165819",
                 "shasum": ""
             },
             "require": {
                 "persistence",
                 "queryobject"
             ],
-            "time": "2018-04-07T18:44:18+00:00"
+            "time": "2018-07-13T04:49:01+00:00"
         },
         {
             "name": "doctrine/inflector",
index 9aece71..8c914e9 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Backend\View\BackendLayout;
  * The TYPO3 project - inspiring people to share!
  */
 
-use Doctrine\Common\Collections\Expr\Comparison;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Resource\FileRepository;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -155,12 +155,12 @@ class DefaultDataProvider implements DataProviderInterface
                     $queryBuilder->expr()->andX(
                         $queryBuilder->expr()->comparison(
                             $queryBuilder->createNamedParameter($pageTsConfigId[$fieldName], \PDO::PARAM_INT),
-                            Comparison::EQ,
+                            ExpressionBuilder::EQ,
                             $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
                         ),
                         $queryBuilder->expr()->comparison(
                             $queryBuilder->createNamedParameter($storagePid, \PDO::PARAM_INT),
-                            Comparison::EQ,
+                            ExpressionBuilder::EQ,
                             $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
                         )
                     ),
@@ -177,7 +177,7 @@ class DefaultDataProvider implements DataProviderInterface
                     $queryBuilder->expr()->andX(
                         $queryBuilder->expr()->comparison(
                             $queryBuilder->createNamedParameter($pageTsConfigId[$fieldName], \PDO::PARAM_INT),
-                            Comparison::EQ,
+                            ExpressionBuilder::EQ,
                             $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
                         ),
                         $queryBuilder->expr()->eq(
index d6055e3..b24beba 100644 (file)
@@ -20,7 +20,7 @@
                "ext-xml": "*",
                "cogpowered/finediff": "~0.3.1",
                "doctrine/annotations": "^1.3",
-               "doctrine/dbal": "^2.7",
+               "doctrine/dbal": "~2.7.0",
                "doctrine/instantiator": "~1.0.4",
                "doctrine/lexer": "^1.0",
                "guzzlehttp/guzzle": "^6.3.0",