Merge branch 'develop' of https://github.com/Karaka-Management/oms-Profile into develop

.github/user_bug_report.md

@@ -8,9 +8,11 @@ assignees: ''
 ---
 
 # Bug Description
+
 A clear and concise description of what the bug is.
 
 # How to Reproduce
+
 Steps to reproduce the behavior:
 
 1. Go to '...'
@@ -19,16 +21,20 @@ Steps to reproduce the behavior:
 4. See error
 
 # Expected Behavior
+
 A clear and concise description of what you expected to happen.
 
 # Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
 # System Information
- - System: [e.g. PC or iPhone11, ...]
+
- - OS: [e.g. iOS]
+- System: [e.g. PC or iPhone11, ...]
- - Browser [e.g. chrome, safari]
+- OS: [e.g. iOS]
- - KarakaVersion [e.g. 22]
+- Browser [e.g. chrome, safari]
+- KarakaVersion [e.g. 22]
 
 # Additional Information
+
 Add any other context about the problem here.

.github/user_feature_request.md

@@ -8,11 +8,14 @@ assignees: ''
 ---
 
 # What is the feature you request
+
 * A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 * A clear and concise description of what you want to happen.
 
 # Alternatives
+
 A clear and concise description of any alternative solutions or features you've considered.
 
 # Additional Information
+
 Add any other context or screenshots about the feature request here.

Controller/ApiController.php

@@ -17,8 +17,8 @@ namespace Modules\Profile\Controller;
 use Modules\Admin\Models\AccountMapper;
 use Modules\Admin\Models\Address;
 use Modules\Admin\Models\AddressMapper;
-use Modules\Media\Models\NullMedia;
 use Modules\Media\Models\MediaMapper;
+use Modules\Media\Models\NullMedia;
 use Modules\Media\Models\PathSettings;
 use Modules\Profile\Models\ContactElement;
 use Modules\Profile\Models\ContactElementMapper;
@@ -271,10 +271,10 @@ final class ApiController extends Controller
     public function validateContactElementCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['account'] = (empty($request->getData('account')) && empty($request->getData('profile'))))
+        if (($val['account'] = (!$request->hasData('account') && !$request->hasData('profile')))
             || ($val['type'] = !\is_numeric($request->getData('type')))
-            || ($val['content'] = empty($request->getData('content')))
+            || ($val['content'] = !$request->hasData('content'))
-            || ($val['contact'] = empty($request->getData('contact')))
+            || ($val['contact'] = !$request->hasData('contact'))
         ) {
             return $val;
         }
@@ -356,11 +356,11 @@ final class ApiController extends Controller
     private function validateAddressCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['account'] = (empty($request->getData('account')) && empty($request->getData('profile'))))
+        if (($val['account'] = (!$request->hasData('account') && !$request->hasData('profile')))
             || ($val['type'] = !\is_numeric($request->getData('type')))
-            || ($val['country'] = empty($request->getData('country')))
+            || ($val['country'] = !$request->hasData('country'))
-            || ($val['city'] = empty($request->getData('city')))
+            || ($val['city'] = !$request->hasData('city'))
-            || ($val['address'] = empty($request->getData('address')))
+            || ($val['address'] = !$request->hasData('address'))
         ) {
             return $val;
         }

Models/ContactElementMapper.php

@@ -23,6 +23,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of ContactElement
+ * @extends DataMapperFactory<T>
  */
 final class ContactElementMapper extends DataMapperFactory
 {

Models/ContactMapper.php

@@ -25,6 +25,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Contact
+ * @extends DataMapperFactory<T>
  */
 final class ContactMapper extends DataMapperFactory
 {

Models/ProfileMapper.php

@@ -25,6 +25,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Profile
+ * @extends DataMapperFactory<T>
  */
 final class ProfileMapper extends DataMapperFactory
 {
@@ -72,7 +75,7 @@ final class ProfileMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = Profile::class;

tests/Controller/ApiControllerTest.php

@@ -26,6 +26,7 @@ use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Event\EventManager;
 use phpOMS\Localization\ISO3166TwoEnum;
+use phpOMS\Localization\L11nManager;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
@@ -66,6 +67,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $this->app->moduleManager  = new ModuleManager($this->app, __DIR__ . '/../../../Modules/');
         $this->app->dispatcher     = new Dispatcher($this->app);
         $this->app->eventManager   = new EventManager($this->app->dispatcher);
+        $this->app->l11nManager    = new L11nManager();
         $this->app->eventManager->importFromFile(__DIR__ . '/../../../Web/Api/Hooks.php');
 
         $account = new Account();
@@ -73,7 +75,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
 
         $permission = new AccountPermission();
         $permission->setUnit(1);
-        $permission->setApp('backend');
+        $permission->setApp(2);
         $permission->setPermission(
             PermissionType::READ
             | PermissionType::CREATE