Merge pull request #761 from openva/deploy

Sync staging with deploy

.github/workflows/deploy.yml

@@ -9,11 +9,15 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: Firenza/[email protected]
         with:
           secrets: ${{ toJSON(secrets) }}
+      - name: Specify PHP version
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '5.6'
       - name: Make branch name available as Bash variable
         run: echo "GITHUB_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
       - run: >-
@@ -52,7 +56,7 @@ jobs:
       github_branch: ${{ steps.get_branch.outputs.github_branch }}
 
   deploy:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     needs: build # Don't deploy unless the build succeeds
     steps:
       - run: echo "Deploy branch is ${{ needs.build.outputs.github_branch }}"

composer.json

@@ -19,7 +19,7 @@
     "require": {
         "phpmailer/phpmailer": "~6.5",
         "ezyang/htmlpurifier":"~4.9",
-        "doctrine/instantiator":"1.4.0",
+        "doctrine/instantiator":"1",
         "simplepie/simplepie": "1.5.5",
         "romainneutron/sphinx-search-api-php-client": "2.0.8.1",
         "tijsverkoyen/akismet": "~1",