From 5766dae4132cff457a61ee853732f516c3e0079e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 29 Oct 2021 14:49:55 +0200 Subject: [PATCH] bug and media fixes --- Admin/Settings/Theme/Backend/settings.tpl.php | 4 ++-- Theme/Backend/accounts-single.tpl.php | 4 ++-- Theme/Backend/settings-general.tpl.php | 4 ++-- tests/Bootstrap.php | 2 +- .../Controller/Api/ApiControllerAccountTrait.php | 1 - tests/Controller/ApiControllerTest.php | 2 +- tests/Models/AddressMapperTest.php | 13 ++++++------- tests/Models/AddressTest.php | 16 ++++++++-------- tests/Models/AppMapperTest.php | 5 ++--- 9 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php index ebe2b9a..a7b33e6 100644 --- a/Admin/Settings/Theme/Backend/settings.tpl.php +++ b/Admin/Settings/Theme/Backend/settings.tpl.php @@ -274,8 +274,8 @@ echo $this->getData('nav')->render();
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index 7fcfc2f..f1151df 100755 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -464,8 +464,8 @@ echo $this->getData('nav')->render(); ?>
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index 1498a3f..17eee67 100755 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -275,8 +275,8 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 051ac7e..f5fc99c 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -392,4 +392,4 @@ function phpServe() : void }); } -phpServe(); +\phpServe(); diff --git a/tests/Controller/Api/ApiControllerAccountTrait.php b/tests/Controller/Api/ApiControllerAccountTrait.php index 9b40deb..cfc3213 100755 --- a/tests/Controller/Api/ApiControllerAccountTrait.php +++ b/tests/Controller/Api/ApiControllerAccountTrait.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\Admin\tests\Controller\Api; -use phpOMS\Account\GroupStatus; use phpOMS\Account\AccountStatus; use phpOMS\Account\AccountType; use phpOMS\Message\Http\HttpRequest; diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 34d97df..c459f58 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -22,11 +22,11 @@ use Modules\Admin\tests\Controller\Api\ApiControllerGroupTrait; use Modules\Admin\tests\Controller\Api\ApiControllerModuleTrait; use Modules\Admin\tests\Controller\Api\ApiControllerPermissionTrait; use Modules\Admin\tests\Controller\Api\ApiControllerSettingsTrait; -use phpOMS\DataStorage\Session\HttpSession; use phpOMS\Account\Account; use phpOMS\Account\AccountManager; use phpOMS\Account\PermissionType; use phpOMS\Application\ApplicationAbstract; +use phpOMS\DataStorage\Session\HttpSession; use phpOMS\Dispatcher\Dispatcher; use phpOMS\Event\EventManager; use phpOMS\Module\ModuleAbstract; diff --git a/tests/Models/AddressMapperTest.php b/tests/Models/AddressMapperTest.php index badf0fb..d48acb2 100644 --- a/tests/Models/AddressMapperTest.php +++ b/tests/Models/AddressMapperTest.php @@ -16,7 +16,6 @@ namespace Modules\Admin\tests\Models; use Modules\Admin\Models\Address; use Modules\Admin\Models\AddressMapper; -use phpOMS\Utils\TestUtils; use phpOMS\Stdlib\Base\AddressType; /** @@ -27,16 +26,16 @@ use phpOMS\Stdlib\Base\AddressType; final class AddressMapperTest extends \PHPUnit\Framework\TestCase { /** - * @covers Modules\Admin\Models\AddressMapper - * @group module - */ + * @covers Modules\Admin\Models\AddressMapper + * @group module + */ public function testCR() : void { $address = new Address(); - $address->name = 'name'; + $address->name = 'name'; $address->addition = 'addition'; - $address->postal = '0123456789'; + $address->postal = '0123456789'; $address->setType(AddressType::BUSINESS); $address->city = 'city'; $address->address = 'Some address here'; @@ -56,4 +55,4 @@ final class AddressMapperTest extends \PHPUnit\Framework\TestCase self::assertEquals($address->address, $addressR->address); self::assertEquals($address->state, $addressR->state); } -} \ No newline at end of file +} diff --git a/tests/Models/AddressTest.php b/tests/Models/AddressTest.php index 348a804..79e5cfd 100644 --- a/tests/Models/AddressTest.php +++ b/tests/Models/AddressTest.php @@ -50,7 +50,7 @@ final class AddressTest extends \PHPUnit\Framework\TestCase 'lat' => 0, 'long' => 0, ], - 'name' => '', + 'name' => '', 'addition' => '', ]; @@ -72,13 +72,13 @@ final class AddressTest extends \PHPUnit\Framework\TestCase 'lat' => 12.1, 'long' => 11.2, ], - 'name' => 'name', + 'name' => 'name', 'addition' => 'addition', ]; - $this->address->name = 'name'; + $this->address->name = 'name'; $this->address->addition = 'addition'; - $this->address->postal = '0123456789'; + $this->address->postal = '0123456789'; $this->address->setType(AddressType::BUSINESS); $this->address->city = 'city'; $this->address->address = 'Some address here'; @@ -101,13 +101,13 @@ final class AddressTest extends \PHPUnit\Framework\TestCase 'lat' => 12.1, 'long' => 11.2, ], - 'name' => 'name', + 'name' => 'name', 'addition' => 'addition', ]; - $this->address->name = 'name'; + $this->address->name = 'name'; $this->address->addition = 'addition'; - $this->address->postal = '0123456789'; + $this->address->postal = '0123456789'; $this->address->setType(AddressType::BUSINESS); $this->address->city = 'city'; $this->address->address = 'Some address here'; @@ -131,7 +131,7 @@ final class AddressTest extends \PHPUnit\Framework\TestCase 'lat' => 12.1, 'long' => 11.2, ], - 'name' => 'name', + 'name' => 'name', 'addition' => 'addition', ]; diff --git a/tests/Models/AppMapperTest.php b/tests/Models/AppMapperTest.php index 8688f18..b19ecba 100644 --- a/tests/Models/AppMapperTest.php +++ b/tests/Models/AppMapperTest.php @@ -17,7 +17,6 @@ namespace Modules\Admin\tests\Models; use Modules\Admin\Models\App; use Modules\Admin\Models\AppMapper; use phpOMS\Application\ApplicationStatus; -use phpOMS\Utils\TestUtils; /** * @testdox Modules\Admin\tests\Models\AppMapperTest: App database mapper @@ -35,8 +34,8 @@ final class AppMapperTest extends \PHPUnit\Framework\TestCase { $app = new App(); - $app->name = 'TestAppName'; - $app->theme = 'Default'; + $app->name = 'TestAppName'; + $app->theme = 'Default'; $app->status = ApplicationStatus::NORMAL; $id = AppMapper::create($app);