Update from develop

.env.example

@@ -4,7 +4,7 @@ APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
 
-LOG_CHANNEL=stack
+LOG_CHANNEL=daily
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 

.github/workflows/publish-docker-images.yml → .github/workflows/build-and-push-docker.yml

@@ -1,15 +1,7 @@
 name: Publish Docker Images
 
 on:
-  push:
-    paths-ignore:
-      - README.md
-      - LICENSE
-      - .env.example
-    branches:
-      - master
-      - develop
-    tags: [ 'v*.*.*' ]
+  workflow_call:
   workflow_dispatch:
 
 env:
@@ -28,23 +20,28 @@ jobs:
       id-token: write
 
     steps:
-      - name: Checkout repository
+      - name: Force linux line endings
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - name: Checkout
         uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        uses: docker/setup-buildx-action@v3
 
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -54,7 +51,7 @@ jobs:
 
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        uses: docker/build-push-action@v6
         with:
           file: docker/production/Dockerfile
           context: .
@@ -63,3 +60,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          platforms: linux/amd64,linux/arm64

.github/workflows/code-quality.yml

@@ -0,0 +1,90 @@
+name: Code Quality
+on:
+  workflow_call:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - master
+      - develop
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+  push:
+    branches:
+      - master
+      - develop
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+jobs:
+  code-quality:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Force linux line endings
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.4
+          extensions: mbstring, json, grpc, opentelemetry
+          ini-values: post_max_size=512M, max_execution_time=180
+          coverage: xdebug
+          tools: phpcs, phpstan, phpunit
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-${{ matrix.php-versions }}
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --dev
+
+      - name: Build Vite manifest
+        run: |
+          npm install
+          npm run build
+
+      - name: Run PHP Codesniffer
+        run: phpcs
+
+      - name: Run tests and collect coverage
+        run: vendor/bin/phpunit --coverage-clover coverage.xml
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+  build-and-push-docker:
+    needs: code-quality
+    uses: ./.github/workflows/build-and-push-docker.yml
+    secrets: inherit
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    # Only build docker images on pushes to master, develop and tags
+    if:
+      (
+        startsWith(github.ref, 'refs/tags') ||
+        github.ref == format('refs/heads/{0}', 'master') ||
+        github.ref == format('refs/heads/{0}', 'develop')
+      ) &&
+      github.event_name != 'pull_request'
+

.gitignore

@@ -18,3 +18,7 @@ yarn-error.log
 /.idea
 /.vscode
 /docker-compose.override.yml
+/html-coverage
+clover.xml
+coverage.txt
+.github/copilot-instructions.md

README.md

@@ -1,25 +1,27 @@
 # Control
