Merge branch '2.1' into 2.2

* 2.1: fixed a circular call (closes symfony#6864) Correct comment in NativeSessionStorage regarding session.save_handler [Security] Add PHPDoc to AuthenticationEvents

Author: fabpot

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -958,23 +958,25 @@ private function getDefinitionsFromArguments(array $arguments)
  *
  * @return Boolean
  */
- private function hasReference($id, array $arguments, $deep = false)
+ private function hasReference($id, array $arguments, $deep = false, $visited = array())
  {
  foreach ($arguments as $argument) {
  if (is_array($argument)) {
- if ($this->hasReference($id, $argument, $deep)) {
+ if ($this->hasReference($id, $argument, $deep, $visited)) {
  return true;
  }
  } elseif ($argument instanceof Reference) {
  if ($id === (string) $argument) {
  return true;
  }
 
- if ($deep) {
+ if ($deep && !isset($visited[(string) $argument])) {
+ $visited[(string) $argument] = true;
+
  $service = $this->container->getDefinition((string) $argument);
  $arguments = array_merge($service->getMethodCalls(), $service->getArguments(), $service->getProperties());
 
- if ($this->hasReference($id, $arguments, $deep)) {
+ if ($this->hasReference($id, $arguments, $deep, $visited)) {
  return true;
  }
  }

src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php

@@ -332,9 +332,9 @@ public function setOptions(array $options)
  * Registers save handler as a PHP session handler.
  *
  * To use internal PHP session save handlers, override this method using ini_set with
- * session.save_handlers and session.save_path e.g.
+ * session.save_handler and session.save_path e.g.
  *
- * ini_set('session.save_handlers', 'files');
+ * ini_set('session.save_handler', 'files');
  * ini_set('session.save_path', /tmp');
  *
  * @see http://php.net/session-set-save-handler

src/Symfony/Component/Security/Core/AuthenticationEvents.php

@@ -13,7 +13,26 @@
 
 final class AuthenticationEvents
 {
+ /**
+ * The AUTHENTICATION_SUCCESS event occurs after a user is authenticated
+ * by one provider.
+ *
+ * The event listener method receives a
+ * Symfony\Component\Security\Core\Event\AuthenticationEvent instance.
+ *
+ * @var string
+ */
  const AUTHENTICATION_SUCCESS = 'security.authentication.success';
 
+ /**
+ * The AUTHENTICATION_FAILURE event occurs after a user cannot be
+ * authenticated by any of the providers.
+ *
+ * The event listener method receives a
+ * Symfony\Component\Security\Core\Event\AuthenticationFailureEvent
+ * instance.
+ *
+ * @var string
+ */
  const AUTHENTICATION_FAILURE = 'security.authentication.failure';
 }