Add php 8 and symfony 6 support

.github/workflows/test-application.yaml

@@ -31,8 +31,26 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       env:
-                          SYMFONY_DEPRECATIONS_HELPER: weak
+                          SYMFONY_DEPRECATIONS_HELPER: disabled
 
+                    - php-version: '8.0'
+                      lint: true
+                      dependency-versions: 'highest'
+                      tools: 'composer:v2'
+                      env:
+                          SYMFONY_DEPRECATIONS_HELPER: disabled
+                    - php-version: '8.1'
+                      lint: true
+                      dependency-versions: 'highest'
+                      tools: 'composer:v2'
+                      env:
+                          SYMFONY_DEPRECATIONS_HELPER: disabled
+                    - php-version: '8.2'
+                      lint: true
+                      dependency-versions: 'highest'
+                      tools: 'composer:v2'
+                      env:
+                          SYMFONY_DEPRECATIONS_HELPER: weak
         services:
             mysql:
                 image: mysql:5.7

.gitignore

@@ -32,5 +32,5 @@ Tests/Application/var
 Tests/Application/.env.test.local
 
 # php-cs-fixer
-.php_cs.cache
+.php-cs-fixer.cache
 php-cs-fixer

.php_cs.dist → .php-cs-fixer.dist.php

@@ -10,10 +10,11 @@
 EOF;
 
 $finder = PhpCsFixer\Finder::create()
-    ->exclude(['var/cache'])
+    ->exclude(['var/cache', 'tests/Resources/cache', 'node_modules'])
     ->in(__DIR__);
 
-return PhpCsFixer\Config::create()
+$config = new PhpCsFixer\Config();
+$config->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         'array_syntax' => ['syntax' => 'short'],
@@ -26,3 +27,5 @@
         'phpdoc_types_order' => false,
     ])
     ->setFinder($finder);
+
+return $config;

Admin/CommentAdmin.php

