Merge pull request #8072 from nupplaphil/task/Cache_to_DI

Replace Core\Cache wrapper with DI::cache() method

diff --cc src/Core/Lock/DatabaseLock.php
Simple merge

diff --cc src/Core/Update.php
index badbdc7851d380092b3965e1e0bbd3ccc794e9e0,dc916d92bcb7493dd638bd1dbb3645100f3b09f1..62ea573db6174d8566cfe7ed0ae65fc046ec298f
--- 1/src/Core/Update.php
--- 2/src/Core/Update.php
+++ b/src/Core/Update.php
@@@ -5,8 -5,8 +5,9 @@@ namespace Friendica\Core
  use Friendica\App;
  use Friendica\Database\DBA;
  use Friendica\Database\DBStructure;
 +use Friendica\DI;
  use Friendica\Util\Strings;
+ use Friendica\Core\Cache\Cache;
  
  class Update
  {

diff --cc src/Model/Photo.php
Simple merge

diff --cc src/Protocol/OStatus.php
Simple merge

diff --cc src/Worker/CronJobs.php
Simple merge

diff --cc tests/Util/DbaLockMockTrait.php
Simple merge