fix version and bugs

Helper/Php/createPhpFromJsonDb.php

@@ -15,7 +15,7 @@ $mapper = <<< MAPPER
  *
  * @package   {$namespace}
  * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
+ * @license   OMS License 2.2
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * {$name} mapper class.
  *
  * @package {$namespace}
- * @license OMS License 2.0
+ * @license OMS License 2.2
  * @link    https://jingga.app
  * @since   1.0.0
  *
@@ -88,7 +88,7 @@ $model = <<< MODEL
  *
  * @package   {$namespace}
  * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
+ * @license   OMS License 2.2
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -100,7 +100,7 @@ namespace {$namespace};
  * {$name} class.
  *
  * @package {$namespace}
- * @license OMS License 2.0
+ * @license OMS License 2.2
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -140,7 +140,7 @@ $nullmodel = <<< NULLMODEL
  *
  * @package   {$namespace}
  * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
+ * @license   OMS License 2.2
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -152,7 +152,7 @@ namespace {$namespace};
  * Null model
  *
  * @package {$namespace}
- * @license OMS License 2.0
+ * @license OMS License 2.2
  * @link    https://jingga.app
  * @since   1.0.0
  */

Helper/Php/findMissingAdminTest.php

@@ -6,7 +6,7 @@
  *
  * @package   Helper
  * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
+ * @license   OMS License 2.2
  * @version   1.0.0
  * @link      https://jingga.app
  */

Helper/Php/findMissingApiFunctions.php

@@ -6,7 +6,7 @@
  *
  * @package   Helper
  * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
+ * @license   OMS License 2.2
  * @version   1.0.0
  * @link      https://jingga.app
  */

Helper/Php/findMissingInvalidApiControllerTest.php

@@ -6,7 +6,7 @@
  *
  * @package   Helper
  * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
+ * @license   OMS License 2.2
  * @version   1.0.0
  * @link      https://jingga.app
  */

Helper/Php/findMissingNullModelTest.php

@@ -6,7 +6,7 @@
  *
  * @package   Helper
  * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
