Merge pull request #367 from Indicia-Team/fix-php8

Update code for compatibility with PHP8

.travis.yml

@@ -11,7 +11,7 @@ language: php
 php:
   # Test oldest and newest maintained versions.
   - '7.3'
-  # - '8.0'
+  - '8.0'
 
 env:
   # Test oldest and newest maintained versions.

application/helpers/postgreSQL.php

@@ -372,7 +372,8 @@ public static function list_fields($entity, $db = NULL) {
         SELECT column_name, column_default, is_nullable, data_type, udt_name,
           character_maximum_length, numeric_precision, numeric_precision_radix, numeric_scale
         FROM information_schema.columns
-        WHERE table_name = \'' . $entity . '\'
+        WHERE table_name = \'' . $entity . '\' 
+        AND table_schema != \'information_schema\'
         ORDER BY ordinal_position
       ');
 

composer.json

@@ -1,10 +1,16 @@
 {
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/misantron/dbunit"
+    }
+  ],
   "require": {
     "firebase/php-jwt": "^5.4",
     "phpoffice/phpspreadsheet": "^1.18"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5",
-    "misantron/dbunit": "^5.1"
+    "misantron/dbunit": "dev-master"
   }
 }

docker/phpunit.sh

@@ -25,7 +25,7 @@ docker-compose -f docker-compose-phpunit.yml build \
   --build-arg GID=$(id -g) \
   --build-arg USER=$(id -un) \
   --build-arg GROUP=$(id -gn) \
-  --build-arg PHP_VERSION=7.3 \
+  --build-arg PHP_VERSION=8 \
   --build-arg PG_VERSION=13 \
   --build-arg PORT=$PORT
 # When the container is brought up, the database will start 

docker/warehouse/Dockerfile

@@ -1,8 +1,6 @@
-# This image contains Debian's Apache httpd in conjunction with PHP7.3
-# (as mod_php) and uses mpm_prefork by default.
+# This image contains Debian's Apache httpd in conjunction with PHP8.0.
 # https://hub.docker.com/_/php
-# Currently warehouse is not compatible with PHP 7.4
-FROM php:7.3-apache
+FROM php:8.0-apache
 # Use PHP development configuration file
 RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 # Increase size of files which can be uploaded.

modules/data_cleaner/controllers/verification_rule.php

@@ -134,7 +134,7 @@ private function get_server_list() {
     $response = curl_exec($session);
     if (curl_errno($session)) {
       $this->session->set_flash('flash_info', 'The list of verification rule servers could not be retrieved from the internet. ' .
-          'More information is avaailable in the server logs.');
+          'More information is available in the server logs.');
       kohana::log('error', 'Error occurred when retrieving list of verification rule servers. ' . curl_error($session));
       return array();
     }