removed SessionInformationIterator class

symfony · paschke · May 4, 2011 · May 5, 2011 · May 5, 2011 · May 5, 2011
commit 33d83b4d8facceaab40b27946cd376dc2241f128
diff --git a/src/Symfony/Bundle/SecurityBundle/Doctrine/DoctrineSessionRegistryStorage.php b/src/Symfony/Bundle/SecurityBundle/Doctrine/DoctrineSessionRegistryStorage.php
@@ -5,7 +5,6 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\Driver\StaticPHPDriver;
 use Symfony\Component\Security\Http\Session\SessionInformation;
-use Symfony\Component\Security\Http\Session\SessionInformationIterator;
 use Symfony\Component\Security\Http\Session\SessionRegistryStorageInterface;

 class DoctrineSessionRegistryStorage implements SessionRegistryStorageInterface
@@ -36,24 +35,22 @@ public function getUsers()
     */
    public function getSessionInformation($sessionId)
    {
-        return $this->em->find('Symfony\Bundle\SecurityBundle\Doctrine\DoctrineSessionInformation', $sessionId);
+        return $this->em->find('Security:DoctrineSessionInformation', $sessionId);
    }

    /**
     * Obtains the maintained information for one user.
     *
-     * @param string $sessionId the session identifier key.
-     * @return SessionInformationIterator a SessionInformationIterator object.
+     * @param string $username The user identifier.
+     * @param boolean $includeExpiredSessions.
+     * @return array An array of SessionInformation objects.
     */
-    public function getSessionInformations($username, $includeExpiredSessions)
+    public function getSessionInformations($username, $includeExpiredSessions = false)
    {
-        $sessions = new SessionInformationIterator();
-
-        foreach ($this->em->getRepository('Symfony\Bundle\SecurityBundle\Doctrine\DoctrineSessionInformation')->findBy(array('username' => $username)) as $sessionInformation) {
-            $sessions->add($sessionInformation);
-        }
-
-        return $sessions;
+        $query = $this->em->createQuery(
+            'SELECT si FROM Security:DoctrineSessionInformation si'.($includeExpiredSessions ? '' : ' WHERE si.expired IS NULL').' ORDER BY si.lastRequest DESC'
+        );
+        return $query->getResult();
    }

    /**

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -29,7 +29,6 @@
        <parameter key="security.authentication.session_registry.class">Symfony\Component\Security\Http\Session\SessionRegistry</parameter>
        <parameter key="security.authentication.session_registry_storage.class">Symfony\Bundle\SecurityBundle\Doctrine\DoctrineSessionRegistryStorage</parameter>
        <parameter key="security.authentication.session_information.class">Symfony\Bundle\SecurityBundle\Doctrine\DoctrineSessionInformation</parameter>
-        <parameter key="security.authentication.session_information_iterator.class">Symfony\Component\Security\Http\Session\SessionInformationIterator</parameter>

        <parameter key="security.access.decision_manager.class">Symfony\Component\Security\Core\Authorization\AccessDecisionManager</parameter>

@@ -75,7 +74,6 @@
        <service id="security.authentication.session_registry" class="%security.authentication.session_registry.class%" public="false">
            <argument type="service" id="security.authentication.session_registry_storage" />
            <argument>%security.authentication.session_information.class%</argument>
-            <argument>%security.authentication.session_information_iterator.class%</argument>
        </service>

        <service id="security.authentication.session_registry_storage" class="%security.authentication.session_registry_storage.class%" public="true">

diff --git a/src/Symfony/Component/Security/Http/Session/ConcurrentSessionControlStrategy.php b/src/Symfony/Component/Security/Http/Session/ConcurrentSessionControlStrategy.php
@@ -60,7 +60,7 @@ public function onAuthentication(Request $request, TokenInterface $token)
        $sessions       = $this->registry->getAllSessions($user);
        $maxSessions    = $this->getMaximumSessionsForThisUser($user);

-        if ($sessions->count() >= $maxSessions && $this->alwaysCreateSession !== true) {
+        if (count($sessions) >= $maxSessions && $this->alwaysCreateSession !== true) {
            if ($this->exceptionIfMaximumExceeded) {
                throw new \RuntimeException(sprintf('Maximum of sessions (%s) exceeded', $maxSessions));
            }
@@ -107,18 +107,15 @@ public function setMaximumSessions($maximumSessions)
    /**
     * Allows subclasses to customise behaviour when too many sessions are detected.
     *
-     * @param SessionInformationIterator $sessions
+     * @param array $sessions
     * @param integer $allowableSessions
     * @param SessionRegistry $registry
     * @return void
     */
-    protected function allowableSessionsExceeded(SessionInformationIterator $sessions, $allowableSessions, SessionRegistry $registry)
+    protected function allowableSessionsExceeded($sessions, $allowableSessions, SessionRegistry $registry)
    {
        // remove oldest sessions from registry
-        $count = 0;
-        $sessions->sort();
-
-        for ($i = $allowableSessions - 1; $i < $sessions->count(); $i++) {
+        for ($i = $allowableSessions - 1; $i < count($sessions); $i++) {
            $sessions[$i]->expireNow();
            $registry->setSessionInformation($sessions[$i]);
        }

diff --git a/src/Symfony/Component/Security/Http/Session/SessionInformationIterator.php b/src/Symfony/Component/Security/Http/Session/SessionInformationIterator.php
diff --git a/src/Symfony/Component/Security/Http/Session/SessionRegistry.php b/src/Symfony/Component/Security/Http/Session/SessionRegistry.php
@@ -24,13 +24,11 @@ class SessionRegistry
 {
    protected $sessionRegistryStorage;
    protected $sessionInformationClass;
-    protected $sessionInformationIteratorClass;

-    public function __construct(SessionRegistryStorageInterface $sessionRegistryStorage, $sessionInformationClass, $sessionInformationIteratorClass)
+    public function __construct(SessionRegistryStorageInterface $sessionRegistryStorage, $sessionInformationClass)
    {
        $this->sessionRegistryStorage = $sessionRegistryStorage;
        $this->sessionInformationClass = $sessionInformationClass;
-        $this->sessionInformationIteratorClass = $sessionInformationIteratorClass;
    }

    /**
@@ -48,7 +46,7 @@ public function getAllUsers()
     *
     * @param UserInterface $user the specified user.
     * @param boolean $includeExpiredSessions.
-     * @return SessionInformationIterator $sessions the known sessions.
+     * @return array An array of SessionInformation objects.
     */
    public function getAllSessions(UserInterface $user, $includeExpiredSessions = false)
    {

diff --git a/src/Symfony/Component/Security/Http/Session/SessionRegistryStorageInterface.php b/src/Symfony/Component/Security/Http/Session/SessionRegistryStorageInterface.php
@@ -38,8 +38,9 @@ function getSessionInformation($sessionId);
    /**
     * Obtains the maintained information for one user.
     *
-     * @param string $sessionId the session identifier key.
-     * @return SessionInformation a SessionInformation object.
+     * @param string $username The user identifier.
+     * @param boolean $includeExpiredSessions.
+     * @return array An array of SessionInformation objects.
     */
    function getSessionInformations($username, $includeExpiredSessions);