improve Dockerfile build sequence

.dockerignore

@@ -0,0 +1,3 @@
+.git
+/vendor
+/docs

.editorconfig

@@ -0,0 +1,21 @@
+# This file is for unifying the coding style for different editors and IDEs.
+# More information at http://EditorConfig.org
+
+# Set this file as the root
+root = true
+
+# Global settings for all files
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+# PHP files
+[*.php]
+indent_size = 4
+
+# Frontend files
+[*.{css,html,js,less,sass,scss}]
+indent_size = 2

.github/workflows/composer-validate.yml

@@ -6,8 +6,8 @@ name: Validate Composer dependencies
 on:
     pull_request:
       branches:
-        - alpha
-  
+        - 'develop'
+
 jobs:
   build-test:
     runs-on: ubuntu-latest

.github/workflows/docker-test.yml

@@ -7,19 +7,18 @@ on:
   # only trigger CI when pull request on following branches
   pull_request:
     branches:
-      - 'alpha'
+      - 'develop'
   # this is to manually trigger the worklow
   workflow_dispatch:
     inputs:
       logLevel:
-        description: 'Reason'     
+        description: 'Reason'
         default: 'Manual launch'
 
 jobs:
   buildAndTestDockerImg:
     runs-on: ubuntu-latest
     steps:
-
       - name: Check Out Repo
         # Check out the repo, using current branch
         # https://github.com/marketplace/actions/checkout
@@ -35,6 +34,7 @@ jobs:
           docker run -p 80:80 -d --rm --name jeedom_bullseye jeedom:bullseye
           sleep 45
           docker exec jeedom_bullseye php sick.php
+
       - name: Build jeedom:bookworm
         # build current image for bookworm
         run: |
@@ -45,7 +45,7 @@ jobs:
           docker run -p 81:80 -d --rm --name jeedom_bookworm jeedom:bookworm
           sleep 45
           docker exec jeedom_bookworm php sick.php
-    
+
       - name: Clean docker image
         continue-on-error: true
         run: |

.github/workflows/phpstan.yaml

@@ -2,46 +2,44 @@ name: PHPStan
 
 on:
   push:
-    branches: [ alpha ]
+    branches: [ develop ]
   pull_request:
-    branches: [ alpha ]
+    branches: [ develop ]
 
 jobs:
   phpstan:
     runs-on: ubuntu-latest
+    # define every php version to test
+    strategy:
+      # do not stop at first fail
+      fail-fast: false
+      matrix:
+        php: [7.4, 8.2]
+
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup PHP 7.4 for dependencies
+      - name: Setup PHP ${{ matrix.php }} for dependencies
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: ${{ matrix.php }}
 
       - name: Install Dependencies
         run: composer update --ignore-platform-reqs
 
-      - name: Setup PHP 8.2 for PHPStan
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-
       - name: Restore PHPStan cache
         id: cache-phpstan
         uses: actions/cache/restore@v3
         with:
           path: phpstan.phar
           key: phpstan-1
 
-      - name: Download PHPStan
-        if: steps.cache-phpstan.outputs.cache-hit != 'true'
-        run: wget https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar
-
       - name: Run PHPStan
-        run: php phpstan.phar analyse --configuration phpstan.neon
+        run: vendor/bin/phpstan analyse --configuration phpstan.neon
 
   update-baseline:
     needs: phpstan
-    if: github.event_name == 'push' && github.ref == 'refs/heads/alpha'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -50,7 +48,7 @@ jobs:
 
       - name: Delete existing branch if exists
         run: |
-          if git ls-remote --heads origin update-phpstan-baseline | grep update-phpstan-baseline; then
+          if git ls-remote --heads origin update-phpstan-baseline | grep -q update-phpstan-baseline; then
             git push origin --delete update-phpstan-baseline
           fi
 
@@ -62,19 +60,11 @@ jobs:
       - name: Install Dependencies
         run: composer update --ignore-platform-reqs
 
-      - name: Setup PHP 8.2 for PHPStan
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-
-      - name: Download PHPStan
-        run: wget https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar
-
       - name: Generate new baseline
         id: generate-baseline
         run: |
           cp phpstan-baseline.neon phpstan-baseline.neon.old
-          php phpstan.phar analyse --configuration phpstan.neon --generate-baseline
+          vendor/bin/phpstan analyse --configuration phpstan.neon --generate-baseline
           if ! diff -q phpstan-baseline.neon phpstan-baseline.neon.old > /dev/null; then
             echo "baseline_changed=true" >> $GITHUB_OUTPUT
           fi
@@ -87,10 +77,10 @@ jobs:
           title: '[CI] Update PHPStan baseline'
           body: |
             Mise à jour automatique du baseline PHPStan suite à la correction d'erreurs.
-            
+
             Cette PR a été générée automatiquement par le workflow CI/CD.
           branch: update-phpstan-baseline
-          base: alpha
+          base: develop
           delete-branch: true
           add-paths: |
             phpstan-baseline.neon

.github/workflows/translations.yml

@@ -0,0 +1,18 @@
+name: translate
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - develop
+
+jobs:
+  auto-translate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: jeedom/jeetranslate@main
+        with:
+          deepl_api_key: ${{ secrets.DEEPL_API_KEY }}
+          include_empty_translation: false
+          target_languages: "en_US,es_ES,de_DE,it_IT,pt_PT"
+          use_core_translations: true

.github/workflows/work.yml

@@ -2,12 +2,10 @@ on:
   # Workflows check plugin Jeedom
   push:
     branches:
-      - alpha
-      - beta
+      - develop
   pull_request:
     branches:
-      - alpha
-      - beta
+      - develop
       - master
 
 name : 'Test Core Jeedom'

Dockerfile

@@ -44,18 +44,18 @@ RUN apt -o Dpkg::Options::="--force-confdef" -y install software-properties-comm
   php libapache2-mod-php php-json php-mysql php-curl php-gd php-imap php-xml php-opcache php-soap php-xmlrpc \
   php-common php-dev php-zip php-ssh2 php-mbstring php-ldap php-yaml php-snmp && apt -y remove brltty
 
-COPY install/install.sh /tmp/
-RUN sh /tmp/install.sh -s 1 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 2 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 3 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 4 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 5 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+COPY --chown=root:root --chmod=550 install/install.sh /root/
+RUN sh /root/install.sh -s 1 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+RUN sh /root/install.sh -s 2 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+RUN sh /root/install.sh -s 3 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+RUN sh /root/install.sh -s 4 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+RUN sh /root/install.sh -s 5 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
 COPY . ${WEBSERVER_HOME}
-RUN sh /tmp/install.sh -s 7 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 8 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 9 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 10 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
-RUN sh /tmp/install.sh -s 11 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+RUN sh /root/install.sh -s 7 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+RUN sh /root/install.sh -s 8 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+RUN sh /root/install.sh -s 9 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+RUN sh /root/install.sh -s 10 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
+RUN sh /root/install.sh -s 11 -v ${VERSION} -w ${WEBSERVER_HOME} -d ${DATABASE} -i docker
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* 
 RUN echo >${WEBSERVER_HOME}/initialisation
 

composer.json

@@ -1,5 +1,6 @@
 {
   "require": {
+    "abbadon1334/sun-position-spa-php" : "^2",
     "dragonmantank/cron-expression": "^3",
     "symfony/expression-language": "5 - 7",
     "pragmarx/google2fa-qrcode": "^3",
@@ -15,5 +16,8 @@
     "platform": {
       "php": "7.4"
     }
+  },
+  "require-dev": {
+    "phpstan/phpstan": "^2.1"
   }
 }