Skip to content

Commit 15dfdcf

Browse files
authored
Merge pull request #6 from ppavlovic/master
Upgrade to php8.3, added laminas/laminas-cache-storage-deprecated-factory
2 parents f6e20eb + 3df2132 commit 15dfdcf

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.gz
88

99
composer.phar
10+
composer.lock
1011
vendor
1112

1213
.buildpath
@@ -19,4 +20,5 @@ tests/unit/coverage/*
1920
!tests/unit/coverage/.gitkeep
2021

2122
.phpunit.result.cache
22-
tests/unit/.phpunit.result.cache
23+
tests/unit/.phpunit.result.cache
24+
.aider*

composer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@
2929
}
3030
},
3131
"require": {
32-
"php" : ">=7.3",
32+
"php" : ">=8.3",
3333
"g4/mcache" : "*",
34-
"laminas/laminas-cache" : "*",
35-
"laminas/laminas-session" : "*"
34+
"laminas/laminas-cache" : "^3.12.0",
35+
"laminas/laminas-session" : "^2.17.0",
36+
"laminas/laminas-cache-storage-deprecated-factory": "^1.0",
37+
"laminas/laminas-cache-storage-adapter-memcached": "^2.5.0|^3.0.0"
3638
},
3739
"require-dev": {
3840
"phpunit/phpunit" : "9.*",
@@ -59,4 +61,4 @@
5961
"./vendor/bin/phpcbf --colors --standard=PSR2 src/"
6062
]
6163
}
62-
}
64+
}

src/Session.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private function getSaveHandler()
175175
{
176176
return $this->getOptions()['adapter']['name'] === self::COUCHBASE
177177
? new Couchbase($this->getOptions()['adapter']['options'])
178-
: new Cache(StorageFactory::factory($this->getOptions()));
178+
: new Cache(\Laminas\Cache\StorageFactory::factory($this->getOptions()));
179179
}
180180

181181
// @todo: Drasko: write our own memcached adapter!

tests/unit/phpunit.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
bootstrap="bootstrap.php"
55
colors="true"
66
cacheResult="false"
7-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
7+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
88
>
99
<coverage>
1010
<include>
@@ -15,4 +15,4 @@ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
1515
<testsuite name="Unit Test Suite">
1616
<directory>./src</directory>
1717
</testsuite>
18-
</phpunit>
18+
</phpunit>

0 commit comments

Comments
 (0)