Manual merge

.travis.yml

@@ -15,6 +15,9 @@ php:
   - '7.4snapshot'
   - nightly
 
+services:
+  - mongodb
+
 dist: xenial
 
 addons:

.travis/before_install_test.sh

@@ -5,6 +5,12 @@ PHP_INI_DIR="$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/"
 TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini"
 echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"
 
+echo "extension=mongodb.so" >> "$TRAVIS_INI_FILE"
+
+# https://github.com/composer/composer/issues/5030
+composer config "platform.ext-mongo" "1.6.16"
+# Backwards compatibility with old mongo extension
+composer require "alcaeus/mongo-php-adapter"
 
 sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json
 

CONTRIBUTING.md

@@ -683,7 +683,7 @@ Before releasing anything, it is best to reduce the gap between branches:
 
 Before abandoning it, the legacy branch MUST receive a last patch version.
 Likewise, the stable branch MUST receive a last version if that version is minor,
-it SHOULD receive one is that version is a patch version.
+it SHOULD receive one if that version is a patch version.
 
 #### Creating the new stable branch and files
 

composer.json

@@ -29,13 +29,13 @@
         "sonata-project/doctrine-extensions": "^1.1.3",
         "sonata-project/doctrine-orm-admin-bundle": "^3.4",
         "sonata-project/easy-extends-bundle": "^2.5",
-        "symfony/config": "^2.8 || ^3.2 || ^4.0",
-        "symfony/console": "^2.8 || ^3.2 || ^4.0",
-        "symfony/dependency-injection": "^2.8 || ^3.2 || ^4.0",
-        "symfony/form": "^2.8 || ^3.2 || ^4.0",
-        "symfony/http-foundation": "^2.8 || ^3.2 || ^4.0",
-        "symfony/http-kernel": "^2.8 || ^3.2 || ^4.0",
-        "symfony/options-resolver": "^2.8 || ^3.2 || ^4.0",
+        "symfony/config": "^3.4 || ^4.2",
+        "symfony/console": "^3.4 || ^4.2",
+        "symfony/dependency-injection": "^3.4 || ^4.2",
+        "symfony/form": "^3.4 || ^4.2",
+        "symfony/http-foundation": "^3.4 || ^4.2",
+        "symfony/http-kernel": "^3.4 || ^4.2",
+        "symfony/options-resolver": "^3.4 || ^4.2",
         "twig/twig": "^1.35 || ^2.0"
     },
     "conflict": {

docs/reference/installation.rst

@@ -8,7 +8,7 @@ Installation
 Prerequisites
 -------------
 
-PHP 5.6 or 7.0 and Symfony 2.8, >=3.3 or 4 are needed to make this bundle work, there are
+PHP 7.1 and Symfony >=3.4 or >= 4.2 are needed to make this bundle work, there are
 also some Sonata dependencies that need to be installed and configured beforehand:
 
 * `SonataEasyExtendsBundle <https://sonata-project.org/bundles/easy-extends>`_

src/Controller/CategoryAdminController.php

@@ -14,10 +14,6 @@
 namespace Sonata\ClassificationBundle\Controller;
 
 use Sonata\AdminBundle\Controller\CRUDController as Controller;
-use Symfony\Bridge\Twig\AppVariable;
-use Symfony\Bridge\Twig\Command\DebugCommand;
-use Symfony\Bridge\Twig\Extension\FormExtension;
-use Symfony\Bridge\Twig\Form\TwigRenderer;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -134,20 +130,6 @@ private function setFormTheme(FormView $formView, $theme): void
     {
         $twig = $this->get('twig');
 
-        // BC for Symfony < 3.2 where this runtime does not exists
-        if (!method_exists(AppVariable::class, 'getToken')) {
-            $twig->getExtension(FormExtension::class)
-                ->renderer->setTheme($formView, $theme);
-
-            return;
-        }
-
-        // BC for Symfony < 3.4 where runtime should be TwigRenderer
-        if (!method_exists(DebugCommand::class, 'getLoaderPaths')) {
-            $twig->getRuntime(TwigRenderer::class)->setTheme($formView, $theme);
-
-            return;
-        }
         $twig->getRuntime(FormRenderer::class)->setTheme($formView, $theme);
     }
 }

