Updating CircleCI to use PHP 7.4 (#111)

--------- Co-authored-by: Ryan Rathsam <[email protected]>
ubccr · Jun 25, 2024 · 37290e8 · 37290e8
1 parent 860a50f
commit 37290e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,6 +22,15 @@ jobs:
       XDMOD_INSTALL_DIR: /xdmod
       XDMOD_TEST_MODE: << parameters.install-type >>
     steps:
+      - run:
+          name: Enable PHP 7.4 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 Python3
           command: dnf -y install --setopt=tsflags=nodocs python3
@@ -50,7 +59,7 @@ jobs:
           name: Ensure that no PHP command-line errors were generated
           command: >
             if [ -e /var/log/php_errors.log ]; then
-                test `fgrep -v 'phpunit/phpunit' /var/log/php_errors.log | wc -l` = 0;
+                test `egrep -v "PHP Deprecated.*vendor\/.*|PHP Notice:  fread()|phpunit.*" /var/log/php_errors.log | wc -l` = 0;
             fi
       - store_artifacts:
           path: /tmp/screenshots

diff --git a/classes/AppKernel/AppKernelIngestor.php b/classes/AppKernel/AppKernelIngestor.php
@@ -565,33 +565,29 @@ public function ingestAppKernelInstances($resourceNickname)
                                     $this->appKernelSummaryReport['parse_error']++;
                                     $this->logger->err("Parse error: '$msg'");
                                     $this->logger->debug("Raw instance data:\n{$akInstance->data}\n");
-                                    continue;
                                     break;
                                 case AppKernel\AppKernelException::Queued:
                                     $resourceReport[$akInstance->akNickname]['queued']++;
                                     $this->appKernelSummaryReport['queued']++;
                                     $this->logger->notice("Queued: '$msg'");
-                                    continue;
                                     break;
                                 case AppKernel\AppKernelException::Error:
                                     $resourceReport[$akInstance->akNickname]['error']++;
                                     $this->appKernelSummaryReport['error']++;
                                     $this->logger->err("Error: '$msg'");
-                                    continue;
                                     break;
                                 case AppKernel\AppKernelException::UnknownType:
                                     $resourceReport[$akInstance->akNickname]['unknown_type']++;
                                     $this->appKernelSummaryReport['unknown_type']++;
                                     $this->logger->warning("Unknown Type: '$msg'");
-                                    continue;
                                     break;
                                 default:
                                     $this->logger->err(array(
                                         'message' => "AppKernelException: '$msg'",
                                         'stacktrace' => $e->getTraceAsString(),
                                     ));
-                                    continue;
                                     break;
+
                             }
                         }