Merge pull request #872 from ucfopen/dev/v3-3-1

Release 3.3.1

.env

@@ -40,7 +40,7 @@ APP_LTI_REDIRECT_PATH="/lti/authorize/check"
 APP_LTI_NAME="UDOIT 3"
 ADMIN_LTI_NAME="UDOIT 3 Admin"
 USE_DEVELOPMENT_AUTH="no"
-VERSION_NUMBER="3.3.0"
+VERSION_NUMBER="3.3.1"
 
 
 ###> symfony/messenger ###

README.md

@@ -1,4 +1,4 @@
-[![Join UCF Open Slack Discussions](https://badgen.net/badge/icon/ucfopen?icon=slack&label)](https://dl.ucf.edu/join-ucfopen)
+[![Join UCF Open Slack Discussions](https://badgen.net/badge/icon/ucfopen?icon=slack&label=slack)](https://dl.ucf.edu/join-ucfopen)
 ![Build Status](https://github.com/ucfopen/UDOIT/actions/workflows/udoit.yml/badge.svg)
 
 # Universal Design Online content Inspection Tool

build/nginx/Dockerfile.build

@@ -13,6 +13,7 @@ RUN docker-php-ext-install pdo_mysql gd pdo \
     && docker-php-ext-install intl \
     && apt-get remove libicu-dev icu-devtools -y
 
+# Write opcache-specific PHP ini file
 RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.interned_strings_buffer=8'; \
@@ -22,7 +23,10 @@ RUN { \
         echo 'opcache.enable_cli=1'; \
     } > /usr/local/etc/php/conf.d/php-opocache-cfg.ini
 
+# Copy custom PHP ini file that overrides defaults
+COPY ./build/nginx/php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini
 
+# Copy custom Nginx configuration
 COPY ./build/nginx/deploy.conf /etc/nginx/sites-enabled/default
 
 COPY ./build/nginx/entrypoint.sh /etc/entrypoint.sh

build/nginx/php-custom.ini

@@ -0,0 +1 @@
+max_execution_time = 180

composer.json

@@ -11,7 +11,7 @@
         "ext-ctype": "*",
         "ext-iconv": "*",
         "ext-sodium": "*",
-        "cidilabs/phpally": "~1.1.1",
+        "cidilabs/phpally": "~1.2.1",
         "composer/package-versions-deprecated": "1.11.99.3",
         "doctrine/annotations": "^1.0",
         "doctrine/doctrine-bundle": "^2.4",

docker-compose.nginx.yml

@@ -3,7 +3,6 @@ version: "3.9"
 services:
   db:
     image: mysql:latest
-    platform: linux/amd64
     volumes:
       - dbdata:/var/lib/mysql
     environment:
@@ -43,6 +42,9 @@ services:
         dockerfile: Dockerfile.php.pdo.mysql
       volumes:
           - ./:/var/www/html
+          - type: bind
+            source: ./build/nginx/php-custom.ini
+            target: /usr/local/etc/php/conf.d/php-custom.ini
       env_file:
         - .env
         - .env.local

src/Lms/LmsResponse.php

@@ -55,7 +55,7 @@ public function setContent($content)
             $this->contentString .= $content;
         }
         else {            
-            $this->contentArray = array_merge($this->contentArray, $results);
+            $this->contentArray = array_merge_recursive($this->contentArray, $results);
         }
     }
 

translations/en.json

@@ -152,7 +152,7 @@
   "label.view_source": "HTML",
   "label.open_in_lms": "View In LMS",
   "label.continue": "Continue",
-  "label.content_loading_msg": "UDOIT is scanning the course content for accessibility issues.  This scan happens automatically each time you use the tool.",
+  "label.content_loading_msg": "UDOIT is scanning the course content for accessibility issues. This scan happens automatically each time you use the tool. It can take multiple minutes depending on your course content. You will not be able to fix or resolve issues until the scan has completed.",
   "label.review_only": "This issue cannot be fixed within UDOIT. You can fix the issue in Canvas, or mark this as reviewed to hide this issue in the future.",
   "label.manually_resolved": "Manually Resolved",
   "label.manual_resolution": "Manual Resolution",

translations/es.json

@@ -152,7 +152,7 @@
   "label.view_source": "HTML",
   "label.open_in_lms": "Ver en LMS",
   "label.continue": "Continuar",
-  "label.content_loading_msg": "Se está revisando el contenido del curso.",
+  "label.content_loading_msg": "UDOIT está revisando el contenido del curso. Este escaneado ocurre automáticamente cada vez que la herramienta se utiliza. Puede tardar varios minutos dependiendo del contenido del curso. No se pueden arreglar ni resolver problemas hasta que el escaneado se haya completado.",
   "label.review_only": "Este problema no se puede solucionar dentro de UDOIT. Puede solucionar el problema en Canvas o marcarlo como revisado para ocultar este problema en el futuro.",
   "label.manually_resolved": "Resuelto Manualmente",
   "label.manual_resolution": "Resolución Manual",