Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-14 23:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix initialization

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-09-09 16:24:03 +02:00
parent 8edb12543d
commit 542d62973e
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
System/File/Ftp/FtpStorage.php
View File

@ -32,9 +32,19 @@ class FtpStorage extends StorageAbstract
{ {
private $con = null; private $con = null;
public function __construct(string $uri, int $port = 21, bool $mode = true, string $login = null, string $pass = null, bool $ssl = false) private static $instance = null;
public function __construct() {
}
public static function getInstance() : StorageAbstract
{ {
$this->connect($uri, $port = 21, $mode, $login = null, $pass = null, $ssl = false); if(!isset(self::$instance)) {
self::$instance = new self();
}
return self::$instance;
} }
public function connect(string $uri, int $port = 21, bool $mode = true, string $login = null, string $pass = null, bool $ssl = false) : bool public function connect(string $uri, int $port = 21, bool $mode = true, string $login = null, string $pass = null, bool $ssl = false) : bool

15
System/File/Local/LocalStorage.php
View File

@ -30,6 +30,21 @@ use phpOMS\System\File\StorageAbstract;
*/ */
class LocalStorage extends StorageAbstract class LocalStorage extends StorageAbstract
{ {
private static $instance = null;
public function __construct() {
}
public static function getInstance() : StorageAbstract
{
if(!isset(self::$instance)) {
self::$instance = new self();
}
return self::$instance;
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

18
System/File/StorageAbstract.php
View File

@ -28,14 +28,6 @@ namespace phpOMS\System\File;
*/ */
abstract class StorageAbstract implements DirectoryInterface, FileInterface abstract class StorageAbstract implements DirectoryInterface, FileInterface
{ {
/**
* Singleton instance.
*
* @var StorageAbstract
* @since 1.0.0
*/
protected static $instance = null;
/** /**
* Storage type. * Storage type.
* *
@ -60,15 +52,7 @@ abstract class StorageAbstract implements DirectoryInterface, FileInterface
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function getInstance() : StorageAbstract abstract public static function getInstance() : StorageAbstract;
{
if(!isset(static::$instance)) {
static::$instance = new static();
}
return static::$instance;
}
/** /**
* Get storage type. * Get storage type.
* *