Undo the changes to the test setup

Because these changes are causing the build to fail, I will put them in another PR to track it

Author: BentiGorlich

.github/workflows/action.yaml

@@ -61,12 +61,6 @@ jobs:
           key: ${{ runner.os }}-composer-no-dev-${{ hashFiles('**/composer.lock') }}
 
       - run: cp .env.example .env
-
-      - run: composer install --no-scripts --no-dev --no-progress
-        name: Composer install without scripts
-
-      - run: composer dump-env prod
-
       - name: Composer install
         run: composer install --no-dev --no-progress
 

config/services.yaml

@@ -239,10 +239,6 @@ services:
                   event: kernel.controller_arguments,
               }
 
-    # Testing
-    App\Tests\Service\:
-        resource: '../tests/Service/'
-
     # Feeds
     debril.rss_atom.provider:
         class: App\Feed\Provider

src/Service/ActivityPub/ApHttpClient.php

@@ -19,7 +19,6 @@
 use Psr\Cache\InvalidArgumentException;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\CacheItem;
-use Symfony\Component\DependencyInjection\Attribute\WhenNot;
 use Symfony\Component\HttpClient\CurlHttpClient;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
@@ -42,7 +41,6 @@ enum ApRequestType
     case NodeInfo;
 }
 
-#[WhenNot(env: 'test')]
 class ApHttpClient implements ApHttpClientInterface
 {
     public const TIMEOUT = 8;

src/Service/ImageManager.php

@@ -8,14 +8,12 @@
 use App\Exception\ImageDownloadTooLargeException;
 use League\Flysystem\FilesystemOperator;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\Attribute\WhenNot;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Mime\MimeTypesInterface;
 use Symfony\Component\Validator\Constraints\Image;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-#[WhenNot(env: 'test')]
 class ImageManager implements ImageManagerInterface
 {
     public const IMAGE_MIMETYPES = [

tests/Service/TestingApHttpClient.php

@@ -7,9 +7,7 @@
 use App\Entity\Magazine;
 use App\Entity\User;
 use App\Service\ActivityPub\ApHttpClientInterface;
-use Symfony\Component\DependencyInjection\Attribute\When;
 
-#[When(env: 'test')]
 class TestingApHttpClient implements ApHttpClientInterface
 {
     /**

tests/Service/TestingImageManager.php

@@ -10,12 +10,10 @@
 use App\Service\SettingsManager;
 use League\Flysystem\FilesystemOperator;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\Attribute\When;
 use Symfony\Component\Mime\MimeTypesInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-#[When(env: 'test')]
 class TestingImageManager implements ImageManagerInterface
 {
     private ImageManager $innerImageManager;

tests/WebTestCase.php

@@ -60,6 +60,7 @@
 use App\Tests\Service\TestingImageManager;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
+use League\Flysystem\Filesystem;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -68,8 +69,11 @@
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Mime\MimeTypesInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 abstract class WebTestCase extends BaseWebTestCase
@@ -178,14 +182,20 @@ public function setUp(): void
         $this->kibbyPath = \dirname(__FILE__).'/assets/kibby_emoji.png';
         $this->client = static::createClient();
 
-        $client = $this->getService(ApHttpClientInterface::class);
-        self::assertTrue($client instanceof TestingApHttpClient);
-        $this->testingApHttpClient = $client;
-
-        $imageManager = $this->getService(ImageManagerInterface::class);
-        self::assertTrue($imageManager instanceof TestingImageManager);
-        $this->imageManager = $imageManager;
+        $this->testingApHttpClient = new TestingApHttpClient();
+        self::getContainer()->set(ApHttpClientInterface::class, $this->testingApHttpClient);
+
+        $this->imageManager = new TestingImageManager(
+            $this->getContainer()->getParameter('kbin_storage_url'),
+            $this->getService(Filesystem::class),
+            $this->getService(HttpClientInterface::class),
+            $this->getService(MimeTypesInterface::class),
+            $this->getService(ValidatorInterface::class),
+            $this->getService(LoggerInterface::class),
+            $this->getService(SettingsManager::class),
+        );
         $this->imageManager->setKibbyPath($this->kibbyPath);
+        self::getContainer()->set(ImageManagerInterface::class, $this->imageManager);
 
         $this->entityManager = $this->getService(EntityManagerInterface::class);
         $this->magazineManager = $this->getService(MagazineManager::class);