friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

"Imported" name spaces (#5361) 

* Fixes for #5355:
- let's import SPL/extension classes and then just use them without name spaces
  like we do it with our own classes/interfaces, too.
- need to add namespace \ (global)

Signed-off-by: Roland Häder <roland@mxchange.org>

* Removed leading slashes from "import" lines.

Signed-off-by: Roland Häder <roland@mxchange.org>

* Completed:
- "import" other classes, then use them

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2018-07-11 00:55:01 +02:00 committed by Hypolite Petovan
parent 3792e2819d
commit 8825728fa4
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Core/Cache/MemcacheCacheDriver.php
View File

@ -4,6 +4,9 @@ namespace Friendica\Core\Cache;
use Friendica\Core\Cache;
use Exception;
use Memcache;
/**
* Memcache Cache Driver
*
@ -15,20 +18,20 @@ class MemcacheCacheDriver extends AbstractCacheDriver implements IMemoryCacheDri
use TraitCompareDelete;
/**
* @var \Memcache
* @var Memcache
*/
private $memcache;
public function __construct($memcache_host, $memcache_port)
{
if (!class_exists('Memcache', false)) {
throw new \Exception('Memcache class isn\'t available');
throw new Exception('Memcache class isn\'t available');
}
$this->memcache = new \Memcache();
$this->memcache = new Memcache();
if (!$this->memcache->connect($memcache_host, $memcache_port)) {
throw new \Exception('Expected Memcache server at ' . $memcache_host . ':' . $memcache_port . ' isn\'t available');
throw new Exception('Expected Memcache server at ' . $memcache_host . ':' . $memcache_port . ' isn\'t available');
}
}

11
src/Core/Cache/MemcachedCacheDriver.php
View File

@ -4,6 +4,9 @@ namespace Friendica\Core\Cache;
use Friendica\Core\Cache;
use Exception;
use Memcached;
/**
* Memcached Cache Driver
*
@ -22,15 +25,15 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
public function __construct(array $memcached_hosts)
{
if (!class_exists('Memcached', false)) {
throw new \Exception('Memcached class isn\'t available');
throw new Exception('Memcached class isn\'t available');
}
$this->memcached = new \Memcached();
$this->memcached = new Memcached();
$this->memcached->addServers($memcached_hosts);
if (count($this->memcached->getServerList()) == 0) {
throw new \Exception('Expected Memcached servers aren\'t available, config:' . var_export($memcached_hosts, true));
throw new Exception('Expected Memcached servers aren\'t available, config:' . var_export($memcached_hosts, true));
}
}
@ -42,7 +45,7 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
// We fetch with the hostname as key to avoid problems with other applications
$value = $this->memcached->get($cachekey);
if ($this->memcached->getResultCode() === \Memcached::RES_SUCCESS) {
if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
$return = $value;
}

11
src/Core/Cache/RedisCacheDriver.php
View File

@ -4,6 +4,9 @@ namespace Friendica\Core\Cache;
use Friendica\Core\Cache;
use Exception;
use Redis;
/**
* Redis Cache Driver. This driver is based on Memcache driver
*
@ -13,20 +16,20 @@ use Friendica\Core\Cache;
class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
{
/**
* @var \Redis
* @var Redis
*/
private $redis;
public function __construct($redis_host, $redis_port)
{
if (!class_exists('Redis', false)) {
throw new \Exception('Redis class isn\'t available');
throw new Exception('Redis class isn\'t available');
}
$this->redis = new \Redis();
$this->redis = new Redis();
if (!$this->redis->connect($redis_host, $redis_port)) {
throw new \Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
throw new Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
}
}