Merge pull request #8142 from nupplaphil/task/di_config

[friendica.git] / src / Factory / LockFactory.php

diff --git a/src/Factory/LockFactory.php b/src/Factory/LockFactory.php
index cee01fe1e9d2647aef5fb9b8b440b0621ae4e3b6..6d739ea41acaf0c825700f19a7118dc1f4d8144f 100644 (file)
--- a/src/Factory/LockFactory.php
+++ b/src/Factory/LockFactory.php
@@ -2,9 +2,9 @@
 
 namespace Friendica\Factory;
 
-use Friendica\Core\Cache\Cache;
 use Friendica\Core\Cache\IMemoryCache;
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\Cache\Type;
+use Friendica\Core\Config\IConfig;
 use Friendica\Core\Lock;
 use Friendica\Database\Database;
 use Psr\Log\LoggerInterface;
@@ -24,7 +24,7 @@ class LockFactory
        const DEFAULT_DRIVER = 'default';
 
        /**
-        * @var Configuration The configuration to read parameters out of the config
+        * @var IConfig The configuration to read parameters out of the config
         */
        private $config;
 
@@ -43,7 +43,7 @@ class LockFactory
         */
        private $logger;
 
-       public function __construct(CacheFactory $cacheFactory, Configuration $config, Database $dba, LoggerInterface $logger)
+       public function __construct(CacheFactory $cacheFactory, IConfig $config, Database $dba, LoggerInterface $logger)
        {
                $this->cacheFactory = $cacheFactory;
                $this->config       = $config;
@@ -57,10 +57,10 @@ class LockFactory
 
                try {
                        switch ($lock_type) {
-                               case Cache::TYPE_MEMCACHE:
-                               case Cache::TYPE_MEMCACHED:
-                               case Cache::TYPE_REDIS:
-                               case Cache::TYPE_APCU:
+                               case Type::MEMCACHE:
+                               case Type::MEMCACHED:
+                               case Type::REDIS:
+                               case Type::APCU:
                                        $cache = $this->cacheFactory->create($lock_type);
                                        if ($cache instanceof IMemoryCache) {
                                                return new Lock\CacheLock($cache);
@@ -87,7 +87,7 @@ class LockFactory
        }
 
        /**
-        * @brief This method tries to find the best - local - locking method for Friendica
+        * This method tries to find the best - local - locking method for Friendica
         *
         * The following sequence will be tried:
         * 1. Semaphore Locking
@@ -109,7 +109,7 @@ class LockFactory
 
                // 2. Try to use Cache Locking (don't use the DB-Cache Locking because it works different!)
                $cache_type = $this->config->get('system', 'cache_driver', 'database');
-               if ($cache_type != Cache::TYPE_DATABASE) {
+               if ($cache_type != Type::DATABASE) {
                        try {
                                $cache = $this->cacheFactory->create($cache_type);
                                if ($cache instanceof IMemoryCache) {