Merge pull request #425 from dotkernel/core-sync

alexmerlin · web-flow · commit 5d3dbd4175ed · 2025-05-20T14:23:45.000+03:00
Core sync
diff --git a/src/Admin/src/InputFilter/AdminRoleInputFilter.php b/src/Admin/src/InputFilter/AdminRoleInputFilter.php
@@ -7,6 +7,12 @@
 use Api\App\InputFilter\Input\UuidInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type AdminRoleDataType array{
+ *     uuid: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<AdminRoleDataType>
+ */
 class AdminRoleInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/Admin/src/InputFilter/CreateAdminInputFilter.php b/src/Admin/src/InputFilter/CreateAdminInputFilter.php
@@ -13,6 +13,19 @@
 use Core\App\InputFilter\AbstractInputFilter;
 use Laminas\InputFilter\CollectionInputFilter;
 
+/**
+ * @phpstan-import-type AdminRoleDataType from AdminRoleInputFilter
+ * @phpstan-type CreateAdminDataType array{
+ *     identity: non-empty-string,
+ *     password: non-empty-string,
+ *     passwordConfirm: non-empty-string,
+ *     firstName?: non-empty-string,
+ *     lastName?: non-empty-string,
+ *     status: non-empty-string,
+ *     roles: AdminRoleDataType[],
+ * }
+ * @extends AbstractInputFilter<CreateAdminDataType>
+ */
 class CreateAdminInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/Admin/src/InputFilter/UpdateAdminInputFilter.php b/src/Admin/src/InputFilter/UpdateAdminInputFilter.php
@@ -12,6 +12,18 @@
 use Core\App\InputFilter\AbstractInputFilter;
 use Laminas\InputFilter\CollectionInputFilter;
 
+/**
+ * @phpstan-import-type AdminRoleDataType from AdminRoleInputFilter
+ * @phpstan-type UpdateAdminDataType array{
+ *     password?: non-empty-string,
+ *     passwordConfirm?: non-empty-string,
+ *     firstName?: non-empty-string,
+ *     lastName?: non-empty-string,
+ *     status?: non-empty-string,
+ *     roles?: AdminRoleDataType[],
+ * }
+ * @extends AbstractInputFilter<UpdateAdminDataType>
+ */
 class UpdateAdminInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/App/src/InputFilter/ErrorReportInputFilter.php b/src/App/src/InputFilter/ErrorReportInputFilter.php
@@ -7,6 +7,12 @@
 use Api\App\InputFilter\Input\MessageInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type ErrorReportDataType array{
+ *     message: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<ErrorReportDataType>
+ */
 class ErrorReportInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/Core/src/Admin/src/ConfigProvider.php b/src/Core/src/Admin/src/ConfigProvider.php
@@ -14,6 +14,10 @@
 use Dot\DependencyInjection\Factory\AttributedRepositoryFactory;
 
 /**
+ * @phpstan-type ConfigType array{
+ *      dependencies: DependenciesType,
+ *      doctrine: DoctrineConfigType,
+ * }
  * @phpstan-type DoctrineConfigType array{
  *      driver: array{
  *          orm_default: array{
@@ -34,10 +38,7 @@
 class ConfigProvider
 {
     /**
-     * @return array{
-     *     dependencies: DependenciesType,
-     *     doctrine: DoctrineConfigType,
-     * }
+     * @return ConfigType
      */
     public function __invoke(): array
     {
diff --git a/src/Core/src/Admin/src/Entity/AdminIdentity.php b/src/Core/src/Admin/src/Entity/AdminIdentity.php
@@ -11,7 +11,7 @@ class AdminIdentity implements UserInterface
 {
     /**
      * @param non-empty-string[] $roles
-     * @param array<non-empty-string, non-empty-string> $details
+     * @param array<non-empty-string, string> $details
      */
     public function __construct(
         public string $uuid,
diff --git a/src/Core/src/App/src/ConfigProvider.php b/src/Core/src/App/src/ConfigProvider.php
@@ -32,6 +32,11 @@
 use function getcwd;
 
 /**
+ * @phpstan-type ConfigType array{
+ *      dependencies: DependenciesType,
+ *      doctrine: DoctrineConfigType,
+ *      resultCacheLifetime: int,
+ * }
  * @phpstan-type DoctrineConfigType array{
  *      cache: array{
  *          array: array{
@@ -95,11 +100,7 @@ class ConfigProvider
     public const REGEXP_UUID = '{uuid:[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}}';
 
     /**
-     * @return array{
-     *     dependencies: DependenciesType,
-     *     doctrine: DoctrineConfigType,
-     *     resultCacheLifetime: int,
-     * }
+     * @return ConfigType
      */
     public function __invoke(): array
     {
diff --git a/src/Core/src/App/src/InputFilter/AbstractInputFilter.php b/src/Core/src/App/src/InputFilter/AbstractInputFilter.php
@@ -7,7 +7,8 @@
 use Laminas\InputFilter\InputFilter;
 
 /**
- * @extends InputFilter<object>
+ * @template TFilteredValues
+ * @extends InputFilter<TFilteredValues>
  */
 abstract class AbstractInputFilter extends InputFilter
 {
diff --git a/src/Core/src/Security/src/ConfigProvider.php b/src/Core/src/Security/src/ConfigProvider.php
@@ -14,6 +14,10 @@
 use Dot\DependencyInjection\Factory\AttributedRepositoryFactory;
 
 /**
+ * @phpstan-type ConfigType array{
+ *      dependencies: DependenciesType,
+ *      doctrine: DoctrineConfigType,
+ * }
  * @phpstan-type DoctrineConfigType array{
  *      driver: array{
  *          orm_default: array{
@@ -33,10 +37,7 @@
 class ConfigProvider
 {
     /**
-     * @return array{
-     *     dependencies: DependenciesType,
-     *     doctrine: DoctrineConfigType,
-     * }
+     * @return ConfigType
      */
     public function __invoke(): array
     {
diff --git a/src/Core/src/Setting/src/ConfigProvider.php b/src/Core/src/Setting/src/ConfigProvider.php
@@ -11,6 +11,10 @@
 use Dot\DependencyInjection\Factory\AttributedRepositoryFactory;
 
 /**
+ * @phpstan-type ConfigType array{
+ *      dependencies: DependenciesType,
+ *      doctrine: DoctrineConfigType,
+ * }
  * @phpstan-type DoctrineConfigType array{
  *      driver: array{
  *          orm_default: array{
@@ -31,10 +35,7 @@
 class ConfigProvider
 {
     /**
-     * @return array{
-     *     dependencies: DependenciesType,
-     *     doctrine: DoctrineConfigType,
-     * }
+     * @return ConfigType
      */
     public function __invoke(): array
     {
diff --git a/src/Core/src/User/src/ConfigProvider.php b/src/Core/src/User/src/ConfigProvider.php
@@ -19,6 +19,10 @@
 use Dot\DependencyInjection\Factory\AttributedServiceFactory;
 
 /**
+ * @phpstan-type ConfigType array{
+ *      dependencies: DependenciesType,
+ *      doctrine: DoctrineConfigType,
+ * }
  * @phpstan-type DoctrineConfigType array{
  *      driver: array{
  *          orm_default: array{
@@ -39,10 +43,7 @@
 class ConfigProvider
 {
     /**
-     * @return array{
-     *     dependencies: DependenciesType,
-     *     doctrine: DoctrineConfigType,
-     * }
+     * @return ConfigType
      */
     public function __invoke(): array
     {
diff --git a/src/Core/src/User/src/Entity/User.php b/src/Core/src/User/src/Entity/User.php
@@ -290,6 +290,11 @@ public function getEmail(): string
         return trim((string) $this->getDetail()->getEmail());
     }
 
+    public function hasEmail(): bool
+    {
+        return $this->getEmail() !== '';
+    }
+
     public function getName(): string
     {
         if (! $this->getDetail() instanceof UserDetail) {
diff --git a/src/User/src/InputFilter/ActivateAccountInputFilter.php b/src/User/src/InputFilter/ActivateAccountInputFilter.php
@@ -7,6 +7,12 @@
 use Api\App\InputFilter\Input\EmailInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type ActivateAccountDataType array{
+ *     email: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<ActivateAccountDataType>
+ */
 class ActivateAccountInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/User/src/InputFilter/CreateUserDetailInputFilter.php b/src/User/src/InputFilter/CreateUserDetailInputFilter.php
@@ -9,6 +9,14 @@
 use Api\App\InputFilter\Input\LastNameInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type CreateUserDetailDataType array{
+ *     firstName?: non-empty-string,
+ *     lastName?: non-empty-string,
+ *     email: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<CreateUserDetailDataType>
+ */
 class CreateUserDetailInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/User/src/InputFilter/CreateUserInputFilter.php b/src/User/src/InputFilter/CreateUserInputFilter.php
@@ -11,6 +11,19 @@
 use Core\App\InputFilter\AbstractInputFilter;
 use Laminas\InputFilter\CollectionInputFilter;
 
+/**
+ * @phpstan-import-type CreateUserDetailDataType from CreateUserDetailInputFilter
+ * @phpstan-import-type UserRoleDataType from UserRoleInputFilter
+ * @phpstan-type CreateAdminDataType array{
+ *     identity: non-empty-string,
+ *     password: non-empty-string,
+ *     passwordConfirm: non-empty-string,
+ *     status: non-empty-string,
+ *     detail: CreateUserDetailDataType,
+ *     roles: UserRoleDataType[],
+ * }
+ * @extends AbstractInputFilter<CreateAdminDataType>
+ */
 class CreateUserInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/User/src/InputFilter/RecoverIdentityInputFilter.php b/src/User/src/InputFilter/RecoverIdentityInputFilter.php
@@ -7,6 +7,12 @@
 use Api\App\InputFilter\Input\EmailInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type RecoverIdentityDataType array{
+ *     email: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<RecoverIdentityDataType>
+ */
 class RecoverIdentityInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/User/src/InputFilter/ResetPasswordInputFilter.php b/src/User/src/InputFilter/ResetPasswordInputFilter.php
@@ -8,6 +8,13 @@
 use Api\App\InputFilter\Input\IdentityInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type ResetPasswordDataType array{
+ *     email?: non-empty-string,
+ *     identity?: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<ResetPasswordDataType>
+ */
 class ResetPasswordInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/User/src/InputFilter/UpdateAvatarInputFilter.php b/src/User/src/InputFilter/UpdateAvatarInputFilter.php
@@ -7,6 +7,12 @@
 use Api\App\InputFilter\Input\ImageInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type UpdateAvatarDataType array{
+ *     avatar: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<UpdateAvatarDataType>
+ */
 class UpdateAvatarInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/User/src/InputFilter/UpdatePasswordInputFilter.php b/src/User/src/InputFilter/UpdatePasswordInputFilter.php
@@ -8,6 +8,13 @@
 use Api\App\InputFilter\Input\PasswordInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type UpdatePasswordDataType array{
+ *     password: non-empty-string,
+ *     passwordConfirm: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<UpdatePasswordDataType>
+ */
 class UpdatePasswordInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/User/src/InputFilter/UpdateUserDetailInputFilter.php b/src/User/src/InputFilter/UpdateUserDetailInputFilter.php
@@ -9,6 +9,14 @@
 use Api\App\InputFilter\Input\LastNameInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type UpdateUserDetailDataType array{
+ *     firstName?: non-empty-string,
+ *     lastName?: non-empty-string,
+ *     email?: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<UpdateUserDetailDataType>
+ */
 class UpdateUserDetailInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/User/src/InputFilter/UpdateUserInputFilter.php b/src/User/src/InputFilter/UpdateUserInputFilter.php
@@ -11,6 +11,19 @@
 use Core\App\InputFilter\AbstractInputFilter;
 use Laminas\InputFilter\CollectionInputFilter;
 
+/**
+ * @phpstan-import-type UpdateUserDetailDataType from UpdateUserDetailInputFilter
+ * @phpstan-import-type UserRoleDataType from UserRoleInputFilter
+ * @phpstan-type CreateAdminDataType array{
+ *     identity: non-empty-string,
+ *     password: non-empty-string,
+ *     passwordConfirm: non-empty-string,
+ *     status: non-empty-string,
+ *     detail: UpdateUserDetailDataType,
+ *     roles: UserRoleDataType[],
+ * }
+ * @extends AbstractInputFilter<CreateAdminDataType>
+ */
 class UpdateUserInputFilter extends AbstractInputFilter
 {
     public function __construct()
diff --git a/src/User/src/InputFilter/UserRoleInputFilter.php b/src/User/src/InputFilter/UserRoleInputFilter.php
@@ -7,6 +7,12 @@
 use Api\App\InputFilter\Input\UuidInput;
 use Core\App\InputFilter\AbstractInputFilter;
 
+/**
+ * @phpstan-type UserRoleDataType array{
+ *     uuid: non-empty-string,
+ * }
+ * @extends AbstractInputFilter<UserRoleDataType>
+ */
 class UserRoleInputFilter extends AbstractInputFilter
 {
     public function __construct()

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class AdminIdentity implements UserInterface`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`	`13`	`* @param non-empty-string[] $roles`
`14`		`- * @param array<non-empty-string, non-empty-string> $details`
	`14`	`+ * @param array<non-empty-string, string> $details`
`15`	`15`	`*/`
`16`	`16`	`public function __construct(`
`17`	`17`	`public string $uuid,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`	`use Laminas\InputFilter\InputFilter;`
`8`	`8`
`9`	`9`	`/**`
`10`		`- * @extends InputFilter<object>`
	`10`	`+ * @template TFilteredValues`
	`11`	`+ * @extends InputFilter<TFilteredValues>`
`11`	`12`	`*/`
`12`	`13`	`abstract class AbstractInputFilter extends InputFilter`
`13`	`14`	`{`