Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace stella-maris/clock with psr/clock #263

Merged
merged 3 commits into from
Jul 17, 2023
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
6 changes: 2 additions & 4 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{
"ignore_php_platform_requirements": {
"8.2": true
},
"extensions": [
"apcu"
],
"ini": [
"apc.enabled=1",
"apc.enable_cli=1"
]
],
"backwardCompatibilityCheck": true
}
3 changes: 1 addition & 2 deletions .laminas-ci/pre-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

WORKING_DIRECTORY=$2
JOB=$3
PHP_VERSION=$(echo "${JOB}" | jq -r '.php')

PHP_VERSION=$(php -nr "echo PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION;")

if [ ! -z "$GITHUB_BASE_REF" ] && [[ "$GITHUB_BASE_REF" =~ ^[0-9]+\.[0-9] ]]; then
readarray -td. TARGET_BRANCH_VERSION_PARTS <<<"${GITHUB_BASE_REF}.";
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"laminas/laminas-stdlib": "^3.6",
"psr/cache": "^1.0",
"psr/simple-cache": "^1.0",
"stella-maris/clock": "^0.1.5",
"psr/clock": "^1.0",
"webmozart/assert": "^1.9"
},
"require-dev": {
Expand All @@ -61,7 +61,8 @@
"vimeo/psalm": "^5.4"
},
"conflict": {
"symfony/console": "<5.1"
"symfony/console": "<5.1",
"stella-maris/clock": "<0.1.7"
},
"provide": {
"psr/cache-implementation": "1.0",
Expand Down
49 changes: 1 addition & 48 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Psr/CacheItemPool/CacheItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use DateTimeImmutable;
use DateTimeInterface;
use Psr\Cache\CacheItemInterface;
use StellaMaris\Clock\ClockInterface;
use Psr\Clock\ClockInterface;

use function gettype;
use function is_int;
Expand Down
2 changes: 1 addition & 1 deletion src/Psr/CacheItemPool/CacheItemPoolDecorator.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use Laminas\Cache\Storage\StorageInterface;
use Psr\Cache\CacheItemInterface;
use Psr\Cache\CacheItemPoolInterface;
use StellaMaris\Clock\ClockInterface;
use Psr\Clock\ClockInterface;

use function array_diff;
use function array_diff_key;
Expand Down
2 changes: 1 addition & 1 deletion test/Psr/CacheItemPool/CacheItemPoolDecoratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Psr\Cache\CacheItemInterface;
use Psr\Clock\ClockInterface;
use stdClass;
use StellaMaris\Clock\ClockInterface;
use Throwable;

use function array_keys;
Expand Down
2 changes: 1 addition & 1 deletion test/Psr/CacheItemPool/CacheItemTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use Laminas\Cache\Psr\CacheItemPool\CacheItem;
use Laminas\Cache\Psr\CacheItemPool\InvalidArgumentException;
use PHPUnit\Framework\TestCase;
use StellaMaris\Clock\ClockInterface;
use Psr\Clock\ClockInterface;

use function date_default_timezone_get;
use function date_default_timezone_set;
Expand Down