Symfony 4 compatibility

.github/workflows/tests.yml

@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: 7.4
+          - php: 8.0
+          - php: 8.1
+          - php: 8.2
+          - php: 8.3
+          - php: 8.4
+
+    name: 'PHP ${{ matrix.php }}'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '${{ matrix.php }}'
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Install dependencies
+        run: composer install --ansi --prefer-dist --no-interaction --no-scripts
+
+      - name: PHPUnit
+        run: vendor/bin/phpunit --colors=always

.gitignore

@@ -1,11 +1,16 @@
 /build
 /Resources/doc/_build
 /vendor
+.idea/
+composer.phar
 composer.lock
 phpunit.xml
 .php_cs.cache
-
+.phpunit.result.cache
+/var
+!/var/cache/.gitignore
+!/var/log/.gitignore
 # propel-generated stuff
 Tests/Fixtures/App/app/propel/sql/
-Tests/Fixtures/App/src/Sonata/TestBundle/Model/map
-Tests/Fixtures/App/src/Sonata/TestBundle/Model/om
+Tests/Fixtures/App/src/Sonata/TestBundle/Model/Base
+Tests/Fixtures/App/src/Sonata/TestBundle/Model/Map

Builder/DatagridBuilder.php

@@ -19,6 +19,7 @@
 use Sonata\AdminBundle\Guesser\TypeGuesserInterface;
 use Sonata\PropelAdminBundle\Datagrid\Datagrid;
 use Sonata\PropelAdminBundle\Datagrid\Pager;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormFactory;
 
 /**
@@ -88,7 +89,7 @@ public function addFilter(DatagridInterface $datagrid, $type = null, FieldDescri
         if ($type == null) {
             $guessType = $this->guesser->guessType($admin->getClass(), $fieldDescription->getName(), $admin->getModelManager());
 
-            $type = $guessType->getType();
+            $type = (null === $guessType) ? null : $guessType->getType();
 
             $fieldDescription->setType($type);
 
@@ -128,7 +129,7 @@ public function getBaseDatagrid(AdminInterface $admin, array $values = array())
             $defaultOptions['csrf_protection'] = false;
         }
 
-        $formBuilder = $this->formFactory->createNamedBuilder('filter', 'form', array(), $defaultOptions);
+        $formBuilder = $this->formFactory->createNamedBuilder('filter', FormType::class, array(), $defaultOptions);
 
         return new Datagrid($admin->createQuery('list'), $admin->getList(), $pager, $formBuilder, $values);
     }

Builder/FormContractor.php

@@ -15,6 +15,11 @@
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 use Sonata\AdminBundle\Builder\FormContractorInterface;
+use Sonata\AdminBundle\Form\Type\AdminType;
+use Sonata\AdminBundle\Form\Type\CollectionType;
+use Sonata\AdminBundle\Form\Type\ModelListType;
+use Sonata\AdminBundle\Form\Type\ModelType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormFactoryInterface;
 
@@ -62,7 +67,7 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
      */
     public function getFormBuilder($name, array $options = array())
     {
-        return $this->formFactory->createNamedBuilder($name, 'form', null, $options);
+        return $this->formFactory->createNamedBuilder($name, FormType::class, null, $options);
     }
 
     /**
@@ -77,26 +82,26 @@ public function getDefaultOptions($type, FieldDescriptionInterface $fieldDescrip
             'sonata_field_description' => $fieldDescription,
         );
 
-        if ($type == 'sonata_type_model' || $type == 'sonata_type_model_list') {
+        if ($type ==  ModelType::class || $type == ModelListType::class) {
             if ($fieldDescription->getOption('edit') == 'list') {
                 throw new \LogicException('The ``sonata_type_model`` type does not accept an ``edit`` option anymore, please review the UPGRADE-2.1.md file from the SonataAdminBundle');
             }
 
             $options['class']         = $fieldDescription->getTargetEntity();
             $options['model_manager'] = $fieldDescription->getAdmin()->getModelManager();
-        } elseif ($type == 'sonata_type_admin') {
+        } elseif ($type == AdminType::class) {
             if (!$fieldDescription->getAssociationAdmin()) {
                 throw new \RuntimeException(sprintf('The current field `%s` is not linked to an admin. Please create one for the target entity : `%s`', $fieldDescription->getName(), $fieldDescription->getTargetEntity()));
             }
 
             $options['data_class'] = $fieldDescription->getAssociationAdmin()->getClass();
             $fieldDescription->setOption('edit', $fieldDescription->getOption('edit', 'admin'));
-        } elseif ($type == 'sonata_type_collection') {
+        } elseif ($type == CollectionType::class) {
             if (!$fieldDescription->getAssociationAdmin()) {
                 throw new \RuntimeException(sprintf('The current field `%s` is not linked to an admin. Please create one for the target entity : `%s`', $fieldDescription->getName(), $fieldDescription->getTargetEntity()));
             }
 
-            $options['type']         = 'sonata_type_admin';
+            $options['type']         = AdminType::class;
             $options['modifiable']   = true;
             $options['type_options'] = array(
                 'sonata_field_description' => $fieldDescription,

Builder/ListBuilder.php

@@ -74,7 +74,7 @@ public function buildField($type = null, FieldDescriptionInterface $fieldDescrip
     {
         if ($type == null) {
             $guessType = $this->guesser->guessType($admin->getClass(), $fieldDescription->getName(), $admin->getModelManager());
-            $fieldDescription->setType($guessType->getType());
+            $fieldDescription->setType((null === $guessType) ? null : $guessType->getType());
         } else {
             $fieldDescription->setType($type);
         }

Builder/ShowBuilder.php

@@ -31,7 +31,7 @@ public function addField(FieldDescriptionCollection $list, $type = null, FieldDe
     {
         if ($type == null) {
             $guessType = $this->guesser->guessType($admin->getClass(), $fieldDescription->getName(), $admin->getModelManager());
-            $fieldDescription->setType($guessType->getType());
+            $fieldDescription->setType((null === $guessType) ? null : $guessType->getType());
         } else {
             $fieldDescription->setType($type);
         }

Datagrid/Datagrid.php

@@ -15,6 +15,7 @@
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
 /**
  * @author Toni Uebernickel <[email protected]>
@@ -36,20 +37,20 @@ public function buildPager()
 		}
 
 		foreach ($this->getFilters() as $name => $filter) {
-			list($type, $options) = $filter->getRenderSettings();
+			[$type, $options] = $filter->getRenderSettings();
 
 			$this->formBuilder->add($filter->getFormName(), $type, $options);
 		}
 
-		$this->formBuilder->add('_sort_by', 'hidden');
+		$this->formBuilder->add('_sort_by', HiddenType::class);
 		$this->formBuilder->get('_sort_by')->addViewTransformer(new CallbackTransformer(
 			function ($value) { return $value; },
 			function ($value) { return $value instanceof FieldDescriptionInterface ? $value->getName() : $value; }
 		));
 
-		$this->formBuilder->add('_sort_order', 'hidden');
-		$this->formBuilder->add('_page', 'hidden');
-		$this->formBuilder->add('_per_page', 'hidden');
+		$this->formBuilder->add('_sort_order', HiddenType::class);
+		$this->formBuilder->add('_page', HiddenType::class);
+		$this->formBuilder->add('_per_page', HiddenType::class);
 
 		$this->form = $this->formBuilder->getForm();
 		$this->form->submit($this->values);

Datagrid/ProxyQuery.php

@@ -204,6 +204,6 @@ public function getQuery()
 
     public function hasMethod($method)
     {
-        return method_exists($this, $method) || method_exists($this->query, $method);
+        return method_exists($this, $method) || (null !== $this->query && method_exists($this->query, $method));
     }
 }

DependencyInjection/Configuration.php

@@ -31,8 +31,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('sonata_propel_orm_admin', 'array');
+        $treeBuilder = new TreeBuilder('sonata_propel_orm_admin');
+        $rootNode    = !method_exists($treeBuilder, 'getRootNode') ? $treeBuilder->root('sonata_propel_orm_admin') : $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

Exporter/Source/PropelCollectionSourceIterator.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sonata\PropelAdminBundle\Exporter\Source;
+
+use Propel\Runtime\Collection\Collection;
+use Sonata\Exporter\Source\AbstractPropertySourceIterator;
+
+class PropelCollectionSourceIterator extends AbstractPropertySourceIterator
+{
+    private Collection $collection;
+
+    /**
+     * @param array<string> $fields Fields to export
+     */
+    public function __construct(Collection $collection, array $fields, string $dateTimeFormat = 'r')
+    {
+        $this->collection = clone $collection;
+
+        parent::__construct($fields, $dateTimeFormat);
+    }
+
+    public function rewind(): void
+    {
+        if (null === $this->iterator) {
+            $this->iterator = $this->collection->getIterator();
+        }
+
+        $this->iterator->rewind();
+    }
+}
+

