add support for symfony 5

Author: esserj

.github/workflows/test-application.yaml

@@ -27,6 +27,9 @@ jobs:
                     - php-version: '7.4'
                       symfony-version: 4.4.*
                       test-installation: true
+                    - php-version: '7.4'
+                      symfony-version: 5.0.*
+                      test-installation: true
 
         steps:
             - name: Checkout project

.gitignore

@@ -1,3 +1,4 @@
 tests/Fixtures/App/var/
 composer.lock
 vendor
+.phpunit.result.cache

composer.json

@@ -15,36 +15,36 @@
     ],
     "require": {
         "php": "^7.4",
-        "symfony/framework-bundle": "^4.4",
-        "symfony/security-core": "^4.4"
+        "symfony/framework-bundle": "^4.4 || ^5.0",
+        "symfony/security-core": "^4.4 || ^5.0"
     },
     "require-dev": {
         "jackalope/jackalope-doctrine-dbal": "^1.3",
-        "symfony/security-bundle": "^4.4",
-        "symfony/phpunit-bridge": "^4.4.34",
+        "symfony/security-bundle": "^4.4 || ^5.0",
+        "symfony/phpunit-bridge": "^4.4.34 || ^5.0",
         "mockery/mockery": "^0.9.4",
         "symfony-cmf/routing-bundle": "^2.1.0",
         "symfony-cmf/testing": "^4.0.0",
         "doctrine/dbal": "^2.5",
         "doctrine/doctrine-bundle": "^2.0",
         "doctrine/phpcr-odm": "^1.4|^2.0 ",
         "doctrine/phpcr-bundle": "^2.3.0",
-        "symfony/browser-kit": "^4.4",
-        "symfony/form": "^4.4",
-        "symfony/monolog-bridge": "^4.4",
+        "symfony/browser-kit": "^4.4 || ^5.0",
+        "symfony/form": "^4.4 || ^5.0",
+        "symfony/monolog-bridge": "^4.4 || ^5.0",
         "symfony/monolog-bundle": "^3.0",
-        "symfony/templating": "^4.4",
-        "symfony/translation": "^4.4",
-        "symfony/twig-bundle": "^4.4",
-        "symfony/validator": "^4.4",
-        "symfony/yaml": "^4.4",
-        "symfony/asset": "^4.4"
+        "symfony/templating": "^4.4 || ^5.0",
+        "symfony/translation": "^4.4 || ^5.0",
+        "symfony/twig-bundle": "^4.4 || ^5.0",
+        "symfony/validator": "^4.4 || ^5.0",
+        "symfony/yaml": "^4.4 || ^5.0",
+        "symfony/asset": "^4.4 || ^5.0"
     },
     "suggest": {
-        "symfony/twig-bundle": "To get access to the CMF twig extension (^3.3 || ^4.4)",
+        "symfony/twig-bundle": "To get access to the CMF twig extension (^4.4 || ^5.0)",
         "doctrine/phpcr-bundle": "To be able to use the CMF twig extension (^1.0)",
         "doctrine/phpcr-odm": "To be able to use the CMF twig extension (^1.0)",
-        "symfony/security-bundle": "To be able to use the publish workflow system (^3.3 || ^4.4)",
+        "symfony/security-bundle": "To be able to use the publish workflow system (^4.4 || ^5.0)",
         "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable (^2.1)",
         "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener (^2.1)",
         "symfony-cmf/sonata-admin-integration-bundle": "To provide an admin interface for the PHPCR ODM documents."

src/DependencyInjection/Configuration.php

@@ -21,8 +21,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('cmf_core');
+        $treeBuilder = new TreeBuilder('cmf_core');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

src/EventListener/PublishWorkflowListener.php

@@ -14,7 +14,7 @@
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Cmf\Bundle\RoutingBundle\Routing\DynamicRouter;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\KernelEvents;
 
@@ -66,7 +66,7 @@ public function setPublishWorkflowPermission($attribute)
     /**
      * Handling the request event.
      */
-    public function onKernelRequest(GetResponseEvent $event)
+    public function onKernelRequest(RequestEvent $event)
     {
         $request = $event->getRequest();
 

src/Form/Type/CheckboxUrlLabelFormType.php

@@ -16,7 +16,6 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 
@@ -53,7 +52,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $routes = $options['routes'];
         $paths = [];
         foreach ($routes as $key => $route) {
-            $name = isset($route['name']) ? $route['name'] : null;
+            $name = isset($route['name']) ? $route['name'] : '';
             $parameters = isset($route['parameters']) ? $route['parameters'] : [];
             $referenceType = isset($route['referenceType']) ? $route['referenceType'] : UrlGeneratorInterface::ABSOLUTE_PATH;
             $paths[$key] = $this->router->generate($name, $parameters, $referenceType);
@@ -62,14 +61,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         parent::buildView($view, $form, $options);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $this->configureOptions($resolver);
-    }
-
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([

tests/Fixtures/App/config/config.php

@@ -14,6 +14,7 @@
 $loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
 $loader->import(__DIR__.'/cmf_core.yml');
 $loader->import(__DIR__.'/cmf_routing.yml');
+$loader->import(__DIR__.'/config.yml');
 
 $container->loadFromExtension('framework', [
     'csrf_protection' => true,

tests/Fixtures/App/config/config.yml

@@ -0,0 +1,4 @@
+# for cmf routing bundle
+framework:
+  property_access: ~
+  annotations: ~

tests/Functional/PublishWorkflow/PublishWorkflowTest.php

@@ -16,13 +16,12 @@
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Security\Core\SecurityContextInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 class PublishWorkflowTest extends BaseTestCase
 {
     /**
-     * @var SecurityContextInterface
+     * @var AuthorizationCheckerInterface
      */
     private $publishWorkflowChecker;
 
@@ -67,7 +66,7 @@ public function testIgnoreRoleHas()
             ->will($this->returnValue(false))
         ;
         $roles = [
-            new Role('ROLE_CAN_VIEW_NON_PUBLISHED'),
+            'ROLE_CAN_VIEW_NON_PUBLISHED',
         ];
         $token = new UsernamePasswordToken('test', 'pass', 'testprovider', $roles);
         $tokenStorage = $this->getContainer()->get('security.token_storage');
@@ -85,7 +84,7 @@ public function testIgnoreRoleNotHas()
             ->will($this->returnValue(false))
         ;
         $roles = [
-            new Role('OTHER_ROLE'),
+            'OTHER_ROLE',
         ];
         $token = new UsernamePasswordToken('test', 'pass', 'testprovider', $roles);
         $tokenStorage = $this->getContainer()->get('security.token_storage');

tests/Functional/Twig/ServiceTest.php

@@ -18,7 +18,7 @@ class ServiceTest extends BaseTestCase
 {
     public function testContainer()
     {
-        /** @var \Twig_Environment $twig */
+        /** @var \Twig\Environment $twig */
         $twig = $this->getContainer()->get('twig');
         $ext = $twig->getExtension(method_exists($twig, 'getRuntime') ? CmfExtension::class : 'cmf');
         $this->assertNotEmpty($ext);