+[![codecov](https://codecov.io/github/mintopia/control/graph/badge.svg?token=UH1Y6FBHQW)](https://codecov.io/github/mintopia/control)
 
 ## Introduction
 
-LAN Party user accounts, ticket management and seat picker. It is designed to work with multiple social authentication providers and ticket providers.
+LAN Party user accounts, ticket management and seat picker. It is designed to work with multiple social authentication
+providers and ticket providers.
 
 ### Social Provider Support
 
- - Discord
- - Steam (No authentication, just account linking)
- - Twitch
+- Discord
+- Steam (No authentication, just account linking)
+- Twitch
 
 These are using Laravel Socialite, so any provider supported by Socialite can be integrated.
 
 ### Ticket Provider Support
 
- - Ticket Tailor
- - WooCommerce
- - Internal
-
-These are custom integrations but more can be added and used if people develop them. The Internal provider allows you to manually issue tickets to users.
+- Ticket Tailor
+- WooCommerce
+- Internal
 
+These are custom integrations but more can be added and used if people develop them. The Internal provider allows you to
+manually issue tickets to users.
 
 ## Technology
 
@@ -64,6 +66,19 @@ I'm running this with an external docker network called `frontend` with Caddy ru
 need to add a network section for the `control` service to add it to the `frontend` network if you
 want to do this.
 
+The Caddyfile config I'm using for this is:
+
+```Caddyfile
+control.example.com {
+  @websockets {
+    header Connection *Upgrade*
+    header Upgrade    websocket
+  }
+  reverse_proxy @websockets control-reverb-1
+  reverse_proxy control-control-1
+}
+```
+
 You will need to make a logs directory and chmod it 777 as I still need to sort permissions out.
 
 To bring up the site, run the following:
@@ -80,29 +95,71 @@ You should now be able to visit the site and login. From here you can use the ad
 
 ## Observability
 
-Control supports basic observability functionality in using an OpenTelemetry collector. It can support traces, logs
-and metrics. If enabled, it will create traces for all HTTP requests. To enable it, add the following to your `.env`:
+The docker images from the project have the [Open Telemetry PHP extension](https://github.com/open-telemetry/opentelemetry-php-instrumentation/releases) and the project includes the appropriate Open
+Telemetry libraries from Packagist. You can use Protobuf or GRPC transport if needed. You should just be able to
+configure it using ENV variables and run a collector container. eg.
 
 ```dotenv
-OPENTELEMETRY_ENABLED=true
+OTEL_PHP_AUTOLOAD_ENABLED=true
+OTEL_SERVICE_NAME=control
+OTEL_EXPORTER_OTLP_ENDPOINT=http://collector:4317
 ```
 
-For logging output, a logger is defined and can be used. I suggest you use this with your usual logger, eg. `daily`.
-You can specify this logging with the following environment variables:
+The docker container already sets `OTEL_PHP_EXCLUDED_URLS` to remove common URLs that are used a lot and add no value
+to monitoring. The default value is:
 
 ```dotenv
-LOG_CHANNEL=stack
-LOG_STACK=opentelemetry,daily
+OTEL_PHP_EXCLUDED_URLS="pulse,telescope/.*,horizon/.*,api/v1/ping,_ignition/.*,_debugbar/.*"
 ```
 
-By default it is configured to send to an OpenTelemetry container running with the name `collector`. An example config
-is supplied with placeholders for sending data to [Honeycomb](https://www.honeycomb.io/).
+For the container:
 
-The plan will be to add further spans within individual requests and have spans for the jobs and queued actions.
+```yaml
+  collector:
+    image: otel/opentelemetry-collector-contrib
+    volumes:
+      - ./collector.yml:/etc/otelcol-contrib/config.yaml
+```
+
+And finally the config in `collector.yml`, adapt this as you need.
+
+```yaml
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: 0.0.0.0:4317
+      http:
+        endpoint: 0.0.0.0:4318
+
+processors:
+  batch:
+
+exporters:
+  debug:
+
+service:
+  pipelines:
+    traces:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [debug]
+    metrics:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [debug]
+    logs:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [debug]
+```
 
 ## Contributing
 
-It's an open source project and I'm happy to accept pull requests. I am terrible at UI and UX, which is why this is entirely using server-side rendering. If someone wants to use Vue/Laravel Livewire - please go ahead!
+It's an open source project and I'm happy to accept pull requests. I am terrible at UI and UX, which is why this is
+entirely using server-side rendering. If someone wants to use Vue/Laravel Livewire - please go ahead!
+
+We have 100% test coverage, and would like to remain that way.
 
 ## Roadmap
 
@@ -111,8 +168,7 @@ The following features are on the roadmap:
  - Better UI/UX. I'm currently using [tabler.io](https://tabler.io) and entirely server-side rendering.
  - Full-featured API. There's a basic one to support seating plan refreshes. I need to refactor it and improve it.
  - UI Customisation from Admin Pages. Currently the UI colours, branding is all either in the `.env` or compiled into the CSS at build.
- - Unit Tests. This was very rapidly developed, I'm sorry!
- - PHPCS and PHPStan. Should be aiming for PSR-12 and level 8 PHPStan.
+ - Static Analysis - We should be aiming for level 8 in PHPStan.
 
 ## Thanks
 

app/Casts/SettingValue.php

@@ -13,6 +13,7 @@ class SettingValue implements CastsAttributes
      *
      * @param array<string, mixed> $attributes
      */
+
     public function get(Model $model, string $key, mixed $value, array $attributes): mixed
     {
         if ($model->encrypted && $value !== null) {
@@ -26,6 +27,7 @@ public function get(Model $model, string $key, mixed $value, array $attributes):
      *
      * @param array<string, mixed> $attributes
      */
+
     public function set(Model $model, string $key, mixed $value, array $attributes): mixed
     {
         if ($model->encrypted && $value !== null) {

app/Console/Commands/SyncDiscordRoles.php

@@ -2,13 +2,11 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Event;
 use App\Models\LinkedAccount;
 use App\Models\SocialProvider;
 use App\Models\TicketType;
 use App\Models\User;
 use App\Services\DiscordApi;
-use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 

app/Console/Commands/SyncTickets.php

@@ -2,9 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Models\LinkedAccount;
 use App\Models\TicketProvider;
-use App\Models\TicketType;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 

app/Console/Commands/UpdateEventSeatingLock.php

@@ -22,6 +22,8 @@ class UpdateEventSeatingLock extends Command
      * @var string
      *
      */
+    protected $description = 'Update Event Seating Locks';
+
     public function handle()
     {
         Event::where('seating_opens_at', '<=', Carbon::now())->chunk(100, function ($chunk) {