From 0d83f2a22bf8f299c5f096dae08e3828f9090fa5 Mon Sep 17 00:00:00 2001 From: Formatter Bot Date: Sat, 2 Oct 2021 18:51:15 +0000 Subject: [PATCH] Automated formatting changes --- Algorithm/Sort/QuickSort.php | 2 +- Application/ApplicationManager.php | 2 +- Application/StatusAbstract.php | 1 - tests/Algorithm/PathFinding/AStarTest.php | 2 +- tests/Algorithm/PathFinding/JumpPointSearchTest.php | 2 +- tests/Application/ApplicationManagerTest.php | 2 +- tests/Application/InstallerAbstractTest.php | 6 +++--- tests/Application/MissingInfo/Admin/Installer.php | 2 +- tests/Application/StatusAbstractTest.php | 6 +++--- .../Application/Testapp/Admin/Install/Application/Hooks.php | 2 +- tests/Message/Http/HttpRequestTest.php | 2 +- tests/Message/Http/HttpResponseTest.php | 5 ++--- tests/Message/RequestAbstractTest.php | 5 ++--- tests/Module/ModuleAbstractTest.php | 1 - tests/Module/ModuleManagerTest.php | 2 +- tests/Module/Test/Theme/Mytheme/Lang/en.lang.php | 4 ++-- tests/Views/testReturnTemplate.tpl.php | 2 +- 17 files changed, 22 insertions(+), 26 deletions(-) diff --git a/Algorithm/Sort/QuickSort.php b/Algorithm/Sort/QuickSort.php index 69dcd6a00..33a58c322 100644 --- a/Algorithm/Sort/QuickSort.php +++ b/Algorithm/Sort/QuickSort.php @@ -87,7 +87,7 @@ final class QuickSort implements SortInterface private static function partition(array &$list, int $lo, int $hi, int $order) : int { $pivot = $list[$hi]; - $i = $lo - 1; + $i = $lo - 1; for ($j = $lo; $j <= $hi - 1; ++$j) { if (!$list[$j]->compare($pivot, $order)) { diff --git a/Application/ApplicationManager.php b/Application/ApplicationManager.php index 5b59e5598..bac390484 100644 --- a/Application/ApplicationManager.php +++ b/Application/ApplicationManager.php @@ -172,7 +172,7 @@ final class ApplicationManager } $classPath = \substr(\realpath($appPath) . '/Admin/Installer', \strlen(\realpath(__DIR__ . '/../../'))); - $class = \str_replace('/', '\\', $classPath); + $class = \str_replace('/', '\\', $classPath); /** @var $class InstallerAbstract */ $class::reInit($info); diff --git a/Application/StatusAbstract.php b/Application/StatusAbstract.php index 5275edb0b..6ec9aceb5 100644 --- a/Application/StatusAbstract.php +++ b/Application/StatusAbstract.php @@ -17,7 +17,6 @@ namespace phpOMS\Application; use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\System\File\PathException; use phpOMS\System\File\PermissionException; -use phpOMS\Utils\ArrayUtils; use phpOMS\Utils\Parser\Php\ArrayParser; /** diff --git a/tests/Algorithm/PathFinding/AStarTest.php b/tests/Algorithm/PathFinding/AStarTest.php index b7b3a0184..5a26a4887 100644 --- a/tests/Algorithm/PathFinding/AStarTest.php +++ b/tests/Algorithm/PathFinding/AStarTest.php @@ -17,9 +17,9 @@ namespace phpOMS\tests\Algorithm\PathFinding; use phpOMS\Algorithm\PathFinding\AStar; use phpOMS\Algorithm\PathFinding\AStarNode; use phpOMS\Algorithm\PathFinding\Grid; -use phpOMS\Algorithm\PathFinding\Path; use phpOMS\Algorithm\PathFinding\HeuristicType; use phpOMS\Algorithm\PathFinding\MovementType; +use phpOMS\Algorithm\PathFinding\Path; require_once __DIR__ . '/../../Autoloader.php'; diff --git a/tests/Algorithm/PathFinding/JumpPointSearchTest.php b/tests/Algorithm/PathFinding/JumpPointSearchTest.php index cde4bc275..ea352da69 100644 --- a/tests/Algorithm/PathFinding/JumpPointSearchTest.php +++ b/tests/Algorithm/PathFinding/JumpPointSearchTest.php @@ -15,11 +15,11 @@ declare(strict_types=1); namespace phpOMS\tests\Algorithm\PathFinding; use phpOMS\Algorithm\PathFinding\Grid; -use phpOMS\Algorithm\PathFinding\Path; use phpOMS\Algorithm\PathFinding\HeuristicType; use phpOMS\Algorithm\PathFinding\JumpPointNode; use phpOMS\Algorithm\PathFinding\JumpPointSearch; use phpOMS\Algorithm\PathFinding\MovementType; +use phpOMS\Algorithm\PathFinding\Path; require_once __DIR__ . '/../../Autoloader.php'; diff --git a/tests/Application/ApplicationManagerTest.php b/tests/Application/ApplicationManagerTest.php index 2ac8d3f2f..122d8f231 100644 --- a/tests/Application/ApplicationManagerTest.php +++ b/tests/Application/ApplicationManagerTest.php @@ -76,8 +76,8 @@ class ApplicationManagerTest extends \PHPUnit\Framework\TestCase /** * @covers phpOMS\Application\ApplicationManager * @covers phpOMS\Application\InstallerAbstract - * @covers phpOMS\Application\UninstallerAbstract * @covers phpOMS\Application\StatusAbstract + * @covers phpOMS\Application\UninstallerAbstract * @group framework */ public function testInstallUninstall() : void diff --git a/tests/Application/InstallerAbstractTest.php b/tests/Application/InstallerAbstractTest.php index 8818440ca..3a175a031 100644 --- a/tests/Application/InstallerAbstractTest.php +++ b/tests/Application/InstallerAbstractTest.php @@ -27,17 +27,17 @@ class InstallerAbstractTest extends \PHPUnit\Framework\TestCase { protected InstallerAbstract $installer; - /** + /** * {@inheritdoc} */ protected function setUp() : void { - $this->installer = new class() extends InstallerAbstract { + $this->installer = new class() extends InstallerAbstract { public const PATH = __DIR__ . '/Invalid'; }; } - /** + /** * @covers phpOMS\Application\InstallerAbstract * @group framework */ diff --git a/tests/Application/MissingInfo/Admin/Installer.php b/tests/Application/MissingInfo/Admin/Installer.php index a81436628..e71ac26b3 100644 --- a/tests/Application/MissingInfo/Admin/Installer.php +++ b/tests/Application/MissingInfo/Admin/Installer.php @@ -1 +1 @@ -status = new class() extends StatusAbstract { + $this->status = new class() extends StatusAbstract { public const PATH = __DIR__ . '/Invalid'; }; } - /** + /** * @covers phpOMS\Application\StatusAbstract * @group framework */ diff --git a/tests/Application/Testapp/Admin/Install/Application/Hooks.php b/tests/Application/Testapp/Admin/Install/Application/Hooks.php index beb77a656..c9ec63e0b 100644 --- a/tests/Application/Testapp/Admin/Install/Application/Hooks.php +++ b/tests/Application/Testapp/Admin/Install/Application/Hooks.php @@ -15,5 +15,5 @@ declare(strict_types=1); return [ '/POST:App:Testapp.*?\-create/' => [ 'callback' => ['\phpOMS\tess\Application\Apps\Testapp\Controller\Controller:testHook'], - ] + ], ]; diff --git a/tests/Message/Http/HttpRequestTest.php b/tests/Message/Http/HttpRequestTest.php index 4208ba022..a71f79fc0 100644 --- a/tests/Message/Http/HttpRequestTest.php +++ b/tests/Message/Http/HttpRequestTest.php @@ -14,6 +14,7 @@ declare(strict_types=1); namespace phpOMS\tests\Message\Http; +use phpOMS\Localization\ISO639x1Enum; use phpOMS\Localization\Localization; use phpOMS\Message\Http\BrowserType; use phpOMS\Message\Http\HttpRequest; @@ -23,7 +24,6 @@ use phpOMS\Message\Http\Rest; use phpOMS\Router\RouteVerb; use phpOMS\System\MimeType; use phpOMS\Uri\HttpUri; -use phpOMS\Localization\ISO639x1Enum; /** * @testdox phpOMS\tests\Message\Http\HttpRequestTest: HttpRequest wrapper for http requests diff --git a/tests/Message/Http/HttpResponseTest.php b/tests/Message/Http/HttpResponseTest.php index f0782f127..a87bf3133 100644 --- a/tests/Message/Http/HttpResponseTest.php +++ b/tests/Message/Http/HttpResponseTest.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace phpOMS\tests\Message\Http; +use phpOMS\Localization\ISO639x1Enum; +use phpOMS\Localization\Localization; use phpOMS\Message\Http\HttpResponse; use phpOMS\System\MimeType; -use phpOMS\Localization\Localization; -use phpOMS\Localization\ISO639x1Enum; /** * @testdox phpOMS\tests\Message\Http\ResponseTest: HttpResponse wrapper for http responses @@ -112,7 +112,6 @@ class ResponseTest extends \PHPUnit\Framework\TestCase */ public function testLangaugeOutput() : void { - $this->response->header->l11n = new Localization(); $this->response->header->l11n->setLanguage(ISO639x1Enum::_DE); diff --git a/tests/Message/RequestAbstractTest.php b/tests/Message/RequestAbstractTest.php index f97a494bc..8032c72a6 100644 --- a/tests/Message/RequestAbstractTest.php +++ b/tests/Message/RequestAbstractTest.php @@ -16,7 +16,6 @@ namespace phpOMS\tests\Message; require_once __DIR__ . '/../Autoloader.php'; -use phpOMS\Localization\ISO639x1Enum; use phpOMS\Message\RequestAbstract; /** @@ -67,7 +66,7 @@ class RequestAbstractTest extends \PHPUnit\Framework\TestCase */ public function testInvalidDataKeyOutput() : void { - self::assertEquals(null, $this->request->getData('invalid')); + self::assertNull($this->request->getData('invalid')); } /** @@ -84,7 +83,7 @@ class RequestAbstractTest extends \PHPUnit\Framework\TestCase self::assertEquals(2, $this->request->getData('key2', 'int')); $this->request->setData('key3', '1'); - self::assertEquals(true, $this->request->getData('key3', 'bool')); + self::assertTrue($this->request->getData('key3', 'bool')); $this->request->setData('key4', '1.23'); self::assertEquals(1.23, $this->request->getData('key4', 'float')); diff --git a/tests/Module/ModuleAbstractTest.php b/tests/Module/ModuleAbstractTest.php index 127547f87..cb7ac09cb 100644 --- a/tests/Module/ModuleAbstractTest.php +++ b/tests/Module/ModuleAbstractTest.php @@ -86,7 +86,6 @@ class ModuleAbstractTest extends \PHPUnit\Framework\TestCase $models[] = new BaseModel(); $models[1]->hasManyRelations = []; - $this->createModels(1, $models, BaseModelMapper::class, '', '127.0.0.1'); } diff --git a/tests/Module/ModuleManagerTest.php b/tests/Module/ModuleManagerTest.php index b7e798279..84143cd91 100644 --- a/tests/Module/ModuleManagerTest.php +++ b/tests/Module/ModuleManagerTest.php @@ -221,8 +221,8 @@ class ModuleManagerTest extends \PHPUnit\Framework\TestCase /** * @testdox A module can be re-initialized - * @covers phpOMS\Module\ModuleManager * @covers phpOMS\Module\InstallerAbstract + * @covers phpOMS\Module\ModuleManager * @covers phpOMS\Module\StatusAbstract * @group framework */ diff --git a/tests/Module/Test/Theme/Mytheme/Lang/en.lang.php b/tests/Module/Test/Theme/Mytheme/Lang/en.lang.php index d6f238bdb..1ba049797 100644 --- a/tests/Module/Test/Theme/Mytheme/Lang/en.lang.php +++ b/tests/Module/Test/Theme/Mytheme/Lang/en.lang.php @@ -14,5 +14,5 @@ declare(strict_types=1); return ['Test' => [ 'Key' => 'Value', -] -]; \ No newline at end of file +], +]; diff --git a/tests/Views/testReturnTemplate.tpl.php b/tests/Views/testReturnTemplate.tpl.php index edc000a60..c02460b85 100644 --- a/tests/Views/testReturnTemplate.tpl.php +++ b/tests/Views/testReturnTemplate.tpl.php @@ -1,2 +1,2 @@ -Test';