Merge pull request #48 from fancyweb/sf-3.4

feat: compatibility with Symfony 3.4

Author: fancyweb

DependencyInjection/Configuration.php

@@ -12,7 +12,6 @@
 namespace Ekino\Bundle\DrupalBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**

DependencyInjection/EkinoDrupalExtension.php

@@ -14,11 +14,8 @@
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Finder\Finder;
 use Symfony\Component\Config\Definition\Processor;
 
 /**

Drupal/DrupalRequestListener.php

@@ -13,7 +13,6 @@
 
 use Ekino\Bundle\DrupalBundle\Delivery\DeliveryStrategyInterface;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 

Entity/FosUser.php

@@ -607,9 +607,9 @@ public function setPlainPassword($password)
     /**
      * Sets the last login time
      *
-     * @param \DateTime $time
+     * @param \DateTime|null $time
      */
-    public function setLastLogin(\DateTime $time)
+    public function setLastLogin(\DateTime $time = null)
     {
         $this->lastLogin = $time;
     }

Entity/HybridUser.php

@@ -11,12 +11,10 @@
 
 namespace Ekino\Bundle\DrupalBundle\Entity;
 
-use Symfony\Component\Security\Core\User\UserInterface as SecurityUserInterface;
 use FOS\UserBundle\Model\UserInterface as FOSUserInterface;
 
 /**
- * This class provide convenient proxies methods between FosUser class and a DrupalUser class
- *
+ * This class provide convenient proxies methods between FosUser class and a DrupalUser class.
  */
 abstract class HybridUser extends FosUser
 {

Entity/User.php

@@ -19,4 +19,12 @@ public function getUid()
     {
         return $this->uid;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setSalt($salt)
+    {
+        $this->salt = $salt;
+    }
 }

Event/Listener/UserEntityHookListener.php

@@ -14,7 +14,7 @@
 use Ekino\Bundle\DrupalBundle\Event\DrupalEntityEvent;
 use Ekino\Bundle\DrupalBundle\Event\DrupalEntitiesEvent;
 use FOS\UserBundle\Model\UserManagerInterface;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * These methods are called by the drupal user hook
@@ -29,7 +29,7 @@ class UserEntityHookListener
 
     /**
      * @param \FOS\UserBundle\Model\UserManagerInterface $userManager
-     * @param \Symfony\Component\HttpKernel\Log\LoggerInterface $logger
+     * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(UserManagerInterface $userManager, LoggerInterface $logger)
     {
@@ -111,4 +111,4 @@ public function onPreSave(DrupalEntityEvent $event)
             $account->usernameCanonical = $account->name;
         }
     }
-}
+}

Event/Listener/UserRegistrationHookListener.php

@@ -13,7 +13,7 @@
 
 use Ekino\Bundle\DrupalBundle\Event\DrupalEvent;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\User\UserInterface;
 
@@ -30,9 +30,9 @@ class UserRegistrationHookListener
     protected $logger;
 
     /**
-     * @var Request
+     * @var RequestStack
      */
-    protected $request;
+    protected $requestStack;
 
     /**
      * @var array
@@ -41,13 +41,13 @@ class UserRegistrationHookListener
 
     /**
      * @param LoggerInterface $logger
-     * @param Request         $request
+     * @param RequestStack    $requestStack
      * @param array           $providerKeys
      */
-    public function __construct(LoggerInterface $logger, Request $request, array $providerKeys)
+    public function __construct(LoggerInterface $logger, RequestStack $requestStack, array $providerKeys)
     {
         $this->logger       = $logger;
-        $this->request      = $request;
+        $this->requestStack = $requestStack;
         $this->providerKeys = $providerKeys;
     }
 
@@ -64,12 +64,14 @@ public function onLogin(DrupalEvent $event)
             throw new \RuntimeException('An instance of UserInterface is expected');
         }
 
+        $request = $this->requestStack->getMasterRequest();
+
         // The ContextListener from the Security component is hijacked to insert a valid token into session
         // so next time the user go to a valid symfony2 url with a proper security context, then the following token
         // will be used
         foreach ($this->providerKeys as $providerKey) {
             $token = new UsernamePasswordToken($user, null, $providerKey, $user->getRoles());
-            $this->request->getSession()->set('_security_'.$providerKey, serialize($token));
+            $request->getSession()->set('_security_'.$providerKey, serialize($token));
         }
     }
 
@@ -78,8 +80,10 @@ public function onLogin(DrupalEvent $event)
      */
     public function onLogout(DrupalEvent $event)
     {
+        $request = $this->requestStack->getMasterRequest();
+
         foreach ($this->providerKeys as $providerKey) {
-            $this->request->getSession()->set('_security_'.$providerKey, null);
+            $request->getSession()->set('_security_'.$providerKey, null);
         }
     }
 }

Listener/ExceptionListener.php

@@ -2,7 +2,6 @@
 
 namespace Ekino\Bundle\DrupalBundle\Listener;
 
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 

Log/LoggerWatchdog.php

@@ -11,7 +11,7 @@
 
 namespace Ekino\Bundle\DrupalBundle\Log;
 
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * LoggerWatchdog.
@@ -135,4 +135,4 @@ public function log($level, $message, array $context = array())
             watchdog('Symfony2', $message, $context, $level);
         }
     }
-}
+}