removed prefix I from IStorage, IJournal, IBulkReader

Author: dg

src/Bridges/CacheDI/CacheExtension.php

@@ -39,12 +39,12 @@ public function loadConfiguration()
 
 		if (extension_loaded('pdo_sqlite')) {
 			$builder->addDefinition($this->prefix('journal'))
-				->setType(Nette\Caching\Storages\IJournal::class)
+				->setType(Nette\Caching\Storages\Journal::class)
 				->setFactory(Nette\Caching\Storages\SQLiteJournal::class, [$dir . '/journal.s3db']);
 		}
 
 		$builder->addDefinition($this->prefix('storage'))
-			->setType(Nette\Caching\IStorage::class)
+			->setType(Nette\Caching\Storage::class)
 			->setFactory(Nette\Caching\Storages\FileStorage::class, [$dir]);
 
 		if ($this->name === 'cache') {

src/Bridges/CacheLatte/CacheMacro.php

@@ -95,7 +95,7 @@ public static function initRuntime(Latte\Runtime\Template $template): void
 	 * @return Nette\Caching\OutputHelper|\stdClass
 	 */
 	public static function createCache(
-		Nette\Caching\IStorage $cacheStorage,
+		Nette\Caching\Storage $cacheStorage,
 		string $key,
 		?array &$parents,
 		array $args = null

src/Caching/IBulkReader.php renamed to src/Caching/BulkReader.php

@@ -13,11 +13,14 @@
 /**
  * Cache storage with a bulk read support.
  */
-interface IBulkReader
+interface BulkReader
 {
 	/**
 	 * Reads from cache in bulk.
 	 * @return array key => value pairs, missing items are omitted
 	 */
 	function bulkRead(array $keys): array;
 }
+
+
+class_exists(IBulkReader::class);

src/Caching/Cache.php

@@ -36,14 +36,14 @@ class Cache
 	/** @internal */
 	public const NAMESPACE_SEPARATOR = "\x00";
 
-	/** @var IStorage */
+	/** @var Storage */
 	private $storage;
 
 	/** @var string */
 	private $namespace;
 
 
-	public function __construct(IStorage $storage, string $namespace = null)
+	public function __construct(Storage $storage, string $namespace = null)
 	{
 		$this->storage = $storage;
 		$this->namespace = $namespace . self::NAMESPACE_SEPARATOR;
@@ -53,7 +53,7 @@ public function __construct(IStorage $storage, string $namespace = null)
 	/**
 	 * Returns cache storage.
 	 */
-	final public function getStorage(): IStorage
+	final public function getStorage(): Storage
 	{
 		return $this->storage;
 	}
@@ -109,7 +109,7 @@ public function bulkLoad(array $keys, callable $fallback = null): array
 			}
 		}
 		$storageKeys = array_map([$this, 'generateKey'], $keys);
-		if (!$this->storage instanceof IBulkReader) {
+		if (!$this->storage instanceof BulkReader) {
 			$result = array_combine($keys, array_map([$this->storage, 'read'], $storageKeys));
 			if ($fallback !== null) {
 				foreach ($result as $key => $value) {

src/Caching/IStorage.php renamed to src/Caching/Storage.php

@@ -13,7 +13,7 @@
 /**
  * Cache storage.
  */
-interface IStorage
+interface Storage
 {
 	/**
 	 * Read from cache.
@@ -41,3 +41,6 @@ function remove(string $key): void;
 	 */
 	function clean(array $conditions): void;
 }
+
+
+class_exists(IStorage::class);

src/Caching/Storages/DevNullStorage.php

@@ -15,7 +15,7 @@
 /**
  * Cache dummy storage.
  */
-class DevNullStorage implements Nette\Caching\IStorage
+class DevNullStorage implements Nette\Caching\Storage
 {
 	use Nette\SmartObject;
 

src/Caching/Storages/FileStorage.php

@@ -16,7 +16,7 @@
 /**
  * Cache file storage.
  */
-class FileStorage implements Nette\Caching\IStorage
+class FileStorage implements Nette\Caching\Storage
 {
 	use Nette\SmartObject;
 
@@ -56,14 +56,14 @@ class FileStorage implements Nette\Caching\IStorage
 	/** @var string */
 	private $dir;
 
-	/** @var IJournal */
+	/** @var Journal */
 	private $journal;
 
 	/** @var array */
 	private $locks;
 
 
-	public function __construct(string $dir, IJournal $journal = null)
+	public function __construct(string $dir, Journal $journal = null)
 	{
 		if (!is_dir($dir)) {
 			throw new Nette\DirectoryNotFoundException("Directory '$dir' not found.");

src/Caching/Storages/IJournal.php renamed to src/Caching/Storages/Journal.php

@@ -13,7 +13,7 @@
 /**
  * Cache journal provider.
  */
-interface IJournal
+interface Journal
 {
 	/**
 	 * Writes entry information into the journal.
@@ -26,3 +26,6 @@ function write(string $key, array $dependencies): void;
 	 */
 	function clean(array $conditions): ?array;
 }
+
+
+class_exists(IJournal::class);

src/Caching/Storages/MemcachedStorage.php

@@ -16,7 +16,7 @@
 /**
  * Memcached storage using memcached extension.
  */
-class MemcachedStorage implements Nette\Caching\IStorage, Nette\Caching\IBulkReader
+class MemcachedStorage implements Nette\Caching\Storage, Nette\Caching\BulkReader
 {
 	use Nette\SmartObject;
 
@@ -32,7 +32,7 @@ class MemcachedStorage implements Nette\Caching\IStorage, Nette\Caching\IBulkRea
 	/** @var string */
 	private $prefix;
 
-	/** @var IJournal */
+	/** @var Journal */
 	private $journal;
 
 
@@ -49,7 +49,7 @@ public function __construct(
 		string $host = 'localhost',
 		int $port = 11211,
 		string $prefix = '',
-		IJournal $journal = null
+		Journal $journal = null
 	) {
 		if (!static::isAvailable()) {
 			throw new Nette\NotSupportedException("PHP extension 'memcached' is not loaded.");

src/Caching/Storages/MemoryStorage.php

@@ -15,7 +15,7 @@
 /**
  * Memory cache storage.
  */
-class MemoryStorage implements Nette\Caching\IStorage
+class MemoryStorage implements Nette\Caching\Storage
 {
 	use Nette\SmartObject;
 

src/Caching/Storages/SQLiteJournal.php

@@ -16,7 +16,7 @@
 /**
  * SQLite based journal.
  */
-class SQLiteJournal implements IJournal
+class SQLiteJournal implements Journal
 {
 	use Nette\SmartObject;
 

src/Caching/Storages/SQLiteStorage.php

@@ -16,7 +16,7 @@
 /**
  * SQLite storage.
  */
-class SQLiteStorage implements Nette\Caching\IStorage, Nette\Caching\IBulkReader
+class SQLiteStorage implements Nette\Caching\Storage, Nette\Caching\BulkReader
 {
 	use Nette\SmartObject;
 

src/compatibility.php

@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\Caching;
+
+if (false) {
+	/** @deprecated use Nette\Caching\BulkReader */
+	interface IBulkReader extends BulkReader
+	{
+	}
+} elseif (!interface_exists(IBulkReader::class)) {
+	class_alias(BulkReader::class, IBulkReader::class);
+}
+
+if (false) {
+	/** @deprecated use Nette\Caching\Storage */
+	interface IStorage extends Storage
+	{
+	}
+} elseif (!interface_exists(IStorage::class)) {
+	class_alias(Storage::class, IStorage::class);
+}
+
+namespace Nette\Caching\Storages;
+
+if (false) {
+	/** @deprecated use Nette\Caching\Storages\Journal */
+	interface IJournal extends Journal
+	{
+	}
+} elseif (!interface_exists(IJournal::class)) {
+	class_alias(Journal::class, IJournal::class);
+}