CheckDate Rule Fix

Docker Fix
pHAlkaline · Feb 26, 2024 · 048235a · 048235a
1 parent 47d93b5
commit 048235a
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 0 deletions.
diff --git a/app/Model/Behavior/DateFormatBehavior.php b/app/Model/Behavior/DateFormatBehavior.php
@@ -77,6 +77,10 @@ function _setValidationFormat($column = null) {
             if (!is_null($rule)) {
                 $field->setRule('date', array('rule' => array('date', strtolower(str_replace(array('-', '/'), '', $this->dateFormat)))));
             }
+            $rule = $field->getRule('checkDate');
+            if (!is_null($rule)) {
+                $field->setRule('checkDate', array('rule' => array('date', strtolower(str_replace(array('-', '/'), '', $this->dateFormat)))));
+            }
         }
     }
 

diff --git a/...php-apache-dev-wkhtmltopdf:7.4/Dockerfile → ...ges/php-apache-wkhtmltopdf:7.4/Dockerfile b/...php-apache-dev-wkhtmltopdf:7.4/Dockerfile → ...ges/php-apache-wkhtmltopdf:7.4/Dockerfile
diff --git a/docker/images/php-apache-wkhtmltopdf:7.4/Dockerfile-phalkaline-apache-7.4 b/docker/images/php-apache-wkhtmltopdf:7.4/Dockerfile-phalkaline-apache-7.4
@@ -0,0 +1,20 @@
+FROM webdevops/php-apache:7.4
+
+# persistent / runtime deps
+RUN apt update && apt -y upgrade
+RUN apt install -y wget
+RUN wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb
+RUN apt install -y \
+                fontconfig \
+                libfreetype6 \
+                libjpeg62-turbo \
+                libpng16-16 \
+                libx11-6 \
+                libxcb1 \
+                libxext6 \
+                libxrender1 \
+                xfonts-75dpi \
+                xfonts-base
+
+RUN dpkg -i wkhtmltox_0.12.6-1.buster_amd64.deb
+
diff --git a/docker/images/php-apache-wkhtmltopdf:7.4/Dockerfile-phalkaline-apache-dev7.4 b/docker/images/php-apache-wkhtmltopdf:7.4/Dockerfile-phalkaline-apache-dev7.4
@@ -0,0 +1,20 @@
+FROM webdevops/php-apache-dev:7.4
+
+# persistent / runtime deps
+RUN apt update && apt -y upgrade
+RUN apt install -y wget
+RUN wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb
+RUN apt install -y \
+                fontconfig \
+                libfreetype6 \
+                libjpeg62-turbo \
+                libpng16-16 \
+                libx11-6 \
+                libxcb1 \
+                libxext6 \
+                libxrender1 \
+                xfonts-75dpi \
+                xfonts-base
+
+RUN dpkg -i wkhtmltox_0.12.6-1.buster_amd64.deb
+
diff --git a/...apache-dev-wkhtmltopdf:7.4/Dockerfile.old → ...php-apache-wkhtmltopdf:7.4/Dockerfile.old b/...apache-dev-wkhtmltopdf:7.4/Dockerfile.old → ...php-apache-wkhtmltopdf:7.4/Dockerfile.old
diff --git a/...e-dev-wkhtmltopdf:7.4/Dockerfile.prod.old → ...pache-wkhtmltopdf:7.4/Dockerfile.prod.old b/...e-dev-wkhtmltopdf:7.4/Dockerfile.prod.old → ...pache-wkhtmltopdf:7.4/Dockerfile.prod.old
diff --git a/...ache-dev-wkhtmltopdf:7.4/default-ssl.conf → ...p-apache-wkhtmltopdf:7.4/default-ssl.conf b/...ache-dev-wkhtmltopdf:7.4/default-ssl.conf → ...p-apache-wkhtmltopdf:7.4/default-ssl.conf
diff --git a/...php-apache-dev-wkhtmltopdf:7.4/server.crt → ...ges/php-apache-wkhtmltopdf:7.4/server.crt b/...php-apache-dev-wkhtmltopdf:7.4/server.crt → ...ges/php-apache-wkhtmltopdf:7.4/server.crt
diff --git a/...php-apache-dev-wkhtmltopdf:7.4/server.csr → ...ges/php-apache-wkhtmltopdf:7.4/server.csr b/...php-apache-dev-wkhtmltopdf:7.4/server.csr → ...ges/php-apache-wkhtmltopdf:7.4/server.csr
diff --git a/...php-apache-dev-wkhtmltopdf:7.4/server.key → ...ges/php-apache-wkhtmltopdf:7.4/server.key b/...php-apache-dev-wkhtmltopdf:7.4/server.key → ...ges/php-apache-wkhtmltopdf:7.4/server.key