src/Form/Type/CategorySelectorType.php

@@ -20,7 +20,6 @@
 use Sonata\Doctrine\Model\ManagerInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
-use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
@@ -43,36 +42,22 @@ public function __construct(ManagerInterface $manager)
     }
 
     /**
-     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
+     * NEXT_MAJOR: Remove this method.
+     *
+     * @deprecated since sonata-project/classification-bundle 3.x, to be removed in version 4.0.
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver): void
     {
         $this->configureOptions($resolver);
     }
 
-    /**
-     * NEXT_MAJOR: replace usage of deprecated 'choice_list' option, when bumping requirements to SF 2.7+.
-     */
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $that = $this;
-
-        if (!interface_exists(ChoiceLoaderInterface::class)) {
-            $resolver->setDefaults([
-                'context' => null,
-                'category' => null,
-                'choice_list' => static function (Options $opts, $previousValue) use ($that) {
-                    return new SimpleChoiceList($that->getChoices($opts));
-                },
-            ]);
-
-            return;
-        }
         $resolver->setDefaults([
             'context' => null,
             'category' => null,
-            'choice_loader' => static function (Options $opts, $previousValue) use ($that) {
-                return new CategoryChoiceLoader(array_flip($that->getChoices($opts)));
+            'choice_loader' => function (Options $opts): ChoiceLoaderInterface {
+                return new CategoryChoiceLoader(array_flip($this->getChoices($opts)));
             },
         ]);
     }
@@ -113,6 +98,11 @@ public function getBlockPrefix()
         return 'sonata_category_selector';
     }
 
