Merge pull request #13842 from seamuslee001/upgrade_log_package

Remove Log.php require_once statements
civicrm · Mar 17, 2019 · 2d5479d · 2d5479d
2 parents 5d0bcc8 + 4f897b7
commit 2d5479d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
@@ -35,7 +35,6 @@
  * @copyright CiviCRM LLC (c) 2004-2019
  */
 
-require_once 'Log.php';
 require_once 'Mail.php';
 
 require_once 'api/api.php';

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
@@ -37,8 +37,6 @@
 require_once 'PEAR/Exception.php';
 require_once 'CRM/Core/Exception.php';
 
-require_once 'Log.php';
-
 /**
  * Class CRM_Exception
  */

diff --git a/CRM/Utils/Check/Component/Source.php b/CRM/Utils/Check/Component/Source.php
@@ -51,6 +51,24 @@ public function getRemovedFiles() {
     $files[] = '[civicrm.vendor]/pear/net_smtp/phpdoc.sh';
     $files[] = '[civicrm.vendor]/phpoffice/phpword/samples';
     $files[] = '[civicrm.root]/templates/CRM/common/version.tpl';
+    $files[] = '[civicrm.packages]/Log.php';
+    $files[] = '[civicrm.packages]/_ORIGINAL_/Log.php';
+    $files[] = '[civicrm.packages]/Log/composite.php';
+    $files[] = '[civicrm.packages]/Log/console.php';
+    $files[] = '[civicrm.packages]/Log/daemon.php';
+    $files[] = '[civicrm.packages]/Log/display.php';
+    $files[] = '[civicrm.packages]/Log/error_log.php';
+    $files[] = '[civicrm.packages]/Log/file.php';
+    $files[] = '[civicrm.packages]/Log/firebug.php';
+    $files[] = '[civicrm.packages]/Log/mail.php';
+    $files[] = '[civicrm.packages]/Log/mcal.php';
+    $files[] = '[civicrm.packages]/Log/mdb2.php';
+    $files[] = '[civicrm.packages]/Log/null.php';
+    $files[] = '[civicrm.packages]/Log/observer.php';
+    $files[] = '[civicrm.packages]/Log/sql.php';
+    $files[] = '[civicrm.packages]/Log/sqlite.php';
+    $files[] = '[civicrm.packages]/Log/syslog.php';
+    $files[] = '[civicrm.packages]/Log/win.php';
 
     return $files;
   }