fix: clean up directories and create the needed object

Signed-off-by: Jessica González <[email protected]>
sbulen · Oct 24, 2020 · 5793a21 · 5793a21
1 parent 18d045d
commit 5793a21
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 7 deletions.
diff --git a/Sources/cache/implementations/Apc.php → Sources/Cache/APIs/Apc.php b/Sources/cache/implementations/Apc.php → Sources/Cache/APIs/Apc.php
diff --git a/Sources/cache/implementations/Apcu.php → Sources/Cache/APIs/Apcu.php b/Sources/cache/implementations/Apcu.php → Sources/Cache/APIs/Apcu.php
diff --git a/Sources/cache/implementations/FileBased.php → Sources/Cache/APIs/FileBased.php b/Sources/cache/implementations/FileBased.php → Sources/Cache/APIs/FileBased.php
diff --git a/...mplementations/MemcacheImplementation.php → ...ces/Cache/APIs/MemcacheImplementation.php b/...mplementations/MemcacheImplementation.php → ...ces/Cache/APIs/MemcacheImplementation.php
diff --git a/...plementations/MemcachedImplementation.php → ...es/Cache/APIs/MemcachedImplementation.php b/...plementations/MemcachedImplementation.php → ...es/Cache/APIs/MemcachedImplementation.php
diff --git a/Sources/cache/implementations/Postgres.php → Sources/Cache/APIs/Postgres.php b/Sources/cache/implementations/Postgres.php → Sources/Cache/APIs/Postgres.php
diff --git a/Sources/cache/implementations/Sqlite.php → Sources/Cache/APIs/Sqlite.php b/Sources/cache/implementations/Sqlite.php → Sources/Cache/APIs/Sqlite.php
diff --git a/Sources/cache/implementations/Xcache.php → Sources/Cache/APIs/Xcache.php b/Sources/cache/implementations/Xcache.php → Sources/Cache/APIs/Xcache.php
diff --git a/Sources/cache/implementations/Zend.php → Sources/Cache/APIs/Zend.php b/Sources/cache/implementations/Zend.php → Sources/Cache/APIs/Zend.php
diff --git a/Sources/cache/CacheAPI.php → Sources/Cache/CacheAPI.php b/Sources/cache/CacheAPI.php → Sources/Cache/CacheAPI.php
@@ -11,6 +11,8 @@
  * @version 2.1 RC3
  */
 
+namespace SMF\Cache;
+
 if (!defined('SMF'))
 	die('No direct access...');
 
@@ -19,6 +21,7 @@
  */
 interface cache_api_interface
 {
+    const APIS_FOLDER = 'APIs';
 	/**
 	 * Checks whether we can use the cache method performed by this API.
 	 *

diff --git a/Sources/cache/CacheApiInterface.php → Sources/Cache/CacheApiInterface.php b/Sources/cache/CacheApiInterface.php → Sources/Cache/CacheApiInterface.php
@@ -11,6 +11,8 @@
  * @version 2.1 RC2
  */
 
+namespace SMF\Cache;
+
 if (!defined('SMF'))
 	die('No direct access...');
 

diff --git a/Sources/ManageServer.php b/Sources/ManageServer.php
@@ -59,6 +59,8 @@
  * @version 2.1 RC3
  */
 
+use SMF\Cache\CacheApi;
+
 if (!defined('SMF'))
 	die('No direct access...');
 

diff --git a/index.php b/index.php
@@ -131,6 +131,7 @@
 		'ReCaptcha\\' => 'ReCaptcha/',
 		'MatthiasMullie\\Minify\\' => 'minify/src/',
 		'MatthiasMullie\\PathConverter\\' => 'minify/path-converter/src/',
+        'SMF\\Cache' => 'Cache/',
 	);
 
 	// Do any third-party scripts want in on the fun?

diff --git a/other/Settings.php b/other/Settings.php
@@ -233,13 +233,6 @@
  */
 $cacheAPIdir = $sourcedir . '/cache';
 
-/**
- * Path to the cache implementations.
- *
- * @var string
- */
-$cacheAPIImplementationdir = $cacheAPIdir . '/implementations';
-
 # Make sure the paths are correct... at least try to fix them.
 if (!is_dir(realpath($boarddir)) && file_exists(dirname(__FILE__) . '/agreement.txt'))
 	$boarddir = dirname(__FILE__);