+    /**
+     * NEXT_MAJOR: Remove this method.
+     *
+     * @deprecated since sonata-project/classification-bundle 3.x, to be removed in version 4.0.
+     */
     public function getName()
     {
         return $this->getBlockPrefix();

tests/Controller/CategoryAdminControllerTest.php

@@ -26,21 +26,15 @@
 use Sonata\ClassificationBundle\Model\CategoryManagerInterface;
 use Sonata\ClassificationBundle\Model\ContextInterface;
 use Sonata\ClassificationBundle\Model\ContextManagerInterface;
-use Symfony\Bridge\Twig\AppVariable;
-use Symfony\Bridge\Twig\Command\DebugCommand;
-use Symfony\Bridge\Twig\Extension\FormExtension;
-use Symfony\Bridge\Twig\Form\TwigRenderer;
 use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
@@ -85,7 +79,7 @@ class CategoryAdminControllerTest extends TestCase
     private $template;
 
     /**
-     * @var CsrfProviderInterface
+     * @var CsrfTokenManagerInterface
      */
     private $csrfProvider;
 
@@ -156,83 +150,29 @@ protected function setUp(): void
 
         $twig = $this->createMock(\Twig_Environment::class);
 
-        // BC for Symfony < 3.4 where runtime should be TwigRenderer
-        if (!method_exists(DebugCommand::class, 'getLoaderPaths')) {
-            $formRenderer = $this->createMock(TwigRenderer::class);
-            $formExtension = new FormExtension($formRenderer);
-        } else {
-            $formRenderer = $this->createMock(FormRenderer::class);
-            $formExtension = new FormExtension();
-        }
-
-        $twig->expects($this->any())
-            ->method('getExtension')
-            ->willReturnCallback(static function ($name) use ($formExtension) {
-                switch ($name) {
-                    case 'form':
-                    case FormExtension::class:
-                        return $formExtension;
-                }
-            });
+        $formRenderer = $this->createMock(FormRenderer::class);
 
         $twig->expects($this->any())
             ->method('getRuntime')
-            ->willReturnCallback(static function ($name) use ($formRenderer) {
-                switch ($name) {
-                    case TwigRenderer::class:
-                    case FormRenderer::class:
-                        if (method_exists(AppVariable::class, 'getToken')) {
-                            return $formRenderer;
-                        }
+            ->willReturn($formRenderer);
 
-                        throw new \Twig_Error_Runtime('This runtime exists when Symfony >= 3.2.');
-                }
-            });
+        $this->csrfProvider = $this->createMock(CsrfTokenManagerInterface::class);
 
-        // Prefer Symfony 2.x interfaces
-        if (interface_exists(CsrfProviderInterface::class)) {
-            $this->csrfProvider = $this->getMockBuilder(
-                CsrfProviderInterface::class
-            )
-                ->getMock();
-
-            $this->csrfProvider->expects($this->any())
-                ->method('generateCsrfToken')
-                ->willReturnCallback(static function ($intention) {
-                    return 'csrf-token-123_'.$intention;
-                });
-
-            $this->csrfProvider->expects($this->any())
-                ->method('isCsrfTokenValid')
-                ->willReturnCallback(static function ($intention, $token) {
-                    if ($token === 'csrf-token-123_'.$intention) {
-                        return true;
-                    }
+        $this->csrfProvider->expects($this->any())
+            ->method('getToken')
+            ->willReturnCallback(static function ($intention) {
+                return new CsrfToken($intention, 'csrf-token-123_'.$intention);
+            });
 
-                    return false;
-                });
-        } else {
-            $this->csrfProvider = $this->getMockBuilder(
-                CsrfTokenManagerInterface::class
-            )
-                ->getMock();
-
-            $this->csrfProvider->expects($this->any())
-                ->method('getToken')
-                ->willReturnCallback(static function ($intention) {
-                    return new CsrfToken($intention, 'csrf-token-123_'.$intention);
-                });
-
-            $this->csrfProvider->expects($this->any())
-                ->method('isTokenValid')
-                ->willReturnCallback(static function (CsrfToken $token) {
-                    if ($token->getValue() === 'csrf-token-123_'.$token->getId()) {
-                        return true;
-                    }
+        $this->csrfProvider->expects($this->any())
+            ->method('isTokenValid')
+            ->willReturnCallback(static function (CsrfToken $token) {
+                if ($token->getValue() === 'csrf-token-123_'.$token->getId()) {
+                    return true;
+                }
 
-                    return false;
-                });
-        }
+                return false;
+            });
 
         // php 5.3 BC
         $csrfProvider = $this->csrfProvider;
@@ -295,11 +235,7 @@ protected function setUp(): void
         $this->container->expects($this->any())
             ->method('has')
             ->willReturnCallback(static function ($id) use ($tthis) {
-                if ('form.csrf_provider' === $id && Kernel::MAJOR_VERSION === 2 && null !== $tthis->getCsrfProvider()) {
-                    return true;
-                }
-
-                if ('security.csrf.token_manager' === $id && Kernel::MAJOR_VERSION >= 3 && null !== $tthis->getCsrfProvider()) {
+                if ('security.csrf.token_manager' === $id && null !== $tthis->getCsrfProvider()) {
                     return true;
                 }
 

tests/Form/ChoiceList/CategoryChoiceLoaderTest.php

@@ -15,20 +15,12 @@
 
 use PHPUnit\Framework\TestCase;
 use Sonata\ClassificationBundle\Form\ChoiceList\CategoryChoiceLoader;
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 
 /**
  * @author Anton Zlotnikov <exp.razor@gmail.com>
  */
 class CategoryChoiceLoaderTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        if (!interface_exists(ChoiceLoaderInterface::class)) {
-            $this->markTestSkipped('Test only available for >= SF3.0');
-        }
-    }
-
     public function testLoadChoiceList(): void
     {
         $choices = [

tests/Form/Type/CategorySelectorTypeTest.php

@@ -30,10 +30,7 @@ public function testConfigureOptions(): void
         $categorySelectorType = new CategorySelectorType($manager);
         $optionsResolver = new OptionsResolver();
         $categorySelectorType->configureOptions($optionsResolver);
-        //unable to get defined options on SF2.3
-        if (!method_exists($optionsResolver, 'getDefinedOptions')) {
-            return;
-        }
+
         $definedOptions = $optionsResolver->getDefinedOptions();
         $this->assertContains('category', $definedOptions);
         $this->assertContains('context', $definedOptions);