Merge pull request #2 from ezsystems/forward_compatability

Use Symfony's namespace for backported features for full 4.x forward compatibility

Author: andrerom

composer.json

@@ -10,6 +10,7 @@
     }
   ],
   "autoload": {
+    "classmap": ["src/lib/Symfony"],
     "psr-4": {
       "EzSystems\\SymfonyToolsBundle\\": "src/bundle/",
       "EzSystems\\SymfonyTools\\": "src/lib/"

doc/RedisSessionHandler.md

@@ -4,16 +4,16 @@ This feature has been backported from Symfony 4. The `RedisSessionHandler` allow
 Last revision: https://github.com/symfony/symfony/commit/239a022cc01cca52c3f6ddde3231199369cf34c2
 
 ## Requirements
-- Symfony 3.x _(implies support for PHP >= 5.6, the feature is native as of Symfony 4)_
-- Redis extension or Predis _(using one of the following: RedisArray / RedisCluster / Predis\Client / RedisProxy / RedisClusterProxy)_
+- Symfony 3.x _(the feature is native as of Symfony 4)_
+- Redis extension _or_ Predis
 
 ## Configuration
 After installing the bundle, you have to configure proper services on your own to be able to use RedisSessionHandler.
 
 At first, you have to define service for Redis connection. It can be done in `app/config/services.yml`. Configuration should look like the following:
 ```yaml
     redis_session_handler_connection:
-        class: 'Redis' # RedisArray/RedisCluster/Predis\Client/RedisProxy/RedisClusterProxy are also supported
+        class: 'Redis' # Or one of: RedisArray, RedisCluster, Predis\Client, or  RedisProxy.
         calls:
             - method: connect
               arguments:
@@ -24,7 +24,7 @@ At first, you have to define service for Redis connection. It can be done in `ap
 Then, you need to define a proper service for handler itself:
 ```yaml
     redis_session_handler:
-        class: EzSystems\SymfonyTools\Symfony\Components\HttpFoundation\Session\Storage\Handler\RedisSessionHandler
+        class: Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler
         arguments:
             - '@redis_session_handler_connection'
 ```

src/lib/Symfony/Components/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
- * @license For full copyright and license information view LICENSE file distributed with this source code.
- */
-
 /*
  * This file is part of the Symfony package.
  *
@@ -15,15 +10,14 @@
  *
  * Original source:
  * https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
- * Last revision: https://github.com/symfony/symfony/commit/239a022cc01cca52c3f6ddde3231199369cf34c2
+ * Last revision: https://github.com/symfony/symfony/commit/239a022cc01cca52c3f6ddde3231199369cf34c2 (+ CS commit: c0323b)
  */
 
-namespace EzSystems\SymfonyTools\Symfony\Components\HttpFoundation\Session\Storage\Handler;
+namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 use Predis\Response\ErrorInterface;
 use Symfony\Component\Cache\Traits\RedisClusterProxy;
 use Symfony\Component\Cache\Traits\RedisProxy;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\AbstractSessionHandler;
 
 /**
  * Redis based session storage handler based on the Redis class
@@ -49,7 +43,7 @@ class RedisSessionHandler extends AbstractSessionHandler
      *
      * @throws \InvalidArgumentException When unsupported client or options are passed
      */
-    public function __construct($redis, array $options = array())
+    public function __construct($redis, array $options = [])
     {
         if (
             !$redis instanceof \Redis &&
@@ -62,7 +56,7 @@ public function __construct($redis, array $options = array())
             throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis)));
         }
 
-        if ($diff = array_diff(array_keys($options), array('prefix'))) {
+        if ($diff = array_diff(array_keys($options), ['prefix'])) {
             throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff)));
         }
 

src/lib/Symfony/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.