Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
test:
name: PHP ${{ matrix.php-version }}

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
matrix:
Expand Down
6 changes: 3 additions & 3 deletions src/DependencyInjection/FOSCKEditorExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
use Symfony\Component\HttpKernel\DependencyInjection\ConfigurableExtension;

/**
Expand All @@ -41,7 +41,7 @@ protected function loadInternal(array $config, ContainerBuilder $container): voi

private function loadResources(ContainerBuilder $container): void
{
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

$resources = [
'builder',
Expand All @@ -54,7 +54,7 @@ private function loadResources(ContainerBuilder $container): void
];

foreach ($resources as $resource) {
$loader->load($resource.'.xml');
$loader->load($resource.'.php');
}
}

Expand Down
21 changes: 21 additions & 0 deletions src/Resources/config/builder.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

declare(strict_types=1);

use FOS\CKEditorBundle\Builder\JsonBuilder;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();

$services->defaults()
->public()
->autowire();

$services->set('fos_ck_editor.builder.json_builder', JsonBuilder::class)
->args([
service('property_accessor'),
])
;
};
12 changes: 0 additions & 12 deletions src/Resources/config/builder.xml

This file was deleted.

22 changes: 22 additions & 0 deletions src/Resources/config/command.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

declare(strict_types=1);

use FOS\CKEditorBundle\Command\CKEditorInstallerCommand;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();

$services->defaults()
->public()
->autowire();

$services->set('fos_ck_editor.command.installer', CKEditorInstallerCommand::class)
->args([
service('fos_ck_editor.installer'),
])
->tag('console.command')
;
};
13 changes: 0 additions & 13 deletions src/Resources/config/command.xml

This file was deleted.

18 changes: 18 additions & 0 deletions src/Resources/config/config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

declare(strict_types=1);

use FOS\CKEditorBundle\Config\CKEditorConfiguration;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();

$services->defaults()
->public()
->autowire();

$services->set('fos_ck_editor.configuration', CKEditorConfiguration::class)
->args(['collection'])
;
};
12 changes: 0 additions & 12 deletions src/Resources/config/config.xml

This file was deleted.

21 changes: 21 additions & 0 deletions src/Resources/config/form.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

declare(strict_types=1);

use FOS\CKEditorBundle\Form\Type\CKEditorType;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();

$services->defaults()
->public()
->autowire();

$services->set('fos_ck_editor.form.type', CKEditorType::class)
->args([
service('fos_ck_editor.configuration'),
])
->tag('form.type');
};
13 changes: 0 additions & 13 deletions src/Resources/config/form.xml

This file was deleted.

16 changes: 16 additions & 0 deletions src/Resources/config/installer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

declare(strict_types=1);

use FOS\CKEditorBundle\Installer\CKEditorInstaller;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();

$services->defaults()
->public()
->autowire();

$services->set('fos_ck_editor.installer', CKEditorInstaller::class);
};
10 changes: 0 additions & 10 deletions src/Resources/config/installer.xml

This file was deleted.

27 changes: 27 additions & 0 deletions src/Resources/config/renderer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

declare(strict_types=1);

use FOS\CKEditorBundle\Renderer\CKEditorRenderer;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function Symfony\Component\DependencyInjection\Loader\Configurator\expr;
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();

$services->defaults()
->public()
->autowire();

$services->set('fos_ck_editor.renderer', CKEditorRenderer::class)
->args([
service('fos_ck_editor.builder.json_builder'),
service('router'),
service('assets.packages'),
service('request_stack'),
service('twig'),
expr("container.hasParameter('locale') ? parameter('locale') : null"),
])
;
};
17 changes: 0 additions & 17 deletions src/Resources/config/renderer.xml

This file was deleted.

20 changes: 20 additions & 0 deletions src/Resources/config/twig.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

declare(strict_types=1);

use FOS\CKEditorBundle\Twig\CKEditorExtension;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();

$services->defaults()
->public()
->autowire();

$services->set('fos_ck_editor.twig_extension', CKEditorExtension::class)
->args([
'fos_ck_editor.renderer',
])
->tag('twig.extension');
};
13 changes: 0 additions & 13 deletions src/Resources/config/twig.xml

This file was deleted.