Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 15c0d48

Browse filesBrowse files
author
Robin Chalas
committed
Merge branch '4.0' into 4.1
* 4.0: Fix merge [HttpKernel] Fix resetting DumpDataCollector::$isCollected [Framework][Workflow] Added support for interfaces
2 parents 6e0818d + 57fc15b commit 15c0d48
Copy full SHA for 15c0d48

File tree

3 files changed

+3
-4
lines changed
Filter options

3 files changed

+3
-4
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
283283
->prototype('scalar')
284284
->cannotBeEmpty()
285285
->validate()
286-
->ifTrue(function ($v) { return !class_exists($v); })
287-
->thenInvalid('The supported class %s does not exist.')
286+
->ifTrue(function ($v) { return !class_exists($v) && !interface_exists($v); })
287+
->thenInvalid('The supported class or interface "%s" does not exist.')
288288
->end()
289289
->end()
290290
->end()

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
8080
$listener = $container->setDefinition($listenerId, new ChildDefinition('security.authentication.listener.guard'));
8181
$listener->replaceArgument(2, $id);
8282
$listener->replaceArgument(3, $authenticators);
83-
$listener->addMethodCall('setSessionAuthenticationStrategy', array(new Reference('security.authentication.session_strategy.'.$id)));
8483

8584
// determine the entryPointId to use
8685
$entryPointId = $this->determineEntryPoint($defaultEntryPoint, $config);

‎src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function reset()
124124
}
125125
$this->data = array();
126126
$this->dataCount = 0;
127-
$this->isCollected = false;
127+
$this->isCollected = true;
128128
$this->clonesCount = 0;
129129
$this->clonesIndex = 0;
130130
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.