Skip to content

Commit aba3107

Browse files
mamazumamazu
committed
Tagging the form loader and removing the routing bundle
1 parent 4363d45 commit aba3107

File tree

12 files changed

+27
-86
lines changed

12 files changed

+27
-86
lines changed

‎DependencyInjection/SuluFormExtension.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ public function load(array $configs, ContainerBuilder $container): void
183183
$loader->load('services.xml');
184184
$loader->load('types.xml');
185185
$loader->load('title-providers.xml');
186+
$loader->load('article.xml');
186187

187188
$definition = $container->getDefinition('sulu_mail.null_helper');
188189

@@ -214,9 +215,6 @@ public function load(array $configs, ContainerBuilder $container): void
214215
/** @var array<string, class-string> $bundles */
215216
$bundles = $container->getParameter('kernel.bundles');
216217

217-
if (\array_key_exists('SuluArticleBundle', $bundles)) {
218-
$loader->load('article.xml');
219-
}
220218

221219
if (\array_key_exists('SuluTrashBundle', $bundles)) {
222220
$loader->load('services_trash.xml');

‎Manager/FormManager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function copy(int $id, string $locale): Form
115115
$newFormTranslation->setDeactivateNotifyMails($translation->getDeactivateNotifyMails());
116116
$newFormTranslation->setDeactivateCustomerMails($translation->getDeactivateCustomerMails());
117117
$newFormTranslation->setReplyTo($translation->getReplyTo());
118-
$newFormTranslation->setChanged(new \DateTime());
118+
$newFormTranslation->setChanged(new \DateTimeImmutable());
119119
$newFormTranslation->setForm($newForm);
120120
$newForm->addTranslation($newFormTranslation);
121121

@@ -203,7 +203,7 @@ public function save(array $data, ?string $locale = null, ?int $id = null, ?bool
203203
$translation->setDeactivateNotifyMails(self::getValue($data, 'deactivateNotifyMails', false));
204204
$translation->setDeactivateCustomerMails(self::getValue($data, 'deactivateCustomerMails', false));
205205
$translation->setReplyTo(self::getValue($data, 'replyTo', false));
206-
$translation->setChanged(new \DateTime());
206+
$translation->setChanged(new \DateTimeImmutable());
207207

208208
// Add Translation to Form.
209209
if (!$translation->getId()) {

‎Metadata/DynamicFormMetadataLoader.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,17 @@ public function warmUp($cacheDir, ?string $buildDir = null): array
7171
$section->addItem($fields);
7272

7373
$formItems = $formMetadata->getItems();
74-
array_splice($formItems, 1, 0, [$section->getName() => $section]);
74+
$formItems =
75+
array_slice($formItems, 0, 1, true) + // Slicing out the title
76+
[$section->getName() => $section] + // Inserting the custom form fields
77+
array_slice($formItems, 1, count($formItems) - 1, true) // Adding the rest of the fields
78+
;
7579
$formMetadata->setItems($formItems);
7680

7781
$configCache = $this->getConfigCache($formMetadata->getKey());
7882
$configCache->write(\serialize($formMetadata), [new FileResource($resource)]);
7983

84+
dump($formMetadata);
8085
return [];
8186
}
8287

‎Metadata/DynamicListMetadataLoader.php‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,11 @@
2222

2323
class DynamicListMetadataLoader implements ListMetadataLoaderInterface
2424
{
25-
/**
26-
* @var TranslatorInterface
27-
*/
28-
private $translator;
29-
30-
/**
31-
* @var FormManager
32-
*/
33-
private $formManager;
34-
35-
/**
36-
* @var DynamicListFactory
37-
*/
38-
private $dynamicListFactory;
39-
4025
public function __construct(
41-
TranslatorInterface $translator,
42-
FormManager $formManager,
43-
DynamicListFactory $dynamicListFactory
26+
private TranslatorInterface $translator,
27+
private FormManager $formManager,
28+
private DynamicListFactory $dynamicListFactory
4429
) {
45-
$this->translator = $translator;
46-
$this->formManager = $formManager;
47-
$this->dynamicListFactory = $dynamicListFactory;
4830
}
4931

5032
public function getMetadata(string $key, string $locale, array $metadataOptions): ?MetadataInterface

‎Resources/config/services.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@
188188
<argument>%kernel.cache_dir%/sulu-form-bundle/forms</argument>
189189
<argument>%kernel.enabled_locales%</argument>
190190
<argument>%kernel.debug%</argument>
191+
192+
<tag name="sulu_admin.form_metadata_loader" />
191193
</service>
192194

193195
<!-- Dynamic Controller -->
@@ -239,6 +241,7 @@
239241
<argument type="service" id="translator"/>
240242
<argument type="service" id="sulu_form.manager.form"/>
241243
<argument type="service" id="sulu_form.list_builder.dynamic_list_factory"/>
244+
242245
<tag name="sulu_admin.list_metadata_loader"/>
243246
</service>
244247

‎Tests/Application/bin/console.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@
2929
$debug = '0' !== \getenv('SYMFONY_DEBUG') && !$input->hasParameterOption(['--no-debug', '']) && 'prod' !== $env;
3030

3131
if ($debug) {
32-
// Clean up when sf 4.3 support is removed
33-
if (\class_exists(Debug::class)) {
34-
Debug::enable();
35-
} else {
36-
Symfony\Component\Debug\Debug::enable();
37-
}
32+
Debug::enable();
3833
}
3934

4035
$kernel = new Kernel($env, $debug, $suluContext);

‎Tests/Functional/Mail/HelperTestCase.php‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,19 @@
1414
use Doctrine\ORM\EntityManagerInterface;
1515
use Sulu\Bundle\FormBundle\Entity\Form;
1616
use Sulu\Bundle\FormBundle\Tests\Functional\Mail\Fixtures\LoadFormFixture;
17-
use Sulu\Bundle\PageBundle\Document\HomeDocument;
1817
use Sulu\Bundle\TestBundle\Testing\SuluTestCase;
19-
use Sulu\Component\DocumentManager\DocumentManagerInterface;
2018
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
2119

2220
class HelperTestCase extends SuluTestCase
2321
{
24-
/**
25-
* @var KernelBrowser
26-
*/
27-
protected $client;
22+
protected KernelBrowser $client;
2823

29-
/**
30-
* @var EntityManagerInterface
31-
*/
32-
protected $entityManager;
24+
protected EntityManagerInterface $entityManager;
3325

3426
protected function setUp(): void
3527
{
3628
$this->client = $this->createWebsiteClient();
3729
$this->purgeDatabase();
38-
$this->initPhpcr();
3930
$this->entityManager = $this->getEntityManager();
4031

4132
$fixture = new LoadFormFixture();
@@ -47,9 +38,6 @@ protected function setUp(): void
4738

4839
protected function updateHomePage(?Form $form = null): void
4940
{
50-
/* @var $suluDocumentManager DocumentManagerInterface */
51-
$suluDocumentManager = static::getContainer()->get('sulu_document_manager.document_manager');
52-
5341
/* @var $homePage HomeDocument */
5442
$homePage = $suluDocumentManager->find('/cmf/sulu-io/contents');
5543
$homePage->setResourceSegment('/');

‎Tests/Functional/Mail/MailerHelperTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ class MailerHelperTest extends HelperTestCase
1919
protected function setUp(): void
2020
{
2121
static::$class = MailerKernel::class;
22-
static::$kernel = null; // requires as Symfony 4.4 does not unset on tearDown
2322

2423
parent::setUp();
2524
}
2625

27-
public function testSendsEmailUsingMailerComponent()
26+
public function testSendsEmailUsingMailerComponent(): void
2827
{
2928
$this->assertIsObject(static::$kernel);
3029
$this->assertSame(MailerKernel::class, \get_class(static::$kernel));

‎Tests/Unit/Event/ProtectedMediaSubscriberTest.php‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ class ProtectedMediaSubscriberTest extends TestCase
4848
*/
4949
private $urlGenerator;
5050

51-
/**
52-
* @var ProtectedMediaSubscriber
53-
*/
54-
private $protectedMediaSubscriber;
51+
private ProtectedMediaSubscriber $protectedMediaSubscriber;
5552

5653
public function setUp(): void
5754
{
@@ -91,9 +88,7 @@ public function testOtherRoute(): void
9188
$event = new RequestEvent(
9289
new Kernel('test', true, SuluKernel::CONTEXT_WEBSITE),
9390
$request,
94-
\defined(HttpKernelInterface::class . '::MASTER_REQUEST')
95-
? HttpKernelInterface::MASTER_REQUEST
96-
: HttpKernelInterface::MAIN_REQUEST
91+
HttpKernelInterface::MAIN_REQUEST
9792
);
9893

9994
$this->formatCache->analyzedMediaUrl(Argument::any())
@@ -114,9 +109,7 @@ public function testImageProxyRoute(): void
114109
$event = new RequestEvent(
115110
new Kernel('test', true, SuluKernel::CONTEXT_WEBSITE),
116111
$request,
117-
\defined(HttpKernelInterface::class . '::MASTER_REQUEST')
118-
? HttpKernelInterface::MASTER_REQUEST
119-
: HttpKernelInterface::MAIN_REQUEST
112+
HttpKernelInterface::MAIN_REQUEST
120113
);
121114

122115
$this->formatCache->analyzedMediaUrl(Argument::any())
@@ -142,9 +135,7 @@ public function testAnalyzedMediaUrlThrowException(): void
142135
$event = new RequestEvent(
143136
new Kernel('test', true, SuluKernel::CONTEXT_WEBSITE),
144137
$request,
145-
\defined(HttpKernelInterface::class . '::MASTER_REQUEST')
146-
? HttpKernelInterface::MASTER_REQUEST
147-
: HttpKernelInterface::MAIN_REQUEST
138+
HttpKernelInterface::MAIN_REQUEST
148139
);
149140

150141
$this->formatCache->analyzedMediaUrl(Argument::any())
@@ -166,9 +157,7 @@ public function testDownloadRoute(): void
166157
$event = new RequestEvent(
167158
new Kernel('test', true, SuluKernel::CONTEXT_WEBSITE),
168159
$request,
169-
\defined(HttpKernelInterface::class . '::MASTER_REQUEST')
170-
? HttpKernelInterface::MASTER_REQUEST
171-
: HttpKernelInterface::MAIN_REQUEST
160+
HttpKernelInterface::MAIN_REQUEST
172161
);
173162

174163
$this->mockLoadCollectionKey('sulu_form');

‎Tests/prophecy-trait-bc-layer.php‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)