Move remaining namespaces and delete Core\Cache.php

diff --git a/mod/ping.php b/mod/ping.php
index d00d0988a998a1108bc98a4393b3b3a5ff1fff6a..26d0efb376909de055b86a9d052114634b1ba9eb 100644 (file)
--- 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 b21dbf31359160c856e1c22d5c3344f556daea09..595a4bd2ee4affd4393642534c10f1d37f1b30d5 100644 (file)
--- 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 6c62d6cfd8b8ddccf5bd4d88b59899379ff56a88..4bcb485fcf50ad039adf527c4a13576466e1f64a 100644 (file)
--- 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 63e9c55dcbf3329215a9a96bc57bb436b6602c6f..19ff88a9cb04a7ffb31ea6bd9ee4c80569617b4e 100644 (file)
--- 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 a7cfa8557643237e6865b59730baaab70c833507..4ac8a1119e811f5d1742416201f71debdcce3d73 100644 (file)
--- 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 (file)
index 4d5d8f0..0000000
--- 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 cecdc3966e41d9a6a1a0abfe889d6acdc8c439ee..867255200444080229f5081ac1cc03993b42fd31 100644 (file)
--- 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 0ead704c101671faa77b9c17fd95122e0df88d2e..dc916d92bcb7493dd638bd1dbb3645100f3b09f1 100644 (file)
--- 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 df4d50dd3dbc58d0380f6425ef75d7222e721a47..82427a211b84d2d9971c7587dde5eb29090cee78 100644 (file)
--- 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 f9bb5d27a5fabc8dfd31b36ad2f646c7a52fecab..bf6da81cba2a2d6baf1ef2d43abf85ecdf23ec65 100644 (file)
--- 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 077df7386d7028b133ba88fb5773b01a553dfa5a..2f8da0fac26fdc1aa3f257e3b3858d748dc59aab 100644 (file)
--- 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 3cf06ede73437c53617d69cfef6587cfc99887b5..995fb85d14f1b00f4793807e38ed1ea1ab72f0c0 100644 (file)
--- 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 05160771056a7c50a485440e07fdd8aa0949c2e0..497fd3c51704bd4f468e708da9ac5f0a1f1153f3 100644 (file)
--- 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 144ce973190c635f5570917f6b6575440fe4ff66..dbfd67cb0dc2474b868a4a7f878ccb995009f35c 100644 (file)
--- 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 db3c80f492945ad5e57eb3e54880c1c6b3eec85f..b3e6956f5149c76ad31d8769acf2e7d874a06d84 100644 (file)
--- 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 04d349be0fef38ba31c1dd874dc4898e85c1d41c..5c552bdc49738f3cb64d81055a43d63a94e6703b 100644 (file)
--- 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 0118689442254071c2037429d0778651ed5d6b9e..e5a4da5b1953304cb75ffe1b296d4d87c580effd 100644 (file)
--- 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 4a5836068d3b96be3a2fa73126503b34b7248836..a56738ffb278c944f436b94c6b0537c3c736ec8b 100644 (file)
--- 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 e88949e657032b35ea97f8ac5c2df3848f4802bd..0bf77eba9196fbfb31e7251574b8e5d547844d7d 100644 (file)
--- 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 4d3087a70fb295ba503f62590357e4d181b71233..3975fe1f7ae275a7c3083f73fec6ae5d7d7ca3c8 100644 (file)
--- 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 5b405dcfc275b9175267f79acb0f24ff576c8970..4b36cf2f75e6b1767a0ae64b0cf4750e41c58e61 100644 (file)
--- 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