Merge branch 'main' into project/3.0

dvsa · Jan 16, 2024 · e50af0c · e50af0c
2 parents affd454 + c9c54e3
commit e50af0c
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 2 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -0,0 +1,47 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    versioning-strategy: "increase-if-necessary"
+    schedule:
+      interval: "weekly"
+    groups:
+      composer-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "composer"
+    directory: "/vendor-bin/phpcs"
+    schedule:
+      interval: "weekly"
+    groups:
+      composer-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "composer"
+    directory: "/vendor-bin/phpstan"
+    schedule:
+      interval: "weekly"
+    groups:
+      composer-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "composer"
+    directory: "/vendor-bin/psalm"
+    schedule:
+      interval: "weekly"
+    groups:
+      composer-dependencies:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      github-action-dependencies:
+        patterns:
+          - "*"
diff --git a/module/Application/src/Controller/UndertakingsController.php b/module/Application/src/Controller/UndertakingsController.php
@@ -3,6 +3,7 @@
 namespace Dvsa\Olcs\Application\Controller;
 
 use Common\Form\Form;
+use Common\Module;
 use Common\RefData;
 use Common\Service\Cqrs\Command\CommandService;
 use Common\Service\Helper\FlashMessengerHelperService;
@@ -121,7 +122,7 @@ public function signedAction()
         /** @var \Common\Service\Helper\TranslationHelperService $translator */
         $translator = $this->translationHelper;
         $form->get('signatureDetails')->get('signature')->setValue(
-            $translator->translateReplace('undertakings_signed', [$signedBy, $signedDate->format(\DATE_FORMAT)])
+            $translator->translateReplace('undertakings_signed', [$signedBy, $signedDate->format(Module::$dateFormat)])
         );
 
         return $this->render('undertakings', $form);

diff --git a/module/Olcs/src/Table/Tables/correspondence.table.php b/module/Olcs/src/Table/Tables/correspondence.table.php
@@ -1,5 +1,6 @@
 <?php
 
+use Common\Module;
 use Common\Service\Table\Formatter\AccessedCorrespondence;
 use Common\Service\Table\Formatter\LicenceNumberLink;
 
@@ -28,7 +29,7 @@
             'width' => '20%',
             'formatter' => function ($row) {
                 if (isset($row['correspondence']['document']['issuedDate'])) {
-                    return date(\DATE_FORMAT, strtotime($row['correspondence']['document']['issuedDate']));
+                    return date(Module::$dateFormat, strtotime($row['correspondence']['document']['issuedDate']));
                 }
                 return '';
             },