Skip to content

Commit cbf45c3

Browse files
committed
allow php8
1 parent b10e255 commit cbf45c3

File tree

5 files changed

+26
-20
lines changed

5 files changed

+26
-20
lines changed

Module.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class Module
1515
{
1616

17-
public function onBootstrap(\Zend\Mvc\MvcEvent $e)
17+
public function onBootstrap(\Laminas\Mvc\MvcEvent $e)
1818
{
1919
$config = $e->getApplication()->getConfig();
2020

@@ -24,7 +24,7 @@ public function onBootstrap(\Zend\Mvc\MvcEvent $e)
2424

2525
try {
2626
$storage->setSessionStorage();
27-
} catch(\Zend\Cache\Exception\InvalidArgumentException $e) {
27+
} catch(\Laminas\Cache\Exception\InvalidArgumentException $e) {
2828
// Todo: Need to do some logging one time over here
2929
}
3030
}
@@ -38,7 +38,7 @@ public function getConfig()
3838
public function getAutoloaderConfig()
3939
{
4040
return array(
41-
'Zend\Loader\ClassMapAutoloader' => array(
41+
'Laminas\Loader\ClassMapAutoloader' => array(
4242
__DIR__ . '/autoload_classmap.php',
4343
),
4444
);

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Zend Framework Module for storing sessions in Redis.
55

66
## Features
77
- Redis SessionSaveHandler support
8-
- Uses Zend\Cache\StorageFactory
8+
- Uses Laminas\Cache\StorageFactory
99
- Easy session configuration
1010

1111
## Setup

composer.json

+11-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
"name": "milqmedia/mq-redis-session",
33
"description": "Zend Framework 2 redis session storage",
44
"type": "library",
5-
"keywords": ["redis","session","storage","zf2"],
5+
"keywords": [
6+
"redis",
7+
"session",
8+
"storage",
9+
"zf2"
10+
],
611
"homepage": "https://github.com/milqmedia/MQRedisSessionStorage",
712
"license": "New BSD License",
813
"authors": [
@@ -14,10 +19,11 @@
1419
}
1520
],
1621
"require": {
17-
"php": "^7.2",
18-
"zendframework/zend-cache": "^2.9.0",
19-
"zendframework/zend-servicemanager": "^3.0",
20-
"zendframework/zend-session": "^2.9.1"
22+
"php": "^7.2 || ~8.0",
23+
"laminas/laminas-cache": "^2.9.0",
24+
"laminas/laminas-servicemanager": "^3.0",
25+
"laminas/laminas-session": "^2.9.1",
26+
"laminas/laminas-dependency-plugin": "^2.1"
2127
},
2228
"autoload": {
2329
"psr-0": {

src/Factory/RedisStorageFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
namespace MQRedisSessionStorage\Factory;
1414

15-
use Zend\ServiceManager\FactoryInterface;
16-
use Zend\ServiceManager\ServiceLocatorInterface;
15+
use Laminas\ServiceManager\FactoryInterface;
16+
use Laminas\ServiceManager\ServiceLocatorInterface;
1717
use MQRedisSessionStorage\Storage\RedisStorage;
1818

1919
class RedisStorageFactory implements FactoryInterface

src/Storage/RedisStorage.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
namespace MQRedisSessionStorage\Storage;
1414

15-
use Zend\Session\Config\SessionConfig;
16-
use Zend\Session\SessionManager;
17-
use Zend\Session\Container;
18-
use Zend\Session\SaveHandler\Cache;
19-
use Zend\Session\Validator\HttpUserAgent;
20-
use Zend\Session\Validator\RemoteAddr;
21-
use Zend\Cache\StorageFactory;
15+
use Laminas\Session\Config\SessionConfig;
16+
use Laminas\Session\SessionManager;
17+
use Laminas\Session\Container;
18+
use Laminas\Session\SaveHandler\Cache;
19+
use Laminas\Session\Validator\HttpUserAgent;
20+
use Laminas\Session\Validator\RemoteAddr;
21+
use Laminas\Cache\StorageFactory;
2222

2323
class RedisStorage
2424
{
@@ -54,7 +54,7 @@ public function setSessionStorage()
5454

5555
$manager = new SessionManager();
5656

57-
$sessionConfig = new \Zend\Session\Config\SessionConfig();
57+
$sessionConfig = new \Laminas\Session\Config\SessionConfig();
5858
$sessionConfig->setOptions($this->_config['session']);
5959

6060
$manager->setConfig($sessionConfig);
@@ -66,7 +66,7 @@ public function setSessionStorage()
6666

6767
try {
6868
$manager->start();
69-
} catch(Zend\Cache\Exception\InvalidArgumentException $e) {
69+
} catch(Laminas\Cache\Exception\InvalidArgumentException $e) {
7070
trigger_error('MQ-RedisSession Error: ' . $e->getMessage(), E_USER_ERROR);
7171
}
7272

0 commit comments

Comments
 (0)