Automated formatting changes

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -51,8 +51,8 @@ class MysqlGrammarTest extends \PHPUnit\Framework\TestCase
/**
* @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\Grammar\MysqlGrammar<extended>
* @group framework
*/
public function testSchemaInputOutput() : void

View File

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

View File

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

View File

@ -138,28 +138,28 @@ class ModuleAbstractTest extends \PHPUnit\Framework\TestCase
public function createWithCallable() : string
{
\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();
}
public function createsWithCallable() : string
{
\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();
}
public function updateWithCallable() : string
{
\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();
}
public function deleteWithCallable() : string
{
\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();
}
};

View File

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

View File

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

View File

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