From 5bfa8605b79e8e4d627942a86a67c7689e8f7a63 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Fri, 25 Dec 2015 11:17:05 +0100 Subject: [PATCH 1/2] default to not check login on backend even in dev mode --- CHANGELOG.md | 8 +++++++- DependencyInjection/DoctrinePHPCRExtension.php | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4adb96e3..77aef016 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ Changelog ========= +1.3.1 +----- + +* Reverted jackalope.check_login_on_server depending on kernel.debug because + it caused too many chicken and egg problems. That value now defaults to false. + 1.2.1 ----- * Added support for priorities. This fixes a regression whereby the new CMF initializer services would - be executed in an arbitry order, causing unresolvable conflicts. + be executed in an arbitrary order, causing unresolvable conflicts. 1.2.0-RC1 --------- diff --git a/DependencyInjection/DoctrinePHPCRExtension.php b/DependencyInjection/DoctrinePHPCRExtension.php index 90a59485..00187bbc 100644 --- a/DependencyInjection/DoctrinePHPCRExtension.php +++ b/DependencyInjection/DoctrinePHPCRExtension.php @@ -212,7 +212,7 @@ private function loadJackalopeSession(array $session, ContainerBuilder $containe $backendParameters += $session['backend']['parameters']; // only set this default here when we know we are jackalope if (!isset($backendParameters['jackalope.check_login_on_server'])) { - $backendParameters['jackalope.check_login_on_server'] = $container->getParameter('kernel.debug'); + $backendParameters['jackalope.check_login_on_server'] = false; } if ('doctrinedbal' === $type && $backendParameters['jackalope.check_login_on_server']) { From 0c6d777c43f250811bf8efa45416fb049d01c666 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 28 Dec 2015 10:52:19 +0100 Subject: [PATCH 2/2] readd conflict rules for the FrameworkBundle --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 31521ccd..b23fad65 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "prefer-stable": true, "require": { "php": "^5.3.9|~7.0", - "symfony/framework-bundle": "~2.3.27|^2.6.6|~3.0", + "symfony/framework-bundle": "~2.3|~3.0", "symfony/doctrine-bridge": "~2.3|~3.0", "phpcr/phpcr-implementation": "2.1.*", "phpcr/phpcr-utils": "^1.2.7" @@ -43,7 +43,8 @@ "burgov/key-value-form-bundle": "to edit assoc multivalue properties. require version 1.0.*" }, "conflict": { - "phpcr/phpcr-shell": "<1.0.0-beta1" + "phpcr/phpcr-shell": "<1.0.0-beta1", + "symfony/framework-bundle": "<2.3.27|>=2.4.0,<2.6.6" }, "autoload": { "psr-4": { "Doctrine\\Bundle\\PHPCRBundle\\": "" }