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.

Sign up for GitHub

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

Jump to bottom

Fix PSR16 compatibility by sanitizing Colon symbol #447

Closed
wants to merge 12 commits into from
Closed

Fix PSR16 compatibility by sanitizing Colon symbol #447

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c221c71
Fix PSR16 compatibility by sanitze Colon symbol
alexander-schranz May 3, 2024
210ba1a
Update CachedClientTest.php
alexander-schranz May 3, 2024
9150e0e
Update keySanitizer
alexander-schranz May 3, 2024
4f3ef01
Apply suggestions from code review
alexander-schranz May 3, 2024
8fb9119
Add functional test with cache
alexander-schranz May 3, 2024
f452a29
Fix simple cache issue
alexander-schranz May 3, 2024
bedfeec
Convert null to false in get method
alexander-schranz May 3, 2024
2614178
Require correct simple psr package
alexander-schranz May 6, 2024
07b7842
Change behaviour to return null like psr always
alexander-schranz May 6, 2024
8824fc3
Fix key sanitizer behaviour for PSR16
alexander-schranz May 6, 2024
3d29d48
Fix test matrix
alexander-schranz May 6, 2024
1cf85bf
Update test-application.yaml
alexander-schranz May 6, 2024
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
2 changes: 1 addition & 1 deletion src/Jackalope/Transport/DoctrineDBAL/CachedClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function __construct(FactoryInterface $factory, Connection $conn, array $

$this->caches = $caches;
$this->keySanitizer = static function ($cacheKey) {
return str_replace(' ', '_', $cacheKey);
return str_replace([' ', ':'], '_', $cacheKey);
dbu marked this conversation as resolved.
Show resolved Hide resolved
};
}

Expand Down
4 changes: 2 additions & 2 deletions tests/Jackalope/Transport/DoctrineDBAL/CachedClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function testArrayObjectIsConvertedToArray()
public function testCacheHit()
{
$cache = new \stdClass();
$this->cacheMock->method('fetch')->with('nodes:_/test,_tests')->willReturn($cache);
$this->cacheMock->method('fetch')->with('nodes__/test,_tests')->willReturn($cache);
alexander-schranz marked this conversation as resolved.
Show resolved Hide resolved

$this->assertSame($cache, $this->transport->getNode('/test'));
}
Expand All @@ -45,7 +45,7 @@ public function testDefaultKeySanitizer()
$this->cacheMock
->method('fetch')
->with(self::callback(function ($arg) use (&$first) {
self::assertEquals($first ? 'nodetypes:_a:0:{}' : 'node_types', $arg);
self::assertEquals($first ? 'nodetypes__a_0_{}' : 'node_types', $arg);
dbu marked this conversation as resolved.
Show resolved Hide resolved
alexander-schranz marked this conversation as resolved.
Show resolved Hide resolved
$first = false;

return true;
Expand Down
Loading