Merge remote branch 'opensky/master'

Conflicts: SimpleCASBundle.php
jmikola · Sep 23, 2010 · b2fc05e · b2fc05e
2 parents cb770af + 32dd26a
commit b2fc05e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 28 deletions.
diff --git a/Controller/AuthController.php b/Controller/AuthController.php
@@ -31,7 +31,7 @@ abstract protected function getLoginActionUrl();
     public function loginAction()
     {
         $simplecas = $this->getSimpleCAS();
-        $session = $this->getUser();
+        $session = $this->getSession();
         $requestHeaders = $this->getRequest()->headers;
 
         /* If the user is attempting to log in while already authenticated,
@@ -44,7 +44,7 @@ public function loginAction()
             $simplecas->unauthenticate();
 
             if ($referer = $requestHeaders->get('referer')) {
-                $session->setAttribute(self::REFERER, $referer);
+                $session->set(self::REFERER, $referer);
             }
 
             return $this->redirect($simplecas->getLogoutUrl());
@@ -100,19 +100,18 @@ protected function getRequest()
         return $this['request'];
     }
 
-    /**
-     * @return \Symfony\Component\HttpFoundation\Session
-     */
-    protected function getSession()
-    {
-        return $this['session'];
-    }
-
     /**
      * @return \Bundle\SimpleCASBundle\SimpleCAS
      */
     protected function getSimpleCAS()
     {
         return $this['simplecas'];
     }
+
+	/**
+	 * @return Symfony\Component\HttpFoundation\Session
+	 */
+	protected function getSession() {
+		return $this['session'];
+	}
 }
diff --git a/SimpleCASBundle.php b/SimpleCASBundle.php
@@ -2,26 +2,9 @@
 
 namespace Bundle\SimpleCASBundle;
 
-use Symfony\Foundation\Bundle\Bundle;
-use Symfony\Components\DependencyInjection\ContainerInterface;
-use Symfony\Components\DependencyInjection\Loader\Loader;
-use Bundle\SimpleCASBundle\DependencyInjection\SimpleCASExtension;
-
 /**
  * SimpleCAS Bundle.
  *
  * @author Jeremy Mikola <jmikola@gmail.com>
  */
-class SimpleCASBundle extends Bundle
-{
-    /**
-     * Customizes the Container instance.
-     *
-     * @param Symfony\Components\DependencyInjection\ContainerInterface $container A ContainerInterface instance
-     * @return Symfony\Components\DependencyInjection\BuilderConfiguration A BuilderConfiguration instance
-     */
-    public function buildContainer(ContainerInterface $container)
-    {
-        Loader::registerExtension(new SimpleCASExtension());
-    }
-}
+class SimpleCASBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle {}