From 15dc07ec91add743b6272abcadce49c20f3ed721 Mon Sep 17 00:00:00 2001
From: pykettk <pykettk@gmail.com>
Date: Thu, 27 Apr 2023 15:56:36 +0100
Subject: [PATCH] Use Sansec PackageVerdict Naming Convention

---
 Enum/IntegrityCheckerArrayKeys.php            | 18 -----
 Model/IntegrityResultsRegistry.php            |  5 +-
 ...sansec-composer-integrity-results-grid.xml | 14 ++--
 .../templates/email/failure-list.phtml        | 73 +++----------------
 4 files changed, 22 insertions(+), 88 deletions(-)
 delete mode 100644 Enum/IntegrityCheckerArrayKeys.php

diff --git a/Enum/IntegrityCheckerArrayKeys.php b/Enum/IntegrityCheckerArrayKeys.php
deleted file mode 100644
index ac3e367..0000000
--- a/Enum/IntegrityCheckerArrayKeys.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Copyright © element119. All rights reserved.
- * See LICENCE.txt for licence details.
- */
-declare(strict_types=1);
-
-namespace Element119\SansecComposerIntegrityChecker\Enum;
-
-enum IntegrityCheckerArrayKeys: string
-{
-    case Checksum = 'checksum';
-    case Package = 'package';
-    case PackageId = 'package_id';
-    case Percentage = 'percentage';
-    case Status = 'status';
-    case Version = 'version';
-}
diff --git a/Model/IntegrityResultsRegistry.php b/Model/IntegrityResultsRegistry.php
index 0fe8fd6..82186aa 100644
--- a/Model/IntegrityResultsRegistry.php
+++ b/Model/IntegrityResultsRegistry.php
@@ -7,7 +7,6 @@
 
 namespace Element119\SansecComposerIntegrityChecker\Model;
 
-use Element119\SansecComposerIntegrityChecker\Enum\IntegrityCheckerArrayKeys;
 use Element119\SansecComposerIntegrityChecker\Scope\Config;
 use Exception;
 use Hyva\Admin\Api\HyvaGridArrayProviderInterface;
@@ -71,7 +70,9 @@ public function getFailedMatches(array $packages = []): array
         $threshold = $this->moduleConfig->getSansecComposerIntegrityMatchThreshold();
 
         foreach ($packages ?: $this->getLastResults() as $package) {
-            if ((int)$package[IntegrityCheckerArrayKeys::Percentage->value] < $threshold) {
+            $package = (array)$package;
+
+            if ((int)$package['percentage'] < $threshold) {
                 $failures[] = $package;
             }
         }
diff --git a/view/adminhtml/hyva-grid/sansec-composer-integrity-results-grid.xml b/view/adminhtml/hyva-grid/sansec-composer-integrity-results-grid.xml
index b8f7f67..52c8cd9 100644
--- a/view/adminhtml/hyva-grid/sansec-composer-integrity-results-grid.xml
+++ b/view/adminhtml/hyva-grid/sansec-composer-integrity-results-grid.xml
@@ -12,12 +12,12 @@
     </source>
     <columns>
         <include>
-            <column name="package"/>
+            <column name="name"/>
             <column name="version"/>
-            <column name="status"/>
+            <column name="verdict"/>
             <column name="percentage"/>
             <column name="checksum"/>
-            <column name="package_id"/>
+            <column name="id"/>
         </include>
     </columns>
     <navigation>
@@ -27,19 +27,19 @@
             <export type="xlsx" label="Export as XLSX"/>
         </exports>
         <filters>
-            <filter column="package"/>
+            <filter column="name"/>
             <filter column="version"/>
-            <filter column="status"/>
+            <filter column="verdict"/>
             <filter column="percentage"/>
             <filter column="checksum"/>
-            <filter column="package_id"/>
+            <filter column="id"/>
         </filters>
         <pager>
             <defaultPageSize>20</defaultPageSize>
             <pageSizes>20,30,50,100,200</pageSizes>
         </pager>
         <sorting>
-            <defaultSortByColumn>package</defaultSortByColumn>
+            <defaultSortByColumn>name</defaultSortByColumn>
             <defaultSortDirection>asc</defaultSortDirection>
         </sorting>
     </navigation>
diff --git a/view/adminhtml/templates/email/failure-list.phtml b/view/adminhtml/templates/email/failure-list.phtml
index 6e5e0af..9adde8f 100644
--- a/view/adminhtml/templates/email/failure-list.phtml
+++ b/view/adminhtml/templates/email/failure-list.phtml
@@ -5,7 +5,6 @@
  */
 declare(strict_types=1);
 
-use Element119\SansecComposerIntegrityChecker\Enum\IntegrityCheckerArrayKeys;
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\Template;
 
@@ -16,71 +15,23 @@ use Magento\Framework\View\Element\Template;
     <table>
         <thead>
             <tr>
-                <th>
-                    <strong>
-                        <?= $escaper->escapeHtml(
-                            __(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Package->value)))
-                        ); ?>
-                    </strong>
-                </th>
-                <th>
-                    <strong>
-                        <?= $escaper->escapeHtml(
-                            __(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Version->value)))
-                        ); ?>
-                    </strong>
-                </th>
-                <th>
-                    <strong>
-                        <?= $escaper->escapeHtml(
-                            __(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Status->value)))
-                        ); ?>
-                    </strong>
-                </th>
-                <th>
-                    <strong>
-                        <?= $escaper->escapeHtml(
-                            __(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Percentage->value)))
-                        ); ?>
-                    </strong>
-                </th>
-                <th>
-                    <strong>
-                        <?= $escaper->escapeHtml(
-                            __(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::Checksum->value)))
-                        ); ?>
-                    </strong>
-                </th>
-                <th>
-                    <strong>
-                        <?= $escaper->escapeHtml(
-                            __(ucwords(str_replace(['-', '_'], ' ', IntegrityCheckerArrayKeys::PackageId->value)))
-                        ); ?>
-                    </strong>
-                </th>
+                <th><strong><?= $escaper->escapeHtml(__('Package')); ?></strong></th>
+                <th><strong><?= $escaper->escapeHtml(__('Version')); ?></strong></th>
+                <th><strong><?= $escaper->escapeHtml(__('Verdict')); ?></strong></th>
+                <th><strong><?= $escaper->escapeHtml(__('Percentage')); ?></strong></th>
+                <th><strong><?= $escaper->escapeHtml(__('Checksum')); ?></strong></th>
+                <th><strong><?= $escaper->escapeHtml(__('Package ID')); ?></strong></th>
             </tr>
         </thead>
         <tbody>
             <?php foreach ($packageData as $data): ?>
                 <tr>
-                    <td style="padding: 10px;">
-                        <?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Package->value]); ?>
-                    </td>
-                    <td style="padding: 10px;">
-                        <?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Version->value]); ?>
-                    </td>
-                    <td style="padding: 10px;">
-                        <?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Status->value]); ?>
-                    </td>
-                    <td style="padding: 10px;">
-                        <?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Percentage->value]); ?>
-                    </td>
-                    <td style="padding: 10px;">
-                        <?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::Checksum->value]); ?>
-                    </td>
-                    <td style="padding: 10px;">
-                        <?= $escaper->escapeHtml($data[IntegrityCheckerArrayKeys::PackageId->value]); ?>
-                    </td>
+                    <td style="padding: 10px;"><?= $escaper->escapeHtml($data['name']); ?></td>
+                    <td style="padding: 10px;"><?= $escaper->escapeHtml($data['version']); ?></td>
+                    <td style="padding: 10px;"><?= $escaper->escapeHtml($data['verdict']); ?></td>
+                    <td style="padding: 10px;"><?= $escaper->escapeHtml($data['percentage']); ?></td>
+                    <td style="padding: 10px;"><?= $escaper->escapeHtml($data['checksum']); ?></td>
+                    <td style="padding: 10px;"><?= $escaper->escapeHtml($data['id']); ?></td>
                 </tr>
             <?php endforeach; ?>
         </tbody>