Skip to content

Bumped versions of taggable #6

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

Merged
cryptiklemur merged 3 commits into from
Jan 11, 2016
Merged

Bumped versions of taggable #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa57f34
Support taggalbe 0.2 and 0.3
Nyholm Jan 9, 2016
84e3b5a
No need to do preg_quote on a constant.. We know the answer
Nyholm Jan 10, 2016
363fec2
Merge branch 'master' into hierarchy
Nyholm Jan 11, 2016
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 composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{
"php": "^5.5|^7.0",
"psr/cache": "1.0.0",
"cache/taggable-cache": "^0.2"
"cache/taggable-cache": "^0.2|^0.3"
},
"require-dev":
{
Expand Down
15 changes: 3 additions & 12 deletions src/AbstractCachePool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ abstract class AbstractCachePool implements CacheItemPoolInterface, TaggablePool
{
use TaggablePoolTrait;

/**
* List of invalid (or reserved) key characters.
*
* @type string
*/
const KEY_INVALID_CHARACTERS = '{}()/\@:';

/**
* @type CacheItemInterface[] deferred
*/
Expand Down Expand Up @@ -245,12 +238,10 @@ protected function validateKey($key)
));
}

$invalid = preg_quote(static::KEY_INVALID_CHARACTERS, '|');
if (preg_match('|['.$invalid.']|', $key)) {
if (preg_match('|[\{\}\(\)/\\@\:]|', $key)) {
throw new InvalidArgumentException(sprintf(
'Invalid key: "%s". The key contains one or more characters reserved for future extension: %s',
$key,
static::KEY_INVALID_CHARACTERS
'Invalid key: "%s". The key contains one or more characters reserved for future extension: {}()/\@:',
$key
));
}
}
Expand Down