@@ -27,15 +27,15 @@
  */
 class CommentAdmin extends Admin
 {
-    const COMMENT_SECURITY_CONTEXT = 'sulu.comment.comments';
-    const COMMENT_LIST_VIEW = 'sulu_comment.comments.list';
-    const COMMENT_EDIT_FORM_VIEW = 'sulu_comment.comments.edit_form';
-    const COMMENT_EDIT_FORM_DETAILS_VIEW = 'sulu_comment.comments.edit_form.details';
-
-    const THREAD_SECURITY_CONTEXT = 'sulu.comment.threads';
-    const THREAD_LIST_VIEW = 'sulu_comment.threads.list';
-    const THREAD_EDIT_FORM_VIEW = 'sulu_comment.threads.edit_form';
-    const THREAD_EDIT_FORM_DETAILS_VIEW = 'sulu_comment.threads.edit_form.details';
+    public const COMMENT_SECURITY_CONTEXT = 'sulu.comment.comments';
+    public const COMMENT_LIST_VIEW = 'sulu_comment.comments.list';
+    public const COMMENT_EDIT_FORM_VIEW = 'sulu_comment.comments.edit_form';
+    public const COMMENT_EDIT_FORM_DETAILS_VIEW = 'sulu_comment.comments.edit_form.details';
+
+    public const THREAD_SECURITY_CONTEXT = 'sulu.comment.threads';
+    public const THREAD_LIST_VIEW = 'sulu_comment.threads.list';
+    public const THREAD_EDIT_FORM_VIEW = 'sulu_comment.threads.edit_form';
+    public const THREAD_EDIT_FORM_DETAILS_VIEW = 'sulu_comment.threads.edit_form.details';
 
     /**
      * @var ViewBuilderFactoryInterface

Controller/CommentController.php

@@ -113,15 +113,17 @@ public function cgetAction(Request $request): Response
 
         foreach ($request->query->all() as $filterKey => $filterValue) {
             if (isset($fieldDescriptors[$filterKey])) {
-                $listBuilder->where($fieldDescriptors[$filterKey], $filterValue);
+                $listBuilder->where($fieldDescriptors[$filterKey], (string) $filterValue);
             }
         }
 
+        /** @var string $route */
+        $route = $request->attributes->get('_route');
         $results = $listBuilder->execute();
         $list = new ListRepresentation(
             $results,
             'comments',
-            $request->attributes->get('_route'),
+            $route,
             $request->query->all(),
             $listBuilder->getCurrentPage(),
             $listBuilder->getLimit(),

Controller/ThreadController.php

@@ -98,20 +98,23 @@ public function cgetAction(Request $request): Response
 
         foreach ($request->query->all() as $filterKey => $filterValue) {
             if (isset($fieldDescriptors[$filterKey])) {
-                $listBuilder->where($fieldDescriptors[$filterKey], $filterValue);
+                $listBuilder->where($fieldDescriptors[$filterKey], (string) $filterValue);
             }
         }
 
+        /** @var string $typeParameter */
         $typeParameter = $request->get('types');
         if ($typeParameter) {
             $listBuilder->in($fieldDescriptors['type'], array_filter(explode(',', $typeParameter)));
         }
 
         $items = $listBuilder->execute();
+        /** @var string $route */
+        $route = $request->attributes->get('_route');
         $list = new ListRepresentation(
             $items,
             'threads',
-            $request->attributes->get('_route'),
+            $route,
             $request->query->all(),
             $listBuilder->getCurrentPage(),
             $listBuilder->getLimit(),

Controller/WebsiteCommentController.php

@@ -118,8 +118,8 @@ public function cgetCommentsAction(string $threadId, Request $request): Response
     {
         list($type, $entityId) = $this->getThreadIdParts($threadId);
 
-        $limit = $request->query->getInt('limit') ?? 10;
-        $offset = $request->query->getInt('offset') ?? 0;
+        $limit = $request->query->getInt('limit', 10);
+        $offset = $request->query->getInt('offset', 0);
 
         $pageSize = $request->get('pageSize');
         if ($pageSize) {

DependencyInjection/Configuration.php

@@ -23,9 +23,6 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('sulu_comment');

DependencyInjection/SuluCommentExtension.php

@@ -25,10 +25,7 @@ class SuluCommentExtension extends Extension implements PrependExtensionInterfac
 {
     use PersistenceExtensionTrait;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         if ($container->hasExtension('jms_serializer')) {
             $container->prependExtensionConfig(
@@ -79,10 +76,7 @@ public function prepend(ContainerBuilder $container)
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);

Entity/Comment.php

@@ -146,7 +146,7 @@ public function getParent(): ?CommentInterface
         return $this->parent;
     }
 
-    public function setParent(?CommentInterface $parent = null): CommentInterface
+    public function setParent(CommentInterface $parent = null): CommentInterface
     {
         $this->parent = $parent;
 

Entity/CommentInterface.php

@@ -15,9 +15,9 @@
 
 interface CommentInterface
 {
-    const STATE_UNPUBLISHED = 0;
+    public const STATE_UNPUBLISHED = 0;
 
-    const STATE_PUBLISHED = 1;
+    public const STATE_PUBLISHED = 1;
 
     public function getId(): int;
 

Events/Events.php

@@ -13,25 +13,25 @@
 
 final class Events
 {
-    const PRE_PERSIST_EVENT = 'sulu_comment.pre_persist';
+    public const PRE_PERSIST_EVENT = 'sulu_comment.pre_persist';
 
-    const POST_PERSIST_EVENT = 'sulu_comment.post_persist';
+    public const POST_PERSIST_EVENT = 'sulu_comment.post_persist';
 
-    const PRE_DELETE_EVENT = 'sulu_comment.pre_delete';
+    public const PRE_DELETE_EVENT = 'sulu_comment.pre_delete';
 
-    const POST_DELETE_EVENT = 'sulu_comment.post_delete';
+    public const POST_DELETE_EVENT = 'sulu_comment.post_delete';
 
-    const PRE_UPDATE_EVENT = 'sulu_comment.pre_update';
+    public const PRE_UPDATE_EVENT = 'sulu_comment.pre_update';
 
-    const PUBLISH_EVENT = 'sulu_comment.publish';
+    public const PUBLISH_EVENT = 'sulu_comment.publish';
 
-    const UNPUBLISH_EVENT = 'sulu_comment.unpublish';
+    public const UNPUBLISH_EVENT = 'sulu_comment.unpublish';
 
-    const THREAD_PRE_UPDATE_EVENT = 'sulu_comment.thread.pre_update';
+    public const THREAD_PRE_UPDATE_EVENT = 'sulu_comment.thread.pre_update';
 
-    const THREAD_PRE_DELETE_EVENT = 'sulu_comment.thread.pre_delete';
+    public const THREAD_PRE_DELETE_EVENT = 'sulu_comment.thread.pre_delete';
 
-    const THREAD_POST_DELETE_EVENT = 'sulu_comment.thread.post_delete';
+    public const THREAD_POST_DELETE_EVENT = 'sulu_comment.thread.post_delete';
 
     /**
      * Private constructor.

Form/Type/CommentType.php

@@ -47,7 +47,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add('submit', SubmitType::class);
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setRequired('threadId');
         $resolver->setDefault('referrer', null);

Manager/CommentManagerInterface.php

@@ -32,7 +32,7 @@ public function addComment(
         string $type,
         string $entityId,
         CommentInterface $comment,
-        ?string $threadTitle = null
+        string $threadTitle = null
     ): ThreadInterface;
 
     public function update(CommentInterface $comment): CommentInterface;

SuluCommentBundle.php

@@ -24,10 +24,7 @@ class SuluCommentBundle extends Bundle
 {
     use PersistenceBundleTrait;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         $this->buildPersistence(
             [

Tests/Application/.env

@@ -1,2 +1,2 @@
 APP_ENV=test
-DATABASE_URL=mysql://root@localhost:3306/su_comment_test
+DATABASE_URL=mysql://root@127.0.0.1:3306/su_comment_test

Tests/Application/Kernel.php

@@ -20,7 +20,7 @@
 
 class Kernel extends SuluTestKernel
 {
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         $bundles = parent::registerBundles();
         $bundles[] = new SuluCommentBundle();
@@ -38,9 +38,15 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
         $context = $this->getContext();
         $loader->load(__DIR__ . '/config/config_' . $context . '.yml');
+
+        if (\version_compare(Kernel::VERSION, '6.0.0', '>=')) {
+            $loader->load(__DIR__ . '/config/security-6.yml');
+        } else {
+            $loader->load(__DIR__ . '/config/security-5-4.yml');
+        }
     }
 
-    protected function getKernelParameters()
+    protected function getKernelParameters(): array
     {
         $parameters = parent::getKernelParameters();
 

Tests/Application/bin/console.php

@@ -13,7 +13,7 @@
 
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
-//umask(0000);
+// umask(0000);
 
 set_time_limit(0);
 

Tests/Application/config/config_admin.yml

@@ -3,7 +3,7 @@ parameters:
     database.url: '%env(resolve:DATABASE_URL)%'
 
 framework:
-    router: { resource: "%kernel.root_dir%/config/routing_admin.yml" }
+    router: { resource: "%kernel.project_dir%/config/routing_admin.yml" }
 
 doctrine:
     orm:

Tests/Application/config/config_website.yml

@@ -3,15 +3,12 @@ parameters:
     database.url: '%env(resolve:DATABASE_URL)%'
 
 framework:
-    router: { resource: "%kernel.root_dir%/config/routing_website.yml" }
+    router: { resource: "%kernel.project_dir%/config/routing_website.yml" }
 
 security:
     access_decision_manager:
         strategy: affirmative
 
-    encoders:
-        Sulu\Bundle\SecurityBundle\Entity\User: plaintext
-
     providers:
         testprovider:
             id: test_user_provider
@@ -22,7 +19,6 @@ security:
     firewalls:
         test:
             http_basic: ~
-            anonymous: ~
 
 sulu_test:
     enable_test_user_provider: true

Tests/Application/config/security-5-4.yml

@@ -0,0 +1,3 @@
+security:
+    encoders:
+        Sulu\Bundle\SecurityBundle\Entity\User: plaintext

Tests/Application/config/security-6.yml

@@ -0,0 +1,3 @@
+security:
+    password_hashers:
+        Sulu\Bundle\SecurityBundle\Entity\User: plaintext