From 2c668f9088bbb515c3636df263f52a8d3bde7125 Mon Sep 17 00:00:00 2001
From: "Joseph P. White" <jpwhite4@buffalo.edu>
Date: Thu, 23 Jan 2020 16:59:31 -0500
Subject: [PATCH] Fix bugs in Configuration classes.

Ensure function prototype is correct for cleanup() function.
Ensure member variables are declared before they are used.

These errors showed up when I was running the unit tests on my ubuntu
box (php 7.2.24). It seems that earlier versions of php let you get away
with it but not in later versions.
---
 classes/Configuration/Configuration.php        | 6 ++++++
 classes/ETL/Configuration/EtlConfiguration.php | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/classes/Configuration/Configuration.php b/classes/Configuration/Configuration.php
index 9e56952d3b..172d66188f 100644
--- a/classes/Configuration/Configuration.php
+++ b/classes/Configuration/Configuration.php
@@ -131,6 +131,12 @@ class Configuration extends Loggable implements iConfiguration
 
     protected $localConfigDir = null;
 
+
+    /**
+     * @var array of filenames of local configuration files
+     */
+    protected $localConfigFiles = array();
+
     /**
      * @var boolean Flag indicating that the directory for local configuration files has been
      * scanned and the list of filenames has been stored for use.
diff --git a/classes/ETL/Configuration/EtlConfiguration.php b/classes/ETL/Configuration/EtlConfiguration.php
index 4803bb1b21..b7e85a0994 100644
--- a/classes/ETL/Configuration/EtlConfiguration.php
+++ b/classes/ETL/Configuration/EtlConfiguration.php
@@ -525,9 +525,9 @@ protected function postMergeTasks()
      * ------------------------------------------------------------------------------------------
      */
 
-    public function cleanup()
+    public function cleanup($deepCleanup = false)
     {
-        parent::cleanup();
+        parent::cleanup($deepCleanup);
         $this->parentDefaults = null;
     }  // cleanup()