Skip to content

Commit

Permalink
Merge pull request #250 from xabbuh/default-no-check-deps-fix
Browse files Browse the repository at this point in the history
 default to not check login on backend even in dev mode
  • Loading branch information
lsmith77 committed Dec 28, 2015
2 parents 93d03e3 + 0c6d777 commit 703b2b0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
---------
Expand Down
2 changes: 1 addition & 1 deletion DependencyInjection/DoctrinePHPCRExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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']) {
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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\\": "" }
Expand Down

0 comments on commit 703b2b0

Please sign in to comment.