+ * @license   OMS License 2.2
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -63,7 +63,7 @@ foreach ($modules as $module) {
 				. ' *' . "\n"
 				. ' * @package   tests' . "\n"
 				. ' * @copyright Dennis Eichhorn' . "\n"
-				. ' * @license   OMS License 2.0' . "\n"
+				. ' * @license   OMS License 2.2' . "\n"
 				. ' * @version   1.0.0' . "\n"
 				. ' * @link      https://jingga.app' . "\n"
 				. ' */' . "\n"

Helper/Php/langUsageInspector.php

@@ -8,7 +8,7 @@
  *
  * @package   Modules\HumanResourceManagement
  * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
+ * @license   OMS License 2.2
  * @version   1.0.0
  * @link      https://jingga.app
  */

Helper/Php/reconcileTestReportElements.php

@@ -6,7 +6,7 @@
  *
  * @package   Helper
  * @copyright Dennis Eichhorn
- * @license   OMS License 2.0
+ * @license   OMS License 2.2
  * @version   1.0.0
  * @link      https://jingga.app
  */

LICENSE.txt

@@ -1,5 +1,6 @@
 The OMS License
-Version 2.0
+
+Version 2.2
 
 1. Definitions
 
@@ -15,7 +16,7 @@ Version 2.0
 
 "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
 
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work.
 
 "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
@@ -25,7 +26,7 @@ Version 2.0
 
 2. Grant of Copyright License
 
-Subject to the terms and conditions of this License, each Contributor grants to You after purchase a perpetual, worldwide, non-exclusive, irrevocable copyright license to prepare Derivative Works of, publicly display, publicly perform the Work and such Derivative Works in Source or Object form. You are not allowed to sublicense, reproduce, or distribute the Work and such Derivative Works in Source or Object form.
+Subject to the terms and conditions of this License, each Contributor grants to You after purchase a temporary, worldwide, non-exclusive copyright license to publicly display or publicly perform the Work in Source or Object form. You are not allowed to sublicense, reproduce, or distribute the Work and such Derivative Works in Source or Object form.
 
 3. Redistribution
 
@@ -46,7 +47,3 @@ Unless required by applicable law or agreed to in writing, Licensor provides the
 7. Limitation of Liability
 
 In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-8. Future Changes
-
-The Licensor may change the License for future versions as he sees fit.

README.md

@@ -20,7 +20,7 @@ The last feature is the backend and documentation generation based on the DocBlo
 
 The build system will take care of most requirements, the following tools and commands have to be available on the system.
 
-    software-properties-common npm git php8.2 php8.2-dev php8.2-cli php8.2-common php8.2-mysql php8.2-pgsql php8.2-xdebug php8.2-opcache php8.2-pdo php8.2-sqlite php8.2-mbstring php8.2-curl php8.2-imap php8.2-bcmath php8.2-zip php8.2-dom php8.2-xml php8.2-phar php8.2-gd php-pear apache2 mysql-server postgresql postgresql-contrib vsftpd tesseract-ocr wget curl grep xarg sed composer
+    software-properties-common npm git php8.3 php8.3-dev php8.3-cli php8.3-common php8.3-mysql php8.3-pgsql php8.3-xdebug php8.3-opcache php8.3-pdo php8.3-sqlite php8.3-mbstring php8.3-curl php8.3-imap php8.3-bcmath php8.3-zip php8.3-dom php8.3-xml php8.3-phar php8.3-gd php-pear apache2 mysql-server postgresql postgresql-contrib vsftpd tesseract-ocr wget curl grep xarg sed composer
 
 ## Inspections
 

docker/WebDockerfile

@@ -0,0 +1,56 @@
+# Use the official Ubuntu base image
+FROM ubuntu:latest
+
+# Set environment variables to non-interactive for automatic installation
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Update the package list and install necessary packages
+RUN apt-get update && \
+    apt-get install -y \
+    apache2 \
+    software-properties-common \
+    wget \
+    gnupg2 \
+    lsb-release
+
+# Add the PHP PPA for PHP 8.3
+RUN add-apt-repository ppa:ondrej/php -y
+
+# Install PHP 8.3 and necessary extensions
+RUN apt-get update && \
+    apt-get install -y \
+    php8.3 php8.3-dev php8.3-cli php8.3-common php8.3-intl php8.3-mysql php8.3-pgsql php8.3-xdebug php8.3-opcache php8.3-pdo php8.3-sqlite php8.3-mbstring php8.3-curl php8.3-imap php8.3-bcmath php8.3-zip php8.3-dom php8.3-xml php8.3-phar php8.3-gd php-pear php8.3-redis \
+    libapache2-mod-php8.3
+
+# Install Tesseract OCR
+RUN apt-get install -y tesseract-ocr
+
+# Install pdftoppm and pdftotext
+RUN apt-get install -y poppler-utils
+
+# Install wkhtmltopdf
+RUN apt-get install -y xvfb libfontconfig wkhtmltopdf
+
+# Install imagemagick
+RUN apt-get install -y imagemagick
+
+# Enable Apache mods and restart Apache
+RUN a2enmod php8.3 && \
+    a2enmod rewrite && \
+    a2enmod expires && \
+    a2enmod headers && \
+    a2enmod cache && \
+    a2enmod cache_disk
+
+# Expose port 80 for Apache
+EXPOSE 80
+
+# Setup php-xdebug
+RUN echo -e "zend_extension=xdebug.so\nxdebug.mode=debug,profile,trace\nxdebug.start_with_request=yes\nxdebug.client_port=9003\nxdebug.client_host=localhost\nxdebug.trace_format=1" > /etc/php/8.3/apache2/conf.d/20-xdebug.ini
+
+RUN service apache2 restart
+
+# Set the default command to run Apache in the foreground
+CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+
+# docker-compose up --watch

docker/docker-compose.yml

@@ -0,0 +1,58 @@
+version: '3.8'
+
+services:
+  web:
+    build:
+      context: .
+      dockerfile: WebDockerfile
+    develop:
+      watch:
+        - action: sync
+          path: ./../../
+          target: /var/www/html
+          ignore:
+            - node_modules
+            - composer
+            - .git
+            - Resources
+            - Modules/Media/Files
+    ports:
+      - "127.0.0.2:80:80"
+      - "127.0.0.2:9003:9003"
+    volumes:
+      - ./../../:/var/www/html
+    depends_on:
+      - mariadb
+      - redis
+      - elasticsearch
+
+  mariadb:
+    image: mariadb
+    environment:
+      MYSQL_ROOT_PASSWORD: rootpassword
+      MYSQL_DATABASE: mydatabase
+      MYSQL_USER: myuser
+      MYSQL_PASSWORD: mypassword
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./sql:/docker-entrypoint-initdb.d
+
+  redis:
+    image: redis:latest
+    ports:
+      - "6379:6379"
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.13.3
+    environment:
+      - discovery.type=single-node
+      - ES_JAVA_OPTS=-Xms512m -Xmx512m
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    volumes:
+      - esdata:/usr/share/elasticsearch/data
+
+volumes:
+  esdata:

docker/sql/init.sql

@@ -0,0 +1,2 @@
+CREATE DATABASE IF NOT EXISTS oms;
+USE oms;