Type hint array|RedirectResponse return types instead of using @phpst…

…an-ignore return.type.
paul121 · Feb 25, 2025 · 45fe134 · 45fe134
1 parent 46bc5d5
commit 45fe134
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 24 deletions.
diff --git a/modules/core/export/modules/csv/src/Form/EntityCsvActionForm.php b/modules/core/export/modules/csv/src/Form/EntityCsvActionForm.php
@@ -205,15 +205,12 @@ public function getConfirmText() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL) {
+  public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL): array|RedirectResponse {
 
     // If we don't have an entity type or list of entities, redirect.
     $this->entityType = $this->entityTypeManager->getDefinition($entity_type_id);
     $this->entities = $this->tempStore->get($this->user->id() . ':' . $entity_type_id);
     if (empty($entity_type_id) || empty($this->entities)) {
-      // Ignore PHPstan error for incorrect return type.
-      // Forms can return a RedirectResponse.
-      // @phpstan-ignore return.type
       return new RedirectResponse($this->getCancelUrl()
         ->setAbsolute()
         ->toString());

diff --git a/modules/core/flag/src/Form/EntityFlagActionForm.php b/modules/core/flag/src/Form/EntityFlagActionForm.php
@@ -144,13 +144,10 @@ public function getConfirmText() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL) {
+  public function buildForm(array $form, FormStateInterface $form_state, $entity_type_id = NULL): array|RedirectResponse {
     $this->entityType = $this->entityTypeManager->getDefinition($entity_type_id);
     $this->entities = $this->tempStore->get($this->user->id() . ':' . $entity_type_id);
     if (empty($entity_type_id) || empty($this->entities)) {
-      // Ignore PHPstan error for incorrect return type.
-      // Forms can return a RedirectResponse.
-      // @phpstan-ignore return.type
       return new RedirectResponse($this->getCancelUrl()
         ->setAbsolute()
         ->toString());

diff --git a/modules/core/log/src/Form/AssetAddLogActionForm.php b/modules/core/log/src/Form/AssetAddLogActionForm.php
@@ -119,13 +119,10 @@ public function getConfirmText() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state) {
+  public function buildForm(array $form, FormStateInterface $form_state): array|RedirectResponse {
     $this->entityType = $this->entityTypeManager->getDefinition('asset');
     $this->entities = $this->tempStore->get((string) $this->user->id());
     if (!$this->entityType || empty($this->entities)) {
-      // Ignore PHPstan error for incorrect return type.
-      // Forms can return a RedirectResponse.
-      // @phpstan-ignore return.type
       return new RedirectResponse($this->getCancelUrl()
         ->setAbsolute()
         ->toString());

diff --git a/modules/core/owner/src/Form/AssignActionForm.php b/modules/core/owner/src/Form/AssignActionForm.php
@@ -132,7 +132,7 @@ public function getConfirmText() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, ?string $entity_type = NULL) {
+  public function buildForm(array $form, FormStateInterface $form_state, ?string $entity_type = NULL): array|RedirectResponse {
 
     // Only allow asset and log entities.
     if (!in_array($entity_type, ['asset', 'log'])) {
@@ -148,9 +148,6 @@ public function buildForm(array $form, FormStateInterface $form_state, ?string $
     // If there are no entities, or if the entity type definition didn't load,
     // redirect the user to the cancel URL.
     if (!$this->entityType || empty($this->entities)) {
-      // Ignore PHPstan error for incorrect return type.
-      // Forms can return a RedirectResponse.
-      // @phpstan-ignore return.type
       return new RedirectResponse($this->getCancelUrl()
         ->setAbsolute()
         ->toString());

diff --git a/modules/core/parent/src/Form/AssetParentActionForm.php b/modules/core/parent/src/Form/AssetParentActionForm.php
@@ -132,7 +132,7 @@ public function getConfirmText() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state) {
+  public function buildForm(array $form, FormStateInterface $form_state): array|RedirectResponse {
 
     // Check if asset IDs were provided in the asset query param.
     if ($asset_ids = $this->request->get('asset')) {
@@ -154,9 +154,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $this->entityType = $this->entityTypeManager->getDefinition('asset');
     if (!$this->entityType || empty($this->entities)) {
-      // Ignore PHPstan error for incorrect return type.
-      // Forms can return a RedirectResponse.
-      // @phpstan-ignore return.type
       return new RedirectResponse($this->getCancelUrl()
         ->setAbsolute()
         ->toString());

diff --git a/modules/taxonomy/log_category/src/Form/LogCategorizeActionForm.php b/modules/taxonomy/log_category/src/Form/LogCategorizeActionForm.php
@@ -120,13 +120,10 @@ public function getConfirmText() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state) {
+  public function buildForm(array $form, FormStateInterface $form_state): array|RedirectResponse {
     $this->entityType = $this->entityTypeManager->getDefinition('log');
     $this->entities = $this->tempStore->get((string) $this->user->id());
     if (!$this->entityType || empty($this->entities)) {
-      // Ignore PHPstan error for incorrect return type.
-      // Forms can return a RedirectResponse.
-      // @phpstan-ignore return.type
       return new RedirectResponse($this->getCancelUrl()
         ->setAbsolute()
         ->toString());