Remove PEAR Log dependencies

bin/xdmod-check-config

@@ -152,33 +152,6 @@ try {
         'PHP XMLWriter extension installed'
     );
 
-    _debug('Checking for Log class');
-    $result = class_exists('Log');
-    displayResult(
-        $result,
-        'PHP PEAR Log class installed'
-    );
-
-    _debug('Including Log/mdb2.php');
-    include_once 'Log/mdb2.php';
-
-    _debug('Checking for Log_mdb2 class');
-    $result = class_exists('Log_mdb2');
-    displayResult(
-        $result,
-        'PHP MDB2 class installed'
-    );
-
-    _debug('Including MDB2/Driver/mysql.php');
-    include_once 'MDB2/Driver/mysql.php';
-
-    _debug('Checking for MDB2_Driver_mysql class');
-    $result = class_exists('MDB2_Driver_mysql');
-    displayResult(
-        $result,
-        'PHP MDB2 MySQL driver installed'
-    );
-
     _debug('Checking for json_encode function');
     $result = function_exists('json_encode');
     displayResult(

classes/CCR/Log.php

@@ -21,8 +21,6 @@ class Log
     const LINE_FORMAT = "%datetime% [%level_name%] %message%\n";
     const TIME_FORMAT = 'Y-m-d H:i:s';
 
-    // Class constants so "Log.php" doesn't need to be required by users
-    // of the Log class.
     const EMERG   = 0;
     const ALERT   = 1;
     const CRIT    = 2;

docs/software-requirements.md

@@ -17,8 +17,6 @@ Open XDMoD requires the following software:
     - [cURL][php-curl]
     - [DOM][php-dom]
     - [XMLWriter][php-xmlwriter]
-    - [PEAR MDB2 Package][pear-mdb2]
-    - [PEAR MDB2 MySQL Driver][pear-mdb2-mysql]
     - [mbstring][php-mbstring]
     - [APCu][php-pecl-apcu]
 - [libreoffice][]
@@ -47,8 +45,6 @@ Open XDMoD requires the following software:
 [php-curl]:        https://secure.php.net/manual/en/book.curl.php
 [php-dom]:         https://secure.php.net/manual/en/book.dom.php
 [php-xmlwriter]:   https://secure.php.net/manual/en/book.xmlwriter.php
-[pear-mdb2]:       https://pear.php.net/package/MDB2
-[pear-mdb2-mysql]: https://pear.php.net/package/MDB2_Driver_mysql
 [php-mbstring]:    https://secure.php.net/manual/en/book.mbstring.php
 [php-pecl-apcu]:   https://www.php.net/manual/en/book.apcu.php
 [libreoffice]:     https://www.libreoffice.org
@@ -82,7 +78,6 @@ added with this command for CentOS 7:
 
     # yum install httpd php php-cli php-mysql php-gd \
                   gmp-devel php-gmp php-pdo php-xml \
-                  php-pear-MDB2 php-pear-MDB2-Driver-mysql \
                   libreoffice \
                   mariadb-server mariadb cronie logrotate \
                   perl-Image-ExifTool php-mbstring php-pecl-apcu jq \

open_xdmod/modules/xdmod/xdmod.spec.in

@@ -14,7 +14,7 @@ BuildRequires: php-cli
 Requires:      httpd mod_ssl
 Requires:      mariadb >= 5.5.3
 Requires:      php >= 5.4 php-cli php-mysql php-pdo php-gd php-xml php-mbstring
-Requires:      php-pear-MDB2 php-pear-MDB2-Driver-mysql php-pecl-apcu
+Requires:      php-pecl-apcu
 Requires:      libreoffice-writer
 Requires:      chromium-headless
 Requires:      librsvg2-tools

tests/ci/bootstrap.sh

@@ -136,3 +136,7 @@ then
         sudo -u xdmod xdmod-ingestor --last-modified-start-date="2017-01-01 00:00:00"
     fi
 fi
+
+# Remove old PEAR dependencies.  This command can be removed when a new Docker
+# image is created without these packages installed.
+yum -y remove php-pear-MDB2 php-pear-MDB2-Driver-mysql