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
2 changes: 1 addition & 1 deletion bin/ci/scripts/install_couchdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ echo "# Running Docker couchdb image"
docker run -d -p $COUCHDB_PORT:$COUCHDB_PORT couchdb:$COUCHDB_VERSION --with-haproxy --with-admin-party-please -n 1

check_db() {
# Allow 4xx errors not to break the connexion check
# Allow 4xx errors not to break the connection check
curl --silent http://$COUCHDB_HOST:$COUCHDB_PORT > /dev/null
echo $?
}
Expand Down
2 changes: 1 addition & 1 deletion docs/migration/MigratingFromV4ToV5.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Cache extends phpFastCacheAbstractProxy
}
```

See examples/extendedPhpFastCache.php for more informations
See examples/extendedPhpFastCache.php for more information



Expand Down
8 changes: 4 additions & 4 deletions docs/migration/MigratingFromV5ToV6.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ $instance = CacheManager::getInstance('Files');
try{
$item = $instance->getItem(array());
}catch(\InvalidArgumentException $e){
//Catched exception code
//Caught exception code
}

```
Expand All @@ -140,7 +140,7 @@ $instance = CacheManager::getInstance('Files');
try{
$item = $instance->getItem(array());
}catch(\phpFastCache\Exceptions\phpFastCacheInvalidArgumentException $e){
//Catched exception code
//Caught exception code
}

```
Expand All @@ -159,7 +159,7 @@ $instance = CacheManager::getInstance('Files');
try{
$item = $instance->getItem(array());
}catch(\LogicException $e){
//Catched exception code
//Caught exception code
}

```
Expand All @@ -175,7 +175,7 @@ $instance = CacheManager::getInstance('Files');
try{
$item = $instance->getItem(array());
}catch(\phpFastCache\Exceptions\phpFastCacheLogicException $e){
//Catched exception code
//Caught exception code
}

```
Expand Down
2 changes: 1 addition & 1 deletion docs/migration/MigratingFromV6ToV7.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ $cacheInstace = CacheManager::getInstance('Files', new Config([
```
#### For non-global option you MUST use the specific Config object provided for each drivers
```php
// The recommanded way is to use an alias to not confuse yourself
// The recommended way is to use an alias to not confuse yourself
use Phpfastcache\Drivers\Files\Config as FilesConfig;

$config = new FilesConfig();
Expand Down
8 changes: 4 additions & 4 deletions lib/Phpfastcache/CacheManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public static function getInstance(string $driver, ?ConfigurationOptionInterface
);
} else {
throw new PhpfastcacheDriverNotFoundException(sprintf(
'The driver "%s" does not exists or does not implements %s',
'The driver "%s" does not exist or does not implement %s',
$driver,
ExtendedCacheItemPoolInterface::class
));
Expand Down Expand Up @@ -293,7 +293,7 @@ public static function addCustomDriver(string $driverName, string $className): v

if (!\class_exists($className)) {
throw new PhpfastcacheInvalidArgumentException(
\sprintf("Can't add '%s' because the class '%s' does not exists", $driverName, $className)
\sprintf("Can't add '%s' because the class '%s' does not exist", $driverName, $className)
);
}

Expand Down Expand Up @@ -366,7 +366,7 @@ public static function removeCustomDriver(string $driverName): void
}

if (!isset(self::$driverCustoms[$driverName])) {
throw new PhpfastcacheLogicException(\sprintf("Driver '%s' does not exists", $driverName));
throw new PhpfastcacheLogicException(\sprintf("Driver '%s' does not exist", $driverName));
}

unset(self::$driverCustoms[$driverName]);
Expand All @@ -390,7 +390,7 @@ public static function addCoreDriverOverride(string $driverName, string $classNa

if (!\class_exists($className)) {
throw new PhpfastcacheInvalidArgumentException(
\sprintf("Can't override '%s' because the class '%s' does not exists", $driverName, $className)
\sprintf("Can't override '%s' because the class '%s' does not exist", $driverName, $className)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public function attachItem(CacheItemInterface $item): static;
/**
* Returns true if the item exists, is attached and the Spl Hash matches
* Returns false if the item exists, is attached and the Spl Hash mismatches
* Returns null if the item does not exists
* Returns null if the item does not exist
*
* @param CacheItemInterface $item
* @return bool
Expand Down
2 changes: 1 addition & 1 deletion lib/Phpfastcache/Core/Pool/TaggableCacheItemPoolTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function getItemsByTags(array $tagNames, int $strategy = TaggableCacheIte
if (\is_string($tagName)) {
$items[] = $this->fetchItemsByTagFromBackend($tagName);
} else {
throw new PhpfastcacheInvalidArgumentException('$tagName must be a a string');
throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Phpfastcache/Drivers/Couchdb/Driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ protected function encodeDocument(array $data): array

/**
* Specific document decoder for Couchdb
* since we dont store encoded version
* since we don't store encoded version
* for performance purposes
*
* @param $value
Expand Down
2 changes: 1 addition & 1 deletion lib/Phpfastcache/Drivers/Memcache/Driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ protected function driverWrite(ExtendedCacheItemInterface $item): bool

/**
* @param ExtendedCacheItemInterface $item
* @retur n bool
* @return bool
* @throws PhpfastcacheInvalidArgumentException
*/
protected function driverDelete(ExtendedCacheItemInterface $item): bool
Expand Down
2 changes: 1 addition & 1 deletion tests/CoreDriverOverride.test.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
|| !class_exists(Phpfastcache\DriverTest\Files2\Driver::class)
|| !class_exists(Phpfastcache\DriverTest\Files2\Config::class)
) {
$testHelper->assertFail('The php classes of driver "Files2" does not exists');
$testHelper->assertFail('The php classes of driver "Files2" do not exist');
$testHelper->terminateTest();
} else {
$testHelper->assertPass('The php classes of driver "Files2" were found');
Expand Down
2 changes: 1 addition & 1 deletion tests/CustomDriver.test.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
|| !class_exists(Phpfastcache\Drivers\Fakefiles\Driver::class)
|| !class_exists(Phpfastcache\Drivers\Fakefiles\Config::class)
) {
$testHelper->assertFail('The php classes of driver "Fakefiles" does not exists');
$testHelper->assertFail('The php classes of driver "Fakefiles" do not exist');
$testHelper->terminateTest();
} else {
$testHelper->assertPass('The php classes of driver "Fakefiles" were found');
Expand Down
2 changes: 1 addition & 1 deletion tests/DisabledStaticItemCaching.test.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
$testHelper->runSubProcess('DisabledStaticItemCaching');
usleep(random_int(250000, 800000));

// We dont want to clear cache instance since we disabled the static item caching
// We don't want to clear cache instance since we disabled the static item caching
$item = $driverInstance->getItem('TestUseStaticItemCaching');

/**
Expand Down