Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-13 15:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automated formatting changes

Browse Source
This commit is contained in:
Formatter Bot 2021-10-10 09:08:16 +00:00
parent fa7fb0f188
commit a42f662062
16 changed files with 219 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/InstallerAbstract.php
View File

@ -14,11 +14,11 @@ declare(strict_types=1);
namespace phpOMS\Application; namespace phpOMS\Application;
use phpOMS\Autoloader;
use phpOMS\Config\SettingsInterface; use phpOMS\Config\SettingsInterface;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder; use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\Directory;
use phpOMS\Autoloader;
/** /**
* Installer abstract class. * Installer abstract class.

2
Module/InstallerAbstract.php
View File

@ -15,10 +15,10 @@ declare(strict_types=1);
namespace phpOMS\Module; namespace phpOMS\Module;
use phpOMS\Application\ApplicationInfo; use phpOMS\Application\ApplicationInfo;
use phpOMS\Autoloader;
use phpOMS\Config\SettingsInterface; use phpOMS\Config\SettingsInterface;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder; use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
use phpOMS\Autoloader;
/** /**
* Installer abstract class. * Installer abstract class.

4
tests/Application/UninstallerAbstractTest.php
View File

@ -16,10 +16,9 @@ namespace phpOMS\tests\Application;
require_once __DIR__ . '/../Autoloader.php'; require_once __DIR__ . '/../Autoloader.php';
use phpOMS\Application\ApplicationInfo;
use phpOMS\Application\UninstallerAbstract; use phpOMS\Application\UninstallerAbstract;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Application\ApplicationInfo;
use Model\CoreSettings;
/** /**
* @testdox phpOMS\tests\Application\UninstallerAbstractTest: Abstract module * @testdox phpOMS\tests\Application\UninstallerAbstractTest: Abstract module
@ -35,7 +34,6 @@ class UninstallerAbstractTest extends \PHPUnit\Framework\TestCase
*/ */
protected function setUp() : void protected function setUp() : void
{ {
$this->uninstaller = new class() extends UninstallerAbstract $this->uninstaller = new class() extends UninstallerAbstract
{ {
public const PATH = __DIR__ . '/invalid'; public const PATH = __DIR__ . '/invalid';

48
tests/Bootstrap.php
View File

@ -30,7 +30,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'insert' => [ 'insert' => [
'db' => 'mysql', /* db type */ 'db' => 'mysql', /* db type */
@ -40,7 +40,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'select' => [ 'select' => [
'db' => 'mysql', /* db type */ 'db' => 'mysql', /* db type */
@ -50,7 +50,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'update' => [ 'update' => [
'db' => 'mysql', /* db type */ 'db' => 'mysql', /* db type */
@ -60,7 +60,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'delete' => [ 'delete' => [
'db' => 'mysql', /* db type */ 'db' => 'mysql', /* db type */
@ -70,7 +70,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'schema' => [ 'schema' => [
'db' => 'mysql', /* db type */ 'db' => 'mysql', /* db type */
@ -80,7 +80,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
], ],
'postgresql' => [ 'postgresql' => [
@ -92,7 +92,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'insert' => [ 'insert' => [
'db' => 'pgsql', /* db type */ 'db' => 'pgsql', /* db type */
@ -102,7 +102,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'select' => [ 'select' => [
'db' => 'pgsql', /* db type */ 'db' => 'pgsql', /* db type */
@ -112,7 +112,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'update' => [ 'update' => [
'db' => 'pgsql', /* db type */ 'db' => 'pgsql', /* db type */
@ -122,7 +122,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'delete' => [ 'delete' => [
'db' => 'pgsql', /* db type */ 'db' => 'pgsql', /* db type */
@ -132,7 +132,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'schema' => [ 'schema' => [
'db' => 'pgsql', /* db type */ 'db' => 'pgsql', /* db type */
@ -142,7 +142,7 @@ $CONFIG = [
'password' => 'root', /* db login password */ 'password' => 'root', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
], ],
'sqlite' => [ 'sqlite' => [
@ -150,37 +150,37 @@ $CONFIG = [
'db' => 'sqlite', /* db type */ 'db' => 'sqlite', /* db type */
'database' => __DIR__ . '/test.sqlite', /* db name */ 'database' => __DIR__ . '/test.sqlite', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'insert' => [ 'insert' => [
'db' => 'sqlite', /* db type */ 'db' => 'sqlite', /* db type */
'database' => __DIR__ . '/test.sqlite', /* db name */ 'database' => __DIR__ . '/test.sqlite', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'select' => [ 'select' => [
'db' => 'sqlite', /* db type */ 'db' => 'sqlite', /* db type */
'database' => __DIR__ . '/test.sqlite', /* db name */ 'database' => __DIR__ . '/test.sqlite', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'update' => [ 'update' => [
'db' => 'sqlite', /* db type */ 'db' => 'sqlite', /* db type */
'database' => __DIR__ . '/test.sqlite', /* db name */ 'database' => __DIR__ . '/test.sqlite', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'delete' => [ 'delete' => [
'db' => 'sqlite', /* db type */ 'db' => 'sqlite', /* db type */
'database' => __DIR__ . '/test.sqlite', /* db name */ 'database' => __DIR__ . '/test.sqlite', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'schema' => [ 'schema' => [
'db' => 'sqlite', /* db type */ 'db' => 'sqlite', /* db type */
'database' => __DIR__ . '/test.sqlite', /* db name */ 'database' => __DIR__ . '/test.sqlite', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
], ],
'mssql' => [ 'mssql' => [
@ -192,7 +192,7 @@ $CONFIG = [
'password' => 'R00troot', /* db login password */ 'password' => 'R00troot', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'insert' => [ 'insert' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
@ -202,7 +202,7 @@ $CONFIG = [
'password' => 'R00troot', /* db login password */ 'password' => 'R00troot', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'select' => [ 'select' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
@ -212,7 +212,7 @@ $CONFIG = [
'password' => 'R00troot', /* db login password */ 'password' => 'R00troot', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'update' => [ 'update' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
@ -222,7 +222,7 @@ $CONFIG = [
'password' => 'R00troot', /* db login password */ 'password' => 'R00troot', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'delete' => [ 'delete' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
@ -232,7 +232,7 @@ $CONFIG = [
'password' => 'R00troot', /* db login password */ 'password' => 'R00troot', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
'schema' => [ 'schema' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
@ -242,7 +242,7 @@ $CONFIG = [
'password' => 'R00troot', /* db login password */ 'password' => 'R00troot', /* db login password */
'database' => 'oms', /* db name */ 'database' => 'oms', /* db name */
'weight' => 1000, /* db table prefix */ 'weight' => 1000, /* db table prefix */
'datetimeformat' => 'Y-m-d H:i:s' 'datetimeformat' => 'Y-m-d H:i:s',
], ],
], ],
], ],

4
tests/DataStorage/Database/DataMapperAbstractTest.php
View File

@ -14,13 +14,13 @@ declare(strict_types=1);
namespace phpOMS\tests\DataStorage\Database; namespace phpOMS\tests\DataStorage\Database;
use phpOMS\tests\DataStorage\Database\TestModel\BaseModel; use phpOMS\tests\DataStorage\Database\TestModel\BaseModel;
use phpOMS\tests\DataStorage\Database\TestModel\NullBaseModel;
use phpOMS\tests\DataStorage\Database\TestModel\BaseModelMapper; use phpOMS\tests\DataStorage\Database\TestModel\BaseModelMapper;
use phpOMS\tests\DataStorage\Database\TestModel\Conditional; use phpOMS\tests\DataStorage\Database\TestModel\Conditional;
use phpOMS\tests\DataStorage\Database\TestModel\ConditionalMapper; use phpOMS\tests\DataStorage\Database\TestModel\ConditionalMapper;
use phpOMS\tests\DataStorage\Database\TestModel\ManyToManyDirectModelMapper; use phpOMS\tests\DataStorage\Database\TestModel\ManyToManyDirectModelMapper;
use phpOMS\tests\DataStorage\Database\TestModel\ManyToManyRelModel; use phpOMS\tests\DataStorage\Database\TestModel\ManyToManyRelModel;
use phpOMS\tests\DataStorage\Database\TestModel\ManyToManyRelModelMapper; use phpOMS\tests\DataStorage\Database\TestModel\ManyToManyRelModelMapper;
use phpOMS\tests\DataStorage\Database\TestModel\NullBaseModel;
/** /**
* @testdox phpOMS\tests\DataStorage\Database\DataMapperAbstractTest: Datamapper for database models * @testdox phpOMS\tests\DataStorage\Database\DataMapperAbstractTest: Datamapper for database models
@ -197,7 +197,7 @@ class DataMapperAbstractTest extends \PHPUnit\Framework\TestCase
public function testCreateNullModel() : void public function testCreateNullModel() : void
{ {
$nullModel1 = new NullBaseModel(); $nullModel1 = new NullBaseModel();
self::assertEquals(null, BaseModelMapper::create($nullModel1)); self::assertNull(BaseModelMapper::create($nullModel1));
$nullModel2 = new NullBaseModel(77); $nullModel2 = new NullBaseModel(77);
self::assertEquals(77, BaseModelMapper::create($nullModel2)); self::assertEquals(77, BaseModelMapper::create($nullModel2));

2
tests/DataStorage/Database/Schema/Grammar/MysqlGrammarTest.php
View File

@ -51,8 +51,8 @@ class MysqlGrammarTest extends \PHPUnit\Framework\TestCase
/** /**
* @testdox The the grammar correctly creates and returns a database table * @testdox The the grammar correctly creates and returns a database table
* @covers phpOMS\DataStorage\Database\Schema\Grammar\MysqlGrammar<extended>
* @covers phpOMS\DataStorage\Database\Schema\Builder * @covers phpOMS\DataStorage\Database\Schema\Builder
* @covers phpOMS\DataStorage\Database\Schema\Grammar\MysqlGrammar<extended>
* @group framework * @group framework
*/ */
public function testSchemaInputOutput() : void public function testSchemaInputOutput() : void

4
tests/Message/Mail/EmailTest.php
View File

@ -82,7 +82,6 @@ class EmailTestTest extends \PHPUnit\Framework\TestCase
], ],
$this->mail->to $this->mail->to
); );
} }
public function testInvalidAddTo() : void public function testInvalidAddTo() : void
@ -103,7 +102,6 @@ class EmailTestTest extends \PHPUnit\Framework\TestCase
], ],
$this->mail->cc $this->mail->cc
); );
} }
public function testInvalidAddCC() : void public function testInvalidAddCC() : void
@ -124,7 +122,6 @@ class EmailTestTest extends \PHPUnit\Framework\TestCase
], ],
$this->mail->bcc $this->mail->bcc
); );
} }
public function testInvalidAddBCC() : void public function testInvalidAddBCC() : void
@ -145,7 +142,6 @@ class EmailTestTest extends \PHPUnit\Framework\TestCase
], ],
$this->mail->replyTo $this->mail->replyTo
); );
} }
public function testInvalidAddReplyTo() : void public function testInvalidAddReplyTo() : void

7
tests/Module/InstallerAbstractTest.php
View File

@ -16,10 +16,10 @@ namespace phpOMS\tests\Module;
require_once __DIR__ . '/../Autoloader.php'; require_once __DIR__ . '/../Autoloader.php';
use phpOMS\Module\InstallerAbstract;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\ModuleInfo;
use Model\CoreSettings; use Model\CoreSettings;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\InstallerAbstract;
use phpOMS\Module\ModuleInfo;
/** /**
* @testdox phpOMS\tests\Module\InstallerAbstractTest: Abstract module * @testdox phpOMS\tests\Module\InstallerAbstractTest: Abstract module
@ -37,7 +37,6 @@ class InstallerAbstractTest extends \PHPUnit\Framework\TestCase
{ {
$this->installer = new class() extends InstallerAbstract $this->installer = new class() extends InstallerAbstract
{ {
}; };
} }

8
tests/Module/ModuleAbstractTest.php
View File

@ -138,28 +138,28 @@ class ModuleAbstractTest extends \PHPUnit\Framework\TestCase
public function createWithCallable() : string public function createWithCallable() : string
{ {
\ob_start(); \ob_start();
$this->createModel(1, null, function() { echo 1; }, '', '127.0.0.1'); $this->createModel(1, null, function() : void { echo 1; }, '', '127.0.0.1');
return \ob_get_clean(); return \ob_get_clean();
} }
public function createsWithCallable() : string public function createsWithCallable() : string
{ {
\ob_start(); \ob_start();
$this->createModels(1, [null, null], function() { echo 1; }, '', '127.0.0.1'); $this->createModels(1, [null, null], function() : void { echo 1; }, '', '127.0.0.1');
return \ob_get_clean(); return \ob_get_clean();
} }
public function updateWithCallable() : string public function updateWithCallable() : string
{ {
\ob_start(); \ob_start();
$this->updateModel(1, null, null, function() { echo 1; }, '', '127.0.0.1'); $this->updateModel(1, null, null, function() : void { echo 1; }, '', '127.0.0.1');
return \ob_get_clean(); return \ob_get_clean();
} }
public function deleteWithCallable() : string public function deleteWithCallable() : string
{ {
\ob_start(); \ob_start();
$this->deleteModel(1, null, function() { echo 1; }, '', '127.0.0.1'); $this->deleteModel(1, null, function() : void { echo 1; }, '', '127.0.0.1');
return \ob_get_clean(); return \ob_get_clean();
} }
}; };

1
tests/Module/StatusAbstractTest.php
View File

@ -34,7 +34,6 @@ class StatusAbstractTest extends \PHPUnit\Framework\TestCase
{ {
$this->status = new class() extends StatusAbstract $this->status = new class() extends StatusAbstract
{ {
}; };
} }
} }

4
tests/Module/UninstallerAbstractTest.php
View File

@ -16,10 +16,9 @@ namespace phpOMS\tests\Module;
require_once __DIR__ . '/../Autoloader.php'; require_once __DIR__ . '/../Autoloader.php';
use phpOMS\Module\UninstallerAbstract;
use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\ModuleInfo; use phpOMS\Module\ModuleInfo;
use Model\CoreSettings; use phpOMS\Module\UninstallerAbstract;
/** /**
* @testdox phpOMS\tests\Module\UninstallerAbstractTest: Abstract module * @testdox phpOMS\tests\Module\UninstallerAbstractTest: Abstract module
@ -35,7 +34,6 @@ class UninstallerAbstractTest extends \PHPUnit\Framework\TestCase
*/ */
protected function setUp() : void protected function setUp() : void
{ {
$this->uninstaller = new class() extends UninstallerAbstract $this->uninstaller = new class() extends UninstallerAbstract
{ {
public const PATH = __DIR__ . '/invalid'; public const PATH = __DIR__ . '/invalid';

2
tests/Stdlib/Graph/NodeTest.php
View File

@ -174,6 +174,6 @@ class NodeTest extends \PHPUnit\Framework\TestCase
$node1->setNodeRelative($node3); $node1->setNodeRelative($node3);
self::assertEquals('C', $node1->getEdgeByNeighbor($node3)->getNode2()->getId()); self::assertEquals('C', $node1->getEdgeByNeighbor($node3)->getNode2()->getId());
self::assertEquals(null, $node1->getEdgeByNeighbor($node4)); self::assertNull($node1->getEdgeByNeighbor($node4));
} }
} }