.env.testing

@@ -11,13 +11,8 @@ BCRYPT_ROUNDS=4
 LOG_CHANNEL=stack
 LOG_STACK=single
 
-# Host and credentials must match docker/dev/docker-compose.yml; nothing enforces it.
+DB_CONNECTION=sqlite
-DB_CONNECTION=mysql
+DB_DATABASE=:memory:
-DB_HOST=db
-DB_PORT=3306
-DB_DATABASE=ffr_testing
-DB_USERNAME=ffr
-DB_PASSWORD=ffr
 
 SESSION_DRIVER=array
 

.forgejo/workflows/build.yml

@@ -1,6 +1,7 @@
 name: Build and Push Docker Image
 on:
   push:
+    branches: [main]
     tags: ['v*']
 
 jobs:

.forgejo/workflows/ci.yml

@@ -10,20 +10,7 @@ jobs:
   ci:
     runs-on: docker
     container:
-      image: forge.lvl0.xyz/lvl0/fedi-feed-router-ci:php8.3-4
+      image: forge.lvl0.xyz/lvl0/fedi-feed-router-ci:php8.3-3
-    services:
-      db:
-        image: mariadb:11
-        env:
-          MARIADB_DATABASE: ffr_testing
-          MARIADB_USER: ffr
-          MARIADB_PASSWORD: ffr
-          MARIADB_ROOT_PASSWORD: ffr_root_ci
-        options: >-
-          --health-cmd="healthcheck.sh --connect --innodb_initialized"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=10
     steps:
       - uses: https://data.forgejo.org/actions/checkout@v4
 

.forgejo/workflows/images.yml

@@ -18,10 +18,10 @@ jobs:
         include:
           - name: fedi-feed-router-base
             file: docker/build/Dockerfile.base
-            version: php8.3-2
+            version: php8.3-1
           - name: fedi-feed-router-ci
             file: docker/build/Dockerfile.ci
-            version: php8.3-4
+            version: php8.3-3
     steps:
       - uses: https://data.forgejo.org/actions/checkout@v4
 
@@ -43,4 +43,5 @@ jobs:
           push: true
           tags: |
             forge.lvl0.xyz/lvl0/${{ matrix.name }}:${{ matrix.version }}
+            forge.lvl0.xyz/lvl0/${{ matrix.name }}:latest
             forge.lvl0.xyz/lvl0/${{ matrix.name }}:${{ github.sha }}

Dockerfile

@@ -1,5 +1,5 @@
 # Production Dockerfile - uses pre-built base image
-FROM forge.lvl0.xyz/lvl0/fedi-feed-router-base:php8.3-2
+FROM forge.lvl0.xyz/lvl0/fedi-feed-router-base:latest
 
 # Set working directory
 WORKDIR /app

docker/build/Dockerfile.base

@@ -1,5 +1,5 @@
 # Base image with FrankenPHP, PHP extensions, Node, and Composer
-FROM dunglas/frankenphp:1.12.7-php8.3.35-alpine
+FROM dunglas/frankenphp:latest-php8.3-alpine
 
 # Install system dependencies
 RUN apk add --no-cache \

docker/build/Dockerfile.ci

@@ -1,7 +1,6 @@
 # Image for CI: PHP and Composer only, no runtime server or frontend toolchain.
-# pdo_mysql is here for the MariaDB test database (#169); pdo_sqlite stays until
+# Tests run against sqlite in memory (see .env.testing), so no database client
-# that switch lands. No CLI database client — PHPUnit reaches the database
+# or cache extension is needed.
-# through PDO and never shells out.
 #
 # Published as fedi-feed-router-ci:php<version>-<revision>, not :latest. Runners
 # cache mutable tags and will not re-pull them, so bump the revision in the tag
@@ -17,7 +16,6 @@ COPY --from=mlocati/php-extension-installer:2 /usr/bin/install-php-extensions /u
 
 RUN install-php-extensions \
     pdo_sqlite \
-    pdo_mysql \
     mbstring \
     dom \
     xml \

docker/dev/docker-compose.yml

@@ -56,7 +56,6 @@ services:
       MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD:-ffr_root_dev}"
     volumes:
       - db_data:/var/lib/mysql
-      - ./initdb:/docker-entrypoint-initdb.d:ro
     healthcheck:
       test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
       interval: 10s

docker/dev/initdb/01-create-test-database.sql

@@ -1,7 +0,0 @@
--- Runs only on an empty data directory. Recreate the volume to apply changes.
-CREATE DATABASE IF NOT EXISTS ffr_testing
-    CHARACTER SET utf8mb4
-    COLLATE utf8mb4_unicode_ci;
-
-GRANT ALL PRIVILEGES ON ffr_testing.* TO 'ffr'@'%';
-FLUSH PRIVILEGES;