Filter/AbstractDateFilter.php

@@ -14,6 +14,8 @@
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
 use Sonata\AdminBundle\Form\Type\Filter\DateRangeType;
+use Sonata\AdminBundle\Form\Type\Filter\DateTimeRangeType;
+use Sonata\AdminBundle\Form\Type\Filter\DateTimeType;
 use Sonata\AdminBundle\Form\Type\Filter\DateType;
 
 /**
@@ -138,6 +140,13 @@ public function getRenderSettings()
             $name .= '_range';
         }
 
+        $name = [
+            'sonata_type_filter_date' => DateType::class,
+            'sonata_type_filter_datetime' => DateTimeType::class,
+            'sonata_type_filter_date_range' => DateRangeType::class,
+            'sonata_type_filter_datetime_range' => DateTimeRangeType::class,
+        ][$name];
+
         return array($name, array(
             'field_type'    => $this->getFieldType(),
             'field_options' => $this->getFieldOptions(),

Filter/BooleanFilter.php

@@ -13,7 +13,8 @@
 
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
-use Sonata\CoreBundle\Form\Type\BooleanType;
+use Sonata\AdminBundle\Form\Type\Filter\DefaultType;
+use Sonata\Form\Type\BooleanType;
 
 /**
  * @author Kévin Gomez <[email protected]>
@@ -44,7 +45,7 @@ public function filter(ProxyQueryInterface $query, $alias, $field, $value)
      */
     public function getRenderSettings()
     {
-        return array('sonata_type_filter_default', array(
+        return array(DefaultType::class, array(
             'field_type'        => $this->getFieldType(),
             'field_options'     => $this->getFieldOptions(),
             'label'             => $this->getLabel(),

Filter/CallbackFilter.php

@@ -14,6 +14,7 @@
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
 use Sonata\AdminBundle\Form\Type\Filter\ChoiceType;
+use Sonata\AdminBundle\Form\Type\Filter\DefaultType;
 
 class CallbackFilter extends AbstractFilter
 {
@@ -55,7 +56,7 @@ public function getDefaultOptions()
 	 */
 	public function getRenderSettings()
 	{
-		return array('sonata_type_filter_default', array(
+		return array(DefaultType::class, array(
 			'field_type'    => $this->getFieldType(),
 			'field_options' => $this->getFieldOptions(),
 			'operator_type' => $this->getOption('operator_type'),