From 94d6a91af7fffc0dab7b4fea098363e703b4c0c4 Mon Sep 17 00:00:00 2001 From: gchi25 Date: Wed, 8 Jan 2025 19:55:32 -0500 Subject: [PATCH 01/10] PXBF-2039-phpstan-fixes: fix greater always true --- .../usagov_benefit_finder_content.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_content/usagov_benefit_finder_content.module b/usagov_benefit_finder/modules/usagov_benefit_finder_content/usagov_benefit_finder_content.module index f61e9cb0..557a9013 100644 --- a/usagov_benefit_finder/modules/usagov_benefit_finder_content/usagov_benefit_finder_content.module +++ b/usagov_benefit_finder/modules/usagov_benefit_finder_content/usagov_benefit_finder_content.module @@ -28,7 +28,7 @@ function usagov_benefit_finder_content_form_alter(&$form, &$form_state, $form_id $form['field_b_eligibility']['widget'][$i]['subform']['field_b_criteria_key']['widget']['#options']; } $i++; - } while ($i > 0); + } while (TRUE); } } From 6110c6d011acdb53470f8c157335185dd7aa3d09 Mon Sep 17 00:00:00 2001 From: gchi25 Date: Wed, 8 Jan 2025 22:40:41 -0500 Subject: [PATCH 02/10] PXBF-2039-phpstan-fixes: remove |null --- .../src/Controller/LifeEventController.php | 2 +- .../src/Controller/CheckDataController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php index 6651db66..228f0c18 100644 --- a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php +++ b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php @@ -85,7 +85,7 @@ class LifeEventController extends ControllerBase { * The entity type manager. * @param \Drupal\Core\File\FileSystemInterface $file_system * The file system service. - * @param \Drupal\file\FileRepositoryInterface|null $file_repository + * @param \Drupal\file\FileRepositoryInterface $file_repository * The file repository. * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator * The file URL generator. diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_content/src/Controller/CheckDataController.php b/usagov_benefit_finder/modules/usagov_benefit_finder_content/src/Controller/CheckDataController.php index 66760501..cff5d93a 100644 --- a/usagov_benefit_finder/modules/usagov_benefit_finder_content/src/Controller/CheckDataController.php +++ b/usagov_benefit_finder/modules/usagov_benefit_finder_content/src/Controller/CheckDataController.php @@ -90,7 +90,7 @@ class CheckDataController extends ControllerBase { * The entity type manager. * @param \Drupal\Core\File\FileSystemInterface $file_system * The file system service. - * @param \Drupal\file\FileRepositoryInterface|null $file_repository + * @param \Drupal\file\FileRepositoryInterface $file_repository * The file repository. * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator * The file URL generator. From 0b544a9920e3ee037d785e7ae7d8660dd084eb24 Mon Sep 17 00:00:00 2001 From: gchi25 Date: Thu, 9 Jan 2025 14:22:24 -0500 Subject: [PATCH 03/10] PXBF-2039-phpstan-fixes: fix phpstan error unknown parameter --- .../src/Controller/LifeEventController.php | 2 +- .../src/Controller/CheckDataController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php index 228f0c18..a68246e0 100644 --- a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php +++ b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php @@ -89,7 +89,7 @@ class LifeEventController extends ControllerBase { * The file repository. * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator * The file URL generator. - * @param \Drupal\Core\Database\Connection $connection + * @param \Drupal\Core\Database\Connection $database * The database connection. * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * The request stack. diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_content/src/Controller/CheckDataController.php b/usagov_benefit_finder/modules/usagov_benefit_finder_content/src/Controller/CheckDataController.php index cff5d93a..92a7181a 100644 --- a/usagov_benefit_finder/modules/usagov_benefit_finder_content/src/Controller/CheckDataController.php +++ b/usagov_benefit_finder/modules/usagov_benefit_finder_content/src/Controller/CheckDataController.php @@ -94,7 +94,7 @@ class CheckDataController extends ControllerBase { * The file repository. * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator * The file URL generator. - * @param \Drupal\Core\Database\Connection $connection + * @param \Drupal\Core\Database\Connection $database * The database connection. * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * The request stack. From 30fce3ffb135fe663a9d49e24e317b21ebd95306 Mon Sep 17 00:00:00 2001 From: gchi25 Date: Sun, 12 Jan 2025 10:03:16 -0500 Subject: [PATCH 04/10] PXBF-2039-phpstan-fixes: fix type --- .../src/Controller/LifeEventController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php index a68246e0..868b5fad 100644 --- a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php +++ b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php @@ -67,9 +67,9 @@ class LifeEventController extends ControllerBase { /** * The display data control variable. * - * @var string + * @var bool */ - protected $displayData; + protected bool $displayData; /** * The benefit finder content mode. From df84cdeb8211a3bc348569ddaf9f5328fc5beeba Mon Sep 17 00:00:00 2001 From: gchi25 Date: Tue, 14 Jan 2025 12:11:17 -0500 Subject: [PATCH 05/10] PXBF-2039-phpstan-fixes: replace deprecated class constant EXISTS_REPLACE --- .../src/Controller/LifeEventController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php index 868b5fad..67203320 100644 --- a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php +++ b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php @@ -6,6 +6,7 @@ use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityStorageException; use Drupal\Core\Entity\EntityTypeManagerInterface; +use Drupal\Core\File\FileExists; use Drupal\Core\File\FileSystemInterface; use Drupal\Core\File\FileUrlGeneratorInterface; use Drupal\file\FileRepositoryInterface; @@ -161,7 +162,7 @@ public function saveJsonData($id) { // Write JSON data file. $filename = "$directory/$id.json"; - $this->fileRepository->writeData($data, $filename, FileSystemInterface::EXISTS_REPLACE); + $this->fileRepository->writeData($data, $filename, FileExists::Replace); $fileUrlString = $this->fileUrlGenerator->generate($filename)->toString(); From 805027832dd303ea700321034346da4dac8e9209 Mon Sep 17 00:00:00 2001 From: gchi25 Date: Tue, 21 Jan 2025 11:52:17 -0500 Subject: [PATCH 06/10] PXBF-2039-phpstan-fixes: fix variable in empty() always exists and is not falsy --- .../src/Controller/LifeEventController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php index 67203320..902b54e3 100644 --- a/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php +++ b/usagov_benefit_finder/modules/usagov_benefit_finder_api/src/Controller/LifeEventController.php @@ -312,9 +312,7 @@ public function getData($id) { // Build benefits. foreach ($benefit_nodes as $benefit_node) { - if (!empty($benefit_node)) { - $benefits[]["benefit"] = $this->buildBenefit($benefit_node); - } + $benefits[]["benefit"] = $this->buildBenefit($benefit_node); } // Encode JSON data. From 090dd56fa5285b73b10594cdc3cd30a459a0b96a Mon Sep 17 00:00:00 2001 From: gchi25 Date: Tue, 21 Jan 2025 12:00:49 -0500 Subject: [PATCH 07/10] PXBF-2039-phpstan-fixes: fix if condition always true, allowing NULL return --- .../src/Traits/BenefitFinderTrait.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php b/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php index b509b47e..9d0c6fed 100644 --- a/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php +++ b/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php @@ -25,7 +25,7 @@ trait BenefitFinderTrait { * The Life Event ID. * @param string $mode * The benefit finder content mode. - * @return NodeInterface + * @return NodeInterface|NULL * The life event node. */ public function getLifeEventById($id, $mode) { @@ -49,7 +49,7 @@ public function getLifeEventById($id, $mode) { * The Life Event form ID. * @param string $mode * The benefit finder content mode. - * @return NodeInterface + * @return NodeInterface|NULL * The life event form node. */ public function getLifeEventFormById($id, $mode) { @@ -99,7 +99,7 @@ public function getBenefitsByLifeEventForm($nid, $mode) { * The agency node ID. * @param string $mode * The benefit finder content mode. - * @return NodeInterface + * @return NodeInterface|NULL * The agency node. */ public function getAgency($nid, $mode) { @@ -113,7 +113,7 @@ public function getAgency($nid, $mode) { * The criteria node ID. * @param string $mode * The benefit finder content mode. - * @return NodeInterface + * @return NodeInterface|NULL * The criteria node. */ public function getCriteria($nid, $mode) { @@ -127,7 +127,7 @@ public function getCriteria($nid, $mode) { * The benefit node ID. * @param string $mode * The benefit finder content mode. - * @return NodeInterface + * @return NodeInterface|NULL * The benefit node. */ public function getBenefit($nid, $mode) { @@ -141,7 +141,7 @@ public function getBenefit($nid, $mode) { * The life event form node ID. * @param string $mode * The benefit finder content mode. - * @return NodeInterface + * @return NodeInterface|NULL * The life event form node. */ public function getLifeEventForm($nid, $mode) { @@ -155,7 +155,7 @@ public function getLifeEventForm($nid, $mode) { * The node ID. * @param string $mode * The benefit finder content mode. - * @return EntityInterface|NodeInterface + * @return EntityInterface|NodeInterface|NULL * The node revision entity. */ public function getNode($nid, $mode) { From d37e906fadc4dba79dba3e28db7a200568b197d3 Mon Sep 17 00:00:00 2001 From: gchi25 Date: Fri, 24 Jan 2025 14:36:06 -0500 Subject: [PATCH 08/10] PXBF-2039-phpstan-fixes: fix undefined method getEntity --- .../usagov_benefit_finder_content.module | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/usagov_benefit_finder/modules/usagov_benefit_finder_content/usagov_benefit_finder_content.module b/usagov_benefit_finder/modules/usagov_benefit_finder_content/usagov_benefit_finder_content.module index 557a9013..95bb6514 100644 --- a/usagov_benefit_finder/modules/usagov_benefit_finder_content/usagov_benefit_finder_content.module +++ b/usagov_benefit_finder/modules/usagov_benefit_finder_content/usagov_benefit_finder_content.module @@ -6,7 +6,9 @@ */ use Drupal\Core\Database\Database; +use Drupal\Core\Entity\EntityForm; use Drupal\Core\Form\FormStateInterface; +use Drupal\node\NodeInterface; use Drupal\node\Entity\Node; /** @@ -482,8 +484,16 @@ function usagov_benefit_finder_content_form_node_bears_life_event_form_edit_form function _usagov_benefit_finder_content_check_life_event_form_criteria_depth(array &$form, FormStateInterface $form_state) { $error_flag = FALSE; $criteria_depths = []; + $life_event_form_node = NULL; + + $form_object = $form_state->getFormObject(); + if ($form_object instanceof EntityForm) { + $entity = $form_object->getEntity(); + if ($entity instanceof NodeInterface) { + $life_event_form_node = $entity; + } + } - $life_event_form_node = $form_state->getFormObject()->getEntity(); $sections = $life_event_form_node->get('field_b_sections_elg_criteria')->referencedEntities(); foreach ($sections as $section) { From 3d5a58d1eda19e20c1d543c21a07d0c229a351a1 Mon Sep 17 00:00:00 2001 From: gchi25 Date: Fri, 24 Jan 2025 14:45:57 -0500 Subject: [PATCH 09/10] PXBF-2039-phpstan-fixes: allow return NULL --- usagov_benefit_finder/src/Traits/BenefitFinderTrait.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php b/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php index 9d0c6fed..ce112318 100644 --- a/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php +++ b/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php @@ -73,7 +73,7 @@ public function getLifeEventFormById($id, $mode) { * The life event form node ID. * @param string $mode * The benefit finder content mode. - * @return NodeInterface[] + * @return NodeInterface[]|NULL * The benefit nodes. */ public function getBenefitsByLifeEventForm($nid, $mode) { @@ -155,7 +155,7 @@ public function getLifeEventForm($nid, $mode) { * The node ID. * @param string $mode * The benefit finder content mode. - * @return EntityInterface|NodeInterface|NULL + * @return NodeInterface|NULL * The node revision entity. */ public function getNode($nid, $mode) { From 05dd7f20b4113d205f8388fe7d804e2c063c4080 Mon Sep 17 00:00:00 2001 From: gchi25 Date: Fri, 24 Jan 2025 14:47:39 -0500 Subject: [PATCH 10/10] PXBF-2039-phpstan-fixes: fix variable $query might not be defined --- usagov_benefit_finder/src/Traits/BenefitFinderTrait.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php b/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php index ce112318..87f2b990 100644 --- a/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php +++ b/usagov_benefit_finder/src/Traits/BenefitFinderTrait.php @@ -159,6 +159,9 @@ public function getLifeEventForm($nid, $mode) { * The node revision entity. */ public function getNode($nid, $mode) { + /** @var \Drupal\Core\Entity\Query\QueryInterface|null $query */ + $query = NULL; + $node = Node::load($nid); if (!$node) {