Update .gitea/workflows/ci.yml

Updated composer.json to remove the translation package and add the stopwatch package. Cleaned up configuration files by removing unused mailer, notifier, translation, and ux_turbo settings, and adjusted CSRF protection settings. Modified messenger.yaml to remove email message routing.
2025-11-07 12:15:13 +00:00 · 2025-11-07 12:08:58 +00:00
11 changed files with 46 additions and 167 deletions
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -10,10 +10,10 @@ env:
  IMAGE_NAME: tonehaus
  DOCKERFILE: docker/php/Dockerfile
  BUILD_TARGET: prod
-  PLATFORMS: linux/amd64,linux/arm64
+  PLATFORMS: linux/amd64

 jobs:
-  build:
+  tonehaus-ci-build:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
@@ -38,28 +38,46 @@ jobs:
        run: |
          echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY" -u "$REGISTRY_USERNAME" --password-stdin

-      - name: Build single-arch images for artifacts (no registry)
-        if: ${{ env.REGISTRY == '' }}
+      - name: Docker Build
+        if: ${{ env.REGISTRY != '' && env.REGISTRY_IMAGE != '' }}
+        env:
+          REGISTRY: ${{ secrets.REGISTRY }}
+          REGISTRY_IMAGE: ${{ secrets.REGISTRY_IMAGE }}
        run: |
          TAG_SHA=${{ steps.meta.outputs.short_sha }}
