Move remaining namespaces and delete Core\Cache.php

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;

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;

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;

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;

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;
 
 /**

src/Core/Cache.php

@@ -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;
-}

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;
 

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
 {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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