Merge branch 'master' of https://github.com/webnet-fr/WebnetSsoAuthBundle

# Conflicts:
#	composer.json

Author: atapia-wbnt

Controller/Controller.php

@@ -2,11 +2,26 @@
 
 namespace Webnet\SsoAuthBundle\Controller;
 
-use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class Controller extends ContainerAware
+class Controller implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface $container
+     */
+    private $container;
+    
+    /**
+     * Sets the container.
+     *
+     * @param ContainerInterface|null $container A ContainerInterface instance or null
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container=$container;
+    }
+    
     protected function render($view, array $parameters)
     {
         return $this

Resources/doc/example.md

@@ -19,6 +19,7 @@ In config.yml:
                     id: cas
                     login_url: https://cas.server.tld/login
                     logout_url: https://cas.server.tld/logout
+                    logout_target: '%logout_target_url%'
                     validation_url: https://cas.server.tld/serviceValidate
 
 

Sso/Cas/Server.php

@@ -24,10 +24,9 @@ public function getLoginUrl()
      */
     public function getLogoutUrl()
     {
-        $service = sprintf('service=%s', urlencode($this->getCheckUrl()));
-        $url = $this->getLogoutTarget() ? sprintf('&url=%s', urlencode($this->getLogoutTarget())) : null;
+        $service = sprintf('service=%s', urlencode($this->getLogoutTarget()));
 
-        return sprintf('%s?%s%s', parent::getLogoutUrl(), $service, $url);
+        return sprintf('%s?%s', parent::getLogoutUrl(), $service);
     }
 
     /**