XDMoD 11.0 PHP 7.4 Changes

.circleci/config.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - run:
           name: Generate OpenSSL Key
-          command: openssl genrsa -rand /proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/uptime 2048 > /etc/pki/tls/private/localhost.key
+          command: openssl genrsa -rand /proc/cpuinfo:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/uptime 2048 > /etc/pki/tls/private/localhost.key
       - run:
           name: Generate Certificate
           command: /usr/bin/openssl req -new -key /etc/pki/tls/private/localhost.key -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req -out /etc/pki/tls/certs/localhost.crt -subj "/C=XX/L=Default City/O=Default Company Ltd"
@@ -35,6 +35,15 @@ jobs:
       #- setup_remote_docker:
       #    docker_layer_caching: true
       # Download and cache dependencies
+      - run:
+          name: Update php module
+          command: dnf module -y reset php && dnf module -y enable php:7.4
+      - run:
+          name: Install PHP 7.4 and PHP module pre-reqs & an updated version of PHP Pear
+          command: dnf install -y php libzip-devel php-pear php-devel
+      - run:
+          name: Install MongoDB Pear module
+          command: yes '' | pecl install mongodb || true
       - run:
             name: install the composer dependencies
             command: composer install
@@ -43,7 +52,9 @@ jobs:
           command: |
             mkdir ~/phpunit
             mkdir /tmp/screenshots
-      - run: ~/bin/buildrpm xdmod
+      - run:
+          name: Build XDMoD RPM
+          command: ~/bin/buildrpm xdmod
       - run:
           name: Install / Upgrade XDMoD from RPM
           command: ./tests/ci/bootstrap.sh
@@ -82,20 +93,24 @@ jobs:
             chown root:root -R /usr/local/node-v10.24.1-linux-x64
       - run: pushd ./tests/ui && PATH=/usr/local/node-v10.24.1-linux-x64/bin:$PATH /usr/local/node-v10.24.1-linux-x64/bin/npm install && popd
       - run: PATH=/usr/local/node-v10.24.1-linux-x64/bin:$PATH ./tests/ui/runtests.sh --headless --log-junit ~/phpunit
+
       - run:
           name: 'Run SSO Tests'
           command: |
             PATH=/usr/local/node-v10.24.1-linux-x64/bin:$PATH ./tests/ci/samlSetup.sh
             PATH=/usr/local/node-v10.24.1-linux-x64/bin:$PATH ./tests/ui/runtests.sh --headless --log-junit ~/phpunit --sso
             ./vendor/phpunit/phpunit/phpunit -c ./tests/integration/phpunit.xml.dist --testsuite sso --log-junit ~/phpunit/xdmod-sso-integration.xml
       - run:
-          name: Ensure that no unexpected Apache errors were generated
-          command: test ! -e /var/log/php-fpm/www-error.log
+          name: Ensure that no unexpected Apache errors were generated ( We expect PHP Deprecated )
+          command: >
+            if [ -e /var/log/php-fpm/www-error.log ]; then
+              test `egrep -v "PHP Deprecated.*vendor\/.*" /var/log/php-fpm/www-error.log | wc -l` = 0;
+            fi
       - run:
           name: Ensure that no PHP command-line errors were generated
           command: >
               if [ -e /var/log/php_errors.log ]; then
-                  test `fgrep -v 'vendor/phpunit/phpunit/src' /var/log/php_errors.log | wc -l` = 0;
+                  test `egrep -v "PHP Deprecated.*vendor\/.*|PHP Notice:  fread()" /var/log/php_errors.log | wc -l` = 0;
               fi
       - store_artifacts:
           path: /tmp/screenshots

bin/acl-config

