Merge branch 'main' into pr/836

Author: DenverCoder1

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu-22.04
+FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu-24.04
 
 ADD first-run-notice.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
 

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+indent_size = 2
+
+[*.{js,css}]
+indent_size = 2

.gitattributes

@@ -1,2 +1,2 @@
 # Auto detect text files and perform LF normalization
-* text=auto
+* text=auto eol=lf

.github/workflows/prettier.yml

@@ -27,8 +27,13 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         uses: actions/checkout@v3
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '22'
+
       - name: Install prettier and plugin-php
-        run: npm install --global prettier@2.8.1 @prettier/plugin-php@0.18.9
+        run: npm i
 
       - name: Lint with Prettier
         continue-on-error: true

.gitignore

@@ -12,9 +12,10 @@ package-lock.json
 
 # Environment
 .env
+.php-version
 DOCKER_ENV
 docker_tag
 
 # IDE
 .vscode/
-.idea/
+.idea/

.prettierignore

@@ -1 +1,3 @@
 vendor
+**/*.min.js
+.prettierrc

.prettierrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  printWidth: 120,
+  endOfLine: "auto",
+  plugins: ["@prettier/plugin-php"],
+  overrides: [
+    {
+      files: "*.php",
+      options: {
+        parser: "php",
+      },
+    },
+  ],
+};

Dockerfile

@@ -0,0 +1,63 @@
+# Use PHP 8.3 (8.4 not supported yet)
+FROM php:8.3-apache@sha256:6be4ef702b2dd05352f7e5fe14667696a4ad091c9d2ad9083becbee4300dc3b1
+
+# Install system dependencies and PHP extensions in one layer
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    git \
+    unzip \
+    libicu-dev \
+    inkscape \
+    fonts-dejavu-core \
+    curl \
+    && docker-php-ext-configure intl \
+    && docker-php-ext-install intl \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Composer
+COPY --from=composer/composer:latest-bin@sha256:c9bda63056674836406cacfbbdd8ef770fb4692ac419c967034225213c64e11b /composer /usr/bin/composer
+
+# Set working directory
+WORKDIR /var/www/html
+
+# Copy composer files and install dependencies
+COPY composer.json composer.lock ./
+COPY src/ ./src/
+RUN composer install --no-dev --optimize-autoloader --no-scripts
+
+# Configure Apache to serve from src/ directory and pass environment variables
+RUN a2enmod rewrite headers && \
+    echo 'ServerTokens Prod\n\
+ServerSignature Off\n\
+PassEnv TOKEN\n\
+<VirtualHost *:80>\n\
+    ServerAdmin webmaster@localhost\n\
+    DocumentRoot /var/www/html/src\n\
+    <Directory /var/www/html/src>\n\
+        Options -Indexes\n\
+        AllowOverride None\n\
+        Require all granted\n\
+        Header always set Access-Control-Allow-Origin "*"\n\
+        Header always set Content-Type "image/svg+xml" "expr=%{REQUEST_URI} =~ m#\\.svg$#i"\n\
+        Header always set Content-Security-Policy "default-src 'none'; style-src 'unsafe-inline'; img-src data:;" "expr=%{REQUEST_URI} =~ m#\\.svg$#i"\n\
+        Header always set Referrer-Policy "no-referrer-when-downgrade"\n\
+        Header always set X-Content-Type-Options "nosniff"\n\
+    </Directory>\n\
+    ErrorLog ${APACHE_LOG_DIR}/error.log\n\
+    CustomLog ${APACHE_LOG_DIR}/access.log combined\n\
+</VirtualHost>' > /etc/apache2/sites-available/000-default.conf
+
+# Set secure permissions
+RUN chown -R www-data:www-data /var/www/html && \
+    find /var/www/html -type d -exec chmod 755 {} \; && \
+    find /var/www/html -type f -exec chmod 644 {} \;
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
+    CMD curl -f http://localhost/demo/ || exit 1
+
+# Expose port
+EXPOSE 80
+
+# Start Apache
+CMD ["apache2-foreground"]

README.md

@@ -31,7 +31,7 @@
       "php -S localhost:8000 -t src"
     ],
     "test": "./vendor/bin/phpunit --testdox tests",
-    "lint": "prettier --check *.md **/*.{php,md,js,css} !**/*.min.js --print-width 120",
-    "lint-fix": "prettier --write *.md **/*.{php,md,js,css} !**/*.min.js --print-width 120"
+    "lint": "npx prettier --check *.md **/*.{php,md,js,css}",
+    "lint-fix": "npx prettier --write *.md **/*.{php,md,js,css}"
   }
 }