Skip to content

Commit d08a242

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Fix more quotes in exception messages [3.4] Minor fixes [PropertyAccess] Improved errors when reading uninitialized properties
2 parents b234f66 + ce180b8 commit d08a242

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Store/MemcachedStore.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(\Memcached $memcached, int $initialTtl = 300)
4747
}
4848

4949
if ($initialTtl < 1) {
50-
throw new InvalidArgumentException(sprintf('%s() expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl));
50+
throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive TTL. Got %d.', __METHOD__, $initialTtl));
5151
}
5252

5353
$this->memcached = $memcached;
@@ -86,7 +86,7 @@ public function waitAndSave(Key $key)
8686
public function putOffExpiration(Key $key, $ttl)
8787
{
8888
if ($ttl < 1) {
89-
throw new InvalidTtlException(sprintf('%s() expects a TTL greater or equals to 1 second. Got %s.', __METHOD__, $ttl));
89+
throw new InvalidTtlException(sprintf('"%s()" expects a TTL greater or equals to 1 second. Got %s.', __METHOD__, $ttl));
9090
}
9191

9292
// Interface defines a float value but Store required an integer.

Store/RedisStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private function evaluate(string $script, string $resource, array $args)
153153
return $this->redis->eval(...array_merge([$script, 1, $resource], $args));
154154
}
155155

156-
throw new InvalidArgumentException(sprintf('%s() expects being initialized with a Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis)));
156+
throw new InvalidArgumentException(sprintf('"%s()" expects being initialized with a Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis)));
157157
}
158158

159159
private function getUniqueToken(Key $key): string

0 commit comments

Comments
 (0)