Issue #3373117 by sidharth_soman, justcaldwell: Fix the errors reported by phpcs

src/Form/ReportForm.php

@@ -2,15 +2,32 @@
 
 namespace Drupal\layout_builder_usage_reports\Form;
 
+use Drupal\Core\Database\Connection;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
+use Drupal\Core\State\StateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class ReportForm.
+ * Constructs the report form.
  */
 class ReportForm extends FormBase {
 
+  /**
+   * The state service.
+   *
+   * @var \Drupal\Core\State\StateInterface
+   */
+  protected $state;
+
+  /**
+   * The database service.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
   /**
    * {@inheritdoc}
    */
@@ -18,6 +35,35 @@ class ReportForm extends FormBase {
     return 'report_form';
   }
 
+  /**
+   * Constructs a new ReportForm object.
+   *
+   * @param \Drupal\Core\State\StateInterface $state
+   *   The state service.
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database service.
+   */
+  public function __construct(StateInterface $state, Connection $database) {
+    $this->state = $state;
+    $this->database = $database;
+  }
+
+  /**
+   * Implements the create() method for the form.
+   *
+   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+   *   The Drupal service container.
+   *
+   * @return static
+   *   The instance of the form.
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+    $container->get('state'),
+    $container->get('database')
+    );
+  }
+
   /**
    * Return true if a string starts with the specified character/ string.
    */
@@ -30,11 +76,11 @@ class ReportForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $lbur_bundle = \Drupal::state()->get('lbur_bundle');
-    $lbur_provider = \Drupal::state()->get('lbur_provider');
-    $lbur_language = \Drupal::state()->get('lbur_language');
-    $lbur_block_type = \Drupal::state()->get('lbur_block_type');
-    $lbur_paragraph_type = \Drupal::state()->get('lbur_paragraph_type');
+    $lbur_bundle = $this->state->get('lbur_bundle');
+    $lbur_provider = $this->state->get('lbur_provider');
+    $lbur_language = $this->state->get('lbur_language');
+    $lbur_block_type = $this->state->get('lbur_block_type');
+    $lbur_paragraph_type = $this->state->get('lbur_paragraph_type');
 
     $header = [
       'entity_id' => $this->t('Node ID'),
@@ -45,7 +91,7 @@ class ReportForm extends FormBase {
       'label' => $this->t('Label'),
       'provider' => $this->t('Provider'),
     ];
-    $database = \Drupal::database();
+    $database = $this->database;
     $result = [];
     $options = [];
     $display_reset = TRUE;
@@ -87,10 +133,17 @@ class ReportForm extends FormBase {
         continue;
       }
       $serialized_data = $record->layout_builder__layout_section;
-      $unserialized_data = unserialize($serialized_data);
+      $unserialized_data = unserialize($serialized_data,
+        [
+          'allowed_classes' => [
+            'Drupal\layout_builder\Section',
+            'Drupal\layout_builder\SectionComponent',
+          ],
+        ]
+      );
 
       $components = $unserialized_data->getComponents();
-      foreach ($components as $components_id => $component) {
+      foreach ($components as $component) {
         $pluginId = $component->getPluginId();
         /*
          * inline_block:title_and_supporting_message
@@ -105,14 +158,14 @@ class ReportForm extends FormBase {
         $paragraph_type = '';
         if ($this->startsWith($pluginId, "inline_block:")) {
           // It's block type.
-          $block_type = (isset($pluginIdPartsArray[1]) ? $pluginIdPartsArray[1] : '');
+          $block_type = ($pluginIdPartsArray[1] ?? '');
           if (!empty($block_type)) {
             $block_types_set[$block_type] = $block_type;
           }
         }
         elseif ($this->startsWith($pluginId, "component:")) {
           // It's paragraph type.
-          $paragraph_type = (isset($pluginIdPartsArray[1]) ? $pluginIdPartsArray[1] : '');
+          $paragraph_type = ($pluginIdPartsArray[1] ?? '');
           if (!empty($paragraph_type)) {
             $paragraph_types_set[$paragraph_type] = $paragraph_type;
           }
@@ -201,7 +254,7 @@ class ReportForm extends FormBase {
     if ($display_reset) {
       $form['filtergroup']['reset'] = [
         '#type' => 'submit',
-        '#value' => t('Reset the filter'),
+        '#value' => $this->t('Reset the filter'),
         '#submit' => [[$this, 'resetForm']],
       ];
     }
@@ -230,7 +283,7 @@ class ReportForm extends FormBase {
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
     foreach ($form_state->getValues() as $key => $value) {
-      // @TODO: Validate fields.
+      // @todo Validate fields.
     }
     parent::validateForm($form, $form_state);
   }
@@ -239,21 +292,22 @@ class ReportForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    \Drupal::state()->set('lbur_bundle', $form_state->getValues()["bundle"]);
-    \Drupal::state()->set('lbur_provider', $form_state->getValues()["provider"]);
-    \Drupal::state()->set('lbur_language', $form_state->getValues()["language"]);
-    \Drupal::state()->set('lbur_block_type', $form_state->getValues()["block_type"]);
-    \Drupal::state()->set('lbur_paragraph_type', $form_state->getValues()["paragraph_type"]);
+    $this->state->set('lbur_bundle', $form_state->getValues()["bundle"]);
+    $this->state->set('lbur_provider', $form_state->getValues()["provider"]);
+    $this->state->set('lbur_language', $form_state->getValues()["language"]);
+    $this->state->set('lbur_block_type', $form_state->getValues()["block_type"]);
+    $this->state->set('lbur_paragraph_type', $form_state->getValues()["paragraph_type"]);
   }
 
   /**
    * Reset the filter.
    */
   public function resetForm() {
-    \Drupal::state()->delete('lbur_bundle');
-    \Drupal::state()->delete('lbur_provider');
-    \Drupal::state()->delete('lbur_language');
-    \Drupal::state()->delete('lbur_block_type');
-    \Drupal::state()->delete('lbur_paragraph_type');
+    $this->state->delete('lbur_bundle');
+    $this->state->delete('lbur_provider');
+    $this->state->delete('lbur_language');
+    $this->state->delete('lbur_block_type');
+    $this->state->delete('lbur_paragraph_type');
   }
+
 }