Revert "Fixup"

This reverts commit b17d11c.

Author: vmcj

webapp/tests/Unit/Twig/TwigExtensionTest.php

@@ -2,51 +2,9 @@
 
 namespace App\Tests\Unit\Twig;
 
-/*use App\Entity\BaseApiEntity;
-use App\Entity\Contest;
-use App\Entity\ContestProblem;
-use App\Entity\ExternalJudgement;
-use App\Entity\ExternalRun;
-use App\Entity\ExternalSourceWarning;
-use App\Entity\HasExternalIdInterface;
-use App\Entity\Judging;
-use App\Entity\JudgingRun;
-use App\Entity\Problem;
-use App\Entity\Submission;
-use App\Entity\SubmissionFile;
-use App\Entity\Team;
-use App\Entity\TeamCategory;
-use App\Entity\Testcase;*/
-use App\Service\AwardService;
-use App\Service\ConfigurationService;
-use App\Service\DOMJudgeService;
-use App\Service\EventLogService;
-use App\Service\SubmissionService;
-/*use App\Utils\Scoreboard\ScoreboardMatrixItem;
-use App\Utils\Scoreboard\TeamScore;
-use App\Utils\Utils;
-use Doctrine\Common\Collections\Collection;*/
-use Doctrine\ORM\EntityManagerInterface;
-/*use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\Intl\Countries;
-use Symfony\Component\Intl\Exception\MissingResourceException;
-use Symfony\Component\PropertyAccess\PropertyAccess;*/
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-/*use Twig\Environment;
-use Twig\Extension\AbstractExtension;
-use Twig\Extension\GlobalsInterface;
-use Twig\Runtime\EscaperRuntime;
-use Twig\TwigFilter;
-use Twig\TwigFunction;*/
-
 use App\Twig\TwigExtension;
-use PHPUnit\Framework\TestCase;
-/*use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;*/
 use Twig\Environment;
+use PHPUnit\Framework\TestCase;
 
 class TwigExtensionTest extends TestCase
 {
@@ -62,10 +20,10 @@ public function testApcaContrast(): void
 	$awards               = self::getContainer()->get(AwardService::class);
 	$em                   = static::getContainer()->get(EntityManagerInterface::class);
 	$tokenStorage         = static::getContainer()->get(TokenStorageInterface::class);
-	$authorizationChecker = static::getContainer()->get(AuthorizationCheckerInterface::class);
-	$router               = static::getContainer()->get(RouterInterface::class);
+	$authorizationChecker = static::getContainer()->get(TokenStorageInterface::class);
+	$router               = static::getContainer()->get(TokenStorageInterface::class);
 	$env                  = new Environment();
-	$twigExt = new TwigExtension($dj, $config, $env, $em, $submissionService,
+	$twigExt = new TwigExtension($dj, $config, $env $em, $submissionService,
                                      $eventLogService, $awards, $tokenStorage,
 				     $authorizationChecker, $router, "");
         self::assertEquals(0.0, $twigExt->apcaContrast("#ffffff",   "#000000"));