From a38b0f7eaf91b7c202cc3e87fef853c601faf394 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin@philipp.info>
Date: Tue, 7 Jan 2020 00:51:02 +0100
Subject: [PATCH] Move remaining namespaces and delete Core\Cache.php
---
mod/ping.php | 2 +-
mod/poco.php | 2 --
src/Content/OEmbed.php | 2 +-
src/Content/Text/BBCode.php | 1 -
src/Content/Widget/TrendingTags.php | 2 --
src/Core/Cache.php | 33 ------------------------
src/Core/Lock/DatabaseLock.php | 2 +-
src/Core/Update.php | 1 +
src/Model/Photo.php | 2 +-
src/Model/Profile.php | 2 +-
src/Model/Term.php | 2 +-
src/Module/Search/Index.php | 3 ---
src/Network/Probe.php | 2 +-
src/Protocol/ActivityPub/Transmitter.php | 2 +-
src/Protocol/Diaspora.php | 2 +-
src/Protocol/OStatus.php | 2 +-
src/Util/Images.php | 1 -
src/Util/JsonLD.php | 2 +-
src/Worker/CronJobs.php | 1 -
src/Worker/SearchDirectory.php | 2 +-
tests/Util/DbaLockMockTrait.php | 2 +-
21 files changed, 14 insertions(+), 56 deletions(-)
delete mode 100644 src/Core/Cache.php
diff --git a/mod/ping.php b/mod/ping.php
index d00d0988a9..26d0efb376 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -6,7 +6,7 @@
use Friendica\App;
use Friendica\Content\ForumManager;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
diff --git a/mod/poco.php b/mod/poco.php
index b21dbf3135..595a4bd2ee 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -6,12 +6,10 @@
use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Protocol\PortableContact;
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 6c62d6cfd8..4bcb485fcf 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -10,7 +10,7 @@ use DOMNode;
use DOMText;
use DOMXPath;
use Exception;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 63e9c55dcb..19ff88a9cb 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -10,7 +10,6 @@ use DOMXPath;
use Exception;
use Friendica\Content\OEmbed;
use Friendica\Content\Smilies;
-use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
diff --git a/src/Content/Widget/TrendingTags.php b/src/Content/Widget/TrendingTags.php
index a7cfa85576..4ac8a1119e 100644
--- a/src/Content/Widget/TrendingTags.php
+++ b/src/Content/Widget/TrendingTags.php
@@ -2,10 +2,8 @@
namespace Friendica\Content\Widget;
-use Friendica\Core\Cache;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
use Friendica\Model\Term;
/**
diff --git a/src/Core/Cache.php b/src/Core/Cache.php
deleted file mode 100644
index 4d5d8f087c..0000000000
--- a/src/Core/Cache.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @file src/Core/Cache.php
- */
-namespace Friendica\Core;
-
-use Friendica\Core\Cache\Cache as CacheClass;
-use Friendica\DI;
-
-/**
- * @brief Class for storing data for a short time
- */
-class Cache
-{
- /** @deprecated Use CacheClass::MONTH */
- const MONTH = CacheClass::MONTH;
- /** @deprecated Use CacheClass::WEEK */
- const WEEK = CacheClass::WEEK;
- /** @deprecated Use CacheClass::DAY */
- const DAY = CacheClass::DAY;
- /** @deprecated Use CacheClass::HOUR */
- const HOUR = CacheClass::HOUR;
- /** @deprecated Use CacheClass::HALF_HOUR */
- const HALF_HOUR = CacheClass::HALF_HOUR;
- /** @deprecated Use CacheClass::QUARTER_HOUR */
- const QUARTER_HOUR = CacheClass::QUARTER_HOUR;
- /** @deprecated Use CacheClass::FIVE_MINUTES */
- const FIVE_MINUTES = CacheClass::FIVE_MINUTES;
- /** @deprecated Use CacheClass::MINUTE */
- const MINUTE = CacheClass::MINUTE;
- /** @deprecated Use CacheClass::INFINITE */
- const INFINITE = CacheClass::INFINITE;
-}
diff --git a/src/Core/Lock/DatabaseLock.php b/src/Core/Lock/DatabaseLock.php
index cecdc3966e..8672552004 100644
--- a/src/Core/Lock/DatabaseLock.php
+++ b/src/Core/Lock/DatabaseLock.php
@@ -2,7 +2,7 @@
namespace Friendica\Core\Lock;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Database\Database;
use Friendica\Util\DateTimeFormat;
diff --git a/src/Core/Update.php b/src/Core/Update.php
index 0ead704c10..dc916d92bc 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -6,6 +6,7 @@ use Friendica\App;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\Util\Strings;
+use Friendica\Core\Cache\Cache;
class Update
{
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index df4d50dd3d..82427a211b 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -6,7 +6,7 @@
*/
namespace Friendica\Model;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index f9bb5d27a5..bf6da81cba 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -10,7 +10,7 @@ use Friendica\Content\ForumManager;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Content\Widget\ContactBlock;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
diff --git a/src/Model/Term.php b/src/Model/Term.php
index 077df7386d..2f8da0fac2 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -4,7 +4,7 @@
*/
namespace Friendica\Model;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Logger;
use Friendica\Database\DBA;
use Friendica\DI;
diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 3cf06ede73..995fb85d14 100644
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -2,13 +2,10 @@
namespace Friendica\Module\Search;
-use Friendica\App\Arguments;
-use Friendica\App\BaseURL;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Text\HTML;
use Friendica\Content\Widget;
-use Friendica\Core\Cache;
use Friendica\Core\Cache\Cache as CacheClass;
use Friendica\Core\Config;
use Friendica\Core\L10n;
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 0516077105..497fd3c517 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -11,7 +11,7 @@ namespace Friendica\Network;
use DOMDocument;
use DomXPath;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 144ce97319..dbfd67cb0d 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -7,7 +7,7 @@ namespace Friendica\Protocol\ActivityPub;
use Friendica\Content\Feature;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index db3c80f492..b3e6956f51 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -13,7 +13,7 @@ namespace Friendica\Protocol;
use Friendica\Content\Feature;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 04d349be0f..5c552bdc49 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -8,7 +8,7 @@ use DOMDocument;
use DOMXPath;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Lock;
diff --git a/src/Util/Images.php b/src/Util/Images.php
index 0118689442..e5a4da5b19 100644
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -2,7 +2,6 @@
namespace Friendica\Util;
-use Friendica\Core\Cache;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\DI;
diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 4a5836068d..a56738ffb2 100644
--- a/src/Util/JsonLD.php
+++ b/src/Util/JsonLD.php
@@ -4,7 +4,7 @@
*/
namespace Friendica\Util;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Logger;
use Exception;
use Friendica\DI;
diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index e88949e657..0bf77eba91 100644
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -5,7 +5,6 @@
namespace Friendica\Worker;
use Friendica\App;
-use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php
index 4d3087a70f..3975fe1f7a 100644
--- a/src/Worker/SearchDirectory.php
+++ b/src/Worker/SearchDirectory.php
@@ -4,7 +4,7 @@
*/
namespace Friendica\Worker;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
diff --git a/tests/Util/DbaLockMockTrait.php b/tests/Util/DbaLockMockTrait.php
index 5b405dcfc2..4b36cf2f75 100644
--- a/tests/Util/DbaLockMockTrait.php
+++ b/tests/Util/DbaLockMockTrait.php
@@ -2,7 +2,7 @@
namespace Friendica\Test\Util;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Lock\DatabaseLock;
trait DbaLockMockTrait