From 0af02565ac646882e922a09c129a71fb397521bb Mon Sep 17 00:00:00 2001
From: Danae Miller-Clendon <danae.miller-clendon@isobar.com>
Date: Wed, 19 Jun 2019 17:38:44 +1200
Subject: [PATCH] - Register health check through _config.php as YML was not
 registering - Change date formate to SS3

---
 _config.php                        | 5 +++++
 _config/environmentcheck.yml       | 4 ----
 composer.json                      | 8 +-------
 src/Configuration/RotateConfig.php | 5 +++--
 src/Storage/RotateStorage.php      | 6 +++++-
 src/Storage/S3ClientFactory.php    | 1 +
 6 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 _config.php

diff --git a/_config.php b/_config.php
new file mode 100644
index 0000000..24e361c
--- /dev/null
+++ b/_config.php
@@ -0,0 +1,5 @@
+<?php
+
+use LittleGiant\SpinDB\Health\BackupCheck;
+
+EnvironmentCheckSuite::register('check', BackupCheck::class, "Is the database backup saving to S3 daily?");
diff --git a/_config/environmentcheck.yml b/_config/environmentcheck.yml
index 72db6d3..392ea6e 100644
--- a/_config/environmentcheck.yml
+++ b/_config/environmentcheck.yml
@@ -5,7 +5,3 @@ EnvironmentCheckSuite:
   registered_suites:
     health:
       - spindb
-  registered_checks:
-    spindb:
-      definition: 'LittleGiant\SpinDB\Health\BackupCheck'
-      title: 'Is the database backup saving to S3 daily?'
diff --git a/composer.json b/composer.json
index 9b5470f..4833eea 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "littlegiant/silverstripe-spindb",
-    "type": "silverstripe-vendormodule",
     "license": "BSD-3-Clause",
     "description": "Backup DB periodically and backup to AWS S3 storage with rotation",
     "require": {
@@ -18,12 +17,7 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
-    },
-    "autoload": {
-        "psr-4": {
-            "LittleGiant\\SpinDB\\": "src/"
+            "dev-ss3": "dev-ss3.x-compat"
         }
     },
     "scripts": {
diff --git a/src/Configuration/RotateConfig.php b/src/Configuration/RotateConfig.php
index d5155fb..a4b4d0f 100644
--- a/src/Configuration/RotateConfig.php
+++ b/src/Configuration/RotateConfig.php
@@ -34,8 +34,8 @@ protected static function getFixedArgs(): array
     public static function getCurrentArgs(): array
     {
         return [
-            'date' => SS_Datetime::now()->Format('y-MM-dd'),
-            'time' => SS_Datetime::now()->Format('HH.mm.ss'),
+            'date' => SS_Datetime::now()->Format('Y-m-d'),
+            'time' => SS_Datetime::now()->Format('H.i.s'),
         ];
     }
 
@@ -110,6 +110,7 @@ public static function parse($path): ?array
             return null;
         }
 
+
         // Return array of matched parts
         $result = [];
         foreach ($patterns as $name => $value) {
diff --git a/src/Storage/RotateStorage.php b/src/Storage/RotateStorage.php
index b39a15a..e0f0a67 100644
--- a/src/Storage/RotateStorage.php
+++ b/src/Storage/RotateStorage.php
@@ -4,7 +4,9 @@
 
 use Aws\Result;
 use Aws\S3\S3Client;
+use Debug;
 use Exception;
+use Injector;
 use LittleGiant\SpinDB\Configuration\RotateConfig;
 use Object;
 
@@ -66,7 +68,9 @@ public function getFiles()
         ]);
         $files = [];
         $objects = $objects->get('Contents');
-        if ($objects) {
+
+        if (!empty($objects)) {
+
             foreach ($objects as $object) {
                 $parts = RotateConfig::parse($object['Key']);
                 if ($parts) {
diff --git a/src/Storage/S3ClientFactory.php b/src/Storage/S3ClientFactory.php
index f29ce66..14c62bd 100644
--- a/src/Storage/S3ClientFactory.php
+++ b/src/Storage/S3ClientFactory.php
@@ -5,6 +5,7 @@
 use Aws\Credentials\Credentials;
 use Aws\S3\S3Client;
 use LittleGiant\SpinDB\Configuration\RotateConfig;
+use SilverStripe\Framework\Injector\Factory;
 
 class S3ClientFactory implements Factory
 {