From 1196ba8108a4bbaad32d1eb954f5dfa3014fc624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Fri, 22 Dec 2023 16:48:08 +0100 Subject: [PATCH] Fixed CS --- .../Loader/SiteAccessPreviewChoiceLoader.php | 12 +++++------- src/lib/Form/Type/Preview/SiteAccessChoiceType.php | 9 --------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/lib/Form/Type/ChoiceList/Loader/SiteAccessPreviewChoiceLoader.php b/src/lib/Form/Type/ChoiceList/Loader/SiteAccessPreviewChoiceLoader.php index d4f42a9023..7d41278ae7 100644 --- a/src/lib/Form/Type/ChoiceList/Loader/SiteAccessPreviewChoiceLoader.php +++ b/src/lib/Form/Type/ChoiceList/Loader/SiteAccessPreviewChoiceLoader.php @@ -8,19 +8,18 @@ namespace Ibexa\AdminUi\Form\Type\ChoiceList\Loader; -use Ibexa\AdminUi\Siteaccess\SiteAccessNameGeneratorInterface; -use Ibexa\AdminUi\Siteaccess\SiteaccessResolverInterface; -use Ibexa\Contracts\Core\Repository\Values\Content\Location; -use Symfony\Component\Form\ChoiceList\ArrayChoiceList; -use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; final class SiteAccessPreviewChoiceLoader extends BaseChoiceLoader { private SiteAccessChoiceLoader $siteAccessChoiceLoader; + private UrlGeneratorInterface $urlGenerator; + private int $contentId; + private string $languageCode; + private int $versionNo; public function __construct( @@ -30,7 +29,6 @@ public function __construct( string $languageCode, int $versionNo ) { - $this->siteAccessChoiceLoader = $siteAccessChoiceLoader; $this->urlGenerator = $urlGenerator; $this->contentId = $contentId; @@ -53,7 +51,7 @@ public function getChoiceList(): array 'contentId' => $this->contentId, 'versionNo' => $this->versionNo, 'language' => $this->languageCode, - 'siteAccessName' => $siteAccessKey + 'siteAccessName' => $siteAccessKey, ] ); } diff --git a/src/lib/Form/Type/Preview/SiteAccessChoiceType.php b/src/lib/Form/Type/Preview/SiteAccessChoiceType.php index cc391ec46d..d2c102431b 100644 --- a/src/lib/Form/Type/Preview/SiteAccessChoiceType.php +++ b/src/lib/Form/Type/Preview/SiteAccessChoiceType.php @@ -14,17 +14,10 @@ use Ibexa\AdminUi\Siteaccess\SiteaccessResolverInterface; use Ibexa\Contracts\Core\Repository\Values\Content\Content; use Ibexa\Contracts\Core\Repository\Values\Content\Location; -use Ibexa\Core\MVC\Symfony\SiteAccess\Router; -use Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessServiceInterface; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\ChoiceList\ChoiceList; -use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceLoader; -use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader; use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\Form\FormView; use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -42,7 +35,6 @@ public function __construct( SiteAccessNameGeneratorInterface $siteAccessNameGenerator, UrlGeneratorInterface $urlGenerator ) { - $this->siteAccessResolver = $siteAccessResolver; $this->siteAccessNameGenerator = $siteAccessNameGenerator; $this->urlGenerator = $urlGenerator; @@ -66,7 +58,6 @@ public function configureOptions(OptionsResolver $resolver): void $options['languageCode'], $options['versionNo'], ) - ); }, ]);