Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*.gz

composer.phar
composer.lock
vendor

.buildpath
Expand All @@ -19,4 +20,5 @@ tests/unit/coverage/*
!tests/unit/coverage/.gitkeep

.phpunit.result.cache
tests/unit/.phpunit.result.cache
tests/unit/.phpunit.result.cache
.aider*
10 changes: 6 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@
}
},
"require": {
"php" : ">=7.3",
"php" : ">=8.3",
"g4/mcache" : "*",
"laminas/laminas-cache" : "*",
"laminas/laminas-session" : "*"
"laminas/laminas-cache" : "^3.12.0",
"laminas/laminas-session" : "^2.17.0",
"laminas/laminas-cache-storage-deprecated-factory": "^1.0",
"laminas/laminas-cache-storage-adapter-memcached": "^2.5.0|^3.0.0"
},
"require-dev": {
"phpunit/phpunit" : "9.*",
Expand All @@ -59,4 +61,4 @@
"./vendor/bin/phpcbf --colors --standard=PSR2 src/"
]
}
}
}
2 changes: 1 addition & 1 deletion src/Session.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private function getSaveHandler()
{
return $this->getOptions()['adapter']['name'] === self::COUCHBASE
? new Couchbase($this->getOptions()['adapter']['options'])
: new Cache(StorageFactory::factory($this->getOptions()));
: new Cache(\Laminas\Cache\StorageFactory::factory($this->getOptions()));
}

// @todo: Drasko: write our own memcached adapter!
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bootstrap="bootstrap.php"
colors="true"
cacheResult="false"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
>
<coverage>
<include>
Expand All @@ -15,4 +15,4 @@ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
<testsuite name="Unit Test Suite">
<directory>./src</directory>
</testsuite>
</phpunit>
</phpunit>