Skip to content

Add compatibility with Symfony 7 and 8, rework service config to PHP #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobvandevijver merged 1 commit into from
Dec 2, 2025
Merged

Add compatibility with Symfony 7 and 8, rework service config to PHP #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions DependencyInjection/AdmingeneratorFormExtensionsExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
use Admingenerator\FormExtensionsBundle\Form\Extension\SingleUploadExtension;
use Admingenerator\FormExtensionsBundle\Twig\Extension\ImageAssetsExtension;
use Admingenerator\FormExtensionsBundle\Twig\Extension\IncludeGlobalsExtension;
use Admingenerator\FormExtensionsBundle\Twig\Extension\LegacyIncludeGlobalsExtension;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader;
Expand All @@ -18,7 +17,6 @@
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Reference;
use Twig\Environment;

/**
* Loads FormExtensions configuration
Expand All @@ -35,8 +33,8 @@ public function load(array $configs, ContainerBuilder $container): void
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);

$loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('services.xml');
$loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('services.php');

$container->setParameter('admingenerator.form.upload_manager', $config['upload_manager']);
$container->setParameter('admingenerator.form.image_manipulator', $config['image_manipulator']);
Expand Down Expand Up @@ -89,15 +87,15 @@ private function loadUploadCollectionListener(array $config, ContainerBuilder $c
}

$collectionUploadListenerDefinition = new Definition('%admingenerator.form.upload_collection_listener.class%');
$collectionUploadListenerDefinition->setArguments(array(
$collectionUploadListenerDefinition->setArguments([
new Reference($config['file_storage']),
$routeName,
new Reference('property_accessor')
));
]);
$collectionUploadListenerDefinition->addTag('kernel.event_subscriber');
$container->setDefinition('admingenerator.form.upload_collection_listener', $collectionUploadListenerDefinition);

$container->getDefinition('admingenerator.form.extensions.type.upload_collection')->addMethodCall('setFileStorage', array(new Reference($config['file_storage'])));
$container->getDefinition('admingenerator.form.extensions.type.upload_collection')->addMethodCall('setFileStorage', [new Reference($config['file_storage'])]);
}
}

Expand Down
67 changes: 67 additions & 0 deletions Resources/config/services.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?php

use Admingenerator\FormExtensionsBundle\EventListener\UploadCollectionListener;
use Admingenerator\FormExtensionsBundle\Form\Type\BootstrapFieldsetCollectionType;
use Admingenerator\FormExtensionsBundle\Form\Type\BootstrapTableCollectionType;
use Admingenerator\FormExtensionsBundle\Form\Type\DatePickerType;
use Admingenerator\FormExtensionsBundle\Form\Type\DateRangePickerType;
use Admingenerator\FormExtensionsBundle\Form\Type\DateTimePickerType;
use Admingenerator\FormExtensionsBundle\Form\Type\DoubleListDocumentType;
use Admingenerator\FormExtensionsBundle\Form\Type\DoubleListEntityType;
use Admingenerator\FormExtensionsBundle\Form\Type\DoubleListModelType;
use Admingenerator\FormExtensionsBundle\Form\Type\ElasticTextareaType;
use Admingenerator\FormExtensionsBundle\Form\Type\GoogleMapType;
use Admingenerator\FormExtensionsBundle\Form\Type\KnobType;
use Admingenerator\FormExtensionsBundle\Form\Type\MiniColorsType;
use Admingenerator\FormExtensionsBundle\Form\Type\MoneyType;
use Admingenerator\FormExtensionsBundle\Form\Type\Select2ChoiceType;
use Admingenerator\FormExtensionsBundle\Form\Type\Select2CountryType;
use Admingenerator\FormExtensionsBundle\Form\Type\Select2DocumentType;
use Admingenerator\FormExtensionsBundle\Form\Type\Select2EntityType;
use Admingenerator\FormExtensionsBundle\Form\Type\Select2HiddenType;
use Admingenerator\FormExtensionsBundle\Form\Type\Select2LanguageType;
use Admingenerator\FormExtensionsBundle\Form\Type\Select2LocaleType;
use Admingenerator\FormExtensionsBundle\Form\Type\Select2ModelType;
use Admingenerator\FormExtensionsBundle\Form\Type\Select2TimezoneType;
use Admingenerator\FormExtensionsBundle\Form\Type\SingleUploadType;
use Admingenerator\FormExtensionsBundle\Form\Type\TimePickerType;
use Admingenerator\FormExtensionsBundle\Form\Type\UploadCollectionType;
use Admingenerator\FormExtensionsBundle\Storage\LocalFileStorage;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use function Symfony\Component\DependencyInjection\Loader\Configurator\service;

return static function (ContainerConfigurator $container): void {
$container->parameters()->set('admingenerator.form.upload_collection_listener.class', UploadCollectionListener::class);

$services = $container->services();
$configureFormType = static fn(string $id, string $class) => $services->set($id, $class)->tag('form.type');
$configureFormType('admingenerator.form.extensions.type.bootstrap_table_collection', BootstrapTableCollectionType::class);
$configureFormType('admingenerator.form.extensions.type.bootstrap_fieldset_collection', BootstrapFieldsetCollectionType::class);
$configureFormType('admingenerator.form.extensions.type.bootstrap_money', MoneyType::class);
$configureFormType('admingenerator.form.extensions.type.upload_collection', UploadCollectionType::class);
$configureFormType('admingenerator.form.extensions.type.datetime_picker', DateTimePickerType::class);
$configureFormType('admingenerator.form.extensions.type.daterange_picker', DateRangePickerType::class)
->call('setTranslator', [service('translator')]);
$configureFormType('admingenerator.form.extensions.type.date_picker', DatePickerType::class);
$configureFormType('admingenerator.form.extensions.type.double_list_entity', DoubleListEntityType::class);
$configureFormType('admingenerator.form.extensions.type.double_list_document', DoubleListDocumentType::class);
$configureFormType('admingenerator.form.extensions.type.double_list_model', DoubleListModelType::class);
$configureFormType('admingenerator.form.extensions.type.elastic_textarea', ElasticTextareaType::class);
$configureFormType('admingenerator.form.extensions.type.google_map', GoogleMapType::class);
$configureFormType('admingenerator.form.extensions.type.knob', KnobType::class);
$configureFormType('admingenerator.form.extensions.type.mini_colors', MiniColorsType::class);
$configureFormType('admingenerator.form.extensions.type.select2_entity', Select2EntityType::class);
$configureFormType('admingenerator.form.extensions.type.select2_document', Select2DocumentType::class);
$configureFormType('admingenerator.form.extensions.type.select2_model', Select2ModelType::class);
$configureFormType('admingenerator.form.extensions.type.select2_locale', Select2LocaleType::class);
$configureFormType('admingenerator.form.extensions.type.select2_language', Select2LanguageType::class);
$configureFormType('admingenerator.form.extensions.type.select2_country', Select2CountryType::class);
$configureFormType('admingenerator.form.extensions.type.select2_timezone', Select2TimezoneType::class);
$configureFormType('admingenerator.form.extensions.type.select2_choice', Select2ChoiceType::class);
$configureFormType('admingenerator.form.extensions.type.single_upload', SingleUploadType::class);
$configureFormType('admingenerator.form.extensions.type.time_picker', TimePickerType::class);
$configureFormType('admingenerator.form.extensions.type.select2_hidden', Select2HiddenType::class);

$services->set('admingenerator.form.file_storage.local', LocalFileStorage::class)
->arg('$requestStack', service('request_stack'));
};
122 changes: 0 additions & 122 deletions Resources/config/services.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Twig/Extension/ImageAssetsExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function getFilters(): array
/**
* Gets the browser path for the image and filter to apply.
*
* @return string The public path.
* @return string|null The public path.
*/
public function asset(object $object, string $field): ?string
{
Expand Down
6 changes: 2 additions & 4 deletions Validator/Constraints/LatLngValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,17 @@

class LatLngValidator extends ConstraintValidator
{
public function validate($value, Constraint $constraint): bool
public function validate($value, Constraint $constraint): void
{
if (!($constraint instanceof LatLng)) {
throw new InvalidArgumentException(sprintf('Expected %s, got %s', LatLng::class, $constraint::class));
}
if (!preg_match('/^[0-9\-\.]+$/', $value['lat'], $matches) || !preg_match('/^[0-9\-\.]+$/', $value['lng'], $matches)) {
$this->context->addViolation($constraint->message, ['%lat%' => (float)$value['lat'], '%lng%' => (float)$value['lng']]);
return false;
return;
}
if ($value['lat'] > 90 || $value['lat'] < -90 || $value['lng'] > 180 || $value['lng'] < -180) {
$this->context->addViolation($constraint->message, ['%lat%' => (float)$value['lat'], '%lng%' => (float)$value['lng']]);
return false;
}
return true;
}
}
24 changes: 12 additions & 12 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
],
"require": {
"php": ">=8.1.0",
"symfony/config": "~4.4|~5.4|~6.2",
"symfony/dependency-injection": "~4.4|~5.4|~6.2",
"symfony/event-dispatcher": "~4.4|~5.4|~6.2",
"symfony/form": "~4.4|~5.4|~6.2",
"symfony/http-foundation": "~4.4|~5.4|~6.2",
"symfony/http-kernel": "~4.4|~5.4|~6.2",
"symfony/options-resolver": "~4.4|~5.4|~6.2",
"symfony/property-access": "~4.4|~5.4|~6.2",
"symfony/translation": "~4.4|~5.4|~6.2",
"symfony/config": "~5.4|~6.4|~7.4|~8.0",
"symfony/dependency-injection": "~5.4|~6.4|~7.4|~8.0",
"symfony/event-dispatcher": "~5.4|~6.4|~7.4|~8.0",
"symfony/form": "~5.4|~6.4|~7.4|~8.0",
"symfony/http-foundation": "~5.4|~6.4|~7.4|~8.0",
"symfony/http-kernel": "~5.4|~6.4|~7.4|~8.0",
"symfony/options-resolver": "~5.4|~6.4|~7.4|~8.0",
"symfony/property-access": "~5.4|~6.4|~7.4|~8.0",
"symfony/translation": "~5.4|~6.4|~7.4|~8.0",
"symfony/translation-contracts": "~1.0|~2.0|~3.0",
"symfony/twig-bridge": "~4.4|~5.4|~6.2",
"symfony/validator": "~4.4|~5.4|~6.2",
"twig/twig": "^2.15.3||^3.4.3",
"symfony/twig-bridge": "~5.4|~6.4|~7.4|~8.0",
"symfony/validator": "~5.4|~6.4|~7.4|~8.0",
"twig/twig": "^3.4.3",
"symfony2admingenerator/form-bundle": "~1.7|~2.0"
},
"suggest": {
Expand Down