some future proofing stuff (openemr#4612)

updated min php to 7.4 added full support in CI for 8.1 Updated to mariadb 10.6 in dev environments updated composer and npm third party packages (lcobucci/jwt required a bit of special attention)
bradymiller · Nov 2, 2021 · 01c42f5 · 01c42f5
1 parent 456845f
commit 01c42f5
Show file tree

Hide file tree

Showing 23 changed files with 14,665 additions and 5,364 deletions.
diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4', '8.0', '8.1']
+        php: ['7.4', '8.0', '8.1']
     name: PHP ${{ matrix.php }}
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,103 +8,11 @@ on:
 
 jobs:
 
-  build_apache_73_105:
-    name: PHP 7.3 - Apache - MariaDB 10.5
+  build_apache_74_106:
+    name: PHP 7.4 - Apache - MariaDB 10.6
     runs-on: ubuntu-20.04
     env:
-      DOCKER_DIR: apache_73_105
-      OPENEMR_DIR: /var/www/localhost/htdocs/openemr
-      CHROMIUM_INSTALL: "apk update; apk add --no-cache chromium chromium-chromedriver; export PANTHER_CHROME_DRIVER_BINARY=/usr/lib/chromium/chromedriver"
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-
-      - name: Report PHP Version
-        run: php -v
-
-      - name: Install npm package
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-
-      - name: Dockers environment start
-        run: |
-          source ci/ciLibrary.source
-          dockers_env_start
-
-      - name: Main build
-        run: |
-          source ci/ciLibrary.source
-          composer_github_auth
-          main_build
-
-      - name: CCDA build
-        run: |
-          source ci/ciLibrary.source
-          ccda_build
-
-      - name: Install and configure
-        run: |
-          source ci/ciLibrary.source
-          install_configure
-
-      - name: Unit testing
-        run: |
-          source ci/ciLibrary.source
-          build_test_unit
-        if: ${{ success() || failure() }}
-
-      - name: E2e testing
-        run: |
-          source ci/ciLibrary.source
-          build_test_e2e
-        if: ${{ success() || failure() }}
-
-      - name: Api testing
-        run: |
-          source ci/ciLibrary.source
-          build_test_api
-        if: ${{ success() || failure() }}
-
-      - name: Fixtures testing
-        run: |
-          source ci/ciLibrary.source
-          build_test_fixtures
-        if: ${{ success() || failure() }}
-
-      - name: Services testing
-        run: |
-          source ci/ciLibrary.source
-          build_test_services
-        if: ${{ success() || failure() }}
-
-      - name: Validators testing
-        run: |
-          source ci/ciLibrary.source
-          build_test_validators
-        if: ${{ success() || failure() }}
-
-      - name: Controllers testing
-        run: |
-          source ci/ciLibrary.source
-          build_test_controllers
-        if: ${{ success() || failure() }}
-
-      - name: Common testing
-        run: |
-          source ci/ciLibrary.source
-          build_test_common
-        if: ${{ success() || failure() }}
-
-  build_apache_74_105:
-    name: PHP 7.4 - Apache - MariaDB 10.5
-    runs-on: ubuntu-20.04
-    env:
-      DOCKER_DIR: apache_74_105
+      DOCKER_DIR: apache_74_106
       OPENEMR_DIR: /var/www/localhost/htdocs/openemr
       CHROMIUM_INSTALL: "apk update; apk add --no-cache chromium chromium-chromedriver; export PANTHER_CHROME_DRIVER_BINARY=/usr/lib/chromium/chromedriver"
     steps:
@@ -836,11 +744,11 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-  build_nginx_73:
-    name: PHP 7.3 - Nginx - MariaDB 10.5
+  build_nginx_74:
+    name: PHP 7.4 - Nginx - MariaDB 10.6
     runs-on: ubuntu-20.04
     env:
-      DOCKER_DIR: nginx_73
+      DOCKER_DIR: nginx_74
       OPENEMR_DIR: /usr/share/nginx/html/openemr
       CHROMIUM_INSTALL: "apt-get update; apt-get install -y chromium-driver; export PANTHER_CHROME_DRIVER_BINARY=/usr/bin/chromedriver"
     steps:
@@ -857,7 +765,7 @@ jobs:
       - name: Install npm package
         uses: actions/setup-node@v1
         with:
-          node-version: '12'
+          node-version: '14'
 
       - name: Dockers environment start
         run: |
@@ -903,6 +811,7 @@ jobs:
           source ci/ciLibrary.source
           build_test_fixtures
         if: ${{ success() || failure() }}
+
       - name: Services testing
         run: |
           source ci/ciLibrary.source
@@ -927,11 +836,11 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-  build_nginx_74:
-    name: PHP 7.4 - Nginx - MariaDB 10.5
+  build_nginx_8:
+    name: PHP 8.0 - Nginx - MariaDB 10.6
     runs-on: ubuntu-20.04
     env:
-      DOCKER_DIR: nginx_74
+      DOCKER_DIR: nginx_80
       OPENEMR_DIR: /usr/share/nginx/html/openemr
       CHROMIUM_INSTALL: "apt-get update; apt-get install -y chromium-driver; export PANTHER_CHROME_DRIVER_BINARY=/usr/bin/chromedriver"
     steps:
@@ -940,7 +849,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.0'
 
       - name: Report PHP Version
         run: php -v
@@ -1019,11 +928,11 @@ jobs:
           build_test_common
         if: ${{ success() || failure() }}
 
-  build_nginx_8:
-    name: PHP 8.0 - Nginx - MariaDB 10.5
+  build_nginx_81:
+    name: PHP 8.1 - Nginx - MariaDB 10.6
     runs-on: ubuntu-20.04
     env:
-      DOCKER_DIR: nginx_80
+      DOCKER_DIR: nginx_81
       OPENEMR_DIR: /usr/share/nginx/html/openemr
       CHROMIUM_INSTALL: "apt-get update; apt-get install -y chromium-driver; export PANTHER_CHROME_DRIVER_BINARY=/usr/bin/chromedriver"
     steps:
@@ -1032,7 +941,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
 
       - name: Report PHP Version
         run: php -v
@@ -1110,95 +1019,3 @@ jobs:
           source ci/ciLibrary.source
           build_test_common
         if: ${{ success() || failure() }}
-
-  build_nginx_81:
-    name: PHP 8.1 - Nginx - MariaDB 10.5 (Note skipping lots of tests in PHP 8.1 for now)
-    runs-on: ubuntu-20.04
-    env:
-      DOCKER_DIR: nginx_81
-      OPENEMR_DIR: /usr/share/nginx/html/openemr
-      CHROMIUM_INSTALL: "apt-get update; apt-get install -y chromium-driver; export PANTHER_CHROME_DRIVER_BINARY=/usr/bin/chromedriver"
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-
-      - name: Report PHP Version
-        run: php -v
-
-      - name: Install npm package
-        uses: actions/setup-node@v1
-        with:
-          node-version: '14'
-
-      - name: Dockers environment start
-        run: |
-          source ci/ciLibrary.source
-          dockers_env_start
-
-      - name: Main build
-        run: |
-          source ci/ciLibrary.source
-          composer_github_auth
-          main_build
-
-      - name: CCDA build
-        run: |
-          source ci/ciLibrary.source
-          ccda_build
-
-      - name: Install and configure
-        run: |
-          source ci/ciLibrary.source
-          install_configure
-
-      - name: Unit testing (skipping in PHP 8.1 for now)
-        run: |
-          source ci/ciLibrary.source
-          #build_test_unit
-        if: ${{ success() || failure() }}
-
-      - name: E2e testing (skipping in PHP 8.1 for now)
-        run: |
-          source ci/ciLibrary.source
-          #build_test_e2e
-        if: ${{ success() || failure() }}
-
-      - name: Api testing (skipping in PHP 8.1 for now)
-        run: |
-          source ci/ciLibrary.source
-          #build_test_api
-        if: ${{ success() || failure() }}
-
-      - name: Fixtures testing (skipping in PHP 8.1 for now)
-        run: |
-          source ci/ciLibrary.source
-          #build_test_fixtures
-        if: ${{ success() || failure() }}
-
-      - name: Services testing (skipping in PHP 8.1 for now)
-        run: |
-          source ci/ciLibrary.source
-          #build_test_services
-        if: ${{ success() || failure() }}
-
-      - name: Validators testing (skipping in PHP 8.1 for now)
-        run: |
-          source ci/ciLibrary.source
-          #build_test_validators
-        if: ${{ success() || failure() }}
-
-      - name: Controllers testing (skipping in PHP 8.1 for now)
-        run: |
-          source ci/ciLibrary.source
-          #build_test_controllers
-        if: ${{ success() || failure() }}
-
-      - name: Common testing (skipping in PHP 8.1 for now)
-        run: |
-          source ci/ciLibrary.source
-          #build_test_common
-        if: ${{ success() || failure() }}
diff --git a/ci/apache_73_105/docker-compose.yml b/ci/apache_73_105/docker-compose.yml
diff --git a/ci/apache_74_105/docker-compose.yml → ci/apache_74_106/docker-compose.yml b/ci/apache_74_105/docker-compose.yml → ci/apache_74_106/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
   mysql:
     restart: always
-    image: mariadb:10.5
+    image: mariadb:10.6
     command: ['mysqld','--character-set-server=utf8mb4']
     environment:
       MYSQL_ROOT_PASSWORD: root

diff --git a/ci/nginx_73/docker-compose.yml b/ci/nginx_73/docker-compose.yml