-          for P in linux/amd64; do \
-            ARCH=${P#linux/}; \
          docker buildx build \
-              --platform "$P" \
+            --platform "$PLATFORMS" \
            --file "$DOCKERFILE" \
            --target "$BUILD_TARGET" \
            --build-arg APP_ENV=prod \
-              --output type=docker \
-              --tag "$IMAGE_NAME:$TAG_SHA-$ARCH" \
-              . ; \
-            docker save "$IMAGE_NAME:$TAG_SHA-$ARCH" -o "tonehaus-image-$ARCH.tar" ; \
-          done
+            --tag "$REGISTRY/$REGISTRY_IMAGE:$TAG_SHA" \
+            --tag "$REGISTRY/$REGISTRY_IMAGE:ci" \
+            --push \
+            .

-      - name: Upload artifacts
-        if: ${{ env.REGISTRY == '' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: tonehaus-images
-          path: |
-            tonehaus-image-amd64.tar
+ #     - name: Build single-arch images for artifacts (no registry)
+ #       if: ${{ env.REGISTRY == '' }}
+ #       run: |
+ #         TAG_SHA=${{ steps.meta.outputs.short_sha }}
+ #         for P in $PLATFORMS; do \
+ #           ARCH=${P#linux/}; \
+ #           docker buildx build \
+ #             --platform "$P" \
+ #             --file "$DOCKERFILE" \
+ #             --target "$BUILD_TARGET" \
+ #             --build-arg APP_ENV=prod \
+ #             --output type=docker \
+ #             --tag "$IMAGE_NAME:$TAG_SHA-$ARCH" \
+ #             . ; \
+ #           docker save "$IMAGE_NAME:$TAG_SHA-$ARCH" -o "tonehaus-image-$ARCH.tar" ; \
+ #         done
+
+## Artifacts not configured yet..
+#      - name: Upload artifacts
+#        if: ${{ env.REGISTRY == '' }}
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: tonehaus-images
+#          path: |
+#            tonehaus-image-amd64.tar

--- a/.idea/musicratings.iml
+++ b/.idea/musicratings.iml
@@ -18,7 +18,6 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/orm" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/persistence" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/sql-formatter" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/egulias/email-validator" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/masterminds/html5" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/monolog/monolog" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
@@ -87,7 +86,6 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-foundation" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-kernel" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/intl" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mailer" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/maker-bundle" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/messenger" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mime" />
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -79,7 +79,6 @@
      <path value="$PROJECT_DIR$/vendor/doctrine/persistence" />
      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
      <path value="$PROJECT_DIR$/vendor/doctrine/sql-formatter" />
-      <path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
      <path value="$PROJECT_DIR$/vendor/symfony/framework-bundle" />
      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
      <path value="$PROJECT_DIR$/vendor/symfony/validator" />
@@ -92,7 +91,6 @@
      <path value="$PROJECT_DIR$/vendor/symfony/web-link" />
      <path value="$PROJECT_DIR$/vendor/symfony/type-info" />
      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/stimulus-bundle" />
      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php84" />
      <path value="$PROJECT_DIR$/vendor/symfony/intl" />
@@ -106,7 +104,6 @@
      <path value="$PROJECT_DIR$/vendor/symfony/dependency-injection" />
      <path value="$PROJECT_DIR$/vendor/symfony/config" />
      <path value="$PROJECT_DIR$/vendor/symfony/security-http" />
-      <path value="$PROJECT_DIR$/vendor/symfony/mailer" />
      <path value="$PROJECT_DIR$/vendor/phar-io/version" />
      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
@@ -122,8 +119,6 @@
      <path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
-      <path value="$PROJECT_DIR$/vendor/symfony/notifier" />
-      <path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-icu" />
      <path value="$PROJECT_DIR$/vendor/symfony/string" />
      <path value="$PROJECT_DIR$/vendor/symfony/messenger" />
@@ -142,6 +137,9 @@
      <path value="$PROJECT_DIR$/vendor/psr/log" />
      <path value="$PROJECT_DIR$/vendor/psr/container" />
      <path value="$PROJECT_DIR$/vendor/monolog/monolog" />
+      <path value="$PROJECT_DIR$/vendor/symfony/ux-turbo" />
+      <path value="$PROJECT_DIR$/vendor/symfony/stimulus-bundle" />
+      <path value="$PROJECT_DIR$/vendor/symfony/notifier" />
    </include_path>
  </component>
  <component name="PhpProjectSharedConfiguration" php_language_level="8.2" />
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,6 @@
        "symfony/security-bundle": "7.3.*",
        "symfony/serializer": "7.3.*",
        "symfony/string": "7.3.*",
-        "symfony/translation": "7.3.*",
        "symfony/twig-bundle": "7.3.*",
        "symfony/validator": "7.3.*",
        "symfony/web-link": "7.3.*",
@@ -99,6 +98,7 @@
        "symfony/css-selector": "7.3.*",
        "symfony/debug-bundle": "7.3.*",
        "symfony/maker-bundle": "^1.64",
+        "symfony/stopwatch": "7.3.*",
        "symfony/web-profiler-bundle": "7.3.*"
    }
 }
--- a/composer.json.old
+++ b/composer.json.old
@@ -1,109 +0,0 @@
-{
-    "type": "project",
-    "license": "proprietary",
-    "minimum-stability": "stable",
-    "prefer-stable": true,
-    "require": {
-        "php": ">=8.2",
-        "ext-ctype": "*",
-        "ext-iconv": "*",
-        "doctrine/dbal": "^3",
-        "doctrine/doctrine-bundle": "^2.18",
-        "doctrine/doctrine-migrations-bundle": "^3.5",
-        "doctrine/orm": "^3.5",
-        "phpdocumentor/reflection-docblock": "^5.6",
-        "phpstan/phpdoc-parser": "^2.3",
-        "symfony/asset": "7.3.*",
-        "symfony/asset-mapper": "7.3.*",
-        "symfony/console": "7.3.*",
-        "symfony/doctrine-messenger": "7.3.*",
-        "symfony/dotenv": "7.3.*",
-        "symfony/expression-language": "7.3.*",
-        "symfony/flex": "^2",
-        "symfony/form": "7.3.*",
-        "symfony/framework-bundle": "7.3.*",
-        "symfony/http-client": "7.3.*",
-        "symfony/intl": "7.3.*",
-        "symfony/mailer": "7.3.*",
-        "symfony/mime": "7.3.*",
-        "symfony/monolog-bundle": "^3.0",
-        "symfony/notifier": "7.3.*",
-        "symfony/process": "7.3.*",
-        "symfony/property-access": "7.3.*",
-        "symfony/property-info": "7.3.*",
-        "symfony/runtime": "7.3.*",
-        "symfony/security-bundle": "7.3.*",
-        "symfony/serializer": "7.3.*",
-        "symfony/stimulus-bundle": "^2.31",
-        "symfony/string": "7.3.*",
-        "symfony/translation": "7.3.*",
-        "symfony/twig-bundle": "7.3.*",
-        "symfony/ux-turbo": "^2.31",
-        "symfony/validator": "7.3.*",
-        "symfony/web-link": "7.3.*",
-        "symfony/yaml": "7.3.*",
-        "twig/extra-bundle": "^2.12|^3.0",
-        "twig/string-extra": "^3.22",
-        "twig/twig": "^2.12|^3.0"
-    },
-    "config": {
-        "allow-plugins": {
-            "php-http/discovery": true,
-            "symfony/flex": true,
-            "symfony/runtime": true
-        },
-        "bump-after-update": true,
-        "sort-packages": true
-    },
-    "autoload": {
-        "psr-4": {
-            "App\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "App\\Tests\\": "tests/"
-        }
-    },
-    "replace": {
-        "symfony/polyfill-ctype": "*",
-        "symfony/polyfill-iconv": "*",
-        "symfony/polyfill-php72": "*",
-        "symfony/polyfill-php73": "*",
-        "symfony/polyfill-php74": "*",
-        "symfony/polyfill-php80": "*",
-        "symfony/polyfill-php81": "*",
-        "symfony/polyfill-php82": "*"
-    },
-    "scripts": {
-        "auto-scripts": {
-            "cache:clear": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd",
-            "importmap:install": "symfony-cmd"
-        },
-        "post-install-cmd": [
-            "@auto-scripts"
-        ],
-        "post-update-cmd": [
-            "@auto-scripts"
-        ]
-    },
-    "conflict": {
-        "symfony/symfony": "*"
-    },
-    "extra": {
-        "symfony": {
-            "allow-contrib": false,
-            "require": "7.3.*"
-        }
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^11.5",
-        "symfony/browser-kit": "7.3.*",
-        "symfony/css-selector": "7.3.*",
-        "symfony/debug-bundle": "7.3.*",
-        "symfony/maker-bundle": "^1.64",
-        "symfony/stopwatch": "7.3.*",
-        "symfony/web-profiler-bundle": "7.3.*"
-    }
-}
--- a/config/packages/csrf.yaml
+++ b/config/packages/csrf.yaml
@@ -5,6 +5,7 @@ framework:
            token_id: submit

    csrf_protection:
+        check_header: true
        stateless_token_ids:
            - submit
            - authenticate
--- a/config/packages/mailer.yaml
+++ b/config/packages/mailer.yaml
@@ -1,3 +0,0 @@
-framework:
-    mailer:
-        dsn: '%env(MAILER_DSN)%'
--- a/config/packages/messenger.yaml
+++ b/config/packages/messenger.yaml
@@ -22,9 +22,6 @@ framework:
            messenger.bus.default: []

        routing:
-            Symfony\Component\Mailer\Messenger\SendEmailMessage: async
-            Symfony\Component\Notifier\Message\ChatMessage: async
-            Symfony\Component\Notifier\Message\SmsMessage: async

            # Route your messages to the transports
            # 'App\Message\YourMessage': async
--- a/config/packages/notifier.yaml
+++ b/config/packages/notifier.yaml
@@ -1,12 +0,0 @@
-framework:
-    notifier:
-        chatter_transports:
-        texter_transports:
-        channel_policy:
-            # use chat/slack, chat/telegram, sms/twilio or sms/nexmo
-            urgent: ['email']
-            high: ['email']
-            medium: ['email']
-            low: ['email']
-        admin_recipients:
-            - { email: admin@example.com }
--- a/config/packages/translation.yaml
+++ b/config/packages/translation.yaml
@@ -1,5 +0,0 @@
-framework:
-    default_locale: en
-    translator:
-        default_path: '%kernel.project_dir%/translations'
-        providers:
--- a/config/packages/ux_turbo.yaml
+++ b/config/packages/ux_turbo.yaml
@@ -1,4 +0,0 @@
-# Enable stateless CSRF protection for forms and logins/logouts
-framework:
-    csrf_protection:
-        check_header: true
Author	SHA1	Message	Date
George Wilkinson	cd13f1478a	Update .gitea/workflows/ci.yml All checks were successful CI - Build Tonehaus Docker image / tonehaus-ci-build (push) Successful in 2m1s Details	2025-11-07 12:15:13 +00:00
boris	0cd77f8b30	Updated composer.json to remove the translation package and add the stopwatch package. Cleaned up configuration files by removing unused mailer, notifier, translation, and ux_turbo settings, and adjusted CSRF protection settings. Modified messenger.yaml to remove email message routing. Some checks failed CI - Build Tonehaus Docker image / build (push) Failing after 2m6s Details	2025-11-07 12:08:58 +00:00