Merge pull request #2886 from xibosignage/develop

Release 4.2.0
xibosignage · Jan 30, 2025 · f647602 · f647602
2 parents f52c38c + 1b52354
commit f647602
Show file tree

Hide file tree

Showing 441 changed files with 42,549 additions and 39,979 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,7 @@ RUN find -type d -name '.git' -exec rm -r {} + && \
 
 # Stage 2
 # Run webpack
-FROM node:12 AS webpack
+FROM node:22 AS webpack
 WORKDIR /app
 
 # Copy package.json and the webpack config file
@@ -72,7 +72,6 @@ RUN LC_ALL=C.UTF-8 DEBIAN_FRONTEND=noninteractive apt update && apt upgrade -y &
     iputils-ping \
     php8.2 \
     libapache2-mod-php8.2 \
-    php8.2-zmq \
     php8.2-gd \
     php8.2-dom \
     php8.2-pdo \
@@ -103,7 +102,10 @@ RUN update-alternatives --set php /usr/bin/php8.2
 
 # Enable Apache module
 RUN a2enmod rewrite \
-    && a2enmod headers
+    && a2enmod headers \
+    && a2enmod proxy \
+    && a2enmod proxy_http \
+    && a2enmod proxy_wstunnel
 
 # Add all necessary config files in one layer
 ADD docker/ /

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -10,7 +10,7 @@ RUN composer install --no-interaction
 
 # Stage 2
 # Run webpack
-FROM node:12 AS webpack
+FROM node:22 AS webpack
 WORKDIR /app
 
 # Copy package.json and the webpack config file
@@ -57,7 +57,6 @@ RUN LC_ALL=C.UTF-8 DEBIAN_FRONTEND=noninteractive apt update && apt upgrade -y &
     iputils-ping \
     php8.2 \
     libapache2-mod-php8.2 \
-    php8.2-zmq \
     php8.2-gd \
     php8.2-dom \
     php8.2-pdo \
@@ -88,7 +87,10 @@ RUN update-alternatives --set php /usr/bin/php8.2
 
 # Enable Apache module
 RUN a2enmod rewrite \
-    && a2enmod headers
+    && a2enmod headers \
+    && a2enmod proxy \
+    && a2enmod proxy_http \
+    && a2enmod proxy_wstunnel
 
 # Add all necessary config files in one layer
 ADD docker/ /

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -24,7 +24,6 @@ RUN LC_ALL=C.UTF-8 DEBIAN_FRONTEND=noninteractive apt update && apt upgrade -y &
     iputils-ping \
     php8.2 \
     libapache2-mod-php8.2 \
-    php8.2-zmq \
     php8.2-gd \
     php8.2-dom \
     php8.2-pdo \
@@ -55,7 +54,10 @@ RUN update-alternatives --set php /usr/bin/php8.2
 
 # Enable Apache module
 RUN a2enmod rewrite \
-    && a2enmod headers
+    && a2enmod headers \
+    && a2enmod proxy \
+    && a2enmod proxy_http \
+    && a2enmod proxy_wstunnel
 
 # Add all necessary config files in one layer
 ADD docker/ /

diff --git a/README.md b/README.md
@@ -114,7 +114,7 @@ npm run build
 Alternatively you can use a Docker container:
 
 ```shell
-docker run -it --volume $PWD:/app --volume ~/.npm:/root/.npm -w /app node:12 sh -c "npm install webpack -g; npm install; npm run build;"
+docker run -it --volume $PWD:/app --volume ~/.npm:/root/.npm -w /app node:22 sh -c "npm install webpack -g; npm install; npm run build;"
 ```
 
 ### Mapped Volumes

diff --git a/composer.json b/composer.json
@@ -19,23 +19,20 @@
     }
   ],
   "repositories": [{
-    "type": "vcs",
-    "url": "https://github.com/xibosignage/support"
-  },{
     "type": "vcs",
     "url": "https://github.com/dasgarner/picofeed"
   }],
   "config": {
       "platform": {
         "php": "8.1",
-        "ext-zmq": "1",
         "ext-mongodb": "1.15.0",
         "ext-gd": "1",
         "ext-dom": "1",
         "ext-pdo": "1",
         "ext-json": "1",
         "ext-soap": "1",
-        "ext-zip": "1"
+        "ext-zip": "1",
+        "ext-fileinfo": "*"
       }
   },
   "minimum-stability": "dev",
@@ -48,6 +45,7 @@
     "ext-soap": "*",
     "ext-zip": "*",
     "ext-openssl": "*",
+    "ext-fileinfo": "*",
     "slim/slim": "^4.3",
     "slim/http": "^1.2",
     "slim/flash": "^0.4",
@@ -59,7 +57,7 @@
     "flynsarmy/slim-monolog": "~1.0",
     "sallar/jdatetime": "dev-master",
     "gettext/gettext": "~4.0",
-    "twig/twig": "3.x",
+    "twig/twig": "3.11.*",
     "respect/validation": "2.2.*",
     "intervention/image": "2.7.2",
     "phpmailer/phpmailer": "6.5.*",
@@ -72,7 +70,7 @@
     "tedivm/stash": "^v0.17.6",
     "phenx/php-font-lib": "^0.5.0",
     "symfony/event-dispatcher": "^4.1",
-    "xibosignage/support": "dev-php8",
+    "xibosignage/support": "0.*",
     "xibosignage/oauth2-xibo-cms": "dev-feature/3.0",
     "mtdowling/cron-expression": "^1.1",
     "ralouphie/mimey": "^1.0",
@@ -90,7 +88,8 @@
     "selective/samesite-cookie": "0.3.0",
     "nesbot/carbon": "2.66.*",
     "jmikola/geojson": "^1.0",
-    "symfony/yaml": "5.4.*"
+    "symfony/yaml": "5.4.*",
+    "mjaschen/phpgeo": "^5.0"
   },
   "require-dev": {
     "phpunit/phpunit": "10.0.*",