Merge branch 'develop' of https://github.com/Orange-Management/phpOMS into develop

This commit is contained in:
Dennis Eichhorn 2020-10-05 19:33:31 +02:00
commit f7c5233d28
8 changed files with 22 additions and 23 deletions

View File

@ -31,7 +31,7 @@ class FtpStorage extends StorageAbstract
{ {
private static $con = null; private static $con = null;
public static function with($con) public static function with($con) : void
{ {
self::$con = $con; self::$con = $con;
} }

View File

@ -20,7 +20,6 @@ use phpOMS\Dispatcher\Dispatcher;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Module\ModuleManager; use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter; use phpOMS\Router\WebRouter;
use phpOMS\System\File\Local\Directory;
use phpOMS\Uri\HttpUri; use phpOMS\Uri\HttpUri;
require_once __DIR__ . '/../Autoloader.php'; require_once __DIR__ . '/../Autoloader.php';

View File

@ -44,7 +44,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
public function testConnection() : void public function testConnection() : void
{ {
self::assertNotEquals(false, Directory::ftpConnect(new HttpUri(self::BASE . '/test'))); self::assertNotFalse(Directory::ftpConnect(new HttpUri(self::BASE . '/test')));
} }
public function testInvalidConnection() : void public function testInvalidConnection() : void
@ -507,7 +507,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
self::assertEquals([ self::assertEquals([
'sub', 'sub',
'test.txt' 'test.txt',
], $dir->getList()); ], $dir->getList());
} }

View File

@ -46,7 +46,7 @@ class FileTest extends \PHPUnit\Framework\TestCase
public function testConnection() : void public function testConnection() : void
{ {
self::assertNotEquals(false, File::ftpConnect(new HttpUri(self::BASE . '/test'))); self::assertNotFalse(File::ftpConnect(new HttpUri(self::BASE . '/test')));
} }
public function testInvalidConnection() : void public function testInvalidConnection() : void

View File

@ -15,10 +15,10 @@ declare(strict_types=1);
namespace phpOMS\tests\System\File\Ftp; namespace phpOMS\tests\System\File\Ftp;
use phpOMS\System\File\ContentPutMode; use phpOMS\System\File\ContentPutMode;
use phpOMS\System\File\Ftp\FtpStorage;
use phpOMS\Uri\HttpUri;
use phpOMS\System\File\Ftp\Directory; use phpOMS\System\File\Ftp\Directory;
use phpOMS\System\File\Ftp\File; use phpOMS\System\File\Ftp\File;
use phpOMS\System\File\Ftp\FtpStorage;
use phpOMS\Uri\HttpUri;
/** /**
* @testdox phpOMS\tests\System\File\Ftp\FtpStorageTest: Directory & File handler for local file system * @testdox phpOMS\tests\System\File\Ftp\FtpStorageTest: Directory & File handler for local file system

View File

@ -518,7 +518,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
self::assertEquals([ self::assertEquals([
'sub', 'sub',
'test.txt' 'test.txt',
], $dir->getList()); ], $dir->getList());
} }

View File

@ -15,11 +15,11 @@ declare(strict_types=1);
namespace phpOMS\tests\Utils\Converter; namespace phpOMS\tests\Utils\Converter;
use phpOMS\Localization\ISO4217CharEnum; use phpOMS\Localization\ISO4217CharEnum;
use phpOMS\Utils\Converter\Currency;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Uri\HttpUri;
use phpOMS\Message\Http\RequestMethod; use phpOMS\Message\Http\RequestMethod;
use phpOMS\Message\Http\Rest; use phpOMS\Message\Http\Rest;
use phpOMS\Uri\HttpUri;
use phpOMS\Utils\Converter\Currency;
/** /**
* @testdox phpOMS\tests\Utils\Converter\CurrencyTest: Currency converter * @testdox phpOMS\tests\Utils\Converter\CurrencyTest: Currency converter