Resolved conflicts

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+    - package-ecosystem:  composer
+      directory: "/"
+      schedule:
+          interval: "daily"
+          time: "02:00"
+
+    - package-ecosystem: "github-actions"
+      directory: "/"
+      schedule:
+          interval: "daily"
+          time: "02:00"

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Lint PHP files
         run: find . -name "*.php" -print0 | xargs -0 -n1 -P3 php --syntax-check
@@ -26,7 +26,7 @@ jobs:
         run: rsync -av . /tmp/build --exclude .git
 
       - name: Archive build artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: csb-build
           path: /tmp/build

.github/workflows/run-tests.yml

@@ -0,0 +1,40 @@
+name: "run-tests"
+
+on: [ push, pull_request, workflow_dispatch ]
+
+jobs:
+    build:
+        name: "PHP"
+        runs-on: ubuntu-latest
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v4
+
+            - name: "Build environment"
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: "8.2"
+            - name: "Check syntax"
+              run: |
+                  find csb -name '*.php' -exec php -l {} \;
+
+            - name: "Tests"
+              run:  |
+                  ./run_tests.sh
+#    auto-merge:
+#        needs: run-tests
+#        runs-on: ubuntu-latest
+#        steps:
+#            - name: Check out repo
+#              uses: actions/checkout@v4
+#            - name: auto-merge
+#              if: |
+#                  github.actor == 'dependabot[bot]' &&
+#                  github.event_name == 'pull_request'
+#              run: |
+#                  ./merge_dependabot.sh
+#              env:
+#                  PR_URL: ${{github.event.pull_request.html_url}}
+#                  # this secret needs to be in the settings.secrets.dependabot
+#                  GITHUB_TOKEN: ${{secrets.GH_ACTION_TOKEN}}
+#

.gitignore

@@ -6,3 +6,6 @@ csb/csb-themes/default/style.css.map
 ***/.idea
 /.buildpath
 /.project
+/vendor
+*.cache
+test-reports/

README.md

@@ -2,7 +2,7 @@
 
 ![CI](https://github.com/CosmoQuestX/CSB7.0/workflows/CI/badge.svg) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](code_of_conduct.md)
 
-An open source implementation of CosmoQuest's Citizen Science Builder software.
+An opensource implementation of CosmoQuest's Citizen Science Builder software.
 
 <details open>
 <summary>Table of Contents</summary>
@@ -36,7 +36,7 @@ This is an open source image annotation platform suitable for citizen science, c
 
 ## License
 
-> Copyright © 2012-2022 CosmoQuest X Team is led by Pamela Gay with the Development team and maintained through community collaboration. **All rights reserved.**
+> Copyright © 2012-2023 CosmoQuest X Team is led by Pamela Gay with the Development team and maintained through community collaboration. **All rights reserved.**
 
 <!--  -->
 > Images, videos and other media belong to their respective owners.
@@ -79,6 +79,17 @@ CSB defines Apache error documents. If you want them to extend to the whole serv
 
 ---------------------------------------------
 
+Note: You'll need the repo accessible to apache. This means either
+clone it into a directory Apache sees, or sim link it there.
+
+### Clone repo
+
+```bash
+cd <directory for apache>
+git clone https://github.com/CosmoQuestX/CSB7.0.git
+
+```
+
 ### Method 1 - No Docker
 
 #### Step 1: Setup the Server

composer.json

@@ -0,0 +1,27 @@
+{
+    "name": "cosmoquestx/csb",
+    "description": "Kata",
+    "type": "project",
+    "license": "apache2",
+    "scripts" : {
+        "test": "phpunit"
+    },
+    "autoload" : {
+        "psr-4" : {
+            "unnamed\\" : "csb/",
+            "CosmoQuestX\\" : "src/"
+        }
+    },
+    "autoload-dev" : {
+        "psr-4" : {
+            "CosmoQuestX\\Tests\\" : "tests/"
+        }
+    },
+    "require": {
+        "phpmailer/phpmailer": "^6.8"
+    },
+    "require-dev": {
+        "phpunit/phpunit": ">=5.4.0",
+        "approvals/approval-tests": "dev-Main"
+    }
+}