@@ -1519,7 +1519,7 @@ SQL;
             $inserted = 0;
             while ($row = $statement->fetch(PDO::FETCH_NUM) ) {
                 $inserted += 1;
-                if (fwrite($bulkdatafile, join($row, ',') . "\n") === false) {
+                if (fwrite($bulkdatafile, join(',', $row) . "\n") === false) {
                     throw new \Exception('Error writing to temporary file');
                 }
             }

classes/CCR/MailWrapper.php

@@ -9,7 +9,7 @@ class MailWrapper
 
     public static function initPHPMailer($properties)
     {
-        $mail = new \PHPMailer(true);
+        $mail = new \PHPMailer\PHPMailer\PHPMailer(true);
         $mail->isSendMail();
         $address = \xd_utilities\getConfiguration('mailer', 'sender_email');
         $mail->Sender = $address;

classes/DB/PDODBMultiIngestor.php

@@ -41,7 +41,7 @@ class PDODBMultiIngestor implements Ingestor
     function __construct(
         $dest_db,
         $source_db,
-        $pre_ingest_update_statements = array(),
+        $pre_ingest_update_statements,
         $source_query,
         $insert_table,
         $insert_fields = array(),

classes/DB/PDODBUnbufferedMultiIngestor.php

@@ -7,7 +7,7 @@ class PDODBUnbufferedMultiIngestor Extends PDODBMultiIngestor
     public function __construct(
         PDODB $dest_db,
         PDODB $source_db,
-        array $pre_ingest_update_statements = array(),
+        array $pre_ingest_update_statements,
         $source_query,
         $insert_table,
         array $insert_fields = array(),

classes/DataWarehouse/ExportBuilder.php

@@ -274,7 +274,7 @@ public static function getFormat(
      * @return array(headers => array of http headers, results => the encoded data to send)
      */
     public static function export(
-        array $exportedDatas = array(),
+        array $exportedDatas,
         $format,
         $inline = true,
         $filename = 'data'

classes/DataWarehouse/Visualization.php

@@ -60,14 +60,14 @@ public static function getColors($count = NULL, $palleteIndex = 0, $includeWhite
         srand();
         return $ret;
     }
-    
+
     public static function HSVtoRGB(array $hsv)
     {
         list($H, $S, $V) = $hsv;
         //1
         $H *= 6;
-        //2
-        $I = floor($H);
+        //2 NOTE: we cast to int so that the switch below works as intended in PHP8
+        $I = (int)floor($H);
         $F = $H - $I;
         //3
         $M = $V * (1 - $S);

classes/ETL/Aggregator/pdoAggregator.php

@@ -730,7 +730,14 @@ protected function _execute($aggregationUnit)
         $aggregationPeriodList = $this->getDirtyAggregationPeriods($aggregationUnit);
         $numAggregationPeriods = count($aggregationPeriodList);
         $firstPeriod = current($aggregationPeriodList);
-        $periodSize = $firstPeriod['period_end_day_id'] - $firstPeriod['period_start_day_id'];
+
+        // There are instances where $firstPeriod is a bool not an array ( when $aggregationPeriodList is empty or at the end of the array)
+        // the following code takes that into account.
+        $periodSize = 0;
+        if (!is_bool($firstPeriod)) {
+            $periodSize = $firstPeriod['period_end_day_id'] - $firstPeriod['period_start_day_id'];
+        }
+
         $batchSliceSize = $this->options->batch_aggregation_periods_per_batch;
         $tmpTableName = null;
         $qualifiedTmpTableName = null;

classes/ETL/DataEndpoint/aStructuredFile.php

@@ -239,7 +239,7 @@ protected function attachFilters()
                         $this->logger->warning(
                             sprintf("Skipping filter '%s': %s", $config->name, implode(", ", $messages))
                         );
-                        continue;
+                        continue 2;
                     }
                     $filterName = 'xdmod.external_process';
                     $resource = @stream_filter_prepend($fd, $filterName, STREAM_FILTER_READ, $config);

classes/ETL/DbModel/Entity.php

@@ -267,10 +267,14 @@ public function setSystemQuoteChar($char)
 
     public function quote($identifier)
     {
-        // Don't quote the identifier if it's already been quoted
+        // We can't quote non-strings so....
+        if (!is_string($identifier)) {
+            return $identifier;
+        }
 
-        if (0 === strpos($identifier, $this->systemQuoteChar)
-            && (strlen($identifier) - 1) === strrpos($identifier, $this->systemQuoteChar) ) {
+        // Don't quote the identifier if it's already been quoted
+        if (str_starts_with($identifier, $this->systemQuoteChar)
+            && str_ends_with($identifier, $this->systemQuoteChar)) {
             return $identifier;
         } else {
             return $this->systemQuoteChar . $identifier . $this->systemQuoteChar;

classes/ETL/Ingestor/HpcdbHostsIngestor.php

@@ -19,7 +19,7 @@ class HpcdbHostsIngestor extends pdoIngestor implements iAction
     /**
      * @see ETL\Ingestor\pdoIngestor::transform
      */
-    public function transform(array $srcRecord, $orderId)
+    public function transform(array $srcRecord, &$orderId)
     {
         $srcRecord = parent::transform($srcRecord, $orderId);
         $transformedRecord = array();

classes/ETL/aRdbmsDestinationAction.php

@@ -769,6 +769,8 @@ public function getSqlColumnNames($sql)
 
         foreach ( $parsedSql['SELECT'] as $item ) {
             if ( array_key_exists('alias', $item)
+                 && is_array($item['alias'])
+                 && array_key_exists('as', $item['alias'])
                  && $item['alias']['as']
                  && array_key_exists('name', $item['alias'])
             ) {

classes/Realm/GroupBy.php

@@ -374,7 +374,7 @@ public function __construct($shortName, \stdClass $config, Realm $realm, LoggerI
                                 break;
                             case 'dataset_display_type':
                                 if ( ! is_object($optionValue) ) {
-                                    continue;
+                                    continue 2;
                                 }
                                 foreach ($optionValue as $datasetType => $chartDisplayValue ) {
                                     if ( ! array_key_exists($datasetType, $this->chartOptions[$optionKey]) ) {
@@ -388,7 +388,7 @@ public function __construct($shortName, \stdClass $config, Realm $realm, LoggerI
                                 break;
                             case 'limit':
                                 if ( ! is_object($optionValue) ) {
-                                    continue;
+                                    continue 2;
                                 }
                                 foreach ($optionValue as $pageType => $limitValue ) {
                                     if ( ! array_key_exists($pageType, $this->chartOptions[$optionKey]) ) {

classes/Rest/Utilities/Conversions.php

@@ -17,6 +17,11 @@ public static function toInt($value)
      */
     public static function toString($value)
     {
+        // If no value was provided, then return an empty string.
+        if (is_null($value)) {
+            return '';
+        }
+
         $isObject = is_object($value);
         $hasToString = method_exists($value, '__toString');
         $isArray = is_array($value);

composer.json

@@ -3,7 +3,7 @@
         "COMMENT": "If kassner/log-parser is updated to version >2.1.1, then the call to web_parser->addPattern in classes/ETL/DataEndpoint/WebServerLogFile.php (added in https://github.com/ubccr/xdmod/pull/1816) can be removed along with this 'extra' section."
     },
     "require": {
-        "php": "^5.4 || ^7.2",
+        "php": "^7.4",
         "egulias/email-validator": "^1.2",
         "google/recaptcha": "~1.1",
         "greenlion/php-sql-parser": "~4.2",
@@ -12,29 +12,30 @@
         "moment/moment-min-file": "^2.13.0",
         "moment/moment-timezone-min-file": "^0.5.4",
         "paragonie/random_compat": "~2.0",
-        "phpmailer/phpmailer": "^5.2",
+        "phpmailer/phpmailer": "~6.9",
         "robrichards/xmlseclibs": "~3.0",
         "sencha/extjs-gpl": "3.4.*",
         "silex/silex": "~1.2",
-        "simplesamlphp/simplesamlphp": "~1",
+        "simplesamlphp/simplesamlphp": "^1.16",
         "symfony/polyfill-php56": "~1.11",
         "symfony/process": "~2.0",
         "taq/pdooci": "^1.0",
         "tildeio/rsvpjs-min-file": "^3.0.18",
         "ubccr/simplesamlphp-module-authglobus": "^1.3",
         "ubccr/simplesamlphp-module-authoidcoauth2": "^1.1",
-        "phpoffice/phpword": "^0.17.0",
+        "phpoffice/phpword": "^1.2.0",
         "monolog/monolog": "^1.25",
         "plotly/plotly": "^2.29.1",
         "kassner/log-parser": "~1.5",
         "geoip2/geoip2": "~2.0",
         "ua-parser/uap-php": "^3.9",
-        "mongodb/mongodb": "^1.11"
+        "mongodb/mongodb": "^1.14"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8",
+        "phpunit/phpunit": "^9.0",
         "ccampbell/chromephp": "^4.1",
-        "swaggest/json-schema": "^0.12.41"
+        "swaggest/json-schema": "^0.12.41",
+        "dms/phpunit-arraysubset-asserts": "^0.5.0"
     },
     "repositories": [
         {