phpunit.xml

@@ -23,8 +23,8 @@
         <server name="APP_MAINTENANCE_DRIVER" value="file" force="true"/>
         <server name="BCRYPT_ROUNDS" value="4" force="true"/>
         <server name="CACHE_STORE" value="array" force="true"/>
-        <server name="DB_CONNECTION" value="mysql" force="true"/>
+        <server name="DB_CONNECTION" value="sqlite" force="true"/>
-        <server name="DB_DATABASE" value="ffr_testing" force="true"/>
+        <server name="DB_DATABASE" value=":memory:" force="true"/>
         <server name="MAIL_MAILER" value="array" force="true"/>
         <server name="PULSE_ENABLED" value="false" force="true"/>
         <server name="QUEUE_CONNECTION" value="sync" force="true"/>

tests/Feature/KeyPlatformChannelPostsMigrationTest.php

@@ -62,7 +62,7 @@ public function test_maps_rows_to_the_local_channel_by_name(): void
     {
         $this->restoreLegacyTable();
 
-        $channel = PlatformChannel::factory()->create(['name' => 'newsbottest']);
+        $channel = PlatformChannel::factory()->create(['name' => 'newsbottest', 'channel_id' => 'newsbottest']);
         $this->seedLegacyRow('217', 'newsbottest', '1');
         $this->seedLegacyRow('217', 'newsbottest', '2');
 
@@ -76,7 +76,7 @@ public function test_drops_rows_that_match_no_channel(): void
     {
         $this->restoreLegacyTable();
 
-        PlatformChannel::factory()->create(['name' => 'newsbottest']);
+        PlatformChannel::factory()->create(['name' => 'newsbottest', 'channel_id' => 'newsbottest']);
         $this->seedLegacyRow('999', 'a-community-that-no-longer-exists', '1');
 
         $this->runMigration();
@@ -94,10 +94,12 @@ public function test_drops_rows_whose_channel_name_is_ambiguous_across_instances
         PlatformChannel::factory()->create([
             'platform_instance_id' => $first->id,
             'name' => 'news',
+            'channel_id' => 'news',
         ]);
         PlatformChannel::factory()->create([
             'platform_instance_id' => $second->id,
             'name' => 'news',
+            'channel_id' => 'news-two',
         ]);
 
         $this->seedLegacyRow('8', 'news', '1');
@@ -111,7 +113,7 @@ public function test_leaves_a_schema_the_new_code_can_use(): void
     {
         $this->restoreLegacyTable();
 
-        $channel = PlatformChannel::factory()->create(['name' => 'newsbottest']);
+        $channel = PlatformChannel::factory()->create(['name' => 'newsbottest', 'channel_id' => 'newsbottest']);
         $this->seedLegacyRow('217', 'newsbottest', '1');
 
         $this->runMigration();

tests/Feature/MirrorDuplicateDetectionTest.php

@@ -41,6 +41,7 @@ protected function setUp(): void
         $instance = PlatformInstance::factory()->create(['url' => 'https://lemmy.test']);
         $channel = PlatformChannel::factory()->create([
             'platform_instance_id' => $instance->id,
+            'channel_id' => 'news',
             'name' => 'news',
         ]);
         $account = PlatformAccount::factory()->create(['instance_url' => 'https://lemmy.test']);
@@ -179,6 +180,7 @@ public function test_a_second_instance_with_the_same_community_name_does_not_col
         $otherInstance = PlatformInstance::factory()->create(['url' => 'https://other.test']);
         $otherChannel = PlatformChannel::factory()->create([
             'platform_instance_id' => $otherInstance->id,
+            'channel_id' => 'news',
             'name' => 'news',
         ]);
 

tests/Feature/ValidateArticleListenerTest.php

@@ -89,8 +89,7 @@ public function test_listener_skips_already_validated_articles(): void
     public function test_listener_skips_articles_with_existing_publication(): void
     {
         $feed = Feed::factory()->create();
-        /** @var Route $route */
+        Route::factory()->active()->create(['feed_id' => $feed->id]);
-        $route = Route::factory()->active()->create(['feed_id' => $feed->id]);
 
         $article = Article::factory()->create([
             'feed_id' => $feed->id,
@@ -99,7 +98,7 @@ public function test_listener_skips_articles_with_existing_publication(): void
         ArticlePublication::create([
             'article_id' => $article->id,
             'post_id' => 'test-post-id',
-            'platform_channel_id' => $route->platform_channel_id,
+            'platform_channel_id' => 1,
             'published_at' => now(),
             'published_by' => 'test-user',
         ]);