Merge branch 'main' into simonLeary42-patch-3

Author: simonLeary42

.github/workflows/functional.yml

@@ -0,0 +1,25 @@
+name: docker-compose-phpunit-functional
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  docker-compose-phpunit-functional:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: "8.3"
+        tools: composer
+    - name: install composer dependencies
+      run: composer update
+    - name: Run docker compose
+      uses: hoverkraft-tech/[email protected]
+      with:
+        compose-file: "./tools/docker-dev/docker-compose.yml"
+    - name: Execute tests in the running services
+      run: docker compose -f ./tools/docker-dev/docker-compose.yml exec -w '/var/www/unity-web-portal' web ./vendor/bin/phpunit --testsuite=functional

.github/workflows/lint.yml

@@ -7,5 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: php-actions/composer@v6
-    - uses: php-actions/phpunit@v3
+    - name: setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: "8.3"
+        # php extensions also listed in tools/docker-dev/web/Dockerfile
+        extensions: curl,mysql,ldap,pdo,redis
+        tools: composer:v2
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress
+    - name: Run PHPUnit tests
+      run: vendor/bin/phpunit --colors=always --testsuite unit

.github/workflows/phpunit.yml

@@ -0,0 +1,19 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
+    - name: setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: "8.3"
+        tools: composer, phpcs, phpcbf
+    - uses: pre-commit/[email protected]

.github/workflows/pre-commit.yml

@@ -2,11 +2,7 @@
 # pre-commit automatically excludes submodules
 exclude: |
   (?x)^(
-      .*\.dist|
-      roles/ood-head/files/auto-copy/var/www/ood/apps/common/common_attributes.yml|
-      roles/ood-head/files/auto-copy/var/www/ood/apps/sys/dashboard/config/locales/en.yml|
-      inventory.d/ipv4.py|
-      files/shibboleth/filtered-incommon-metadata.xml.j2|
+      test/.*|
   )$
 
 repos:
@@ -46,3 +42,9 @@ repos:
         language: system
         files: \.php$
         args: [--standard=PSR2, --colors]
+      - id: php-l
+        name: php -l
+        entry: php
+        language: system
+        files: \.php$
+        args: [-l]

.pre-commit-config.yaml

@@ -1,8 +1,11 @@
 {
     "require": {
         "psr/log": "1.1.4",
-        "phpseclib/phpseclib": "3.0.16",
+        "phpseclib/phpseclib": "3.0.43",
         "phpmailer/phpmailer": "6.6.4",
-        "hakasapl/phpopenldaper": "1.0.5"
+        "hakasapl/phpopenldaper": "1.0.6"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "<12.1"
     }
 }

composer.json

@@ -11,6 +11,7 @@ name = "Unity Cluster"  ; Name of the website
 url = "https://127.0.0.1:8000/"  ; URL of the website
 description = "The Unity Web Portal is a lightweight HPC cluster front-end"  ; Description of the website
 logo = "logo.png"  ; path to logo file, in the webroot/assets/branding folder
+terms_of_service_url = "https://github.com" ; this can be external or a portal page created with "content management"
 
 [ldap]
 uri = "ldap://identity"  ; URI of remote LDAP server
@@ -100,4 +101,3 @@ url = "https://hooks.slack.com/services/T04BB3N3M26/B050A55CBNX/IGm1YA0VhjczAfs5
 [page]  ; which sql objects to use for the content on these pages
 home = "home"
 support = "support"
-policy = "policy"

defaults/config.ini.default

@@ -1,13 +1,16 @@
+<!-- restrictWarnings="true" -->
 <phpunit
-  bootstrap="test/unit/bootstrap.php"
+  bootstrap="test/phpunit-bootstrap.php"
   failOnWarning="true"
   failOnDeprecation="true"
   failOnNotice="true"
-  restrictWarnings="true"
 >
   <testsuites>
     <testsuite name="unit">
       <directory>test/unit</directory>
     </testsuite>
+    <testsuite name="functional">
+      <directory>test/functional</directory>
+    </testsuite>
   </testsuites>
 </phpunit>

phpunit.xml

@@ -19,6 +19,7 @@
 require_once __DIR__ . "/lib/UnityConfig.php";
 require_once __DIR__ . "/lib/UnityWebhook.php";
 require_once __DIR__ . "/lib/UnityRedis.php";
+require_once __DIR__ . "/lib/UnityGithub.php";
 
 // run init script
 require __DIR__ . "/init.php";

resources/autoload.php

@@ -12,6 +12,7 @@
 use UnityWebPortal\lib\UnityUser;
 use UnityWebPortal\lib\UnityRedis;
 use UnityWebPortal\lib\UnityWebhook;
+use UnityWebPortal\lib\UnityGithub;
 
 //
 // Initialize Session
@@ -84,6 +85,8 @@
     $CONFIG["site"]["url"] . $CONFIG["site"]["prefix"]
 );
 
+$GITHUB = new UnityGithub();
+
 //
 // SSO Init
 //