diff --git a/composer.json b/composer.json index a2b87e06b63fad53a517f7e871f8b03f1f586d4f..7a09394ed9f797ef23936d3ce6db04576b292325 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/composer.lock b/composer.lock index 3401a01aae1b5be24e4e9541c1669698528a4fd5..de4c5bc6fdae2acbc4d38a0186f0bbfca5916f11 100644 --- a/composer.lock +++ b/composer.lock @@ -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", @@ -337,16 +337,16 @@ }, { "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": { @@ -408,7 +408,7 @@ "persistence", "queryobject" ], - "time": "2018-04-07T18:44:18+00:00" + "time": "2018-07-13T04:49:01+00:00" }, { "name": "doctrine/inflector", diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php b/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php index 9aece716b4e275f58720964d80f6e5deddee42e6..8c914e9384db28b919bfc21305e36785be1114bf 100644 --- a/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php +++ b/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php @@ -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( diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json index d6055e33f86b02c31fadb3c084c98c30924e2eb8..b24bebaae6d3e3624e010bff1e0fe770abaf93f6 100644 --- a/typo3/sysext/core/composer.json +++ b/typo3/sysext/core/composer.json @@ -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",