From b4316ea228fe189b808f1d9d47307b0ffb49afbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Wed, 24 Nov 2021 12:43:46 +0000
Subject: [PATCH 01/30] wip: make bundle compatible with ibexa v3

---
 bundle/Controller/Admin/Export/Export.php     |   2 +-
 .../NetgenInformationCollectionExtension.php  |   2 +
 bundle/Resources/views/admin/view.html.twig   |   2 +-
 .../Resources/views/email/default.html.twig   |   4 +-
 lib/API/Value/InformationCollectionStruct.php |   6 +-
 lib/Core/Action/BaseEmailAction.php           |  20 ++--
 .../AutoResponderProvider.php                 |  21 ++--
 .../EmailDataProvider/DefaultProvider.php     | 105 +++++-------------
 lib/Core/Factory/EmailDataFactory.php         |  10 +-
 lib/Core/Mailer/SwiftMailerBasedMailer.php    |  51 +++++++--
 lib/Core/Mailer/SymfonyMailerBasedMailer.php  |  10 +-
 lib/Resources/config/actions.yml              |   7 +-
 lib/Resources/config/email_data_providers.yml |   8 ++
 lib/Resources/config/factories.yml            |   9 +-
 lib/Resources/config/mailers.yml              |   9 ++
 lib/Resources/config/services.yml             |   4 +-
 16 files changed, 133 insertions(+), 137 deletions(-)
 create mode 100644 lib/Resources/config/email_data_providers.yml
 create mode 100644 lib/Resources/config/mailers.yml

diff --git a/bundle/Controller/Admin/Export/Export.php b/bundle/Controller/Admin/Export/Export.php
index fc442760..79d98382 100644
--- a/bundle/Controller/Admin/Export/Export.php
+++ b/bundle/Controller/Admin/Export/Export.php
@@ -3,12 +3,12 @@
 namespace Netgen\Bundle\InformationCollectionBundle\Controller\Admin\Export;
 
 use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
+use Netgen\Bundle\InformationCollectionBundle\Form\ExportType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Netgen\InformationCollection\API\Value\Export\ExportCriteria;
 use Netgen\InformationCollection\API\Service\Exporter;
 use Netgen\InformationCollection\Core\Export\ExportResponseFormatterRegistry;
 use Symfony\Component\HttpFoundation\Request;
-use Netgen\InformationCollection\Form\Type\ExportType;
 use eZ\Publish\API\Repository\ContentService;
 
 final class Export extends AbstractController
diff --git a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
index f36e19d5..ef4c0d24 100644
--- a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
+++ b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
@@ -42,6 +42,8 @@ public function load(array $configs, ContainerBuilder $container)
         $libResourceLoader->load('services.yml');
         $libResourceLoader->load('parameters.yml');
         $libResourceLoader->load('default_settings.yml');
+        $libResourceLoader->load('email_data_providers.yml');
+        $libResourceLoader->load('mailers.yml');
 
 
         $this->processSemanticConfig($container, $config);
diff --git a/bundle/Resources/views/admin/view.html.twig b/bundle/Resources/views/admin/view.html.twig
index fad83a99..a1d0eddb 100644
--- a/bundle/Resources/views/admin/view.html.twig
+++ b/bundle/Resources/views/admin/view.html.twig
@@ -32,7 +32,7 @@
                     <input id="{{ attribute.fieldDefinition.id }}" name="FieldId[]" value="{{ attribute.fieldDefinition.id }}" title="Select collections for removal." type="checkbox" data-enable="Item">
                     <label for="{{ attribute.fieldDefinition.id }}">
                         <span class="attribute-name">
-                            {{ ez_field_name(content, attribute.field.fieldDefIdentifier) }}:
+                            {{ ez_field_name(content, attribute.fieldDefinition.identifier) }}:
                         </span>
                         <span class="attribute-value">
                             {{ info_collection_render_field(collection, attribute) }}
diff --git a/bundle/Resources/views/email/default.html.twig b/bundle/Resources/views/email/default.html.twig
index 271a3f00..6f2b759f 100644
--- a/bundle/Resources/views/email/default.html.twig
+++ b/bundle/Resources/views/email/default.html.twig
@@ -13,7 +13,7 @@
             </div>
             <div class="value">
                 {% if content_type.fieldDefinitionsByIdentifier[field_name].fieldTypeIdentifier == 'ezselection' %}
-                    {% set selectionArray=field_value|split('-') %}
+                    {% set selectionArray=field_value.value|split('-') %}
                     {% if selectionArray|length > 1 %}<ul>{% endif %}
                     {% for selected_key, selected_value in selectionArray %}
                         {% if loop.length == 1 %}
@@ -24,7 +24,7 @@
                     {% endfor %}
                     {% if selectionArray|length > 1 %}</ul>{% endif %}
                 {% else %}
-                    {{ field_value }}
+                    {{ field_value.value }}
                 {% endif %}
             </div><br>
         </div>
diff --git a/lib/API/Value/InformationCollectionStruct.php b/lib/API/Value/InformationCollectionStruct.php
index 56b795d1..daa7300c 100644
--- a/lib/API/Value/InformationCollectionStruct.php
+++ b/lib/API/Value/InformationCollectionStruct.php
@@ -7,7 +7,7 @@
 use eZ\Publish\API\Repository\Values\Content\Content;
 use eZ\Publish\API\Repository\Values\Content\Location;
 use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use EzSystems\RepositoryForms\Data\Content\FieldData;
+use EzSystems\EzPlatformContentForms\Data\Content\FieldData;
 
 final class InformationCollectionStruct extends ValueObject
 {
@@ -82,7 +82,7 @@ public function getContentType(): ContentType
     }
 
     /**
-     * @return \EzSystems\RepositoryForms\Data\Content\FieldData[]
+     * @return FieldData[]
      */
     public function getFieldsData(): array
     {
@@ -90,7 +90,7 @@ public function getFieldsData(): array
     }
 
     /**
-     * @return \EzSystems\RepositoryForms\Data\Content\FieldData[]
+     * @return FieldData[]
      */
     public function getCollectedFields(): array
     {
diff --git a/lib/Core/Action/BaseEmailAction.php b/lib/Core/Action/BaseEmailAction.php
index 64605f5f..b4643cd2 100644
--- a/lib/Core/Action/BaseEmailAction.php
+++ b/lib/Core/Action/BaseEmailAction.php
@@ -8,6 +8,7 @@
 use Netgen\InformationCollection\API\Exception\EmailNotSentException;
 use Netgen\InformationCollection\API\MailerInterface;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
+use Netgen\InformationCollection\Core\EmailDataProvider\DefaultProvider;
 use Netgen\InformationCollection\Core\Factory\BaseEmailDataFactory;
 
 abstract class BaseEmailAction implements ActionInterface
@@ -18,20 +19,15 @@ abstract class BaseEmailAction implements ActionInterface
     protected $mailer;
 
     /**
-     * @var \Netgen\InformationCollection\Core\Factory\BaseEmailDataFactory
+     * @var DefaultProvider
      */
-    protected $factory;
+    protected $emailDataProvider;
 
-    /**
-     * EmailAction constructor.
-     *
-     * @param \Netgen\InformationCollection\API\MailerInterface $mailer
-     * @param \Netgen\InformationCollection\Core\Factory\BaseEmailDataFactory $factory
-     */
-    public function __construct(MailerInterface $mailer, BaseEmailDataFactory $factory)
+
+    public function __construct(MailerInterface $mailer, DefaultProvider $emailDataProvider)
     {
         $this->mailer = $mailer;
-        $this->factory = $factory;
+        $this->emailDataProvider = $emailDataProvider;
     }
 
     /**
@@ -39,10 +35,10 @@ public function __construct(MailerInterface $mailer, BaseEmailDataFactory $facto
      */
     public function act(InformationCollected $event): void
     {
-        $emailData = $this->factory->build($event);
+        $emailData = $this->emailDataProvider->provide($event);
 
         try {
-            $this->mailer->createAndSendMessage($emailData);
+            $this->mailer->sendEmail($emailData);
         } catch (EmailNotSentException $e) {
             $this->throwException($e);
         }
diff --git a/lib/Core/EmailDataProvider/AutoResponderProvider.php b/lib/Core/EmailDataProvider/AutoResponderProvider.php
index 33a3c238..cf8a4fea 100644
--- a/lib/Core/EmailDataProvider/AutoResponderProvider.php
+++ b/lib/Core/EmailDataProvider/AutoResponderProvider.php
@@ -3,21 +3,14 @@
 
 namespace Netgen\InformationCollection\Core\EmailDataProvider;
 
-use Netgen\InformationCollection\API\Action\EmailDataProviderInterface;
-use Netgen\InformationCollection\API\Value\Event\InformationCollected;
-use Symfony\Component\Mime\Email;
+use Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory;
 
-class AutoResponderProvider implements EmailDataProviderInterface
+class AutoResponderProvider extends DefaultProvider
 {
-    public function provide(InformationCollected $value): Email
-    {
-        $email = new Email();
-
-        $headers = $email->getHeaders();
-
-        $header = new Header
-        $headers->add('Content-Type', '');
-
-        return $email;
+    // could be replaced by pure service configuration
+    public function __construct(
+        AutoResponderDataFactory $emailDataFactory
+    ) {
+        parent::__construct($emailDataFactory);
     }
 }
diff --git a/lib/Core/EmailDataProvider/DefaultProvider.php b/lib/Core/EmailDataProvider/DefaultProvider.php
index 61dae1e4..aadb945c 100644
--- a/lib/Core/EmailDataProvider/DefaultProvider.php
+++ b/lib/Core/EmailDataProvider/DefaultProvider.php
@@ -2,97 +2,46 @@
 
 namespace Netgen\InformationCollection\Core\EmailDataProvider;
 
+use EzSystems\EzPlatformContentForms\Data\Content\FieldData;
 use Netgen\InformationCollection\API\Action\EmailDataProviderInterface;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
+use Netgen\InformationCollection\Core\Factory\EmailDataFactory;
 use Symfony\Component\Mime\Email;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
-use Netgen\InformationCollection\Core\Action\EmailAction;
-use function array_key_exists;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\BinaryFile\Value as BinaryFile;
-use eZ\Publish\Core\Helper\FieldHelper;
-use eZ\Publish\Core\Helper\TranslationHelper;
-use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
-use Netgen\InformationCollection\API\Constants;
-use Netgen\InformationCollection\API\ConfigurationConstants;
-use Netgen\InformationCollection\API\Exception\MissingEmailBlockException;
-use Netgen\InformationCollection\API\Exception\MissingValueException;
-use Netgen\InformationCollection\API\Value\DataTransfer\TemplateContent;
-use function trim;
-use Twig\Environment;
 
 class DefaultProvider implements EmailDataProviderInterface
 {
-    /**
-     * @var array
-     */
-    protected $configResolver;
+    protected $emailDataFactory;
 
-    /**
-     * @var \eZ\Publish\Core\Helper\TranslationHelper
-     */
-    protected $translationHelper;
-
-    /**
-     * @var \eZ\Publish\Core\Helper\FieldHelper
-     */
-    protected $fieldHelper;
-
-    /**
-     * @var \Twig\Environment
-     */
-    protected $twig;
-
-    /**
-     * EmailDataFactory constructor.
-     *
-     * @param array $config
-     * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
-     * @param \eZ\Publish\Core\Helper\FieldHelper $fieldHelper
-     * @param \Twig\Environment $twig
-     */
     public function __construct(
-        ConfigResolverInterface $configResolver,
-        TranslationHelper $translationHelper,
-        FieldHelper $fieldHelper,
-        Environment $twig
+        EmailDataFactory $emailDataFactory
     ) {
-        $this->configResolver = $configResolver;
-        $this->config = $this->configResolver->getParameter('action_config', 'netgen_information_collection')[EmailAction::$defaultName];
-        $this->translationHelper = $translationHelper;
-        $this->fieldHelper = $fieldHelper;
-        $this->twig = $twig;
+        $this->emailDataFactory = $emailDataFactory;
     }
 
-    /**
-     * Factory method.
-     *
-     * @param InformationCollected $value
-     *
-     * @return EmailContent
-     */
-    public function build(InformationCollected $value): EmailContent
+    public function provide(InformationCollected $value): Email
     {
-        $contentType = $value->getContentType();
-
-        $template = $this->resolveTemplate($contentType->identifier);
-
-        $templateWrapper = $this->twig->load($template);
-        $data = new TemplateContent($value, $templateWrapper);
-
-        $body = $this->resolveBody($data);
-
-        return new EmailContent(
-            $this->resolveEmail($data, Constants::FIELD_RECIPIENT),
-            $this->resolveEmail($data, Constants::FIELD_SENDER),
-            $this->resolve($data, Constants::FIELD_SUBJECT),
-            $body,
-            $this->resolveAttachments($contentType->identifier, $value->getInformationCollectionStruct()->getFieldsData())
+        $emailContent = $this->emailDataFactory->build($value);
+
+        $email = (new Email())
+            ->from(...$emailContent->getSender())
+            ->to(...$emailContent->getRecipients())
+            ->subject($emailContent->getSubject())
+            ->html($emailContent->getBody())
+            ->text($emailContent->getBody());
+
+        array_map(
+            function (FieldData $fieldData) use ($email) {
+                $binaryFileValue = $fieldData->value;
+
+                $email->attachFromPath(
+                    $binaryFileValue->inputUri,
+                    $binaryFileValue->fileName,
+                    $binaryFileValue->mimeType
+                );
+            },
+            $emailContent->getAttachments()
         );
-    }
 
-    public function provide(InformationCollected $value): Email
-    {
-        return new Email();
+        return $email;
     }
 }
diff --git a/lib/Core/Factory/EmailDataFactory.php b/lib/Core/Factory/EmailDataFactory.php
index d9b86c61..a186d27d 100644
--- a/lib/Core/Factory/EmailDataFactory.php
+++ b/lib/Core/Factory/EmailDataFactory.php
@@ -274,9 +274,13 @@ protected function resolveAttachments(string $contentTypeIdentifier, array $coll
     protected function getBinaryFileFields(array $collectedFields)
     {
         $filtered = [];
-        foreach ($collectedFields as $identifier => $value) {
-            if ($value instanceof BinaryFile) {
-                $filtered[] = $value;
+
+        /**
+         * @var $collectedField \EzSystems\EzPlatformContentForms\Data\Content\FieldData
+         */
+        foreach ($collectedFields as $identifier => $collectedField) {
+            if ($collectedField->value instanceof BinaryFile) {
+                $filtered[] = $collectedField;
             }
         }
 
diff --git a/lib/Core/Mailer/SwiftMailerBasedMailer.php b/lib/Core/Mailer/SwiftMailerBasedMailer.php
index 964e4e48..a810617d 100644
--- a/lib/Core/Mailer/SwiftMailerBasedMailer.php
+++ b/lib/Core/Mailer/SwiftMailerBasedMailer.php
@@ -6,6 +6,7 @@
 
 use Netgen\InformationCollection\API\Exception\EmailNotSentException;
 use Netgen\InformationCollection\API\MailerInterface;
+use Swift_Message;
 use Symfony\Component\Mime\Email;
 
 class SwiftMailerBasedMailer implements MailerInterface
@@ -30,31 +31,59 @@ public function __construct(\Swift_Mailer $internalMailer)
      */
     public function sendEmail(Email $content): void
     {
-        $message = new \Swift_Message();
+        $message = new Swift_Message();
 
         try {
-            $message->setTo($content->getFrom());
+            $message->setTo(
+                array_map(
+                    function(\Symfony\Component\Mime\Address $address) {
+                        return $address->getAddress();
+                    },
+                    $content->getTo()
+                )
+            );
         } catch (\Swift_RfcComplianceException $e) {
             throw new EmailNotSentException('recipients', $e->getMessage());
         }
 
-        try {
-            $message->setFrom($data->getSender());
-        } catch (\Swift_RfcComplianceException $e) {
-            throw new EmailNotSentException('sender', $e->getMessage());
+        if (!$content->getFrom())
+        {
+            throw new EmailNotSentException('sender', "No sender has been set for the email.");
         }
 
-        $message->setSubject($data->getSubject());
+        $message->setFrom(
+            array_map(
+                function(\Symfony\Component\Mime\Address $address) {
+                    return $address->getAddress();
+                },
+                $content->getFrom()
+            )
+        );
+
+        $message->setSubject($content->getSubject());
+
+        // attachments still todo
+
+        if (!empty($content->getAttachments())) {
+            foreach ($content->getAttachments() as $attachment) {
+                $body = $attachment->getBody();
+                $preparedHeaders = $attachment->getPreparedHeaders();
+
+                $filename = $preparedHeaders->get('content-disposition')->getParameter('filename');
+                $contentType = $preparedHeaders->get('content-type')->getBody();
 
-        if ($data->hasAttachments()) {
-            foreach ($data->getAttachments() as $attachment) {
                 $message->attach(
-                    \Swift_Attachment::fromPath($attachment->inputUri, $attachment->mimeType)
-                        ->setFilename($attachment->fileName)
+                    new \Swift_Attachment($body, $filename, $contentType)
                 );
+
             }
         }
 
+        $message->setBody(
+            $content->getHtmlBody(),
+            'text/html'
+        );
+
         if (!$this->internalMailer->send($message)) {
             throw new EmailNotSentException('send', 'invalid mailer configuration?');
         }
diff --git a/lib/Core/Mailer/SymfonyMailerBasedMailer.php b/lib/Core/Mailer/SymfonyMailerBasedMailer.php
index 0c92fad5..a178f550 100644
--- a/lib/Core/Mailer/SymfonyMailerBasedMailer.php
+++ b/lib/Core/Mailer/SymfonyMailerBasedMailer.php
@@ -3,6 +3,7 @@
 namespace Netgen\InformationCollection\Core\Mailer;
 
 use Netgen\InformationCollection\API\MailerInterface;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface as SfMailerInterface;
 use Symfony\Component\Mime\Email;
 
@@ -18,12 +19,11 @@ public function __construct(SfMailerInterface $mailer)
         $this->mailer = $mailer;
     }
 
+    /**
+     * @throws TransportExceptionInterface
+     */
     public function sendEmail(Email $content): void
     {
-        try {
-            $this->mailer->send($content);
-        } catch () {
-
-        }
+        $this->mailer->send($content);
     }
 }
diff --git a/lib/Resources/config/actions.yml b/lib/Resources/config/actions.yml
index 45a206f9..fbe7478b 100644
--- a/lib/Resources/config/actions.yml
+++ b/lib/Resources/config/actions.yml
@@ -21,11 +21,10 @@ services:
         tags:
             - { name: netgen_information_collection.action, priority: 300 }
 
-    netgen_information_collection.action.email:
-        class: Netgen\InformationCollection\Core\Action\EmailAction
+    Netgen\InformationCollection\Core\Action\EmailAction:
         arguments:
-            - '@netgen_information_collection.mailer'
-            - '@netgen_information_collection.factory.email_data'
+            - '@Netgen\InformationCollection\API\MailerInterface'
+            - '@Netgen\InformationCollection\Core\EmailDataProvider\DefaultProvider'
         tags:
             - { name: netgen_information_collection.action }
 
diff --git a/lib/Resources/config/email_data_providers.yml b/lib/Resources/config/email_data_providers.yml
new file mode 100644
index 00000000..37e41f26
--- /dev/null
+++ b/lib/Resources/config/email_data_providers.yml
@@ -0,0 +1,8 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Netgen\InformationCollection\Core\EmailDataProvider\:
+        resource: '../../Core/EmailDataProvider/'
+        exclude: '../../Core/EmailDataProvider/AbstractProvider.php'
\ No newline at end of file
diff --git a/lib/Resources/config/factories.yml b/lib/Resources/config/factories.yml
index 598ef3fa..4ec5b786 100644
--- a/lib/Resources/config/factories.yml
+++ b/lib/Resources/config/factories.yml
@@ -1,14 +1,19 @@
 services:
     netgen_information_collection.factory.email_data:
-        class: Netgen\InformationCollection\Core\Factory\EmailDataFactory
+        alias: Netgen\InformationCollection\Core\Factory\EmailDataFactory
+
+    Netgen\InformationCollection\Core\Factory\EmailDataFactory:
         arguments:
             - '@ezpublish.config.resolver'
             - '@ezpublish.translation_helper'
             - '@ezpublish.field_helper'
             - '@twig'
 
+
     netgen_information_collection.factory.auto_responder_data:
-        class: Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory
+        alias: Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory
+
+    Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory:
         arguments:
             - "$action_config.auto_responder;netgen_information_collection$"
             - '@ezpublish.translation_helper'
diff --git a/lib/Resources/config/mailers.yml b/lib/Resources/config/mailers.yml
new file mode 100644
index 00000000..73454736
--- /dev/null
+++ b/lib/Resources/config/mailers.yml
@@ -0,0 +1,9 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Netgen\InformationCollection\Core\Mailer\:
+        resource: '../../Core/Mailer/'
+
+    Netgen\InformationCollection\API\MailerInterface: '@Netgen\InformationCollection\Core\Mailer\SwiftMailerBasedMailer'
\ No newline at end of file
diff --git a/lib/Resources/config/services.yml b/lib/Resources/config/services.yml
index 399266dc..fed34d1b 100644
--- a/lib/Resources/config/services.yml
+++ b/lib/Resources/config/services.yml
@@ -25,7 +25,7 @@ services:
     netgen_information_collection.mailer:
         class: Netgen\InformationCollection\Core\Mailer\Mailer
         arguments:
-            - '@mailer'
+            - 'Netgen\InformationCollection\API\MailerInterface'
 
     netgen_information_collection.form.extension.field_definition:
         class: Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\FieldDefinitionTypeExtension
@@ -92,3 +92,5 @@ services:
             - '@netgen_information_collection.listener.captcha_validation'
         tags:
             - { name: form.type }
+
+    # Autowire the providers
\ No newline at end of file

From 40f9998546a1504337b8a5aed04bcf323f6994b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Tue, 18 Jan 2022 16:49:16 +0000
Subject: [PATCH 02/30] feat: fix ibexa 3 compatibility

---
 bundle/Controller/Admin/TreeController.php             |  2 +-
 .../RepositoryForms/InformationCollectionType.php      |  1 +
 bundle/Listener/CaptchaValidationListener.php          |  7 +++++--
 bundle/Resources/views/admin/content_fields.html.twig  |  8 ++++++++
 lib/API/Value/Captcha/ReCaptcha.php                    |  2 --
 lib/Core/Factory/EmailDataFactory.php                  |  2 +-
 lib/Resources/config/services.yml                      | 10 ++++++++++
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/bundle/Controller/Admin/TreeController.php b/bundle/Controller/Admin/TreeController.php
index 575e9cec..afba5da5 100644
--- a/bundle/Controller/Admin/TreeController.php
+++ b/bundle/Controller/Admin/TreeController.php
@@ -120,7 +120,7 @@ protected function getCollections(Content $content, $isRoot = false)
         return array(
             'id' => $content->getContent()->id,
             'parent' => $isRoot ? '#' : '0',
-            'text' => $content->getContent()->getName($languages[0]) . ' (' . strval($count->getCount()) . ')',
+            'text' => $content->getContent()->getName(in_array($languages[0], $content->getContent()->getVersionInfo()->languageCodes) ? $languages[0] : null) . ' (' . strval($count->getCount()) . ')',
             'children' => false,
             'a_attr' => array(
                 'href' => $this->router->generate('netgen_information_collection.route.admin.collection_list', ['contentId' => $content->getContent()->id]),
diff --git a/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php b/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php
index ad00102e..815ac2cc 100644
--- a/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php
+++ b/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php
@@ -48,6 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         foreach ($struct->getFieldsData() as $fieldsDatum) {
             $builder->add($fieldsDatum->fieldDefinition->identifier, InformationCollectionFieldType::class, [
+                //'label' => false,
                 'languageCode' => $options['languageCode'],
                 'mainLanguageCode' => $options['mainLanguageCode'],
             ]);
diff --git a/bundle/Listener/CaptchaValidationListener.php b/bundle/Listener/CaptchaValidationListener.php
index 2e93b1ad..f147ec63 100644
--- a/bundle/Listener/CaptchaValidationListener.php
+++ b/bundle/Listener/CaptchaValidationListener.php
@@ -50,8 +50,11 @@ public function onPostSubmit(FormEvent $event)
             ->getConfig()
             ->getOption('captcha_value');
 
-//        $request = $this->requestStack->getCurrentRequest();
-        $request = Request::createFromGlobals();
+        $request = $this->requestStack->getCurrentRequest();
+//        $request = Request::createFromGlobals();
+
+        $submittedHostName = $request->getHost();
+        $captchaValue->getInnerCaptcha()->setExpectedHostname($submittedHostName);
 
         $text = 'The captcha is invalid. Please try again.';
 
diff --git a/bundle/Resources/views/admin/content_fields.html.twig b/bundle/Resources/views/admin/content_fields.html.twig
index a35f67be..1afb1402 100644
--- a/bundle/Resources/views/admin/content_fields.html.twig
+++ b/bundle/Resources/views/admin/content_fields.html.twig
@@ -18,6 +18,14 @@
     {% endapply %}
 {% endblock %}
 
+{% block enhancedezbinaryfile_field %}
+    {% apply spaceless %}
+        <a href={{ path('netgen_enhancedezbinaryfile.route.download_binary_file', {infocollectionAttributeId: attribute.id}) }}>
+            Download
+        </a>
+    {% endapply %}
+{% endblock %}
+
 {% block default_field %}
     {% apply spaceless %}
         {{ attribute.value }}
diff --git a/lib/API/Value/Captcha/ReCaptcha.php b/lib/API/Value/Captcha/ReCaptcha.php
index 399c6d03..a4324924 100644
--- a/lib/API/Value/Captcha/ReCaptcha.php
+++ b/lib/API/Value/Captcha/ReCaptcha.php
@@ -37,8 +37,6 @@ public function isValid(Request $request): bool
             $clientIp
         );
 
-        dump($response);
-
         return $response->isSuccess();
     }
 
diff --git a/lib/Core/Factory/EmailDataFactory.php b/lib/Core/Factory/EmailDataFactory.php
index a186d27d..76ea96ce 100644
--- a/lib/Core/Factory/EmailDataFactory.php
+++ b/lib/Core/Factory/EmailDataFactory.php
@@ -256,7 +256,7 @@ protected function resolveAttachments(string $contentTypeIdentifier, array $coll
         if (array_key_exists($contentTypeIdentifier, $this->config[ConfigurationConstants::ATTACHMENTS][ConfigurationConstants::CONTENT_TYPES])) {
             $send = $this->config[ConfigurationConstants::ATTACHMENTS][ConfigurationConstants::CONTENT_TYPES][$contentTypeIdentifier];
         } else {
-            $send = $this->config[ConfigurationConstants::ATTACHMENTS][ConfigurationConstants::SETTINGS_DEFAULT];
+            $send = $this->config[ConfigurationConstants::ATTACHMENTS]['enabled'];
         }
 
         if (!$send) {
diff --git a/lib/Resources/config/services.yml b/lib/Resources/config/services.yml
index fed34d1b..c6eb7b8b 100644
--- a/lib/Resources/config/services.yml
+++ b/lib/Resources/config/services.yml
@@ -53,6 +53,16 @@ services:
         tags:
             - { name: twig.runtime }
 
+    Netgen\Bundle\InformationCollectionBundle\Templating\Twig\Extensions\CaptchaExtension:
+        autowire: true
+        autoconfigure: true
+
+    Netgen\Bundle\InformationCollectionBundle\Templating\Twig\Extensions\CaptchaRuntime:
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: twig.runtime }
+
     netgen_information_collection.form.information_collection_type:
         class: Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionType
         arguments:

From b44dc590c454fe0a2dba289fca91ffc1c51745dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Wed, 23 Feb 2022 16:10:31 +0100
Subject: [PATCH 03/30] Rename eZ Platform to Ibexa

---
 README.md                                     |  4 +-
 bundle/Controller/Admin/AdminController.php   | 22 +++++-----
 bundle/Controller/Admin/Export/Export.php     |  6 +--
 bundle/Controller/Admin/TreeController.php    |  4 +-
 bundle/Controller/CollectInformation.php      |  2 +-
 .../InformationCollectionCollector.php        | 12 +++---
 bundle/DependencyInjection/Configuration.php  |  2 +-
 .../NetgenInformationCollectionExtension.php  | 15 +++----
 .../EventListener/SetPageLayoutListener.php   |  6 +--
 .../Admin}/MenuListener.php                   |  6 +--
 .../InformationCollectionPolicyProvider.php   |  8 ++--
 .../FieldDefinitionTypeExtension.php          |  4 +-
 .../InformationCollectionFieldType.php        |  8 ++--
 .../InformationCollectionMapper.php           | 20 +++++-----
 .../InformationCollectionType.php             |  4 +-
 bundle/NetgenInformationCollectionBundle.php  |  8 ++--
 bundle/Resources/config/controllers.yml       | 10 ++---
 bundle/Resources/config/services.yml          |  4 +-
 ...zadmin_style.css => ibexa_admin_style.css} |  0
 .../views/admin/collection_list.html.twig     |  4 +-
 .../Resources/views/admin/overview.html.twig  |  4 +-
 bundle/Resources/views/admin/path.html.twig   |  4 +-
 bundle/Resources/views/admin/view.html.twig   |  6 +--
 .../views/data_collector/template.html.twig   |  4 +-
 .../Resources/views/email/default.html.twig   |  4 +-
 .../admin}/pagelayout.html.twig               |  4 +-
 .../admin}/stylesheets.html.twig              |  2 +-
 .../Templating/Twig/AdminGlobalVariable.php   |  4 +-
 .../Twig/Extensions/CaptchaRuntime.php        |  6 +--
 .../Twig/Extensions/FieldRenderingRuntime.php |  4 +-
 composer.json                                 | 17 ++++----
 doc/cookbook/custom_field_handler.rst         |  6 +--
 doc/getting_started/configuration.rst         |  4 +-
 doc/getting_started/installation.rst          | 25 ++----------
 doc/index.rst                                 |  8 ++--
 doc/overview/how_it_works.rst                 | 18 ++++-----
 doc/reference/configuration.rst               |  2 +-
 doc/reference/container_parameters.rst        |  4 +-
 .../{ez_policies.rst => ibexa_policies.rst}   | 10 ++---
 doc/reference/index.rst                       |  2 +-
 doc/reference/info_collector_actions.rst      |  2 +-
 doc/reference/map.rst.inc                     |  2 +-
 lib/API/Export/ExportResponseFormatter.php    |  4 +-
 .../CustomFieldHandlerInterface.php           | 10 ++---
 .../CustomLegacyFieldHandlerInterface.php     | 10 ++---
 lib/API/InformationCollectionTrait.php        | 12 +++---
 .../Visitor/FieldAnonymizerVisitor.php        |  6 +--
 lib/API/Service/CaptchaService.php            | 10 ++---
 lib/API/Value/Attribute.php                   |  8 ++--
 lib/API/Value/Collection.php                  |  8 ++--
 lib/API/Value/Content.php                     |  4 +-
 .../Value/DataTransfer/AdditionalContent.php  |  6 +--
 lib/API/Value/DataTransfer/EmailContent.php   |  2 +-
 .../Value/DataTransfer/TemplateContent.php    |  4 +-
 lib/API/Value/Event/InformationCollected.php  | 20 +++++-----
 lib/API/Value/InformationCollectionStruct.php | 26 ++++++------
 lib/API/Value/NullUser.php                    |  8 ++--
 lib/Core/Action/ConfigurationUtility.php      |  6 +--
 .../EmailDataProvider/AbstractProvider.php    | 14 +++----
 .../EmailDataProvider/DefaultProvider.php     | 18 ++++-----
 .../Export/CsvExportResponseFormatter.php     | 14 +++----
 .../Export/JsonExportResponseFormatter.php    |  2 +-
 .../Export/XlsExportResponseFormatter.php     |  8 ++--
 .../Export/XlsxExportResponseFormatter.php    |  8 ++--
 lib/Core/Factory/AutoResponderDataFactory.php |  2 +-
 lib/Core/Factory/EmailDataFactory.php         | 18 ++++-----
 lib/Core/Factory/FieldDataFactory.php         |  8 ++--
 lib/Core/Mapper/DomainObjectMapper.php        | 24 +++++------
 .../Anonymizer/AnonymizerService.php          | 12 +++---
 .../Anonymizer/Visitor/Field/Aggregate.php    |  2 +-
 .../Anonymizer/Visitor/Field/Email.php        |  2 +-
 .../Anonymizer/Visitor/Field/Simple.php       |  2 +-
 lib/Core/Persistence/ContentTypeUtils.php     | 22 +++++-----
 .../Custom/CheckboxFieldHandler.php           |  8 ++--
 .../Custom/CountryFieldHandler.php            |  8 ++--
 .../Custom/DateAndTimeFieldHandler.php        |  8 ++--
 .../FieldHandler/Custom/DateFieldHandler.php  |  8 ++--
 .../FieldHandler/Custom/FloatFieldHandler.php |  8 ++--
 .../Custom/IntegerFieldHandler.php            |  8 ++--
 .../FieldHandler/Custom/TimeFieldHandler.php  |  8 ++--
 .../FieldHandler/FieldHandlerRegistry.php     |  2 +-
 lib/Core/Service/CaptchaService.php           | 26 ++++++------
 .../Service/InformationCollectionService.php  | 12 +++---
 .../EzInfoCollectionAttributeRepository.php   |  4 +-
 .../Repository/EzInfoCollectionRepository.php |  4 +-
 lib/Handler.php                               | 12 +++---
 lib/Resources/config/actions.yml              |  2 +-
 lib/Resources/config/admin.yml                | 13 +++---
 lib/Resources/config/anonymizers.yml          |  2 +-
 lib/Resources/config/ezplatform_admin.yml     | 18 ---------
 lib/Resources/config/factories.yml            | 12 +++---
 lib/Resources/config/ibexa_admin.yml          | 18 +++++++++
 lib/Resources/config/services.yml             | 22 +++++-----
 phpstan.neon                                  | 10 ++---
 tests/old/Action/ActionRegistryTest.php       |  2 +-
 tests/old/Action/DatabaseActionTest.php       | 40 +++++++++----------
 tests/old/ContentViewStub.php                 |  2 +-
 .../InformationCollectionControllerTest.php   |  6 +--
 ...tgenInformationCollectionExtensionTest.php |  2 +-
 .../Factory/AutoResponderDataFactoryTest.php  | 28 ++++++-------
 tests/old/Factory/EmailDataFactoryTest.php    | 28 ++++++-------
 tests/old/Factory/FieldDataFactoryTest.php    |  4 +-
 .../Custom/CheckboxFieldHandlerTest.php       | 10 ++---
 .../Custom/DateAndTimeFieldHandlerTest.php    | 10 ++---
 .../Custom/DateFieldHandlerTest.php           | 10 ++---
 .../Custom/FloatFieldHandlerTest.php          | 10 ++---
 .../Custom/IntegerFieldHandlerTest.php        | 10 ++---
 .../Custom/TimeFieldHandlerTest.php           | 12 +++---
 .../FieldHandler/FieldHandlerRegistryTest.php |  2 +-
 tests/old/Form/Builder/FormBuilderTest.php    |  6 +--
 tests/old/Mailer/MailerTest.php               |  2 +-
 tests/old/Value/TemplateDataTest.php          |  4 +-
 112 files changed, 485 insertions(+), 507 deletions(-)
 rename bundle/{EzPlatform/EzPlatformAdmin => Ibexa/Admin}/EventListener/SetPageLayoutListener.php (84%)
 rename bundle/{EzPlatform/EzPlatformAdmin => Ibexa/Admin}/MenuListener.php (89%)
 rename bundle/{EzPlatform => Ibexa}/PolicyProvider/InformationCollectionPolicyProvider.php (61%)
 rename bundle/{EzPlatform => Ibexa}/RepositoryForms/FieldDefinitionTypeExtension.php (84%)
 rename bundle/{EzPlatform => Ibexa}/RepositoryForms/InformationCollectionFieldType.php (84%)
 rename bundle/{EzPlatform => Ibexa}/RepositoryForms/InformationCollectionMapper.php (63%)
 rename bundle/{EzPlatform => Ibexa}/RepositoryForms/InformationCollectionType.php (96%)
 rename bundle/Resources/public/admin/css/{ezadmin_style.css => ibexa_admin_style.css} (100%)
 rename bundle/Resources/views/{ezadminui => ibexa/admin}/pagelayout.html.twig (89%)
 rename bundle/Resources/views/{ezadminui => ibexa/admin}/stylesheets.html.twig (55%)
 rename doc/reference/{ez_policies.rst => ibexa_policies.rst} (88%)
 delete mode 100644 lib/Resources/config/ezplatform_admin.yml
 create mode 100644 lib/Resources/config/ibexa_admin.yml

diff --git a/README.md b/README.md
index 5ab43b56..55f612f7 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ It is typically useful when it comes to the creation of feedback forms, polls, e
 An object can collect information if at least one of the class attributes is marked as an information collector.
 When the object is viewed, each collector attribute will be displayed using the chosen datatype's data collector template. 
 Instead of just outputting the attributes' contents, the collector templates provide interfaces for data input. 
-The generated input interface depends on the datatype that represents the attribute. ( From eZ [documentation](https://doc.ez.no/eZ-Publish/Technical-manual/3.9/Concepts-and-basics/Content-management/Information-collection)).
+The generated input interface depends on the datatype that represents the attribute. ( From eZ legacy [documentation](https://doc.ez.no/eZ-Publish/Technical-manual/3.9/Concepts-and-basics/Content-management/Information-collection)).
 
-This bundle reimplements information collection feature in eZ Platform/Ibexa stack.
+This bundle reimplements information collection feature in Ibexa Platform stack.
 
 License, docs and installation instructions
 -------------------------------------------
diff --git a/bundle/Controller/Admin/AdminController.php b/bundle/Controller/Admin/AdminController.php
index ae67cd38..4e059de1 100644
--- a/bundle/Controller/Admin/AdminController.php
+++ b/bundle/Controller/Admin/AdminController.php
@@ -2,11 +2,11 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Controller\Admin;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
-use eZ\Bundle\EzPublishCoreBundle\Controller;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
+use Ibexa\Bundle\Core\Controller;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer;
 use Netgen\InformationCollection\API\Service\InformationCollection;
 use Netgen\InformationCollection\API\Value\Collection;
@@ -32,12 +32,12 @@ class AdminController extends Controller
     protected $service;
 
     /**
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
     /**
-     * @var \eZ\Publish\Core\MVC\ConfigResolverInterface
+     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
      */
     protected $configResolver;
 
@@ -56,8 +56,8 @@ class AdminController extends Controller
      *
      * @param \Netgen\InformationCollection\API\Service\InformationCollection $service
      * @param \Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer $anonymizer
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
-     * @param \eZ\Publish\Core\MVC\ConfigResolverInterface $configResolver
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
+     * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver
      * @param \Symfony\Contracts\Translation\TranslatorInterface $translator
      */
     public function __construct(
@@ -96,7 +96,7 @@ public function overviewAction(Request $request)
      * Displays list of collection for selected Content
      *
      * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \eZ\Publish\API\Repository\Values\Content\Content $content
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
@@ -117,7 +117,7 @@ public function collectionListAction(Request $request, Content $content)
      * Handles collection search
      *
      * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \eZ\Publish\API\Repository\Values\Content\Content $content
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
diff --git a/bundle/Controller/Admin/Export/Export.php b/bundle/Controller/Admin/Export/Export.php
index fc442760..35f1186d 100644
--- a/bundle/Controller/Admin/Export/Export.php
+++ b/bundle/Controller/Admin/Export/Export.php
@@ -2,19 +2,19 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Controller\Admin\Export;
 
-use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
+use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Netgen\InformationCollection\API\Value\Export\ExportCriteria;
 use Netgen\InformationCollection\API\Service\Exporter;
 use Netgen\InformationCollection\Core\Export\ExportResponseFormatterRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Netgen\InformationCollection\Form\Type\ExportType;
-use eZ\Publish\API\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentService;
 
 final class Export extends AbstractController
 {
     /**
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     protected $contentService;
 
diff --git a/bundle/Controller/Admin/TreeController.php b/bundle/Controller/Admin/TreeController.php
index 575e9cec..9452e204 100644
--- a/bundle/Controller/Admin/TreeController.php
+++ b/bundle/Controller/Admin/TreeController.php
@@ -2,8 +2,8 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Controller\Admin;
 
-use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
-use eZ\Bundle\EzPublishCoreBundle\Controller;
+use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
+use Ibexa\Bundle\Core\Controller;
 use Netgen\InformationCollection\API\Service\InformationCollection;
 use Netgen\InformationCollection\API\Value\Content;
 use Netgen\InformationCollection\API\Value\Filter\ContentId;
diff --git a/bundle/Controller/CollectInformation.php b/bundle/Controller/CollectInformation.php
index fe65430e..76acb163 100644
--- a/bundle/Controller/CollectInformation.php
+++ b/bundle/Controller/CollectInformation.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Controller;
 
-use eZ\Publish\Core\MVC\Symfony\View\ContentValueView;
+use Ibexa\Core\MVC\Symfony\View\ContentValueView;
 use Netgen\InformationCollection\API\InformationCollectionTrait;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
diff --git a/bundle/DataCollector/InformationCollectionCollector.php b/bundle/DataCollector/InformationCollectionCollector.php
index b69e4a1c..9e5f3d0c 100644
--- a/bundle/DataCollector/InformationCollectionCollector.php
+++ b/bundle/DataCollector/InformationCollectionCollector.php
@@ -4,23 +4,23 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\DataCollector;
 
-use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\Helper\TranslationHelper;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Helper\TranslationHelper;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-use Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionType;
+use Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms\InformationCollectionType;
 
 class InformationCollectionCollector extends DataCollector
 {
     /**
-     * @var \eZ\Publish\API\Repository\Repository
+     * @var \Ibexa\Contracts\Core\Repository\Repository
      */
     private $repository;
 
     /**
-     * @var \eZ\Publish\Core\Helper\TranslationHelper
+     * @var \Ibexa\Core\Helper\TranslationHelper
      */
     private $translationHelper;
 
diff --git a/bundle/DependencyInjection/Configuration.php b/bundle/DependencyInjection/Configuration.php
index 28eb09d3..9a66a947 100644
--- a/bundle/DependencyInjection/Configuration.php
+++ b/bundle/DependencyInjection/Configuration.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\DependencyInjection;
 
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration;
+use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration;
 use Netgen\InformationCollection\Core\Action\EmailAction;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
diff --git a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
index f36e19d5..8147a347 100644
--- a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
+++ b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
@@ -2,8 +2,9 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\DependencyInjection;
 
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\ConfigurationProcessor;
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
+use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ConfigurationProcessor;
+use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
+use Ibexa\Core\Helper\TranslationHelper;
 use Netgen\InformationCollection\API\Action\ActionInterface;
 use Netgen\InformationCollection\API\ConfigurationConstants;
 use Symfony\Component\Config\FileLocator;
@@ -51,7 +52,7 @@ public function load(array $configs, ContainerBuilder $container)
 //            ConfigurationConstants::ACTION_CONFIG,
 //        );
 //
-//        $scopes = array_merge(array('default'), $container->getParameter('ezpublish.siteaccess.list'));
+//        $scopes = array_merge(array('default'), $container->getParameter('ibexa.site_access.list'));
 //
 //        foreach ($configArrays as $configArray) {
 //            $processor->mapConfigArray($configArray, $config);
@@ -147,8 +148,8 @@ protected function registerServiceDefinitions(ContainerBuilder $container): void
                 \Netgen\InformationCollection\Core\Export\CsvExportResponseFormatter::class
             );
             $csvExportFormatter->addTag('netgen_information_collection.export.formatter');
-            $csvExportFormatter->addArgument(new Reference('ezpublish.translation_helper'));
-            $csvExportFormatter->addArgument(new Reference('ezpublish.config.resolver'));
+            $csvExportFormatter->addArgument(new Reference(TranslationHelper::class));
+            $csvExportFormatter->addArgument(new Reference('ibexa.config.resolver'));
             $csvExportFormatter->setPublic(false);
             $csvExportFormatter->setAutowired(false);
             $csvExportFormatter->setAutoconfigured(false);
@@ -161,7 +162,7 @@ protected function registerServiceDefinitions(ContainerBuilder $container): void
                 \Netgen\InformationCollection\Core\Export\XlsExportResponseFormatter::class
             );
             $xlsExportFormatter->addTag('netgen_information_collection.export.formatter');
-            $xlsExportFormatter->addArgument(new Reference('ezpublish.translation_helper'));
+            $xlsExportFormatter->addArgument(new Reference(TranslationHelper::class));
             $xlsExportFormatter->setPublic(false);
             $xlsExportFormatter->setAutowired(false);
             $xlsExportFormatter->setAutoconfigured(false);
@@ -170,7 +171,7 @@ protected function registerServiceDefinitions(ContainerBuilder $container): void
                 \Netgen\InformationCollection\Core\Export\XlsxExportResponseFormatter::class
             );
             $xlsxExportFormatter->addTag('netgen_information_collection.export.formatter');
-            $xlsxExportFormatter->addArgument(new Reference('ezpublish.translation_helper'));
+            $xlsxExportFormatter->addArgument(new Reference(TranslationHelper::class));
             $xlsxExportFormatter->setPublic(false);
             $xlsxExportFormatter->setAutowired(false);
             $xlsxExportFormatter->setAutoconfigured(false);
diff --git a/bundle/EzPlatform/EzPlatformAdmin/EventListener/SetPageLayoutListener.php b/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php
similarity index 84%
rename from bundle/EzPlatform/EzPlatformAdmin/EventListener/SetPageLayoutListener.php
rename to bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php
index 9551ff31..bc1ddfb7 100644
--- a/bundle/EzPlatform/EzPlatformAdmin/EventListener/SetPageLayoutListener.php
+++ b/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Netgen\Bundle\InformationCollectionBundle\EzPlatform\EzPlatformAdmin\EventListener;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\Admin\EventListener;
 
-use EzSystems\EzPlatformAdminUiBundle\EzPlatformAdminUiBundle;
+use Ibexa\Bundle\AdminUi\IbexaAdminUiBundle;
 use Netgen\Bundle\InformationCollectionBundle\Templating\Twig\AdminGlobalVariable;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -55,7 +55,7 @@ public function onKernelRequest(RequestEvent $event)
             return;
         }
 
-        if (!in_array(EzPlatformAdminUiBundle::ADMIN_GROUP_NAME, $this->groupsBySiteAccess[$siteAccess], true)) {
+        if (!in_array(IbexaAdminUiBundle::ADMIN_GROUP_NAME, $this->groupsBySiteAccess[$siteAccess], true)) {
             return;
         }
 
diff --git a/bundle/EzPlatform/EzPlatformAdmin/MenuListener.php b/bundle/Ibexa/Admin/MenuListener.php
similarity index 89%
rename from bundle/EzPlatform/EzPlatformAdmin/MenuListener.php
rename to bundle/Ibexa/Admin/MenuListener.php
index d8538dda..9ea36152 100644
--- a/bundle/EzPlatform/EzPlatformAdmin/MenuListener.php
+++ b/bundle/Ibexa/Admin/MenuListener.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Netgen\Bundle\InformationCollectionBundle\EzPlatform\EzPlatformAdmin;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\Admin;
 
-use EzSystems\EzPlatformAdminUi\Menu\Event\ConfigureMenuEvent;
-use EzSystems\EzPlatformAdminUi\Menu\MainMenuBuilder;
+use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent;
+use Ibexa\AdminUi\Menu\MainMenuBuilder;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class MenuListener implements EventSubscriberInterface
diff --git a/bundle/EzPlatform/PolicyProvider/InformationCollectionPolicyProvider.php b/bundle/Ibexa/PolicyProvider/InformationCollectionPolicyProvider.php
similarity index 61%
rename from bundle/EzPlatform/PolicyProvider/InformationCollectionPolicyProvider.php
rename to bundle/Ibexa/PolicyProvider/InformationCollectionPolicyProvider.php
index 62faa039..8ff079fe 100644
--- a/bundle/EzPlatform/PolicyProvider/InformationCollectionPolicyProvider.php
+++ b/bundle/Ibexa/PolicyProvider/InformationCollectionPolicyProvider.php
@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Netgen\Bundle\InformationCollectionBundle\EzPlatform\PolicyProvider;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\PolicyProvider;
 
 use Netgen\InformationCollection\API\Permissions;
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\ConfigBuilderInterface;
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Security\PolicyProvider\PolicyProviderInterface;
+use Ibexa\Bundle\Core\DependencyInjection\Configuration\ConfigBuilderInterface;
+use Ibexa\Bundle\Core\DependencyInjection\Security\PolicyProvider\PolicyProviderInterface;
 
 class InformationCollectionPolicyProvider implements PolicyProviderInterface
 {
     /**
-     * @param \eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\ConfigBuilderInterface $configBuilder
+     * @param \Ibexa\Bundle\Core\DependencyInjection\Configuration\ConfigBuilderInterface $configBuilder
      *
      * @return array
      */
diff --git a/bundle/EzPlatform/RepositoryForms/FieldDefinitionTypeExtension.php b/bundle/Ibexa/RepositoryForms/FieldDefinitionTypeExtension.php
similarity index 84%
rename from bundle/EzPlatform/RepositoryForms/FieldDefinitionTypeExtension.php
rename to bundle/Ibexa/RepositoryForms/FieldDefinitionTypeExtension.php
index 0f07b468..63e72823 100644
--- a/bundle/EzPlatform/RepositoryForms/FieldDefinitionTypeExtension.php
+++ b/bundle/Ibexa/RepositoryForms/FieldDefinitionTypeExtension.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms;
 
-use EzSystems\EzPlatformAdminUi\Form\Type\FieldDefinition\FieldDefinitionType;
+use Ibexa\AdminUi\Form\Type\FieldDefinition\FieldDefinitionType;
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/bundle/EzPlatform/RepositoryForms/InformationCollectionFieldType.php b/bundle/Ibexa/RepositoryForms/InformationCollectionFieldType.php
similarity index 84%
rename from bundle/EzPlatform/RepositoryForms/InformationCollectionFieldType.php
rename to bundle/Ibexa/RepositoryForms/InformationCollectionFieldType.php
index 1a844a33..7ead3b77 100644
--- a/bundle/EzPlatform/RepositoryForms/InformationCollectionFieldType.php
+++ b/bundle/Ibexa/RepositoryForms/InformationCollectionFieldType.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms;
 
-use EzSystems\EzPlatformContentForms\Data\Content\FieldData;
-use EzSystems\EzPlatformContentForms\FieldType\FieldTypeFormMapperDispatcherInterface;
+use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
+use Ibexa\ContentForms\FieldType\FieldTypeFormMapperDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -16,7 +16,7 @@
 class InformationCollectionFieldType extends AbstractType
 {
     /**
-     * @var \EzSystems\EzPlatformContentForms\FieldType\FieldTypeFormMapperDispatcherInterface
+     * @var \Ibexa\ContentForms\FieldType\FieldTypeFormMapperDispatcherInterface
      */
     private $fieldTypeFormMapper;
 
diff --git a/bundle/EzPlatform/RepositoryForms/InformationCollectionMapper.php b/bundle/Ibexa/RepositoryForms/InformationCollectionMapper.php
similarity index 63%
rename from bundle/EzPlatform/RepositoryForms/InformationCollectionMapper.php
rename to bundle/Ibexa/RepositoryForms/InformationCollectionMapper.php
index 9cb45293..759c04a5 100644
--- a/bundle/EzPlatform/RepositoryForms/InformationCollectionMapper.php
+++ b/bundle/Ibexa/RepositoryForms/InformationCollectionMapper.php
@@ -2,24 +2,24 @@
 
 declare(strict_types=1);
 
-namespace Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\API\Repository\Values\ValueObject;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
 use Netgen\InformationCollection\API\Value\InformationCollectionStruct;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use EzSystems\EzPlatformContentForms\Data\Mapper\FormDataMapperInterface;
-use EzSystems\EzPlatformContentForms\Data\Content\FieldData;
+use Ibexa\ContentForms\Data\Mapper\FormDataMapperInterface;
+use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
 
 final class InformationCollectionMapper
 {
     /**
-     * Maps a ValueObject from eZ content repository to a data usable as underlying form data (e.g. create/update struct).
+     * Maps a ValueObject from Ibexa content repository to a data usable as underlying form data (e.g. create/update struct).
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Content $contentDraft
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $contentDraft
      * @param array $params
      *
      * @return InformationCollectionStruct
diff --git a/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php b/bundle/Ibexa/RepositoryForms/InformationCollectionType.php
similarity index 96%
rename from bundle/EzPlatform/RepositoryForms/InformationCollectionType.php
rename to bundle/Ibexa/RepositoryForms/InformationCollectionType.php
index ad00102e..cc0eb2b7 100644
--- a/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php
+++ b/bundle/Ibexa/RepositoryForms/InformationCollectionType.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\Bundle\InformationCollectionBundle\Form\CaptchaType;
 use Netgen\InformationCollection\API\Service\CaptchaService;
 use Netgen\InformationCollection\API\Value\InformationCollectionStruct;
diff --git a/bundle/NetgenInformationCollectionBundle.php b/bundle/NetgenInformationCollectionBundle.php
index 4730b114..93762972 100644
--- a/bundle/NetgenInformationCollectionBundle.php
+++ b/bundle/NetgenInformationCollectionBundle.php
@@ -2,8 +2,8 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle;
 
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\EzPublishCoreExtension;
-use Netgen\Bundle\InformationCollectionBundle\EzPlatform\PolicyProvider\InformationCollectionPolicyProvider;
+use Ibexa\Bundle\Core\DependencyInjection\IbexaCoreExtension;
+use Netgen\Bundle\InformationCollectionBundle\Ibexa\PolicyProvider\InformationCollectionPolicyProvider;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -16,8 +16,8 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        $eZExtension = $container->getExtension('ezpublish');
-        if ($eZExtension instanceof EzPublishCoreExtension) {
+        $eZExtension = $container->getExtension('ibexa');
+        if ($eZExtension instanceof IbexaCoreExtension) {
             $eZExtension->addPolicyProvider(new InformationCollectionPolicyProvider());
         }
     }
diff --git a/bundle/Resources/config/controllers.yml b/bundle/Resources/config/controllers.yml
index 3d6ddef3..823d064b 100644
--- a/bundle/Resources/config/controllers.yml
+++ b/bundle/Resources/config/controllers.yml
@@ -9,20 +9,20 @@ services:
 
     netgen_information_collection.controller.admin:
         class: Netgen\Bundle\InformationCollectionBundle\Controller\Admin\AdminController
-        parent: ezpublish.controller.base
+        parent: ibexa.controller.base
         public: true
         arguments:
             - "@netgen_information_collection.api.service"
             - "@netgen_information_collection.anonymizer.service"
-            - "@ezpublish.api.service.content"
-            - "@ezpublish.config.resolver"
+            - "@ibexa.api.service.content"
+            - "@ibexa.config.resolver"
             - "@translator"
 
     netgen_information_collection.controller.export.export:
         class: Netgen\Bundle\InformationCollectionBundle\Controller\Admin\Export\Export
         public: true
         arguments:
-            - "@ezpublish.api.service.content"
+            - "@ibexa.api.service.content"
             - "@netgen_information_collection.service.exporter"
             - "@netgen_information_collection.core.export.registry"
         tags:
@@ -32,7 +32,7 @@ services:
 
     netgen_information_collection.controller.tree:
         class: Netgen\Bundle\InformationCollectionBundle\Controller\Admin\TreeController
-        parent: ezpublish.controller.base
+        parent: ibexa.controller.base
         public: true
         arguments:
             - "@netgen_information_collection.api.service"
diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml
index b637a4ec..d051d4b0 100644
--- a/bundle/Resources/config/services.yml
+++ b/bundle/Resources/config/services.yml
@@ -20,8 +20,8 @@ services:
         class: Netgen\Bundle\InformationCollectionBundle\DataCollector\InformationCollectionCollector
         public: false
         arguments:
-            - '@ezpublish.api.repository'
-            - '@ezpublish.translation_helper'
+            - '@ibexa.api.repository'
+            - '@Ibexa\Core\Helper\TranslationHelper'
         tags:
             - { name: data_collector, template: '@NetgenInformationCollection/data_collector/template.html.twig', id: 'netgen_information_collection_collector' }
 
diff --git a/bundle/Resources/public/admin/css/ezadmin_style.css b/bundle/Resources/public/admin/css/ibexa_admin_style.css
similarity index 100%
rename from bundle/Resources/public/admin/css/ezadmin_style.css
rename to bundle/Resources/public/admin/css/ibexa_admin_style.css
diff --git a/bundle/Resources/views/admin/collection_list.html.twig b/bundle/Resources/views/admin/collection_list.html.twig
index 414d884d..a7e2984d 100644
--- a/bundle/Resources/views/admin/collection_list.html.twig
+++ b/bundle/Resources/views/admin/collection_list.html.twig
@@ -10,7 +10,7 @@
 
     {% include "@NetgenInformationCollection/admin/flash_messages.html.twig" %}
 
-    <h1>{{ 'netgen_information_collection_admin_collection_list_title'|trans({'%content_name%': ez_content_name(content), '%count%': objects.count}) }}</h1>
+    <h1>{{ 'netgen_information_collection_admin_collection_list_title'|trans({'%content_name%': ibexa_content_name(content), '%count%': objects.count}) }}</h1>
     {% if objects is not empty %}
 
         {% set search_text = app.request.query.get('searchText', '') %}
@@ -68,7 +68,7 @@
                             </label>
                         </td>
                         <td>
-                            {{ ez_content_name(object.creator) }}
+                            {{ ibexa_content_name(object.creator) }}
                         </td>
                         <td>
                             {{ object.created|date("Y.m.d H:i") }}
diff --git a/bundle/Resources/views/admin/overview.html.twig b/bundle/Resources/views/admin/overview.html.twig
index afa2273c..a05d85fe 100644
--- a/bundle/Resources/views/admin/overview.html.twig
+++ b/bundle/Resources/views/admin/overview.html.twig
@@ -32,8 +32,8 @@
                             <td>
                                 <img src="{{ asset('bundles/netgeninformationcollection/admin/images/Document.png') }}" alt="section" title="section" width="16" height="16">
                                 &nbsp;
-                                {% if object.hasLocation %}<a href="{{ path("ez_urlalias", { "contentId": object.content.contentInfo.id }) }}">{% endif %}
-                                    {{ ez_content_name(object.content) }}
+                                {% if object.hasLocation %}<a href="{{ path("ibexa.url.alias", { "contentId": object.content.contentInfo.id }) }}">{% endif %}
+                                    {{ ibexa_content_name(object.content) }}
                                 {% if object.hasLocation %}</a>{% endif %}
                             </td>
                             <td>
diff --git a/bundle/Resources/views/admin/path.html.twig b/bundle/Resources/views/admin/path.html.twig
index 8ab489c5..a0df48fc 100644
--- a/bundle/Resources/views/admin/path.html.twig
+++ b/bundle/Resources/views/admin/path.html.twig
@@ -6,11 +6,11 @@
     {% if app.request.get('contentId') %}
         <a class="path" href="{{ path('netgen_information_collection.route.admin.overview') }}">{{ 'netgen_information_collection_admin_path_collected_information'|trans }}</a>
         <span class="slash"> / </span>
-        <span class="path">{{ ez_content_name(content) }}</span>
+        <span class="path">{{ ibexa_content_name(content) }}</span>
     {% elseif app.request.get('collectionId') %}
         <a class="path" href="{{ path('netgen_information_collection.route.admin.overview') }}">{{ 'netgen_information_collection_admin_path_collected_information'|trans }}</a>
         <span class="slash"> / </span>
-        <a class="path" href="{{ path('netgen_information_collection.route.admin.collection_list', {'contentId': content.id}) }}">{{ ez_content_name(content) }}</a>
+        <a class="path" href="{{ path('netgen_information_collection.route.admin.collection_list', {'contentId': content.id}) }}">{{ ibexa_content_name(content) }}</a>
         <span class="slash"> / </span>
         <span class="path">{{ collection.id }}</span>
     {% else %}
diff --git a/bundle/Resources/views/admin/view.html.twig b/bundle/Resources/views/admin/view.html.twig
index fad83a99..54cf4a85 100644
--- a/bundle/Resources/views/admin/view.html.twig
+++ b/bundle/Resources/views/admin/view.html.twig
@@ -10,8 +10,8 @@
 
     {% include "@NetgenInformationCollection/admin/flash_messages.html.twig" %}
 
-    <h1>{{ 'netgen_information_collection_admin_view_title'|trans({'%collection_id%': collection.id, '%content_name%': ez_content_name(collection.content)}) }}</h1>
-    <h6>{{ 'netgen_information_collection_admin_view_subtitle'|trans({'%date%': collection.modified|date("Y.m.d H:i"), '%user_name%': ez_content_name(collection.creator)}) }}</h6>
+    <h1>{{ 'netgen_information_collection_admin_view_title'|trans({'%collection_id%': collection.id, '%content_name%': ibexa_content_name(collection.content)}) }}</h1>
+    <h6>{{ 'netgen_information_collection_admin_view_subtitle'|trans({'%date%': collection.modified|date("Y.m.d H:i"), '%user_name%': ibexa_content_name(collection.creator)}) }}</h6>
 
     <form method="post" action="{{ path('netgen_information_collection.route.admin.handle_collection') }}">
 
@@ -32,7 +32,7 @@
                     <input id="{{ attribute.fieldDefinition.id }}" name="FieldId[]" value="{{ attribute.fieldDefinition.id }}" title="Select collections for removal." type="checkbox" data-enable="Item">
                     <label for="{{ attribute.fieldDefinition.id }}">
                         <span class="attribute-name">
-                            {{ ez_field_name(content, attribute.field.fieldDefIdentifier) }}:
+                            {{ ibexa_field_name(content, attribute.field.fieldDefIdentifier) }}:
                         </span>
                         <span class="attribute-value">
                             {{ info_collection_render_field(collection, attribute) }}
diff --git a/bundle/Resources/views/data_collector/template.html.twig b/bundle/Resources/views/data_collector/template.html.twig
index 2e32a93d..7c9e0859 100644
--- a/bundle/Resources/views/data_collector/template.html.twig
+++ b/bundle/Resources/views/data_collector/template.html.twig
@@ -50,7 +50,7 @@
 
         <div class="metric">
             <span class="value">
-                <a href="{{ path('_ez_content_view', {
+                <a href="{{ path('ibexa.content.view', {
                     'contentId': collector.contentId,
                     'siteaccess': collector.adminSiteaccess
                 }) }}">
@@ -62,7 +62,7 @@
 
         <div class="metric">
             <span class="value">
-                <a href="{{ path('ezplatform.content_type.view', {
+                <a href="{{ path('ibexa.content_type.view', {
                     'contentTypeGroupId': collector.contentTypeGroupId ,
                     'contentTypeId': collector.contentTypeId,
                     'siteaccess': collector.adminSiteaccess
diff --git a/bundle/Resources/views/email/default.html.twig b/bundle/Resources/views/email/default.html.twig
index 271a3f00..b3cc36ac 100644
--- a/bundle/Resources/views/email/default.html.twig
+++ b/bundle/Resources/views/email/default.html.twig
@@ -1,5 +1,5 @@
 {# event \Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected #}
-{# content \eZ\Publish\API\Repository\Values\Content\Content #}
+{# content \Ibexa\Contracts\Core\Repository\Values\Content\Content #}
 
 {% block email %}
 
@@ -9,7 +9,7 @@
     {% if content.fields[field_name] is defined and content.fields[field_name] is not empty %}
         <div class="data-group attr-{{ field_name }}">
             <div class="label">
-                {{ ez_field_name(content, field_name) }}:
+                {{ ibexa_field_name(content, field_name) }}:
             </div>
             <div class="value">
                 {% if content_type.fieldDefinitionsByIdentifier[field_name].fieldTypeIdentifier == 'ezselection' %}
diff --git a/bundle/Resources/views/ezadminui/pagelayout.html.twig b/bundle/Resources/views/ibexa/admin/pagelayout.html.twig
similarity index 89%
rename from bundle/Resources/views/ezadminui/pagelayout.html.twig
rename to bundle/Resources/views/ibexa/admin/pagelayout.html.twig
index f9c78fda..d1ae8cf1 100644
--- a/bundle/Resources/views/ezadminui/pagelayout.html.twig
+++ b/bundle/Resources/views/ibexa/admin/pagelayout.html.twig
@@ -5,7 +5,7 @@
     to be able to inject additional markup before and after its
     content block.
 #}
-{% embed ['@EzPlatformAdminUi/layout.html.twig', '@ezdesign/ui/layout.html.twig'] %}
+{% embed '@ibexadesign/ui/layout.html.twig' %}
     {% trans_default_domain 'netgen_information_collection_admin' %}
 
     {% block title %}{{ 'pagelayout.title'|trans }}{% endblock %}
@@ -16,7 +16,7 @@
         {{ parent() }}
 
         {% include '@NetgenInformationCollection/admin/stylesheets.html.twig' %}
-        {% include '@NetgenInformationCollection/ezadminui/stylesheets.html.twig' %}
+        {% include '@NetgenInformationCollection/ibexa/admin/stylesheets.html.twig' %}
     {% endblock %}
 
     {% block javascripts %}
diff --git a/bundle/Resources/views/ezadminui/stylesheets.html.twig b/bundle/Resources/views/ibexa/admin/stylesheets.html.twig
similarity index 55%
rename from bundle/Resources/views/ezadminui/stylesheets.html.twig
rename to bundle/Resources/views/ibexa/admin/stylesheets.html.twig
index f1dae4aa..1f9b3967 100644
--- a/bundle/Resources/views/ezadminui/stylesheets.html.twig
+++ b/bundle/Resources/views/ibexa/admin/stylesheets.html.twig
@@ -1 +1 @@
-<link rel="stylesheet" href="{{ asset('bundles/netgeninformationcollection/admin/css/ezadmin_style.css') }}" />
\ No newline at end of file
+<link rel="stylesheet" href="{{ asset('bundles/netgeninformationcollection/admin/css/ibexa_admin_style.css') }}" />
diff --git a/bundle/Templating/Twig/AdminGlobalVariable.php b/bundle/Templating/Twig/AdminGlobalVariable.php
index 0cfcd037..f2adeb12 100644
--- a/bundle/Templating/Twig/AdminGlobalVariable.php
+++ b/bundle/Templating/Twig/AdminGlobalVariable.php
@@ -4,12 +4,12 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Templating\Twig;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 
 class AdminGlobalVariable
 {
     /**
-     * @var \eZ\Publish\Core\MVC\ConfigResolverInterface
+     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
      */
     protected $configResolver;
 
diff --git a/bundle/Templating/Twig/Extensions/CaptchaRuntime.php b/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
index 22e88ed1..e1e813a2 100644
--- a/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
+++ b/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
@@ -4,7 +4,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Templating\Twig\Extensions;
 
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Netgen\InformationCollection\API\Service\CaptchaService;
 
 class CaptchaRuntime
@@ -27,7 +27,7 @@ public function __construct(CaptchaService $captcha)
     /**
      * Checks if captcha is enabled for given Location.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      *
      * @return bool
      */
@@ -39,7 +39,7 @@ public function isEnabled(Location $location): bool
     /**
      * Return configured site key for given Location.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      *
      * @return string
      */
diff --git a/bundle/Templating/Twig/Extensions/FieldRenderingRuntime.php b/bundle/Templating/Twig/Extensions/FieldRenderingRuntime.php
index fac7568f..889203dc 100644
--- a/bundle/Templating/Twig/Extensions/FieldRenderingRuntime.php
+++ b/bundle/Templating/Twig/Extensions/FieldRenderingRuntime.php
@@ -4,7 +4,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Templating\Twig\Extensions;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\API\Value\Attribute;
 use Netgen\InformationCollection\API\Value\Collection;
 use Twig\Environment;
@@ -20,7 +20,7 @@ class FieldRenderingRuntime
     protected $environment;
 
     /**
-     * @var \eZ\Publish\Core\MVC\ConfigResolverInterface
+     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
      */
     protected $configResolver;
 
diff --git a/composer.json b/composer.json
index 4443ad91..4b1f8c3b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,9 @@
 {
     "name": "netgen/information-collection-bundle",
-    "description": "Information collection alike feature for eZ Platform",
-    "type": "ezplatform-bundle",
+    "description": "Information collection alike feature for Ibexa Platform",
+    "type": "ibexa-bundle",
     "keywords": [
-        "ezpublish",
-        "ezplatform",
+        "ibexa",
         "information collection",
         "netgen",
         "information-collection-bundle"
@@ -24,12 +23,12 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^7.4 || ^8.0",
         "ext-pdo": "*",
         "doctrine/orm": "^2.5",
-        "ezsystems/ezplatform-admin-ui": "^2.0",
-        "ezsystems/ezplatform-content-forms": "^1.0",
-        "ezsystems/ezplatform-kernel": "^1.0",
+        "ibexa/admin-ui": "^4.0",
+        "ibexa/content-forms": "^4.0",
+        "ibexa/core": "^4.0",
         "symfony/swiftmailer-bundle": "^3.4",
         "twig/twig": "^3.0",
         "google/recaptcha": "^1.2",
@@ -67,7 +66,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }
diff --git a/doc/cookbook/custom_field_handler.rst b/doc/cookbook/custom_field_handler.rst
index 93900fa6..5884b515 100644
--- a/doc/cookbook/custom_field_handler.rst
+++ b/doc/cookbook/custom_field_handler.rst
@@ -16,9 +16,9 @@ Field handler example:
     namespace Acme\Bundle\AcmeBundle\MyCustomFieldHandlers;
 
     use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomFieldHandlerInterface;
-    use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-    use eZ\Publish\Core\FieldType\Value;
-    use eZ\Publish\Core\FieldType\Integer\Value as IntegerValue;
+    use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+    use Ibexa\Core\FieldType\Value;
+    use Ibexa\Core\FieldType\Integer\Value as IntegerValue;
 
     class IntegerFieldHandler implements CustomFieldHandlerInterface
     {
diff --git a/doc/getting_started/configuration.rst b/doc/getting_started/configuration.rst
index cd823a28..137015f9 100644
--- a/doc/getting_started/configuration.rst
+++ b/doc/getting_started/configuration.rst
@@ -5,7 +5,7 @@ Set siteaccess aware configuration
 ----------------------------------
 
 Here is sample configuration for actions, the developer will need to define a list of actions to be run depending on the content type.
-Configuration needs to be added in `app/config/config.yml` or `app/config/ezplatform.yml`:
+Configuration needs to be added to your `config/packages/` folder:
 
 
 .. code-block:: yaml
@@ -31,7 +31,7 @@ Don't forget to create default email template.
 Clear the caches
 ----------------
 
-Clear the eZ Publish caches with the following command:
+Clear the Ibexa Platform caches with the following command:
 
 .. code-block:: bash
 
diff --git a/doc/getting_started/installation.rst b/doc/getting_started/installation.rst
index a96d9beb..e0445a91 100644
--- a/doc/getting_started/installation.rst
+++ b/doc/getting_started/installation.rst
@@ -4,8 +4,8 @@ Installation instructions
 Requirements
 ------------
 
-* PHP 7.3+
-* eZ Platform 2.0+
+* PHP 7.4+
+* Ibexa Platform 4.0+
 
 Installation steps
 ------------------
@@ -20,29 +20,10 @@ Run the following from your website root folder to install NetgenInformationColl
 
     $ composer require netgen/information-collection-bundle
 
-
-Activate the bundle
-~~~~~~~~~~~~~~~~~~~
-
-Activate required bundles in `app/AppKernel.php` file by adding them to the `$bundles` array in `registerBundles` method:
-
-.. code-block:: php
-
-    public function registerBundles()
-    {
-        ...
-        $bundles[] = new Netgen\Bundle\EzFormsBundle\NetgenEzFormsBundle();
-        $bundles[] = new Netgen\Bundle\InformationCollectionBundle\NetgenInformationCollectionBundle();
-
-        return $bundles;
-    }
-
-
 Include routing configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-
-In your main routing configuration file probably `routing.yml` add:
+In your `config/routes` folder add:
 
 .. code-block:: yaml
 
diff --git a/doc/index.rst b/doc/index.rst
index 75c5fe78..1c1b1fc8 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -14,17 +14,17 @@ When the object is viewed, each collector attribute will be displayed using the
 Instead of just outputting the attributes' contents, the collector templates provide interfaces for data input.
 The generated input interface depends on the datatype that represents the attribute.
 
-This bundle re-implements the information collection feature for eZ Platform/Ibexa stack.
+This bundle re-implements the information collection feature for Ibexa Platform stack.
 
 .. note::
 
     This documentation assumes you have a working knowledge of the Symfony
-    Framework and eZ Platform DXP. If you're not familiar with Symfony, please start with
-    reading the `Quick Tour`_ from the Symfony documentation and for eZ Platform DXP visit the eZ
+    Framework and Ibexa Platform DXP. If you're not familiar with Symfony, please start with
+    reading the `Quick Tour`_ from the Symfony documentation and for Ibexa Platform DXP visit the Ibexa
     Platform `Developer Documentation`_.
 
 .. _`Quick Tour`: https://symfony.com/doc/current/quick_tour
-.. _`Developer Documentation`: https://doc.ezplatform.com/
+.. _`Developer Documentation`: https://doc.ibexa.co
 
 
 :doc:`Overview </overview/index>`
diff --git a/doc/overview/how_it_works.rst b/doc/overview/how_it_works.rst
index 0503cbc6..96884a85 100644
--- a/doc/overview/how_it_works.rst
+++ b/doc/overview/how_it_works.rst
@@ -14,7 +14,7 @@ Then define content view for given content type (*content_view.yml*) specifiying
 
 .. code-block:: yaml
 
-    ezpublish:
+    ibexa:
         system:
             frontend_group:
                 content_view:
@@ -26,7 +26,7 @@ Then define content view for given content type (*content_view.yml*) specifiying
                                 Identifier\ContentType: my_content_type
 
 
-Controller will return standard eZ ContentView with additional two variables *form* and *is_valid*. *form* contains Symfony form and it is up
+Controller will return standard Ibexa ContentView with additional two variables *form* and *is_valid*. *form* contains Symfony form and it is up
 to you it will be rendered and *is_valid* signals when form is valid and submitted.
 
 Example template:
@@ -41,25 +41,25 @@ Example template:
 
             {% if is_valid is defined and is_valid %}
                 <div class="confirmation-message">
-                    {% if not ez_is_field_empty( content, "success_text" ) %}
+                    {% if not ibexa_field_is_empty( content, "success_text" ) %}
                         <div class="att-success-text">
-                            {{ ez_render_field( content, "success_text" ) }}
+                            {{ ibexa_render_field( content, "success_text" ) }}
                         </div>
                     {% endif %}
                 </div>
             {% else %}
 
-                <h1 class="page-header">{{ ez_render_field( content, "title" ) }}</h1>
+                <h1 class="page-header">{{ ibexa_render_field( content, "title" ) }}</h1>
 
-                {% if not ez_is_field_empty( content, "full_intro" ) %}
+                {% if not ibexa_field_is_empty( content, "full_intro" ) %}
                     <div class="intro">
-                        {{ ez_render_field( content, "full_intro" ) }}
+                        {{ ibexa_render_field( content, "full_intro" ) }}
                     </div>
                 {% endif %}
 
-                {% if not ez_is_field_empty( content, "body" ) %}
+                {% if not ibexa_field_is_empty( content, "body" ) %}
                     <div class="body">
-                        {{ ez_render_field( content, "body" ) }}
+                        {{ ibexa_render_field( content, "body" ) }}
                     </div>
                 {% endif %}
 
diff --git a/doc/reference/configuration.rst b/doc/reference/configuration.rst
index 7d672bd5..44355ab0 100644
--- a/doc/reference/configuration.rst
+++ b/doc/reference/configuration.rst
@@ -252,7 +252,7 @@ The following lists all available design configuration options:
 
 .. tip::
 
-    In eZ Platform integration, currently active design is siteaccess aware,
+    In Ibexa Platform integration, currently active design is siteaccess aware,
     meaning, you can use configuration similar to this:
 
     .. code-block:: yaml
diff --git a/doc/reference/container_parameters.rst b/doc/reference/container_parameters.rst
index 6aea87f2..f407652b 100644
--- a/doc/reference/container_parameters.rst
+++ b/doc/reference/container_parameters.rst
@@ -5,7 +5,5 @@ Available Container parameters:
 
 - `netgen_information_collection.default.admin.max_per_page` - controls how many items will be displayed per page
 - `netgen_information_collection.default.form.use_csrf` - controls whenever will CSRF token be used on forms or not
-- `netgen_information_collection.ezadminui.pagelayout` - controls which template will be used for admin pagelayout
-- `netgen_information_collection.default.admin.tree_limit` - controls which template will be used for admin pagelayout
+- `netgen_information_collection.default.admin.tree_limit` - controls how many items will be displayed in the tree
 - `netgen_information_collection.default.admin.pagelayout` - controls which template will be used for admin pagelayout
-- `netgen_information_collection.ezadminui.pagelayout` - controls which template will be used for admin pagelayout
diff --git a/doc/reference/ez_policies.rst b/doc/reference/ibexa_policies.rst
similarity index 88%
rename from doc/reference/ez_policies.rst
rename to doc/reference/ibexa_policies.rst
index 13f8f6cd..7c66c288 100644
--- a/doc/reference/ez_policies.rst
+++ b/doc/reference/ibexa_policies.rst
@@ -1,5 +1,5 @@
-eZ Platform Policies
-====================
+Ibexa Platform Policies
+=======================
 
 The following is a list of Symfony commands available in Netgen Layouts used for
 exporting/importing Netgen Layouts data.
@@ -7,12 +7,12 @@ exporting/importing Netgen Layouts data.
 .. note::
 
     This documentation assumes you have a working knowledge of the Symfony
-    Framework and eZ Platform DXP. If you're not familiar with Symfony, please start with
-    reading the `Quick Tour`_ from the Symfony documentation and for eZ Platform DXP visit the eZ
+    Framework and Ibexa Platform DXP. If you're not familiar with Symfony, please start with
+    reading the `Quick Tour`_ from the Symfony documentation and for Ibexa Platform DXP visit the Ibexa
     Platform `Developer Documentation`_.
 
 .. _`Quick Tour`: https://symfony.com/doc/current/quick_tour
-.. _`Developer Documentation`: https://doc.ezplatform.com/
+.. _`Developer Documentation`: https://doc.ibexa.co
 
 .. rst-class:: responsive
 
diff --git a/doc/reference/index.rst b/doc/reference/index.rst
index e0895222..41c55504 100644
--- a/doc/reference/index.rst
+++ b/doc/reference/index.rst
@@ -10,7 +10,7 @@ Reference
     events
     configuration
     commands
-    ez_policies
+    ibexa_policies
     info_collector_actions
 
 
diff --git a/doc/reference/info_collector_actions.rst b/doc/reference/info_collector_actions.rst
index fb465aa8..862e031f 100644
--- a/doc/reference/info_collector_actions.rst
+++ b/doc/reference/info_collector_actions.rst
@@ -42,7 +42,7 @@ Some simple email template would look like this:
     {% for field_name, field_value in collected_fields %}
         {% if content.fields[field_name] is defined and content.fields[field_name] is not empty %}
             <div class="label">
-                {{ ez_field_name(content, field_name) }}:
+                {{ ibexa_field_name(content, field_name) }}:
             </div>
             <div class="value">
                 {{ field_value }}
diff --git a/doc/reference/map.rst.inc b/doc/reference/map.rst.inc
index 003e85cb..bbab5d1d 100644
--- a/doc/reference/map.rst.inc
+++ b/doc/reference/map.rst.inc
@@ -4,5 +4,5 @@
 * :doc:`/reference/events`
 * :doc:`/reference/configuration`
 * :doc:`/reference/commands`
-* :doc:`/reference/ez_policies`
+* :doc:`/reference/ibexa_policies`
 * :doc:`/reference/info_collector_actions`
diff --git a/lib/API/Export/ExportResponseFormatter.php b/lib/API/Export/ExportResponseFormatter.php
index 2a167eac..aefb1505 100644
--- a/lib/API/Export/ExportResponseFormatter.php
+++ b/lib/API/Export/ExportResponseFormatter.php
@@ -3,7 +3,7 @@
 namespace Netgen\InformationCollection\API\Export;
 
 use Netgen\InformationCollection\API\Value\Export\Export;
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Symfony\Component\HttpFoundation\Response;
 
 interface ExportResponseFormatter
@@ -15,7 +15,7 @@ public function getIdentifier(): string;
 
     /**
      * @param \Netgen\InformationCollection\API\Value\Export\Export $export
-     * @param \eZ\Publish\API\Repository\Values\Content\Content $content
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
diff --git a/lib/API/FieldHandler/CustomFieldHandlerInterface.php b/lib/API/FieldHandler/CustomFieldHandlerInterface.php
index 33a35cc9..ff121540 100644
--- a/lib/API/FieldHandler/CustomFieldHandlerInterface.php
+++ b/lib/API/FieldHandler/CustomFieldHandlerInterface.php
@@ -4,15 +4,15 @@
 
 namespace Netgen\InformationCollection\API\FieldHandler;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\Value;
 
 interface CustomFieldHandlerInterface
 {
     /**
      * Checks if given Value can be handled.
      *
-     * @param \eZ\Publish\Core\FieldType\Value $value
+     * @param \Ibexa\Core\FieldType\Value $value
      *
      * @return bool
      */
@@ -21,8 +21,8 @@ public function supports(Value $value): bool;
     /**
      * Transforms field value object to string.
      *
-     * @param \eZ\Publish\Core\FieldType\Value $value
-     * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition $fieldDefinition
+     * @param \Ibexa\Core\FieldType\Value $value
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition
      *
      * @return string
      */
diff --git a/lib/API/FieldHandler/CustomLegacyFieldHandlerInterface.php b/lib/API/FieldHandler/CustomLegacyFieldHandlerInterface.php
index d943fcf8..8dfe92f3 100644
--- a/lib/API/FieldHandler/CustomLegacyFieldHandlerInterface.php
+++ b/lib/API/FieldHandler/CustomLegacyFieldHandlerInterface.php
@@ -4,18 +4,18 @@
 
 namespace Netgen\InformationCollection\API\FieldHandler;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\Value;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
 
 interface CustomLegacyFieldHandlerInterface extends CustomFieldHandlerInterface
 {
     /**
-     * Transforms eZ field value to object persistable
+     * Transforms Ibexa field value to object persistable
      * in legacy information collection database structure.
      *
-     * @param \eZ\Publish\Core\FieldType\Value $value
-     * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition $fieldDefinition
+     * @param \Ibexa\Core\FieldType\Value $value
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition
      *
      * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
diff --git a/lib/API/InformationCollectionTrait.php b/lib/API/InformationCollectionTrait.php
index 84b9633e..12700bca 100644
--- a/lib/API/InformationCollectionTrait.php
+++ b/lib/API/InformationCollectionTrait.php
@@ -4,10 +4,10 @@
 
 namespace Netgen\InformationCollection\API;
 
-use eZ\Publish\Core\MVC\Symfony\View\BaseView;
-use eZ\Publish\Core\MVC\Symfony\View\CachableView;
-use eZ\Publish\Core\MVC\Symfony\View\ContentValueView;
-use eZ\Publish\Core\MVC\Symfony\View\LocationValueView;
+use Ibexa\Core\MVC\Symfony\View\BaseView;
+use Ibexa\Core\MVC\Symfony\View\CachableView;
+use Ibexa\Core\MVC\Symfony\View\ContentValueView;
+use Ibexa\Core\MVC\Symfony\View\LocationValueView;
 use Netgen\InformationCollection\Handler;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -16,7 +16,7 @@ trait InformationCollectionTrait
     /**
      * Builds Form, checks if Form is valid and dispatches InformationCollected event.
      *
-     * @param \eZ\Publish\Core\MVC\Symfony\View\ContentValueView $view
+     * @param \Ibexa\Core\MVC\Symfony\View\ContentValueView $view
      * @param array $options
      *
      * @return array
@@ -26,7 +26,7 @@ protected function collectInformation(ContentValueView $view, array $options): C
         $isValid = false;
 
         if (!$view instanceof LocationValueView) {
-            throw new \BadMethodCallException('eZ view needs to implement LocationValueView interface');
+            throw new \BadMethodCallException('Ibexa view needs to implement LocationValueView interface');
         }
 
         /** @var Handler $handler */
diff --git a/lib/API/Persistence/Anonymizer/Visitor/FieldAnonymizerVisitor.php b/lib/API/Persistence/Anonymizer/Visitor/FieldAnonymizerVisitor.php
index 5c8d2840..e8f0eb97 100644
--- a/lib/API/Persistence/Anonymizer/Visitor/FieldAnonymizerVisitor.php
+++ b/lib/API/Persistence/Anonymizer/Visitor/FieldAnonymizerVisitor.php
@@ -4,7 +4,7 @@
 
 namespace Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Netgen\InformationCollection\API\Value\Attribute;
 use Netgen\InformationCollection\API\Value\AttributeValue;
 
@@ -14,7 +14,7 @@ abstract class FieldAnonymizerVisitor
      * Accept the given $ezInfoCollectionAttribute for visiting.
      *
      * @param \Netgen\InformationCollection\API\Value\Attribute $attribute
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
      *
      * @return bool
      */
@@ -24,7 +24,7 @@ abstract public function accept(Attribute $attribute, ContentType $contentType):
      * Visit given $ezInfoCollectionAttribute and return string.
      *
      * @param \Netgen\InformationCollection\API\Value\Attribute $attribute
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
      *
      * @return \Netgen\InformationCollection\API\Value\AttributeValue
      */
diff --git a/lib/API/Service/CaptchaService.php b/lib/API/Service/CaptchaService.php
index bf83b6c8..7d1d6df1 100644
--- a/lib/API/Service/CaptchaService.php
+++ b/lib/API/Service/CaptchaService.php
@@ -4,14 +4,14 @@
 
 namespace Netgen\InformationCollection\API\Service;
 
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 
 interface CaptchaService
 {
     /**
      * Returns Captcha implementation.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      *
      * @return \Netgen\InformationCollection\API\Service\CaptchaValue
      */
@@ -20,7 +20,7 @@ public function getCaptcha(Location $location): CaptchaValue;
     /**
      * Checks if captcha is enabled for given Location.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      *
      * @return bool
      */
@@ -29,7 +29,7 @@ public function isEnabled(Location $location): bool;
     /**
      * Returns configured captcha site key for given Location.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      *
      * @return string
      */
@@ -38,7 +38,7 @@ public function getSiteKey(Location $location): string;
     /**
      * Returns the captcha configuration for given Location.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      *
      * @return string
      */
diff --git a/lib/API/Value/Attribute.php b/lib/API/Value/Attribute.php
index e0525cdb..eea1bde1 100644
--- a/lib/API/Value/Attribute.php
+++ b/lib/API/Value/Attribute.php
@@ -4,19 +4,19 @@
 
 namespace Netgen\InformationCollection\API\Value;
 
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use Netgen\InformationCollection\Doctrine\Entity\EzInfoCollectionAttribute;
 
 final class Attribute extends ValueObject
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Field
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Field
      */
     protected $field;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition
      */
     protected $fieldDefinition;
 
diff --git a/lib/API/Value/Collection.php b/lib/API/Value/Collection.php
index 04c0c0aa..da29c223 100644
--- a/lib/API/Value/Collection.php
+++ b/lib/API/Value/Collection.php
@@ -5,8 +5,8 @@
 namespace Netgen\InformationCollection\API\Value;
 
 use DateTimeInterface;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\User\User;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\User\User;
 
 final class Collection extends ValueObject
 {
@@ -16,12 +16,12 @@ final class Collection extends ValueObject
     protected $id;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Content
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     protected $content;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\User\User
+     * @var \Ibexa\Contracts\Core\Repository\Values\User\User
      */
     protected $creator;
 
diff --git a/lib/API/Value/Content.php b/lib/API/Value/Content.php
index 9e350e8a..798d2361 100644
--- a/lib/API/Value/Content.php
+++ b/lib/API/Value/Content.php
@@ -4,8 +4,8 @@
 
 namespace Netgen\InformationCollection\API\Value;
 
-use eZ\Publish\API\Repository\Values\Content\Content as APIContent;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content as APIContent;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 
 final class Content extends ValueObject
 {
diff --git a/lib/API/Value/DataTransfer/AdditionalContent.php b/lib/API/Value/DataTransfer/AdditionalContent.php
index a54c674f..bee062a4 100644
--- a/lib/API/Value/DataTransfer/AdditionalContent.php
+++ b/lib/API/Value/DataTransfer/AdditionalContent.php
@@ -4,13 +4,13 @@
 
 namespace Netgen\InformationCollection\API\Value\DataTransfer;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Netgen\InformationCollection\API\Value\ValueObject;
 
 class AdditionalContent extends ValueObject
 {
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Content|null
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content|null
      */
     protected $content;
 
@@ -25,7 +25,7 @@ public function __construct(?Content $content = null)
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\Content|null
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content|null
      */
     public function getContent(): ?Content
     {
diff --git a/lib/API/Value/DataTransfer/EmailContent.php b/lib/API/Value/DataTransfer/EmailContent.php
index 4f365750..e025b943 100644
--- a/lib/API/Value/DataTransfer/EmailContent.php
+++ b/lib/API/Value/DataTransfer/EmailContent.php
@@ -4,7 +4,7 @@
 
 namespace Netgen\InformationCollection\API\Value\DataTransfer;
 
-use eZ\Publish\Core\FieldType\BinaryFile\Value as BinaryFile;
+use Ibexa\Core\FieldType\BinaryFile\Value as BinaryFile;
 use Netgen\InformationCollection\API\Value\ValueObject;
 
 class EmailContent extends ValueObject
diff --git a/lib/API/Value/DataTransfer/TemplateContent.php b/lib/API/Value/DataTransfer/TemplateContent.php
index bd05dc5f..85bd35f8 100644
--- a/lib/API/Value/DataTransfer/TemplateContent.php
+++ b/lib/API/Value/DataTransfer/TemplateContent.php
@@ -4,7 +4,7 @@
 
 namespace Netgen\InformationCollection\API\Value\DataTransfer;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
 use Netgen\InformationCollection\API\Value\ValueObject;
 use Twig\TemplateWrapper;
@@ -42,7 +42,7 @@ public function getEvent(): InformationCollected
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\Content
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     public function getContent(): Content
     {
diff --git a/lib/API/Value/Event/InformationCollected.php b/lib/API/Value/Event/InformationCollected.php
index d7bd5313..7fe92721 100644
--- a/lib/API/Value/Event/InformationCollected.php
+++ b/lib/API/Value/Event/InformationCollected.php
@@ -4,10 +4,10 @@
 
 namespace Netgen\InformationCollection\API\Value\Event;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Netgen\InformationCollection\API\Value\InformationCollectionStruct;
 use Symfony\Contracts\EventDispatcher\Event;
 
@@ -24,7 +24,7 @@ final class InformationCollected extends Event
     protected $options;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Location
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location
      */
     protected $location;
 
@@ -32,7 +32,7 @@ final class InformationCollected extends Event
      * InformationCollected constructor.
      *
      * @param \Netgen\InformationCollection\API\Value\InformationCollectionStruct $struct
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      * @param array $options
      */
     public function __construct(
@@ -56,7 +56,7 @@ public function getInformationCollectionStruct(): InformationCollectionStruct
     /**
      * Return ContentType.
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public function getContentType(): ContentType
     {
@@ -67,7 +67,7 @@ public function getContentType(): ContentType
     /**
      * Return Location.
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\Content
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     public function getContent(): Content
     {
@@ -76,7 +76,7 @@ public function getContent(): Content
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\ContentInfo
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo
      */
     public function getContentInfo(): ContentInfo
     {
@@ -86,7 +86,7 @@ public function getContentInfo(): ContentInfo
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\Location
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Location
      */
     public function getLocation(): Location
     {
diff --git a/lib/API/Value/InformationCollectionStruct.php b/lib/API/Value/InformationCollectionStruct.php
index 56b795d1..f618457a 100644
--- a/lib/API/Value/InformationCollectionStruct.php
+++ b/lib/API/Value/InformationCollectionStruct.php
@@ -4,10 +4,10 @@
 
 namespace Netgen\InformationCollection\API\Value;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use EzSystems\RepositoryForms\Data\Content\FieldData;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
 
 final class InformationCollectionStruct extends ValueObject
 {
@@ -19,22 +19,22 @@ final class InformationCollectionStruct extends ValueObject
     protected $languageCode;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Content
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     protected $content;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     protected $contentType;
 
     /**
-     * @var \EzSystems\RepositoryForms\Data\Content\FieldData[]
+     * @var \Ibexa\Contracts\ContentForms\Data\Content\FieldData[]
      */
     protected $fields;
 
     /**
-     * @var \eZ\Publish\API\Repository\Values\Content\Location
+     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location
      */
     private $location;
 
@@ -58,7 +58,7 @@ public function getLanguageCode(): string
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\Content
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     public function getContent(): Content
     {
@@ -66,7 +66,7 @@ public function getContent(): Content
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\Content\Location
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Location
      */
     public function getLocation(): Location
     {
@@ -74,7 +74,7 @@ public function getLocation(): Location
     }
 
     /**
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public function getContentType(): ContentType
     {
@@ -82,7 +82,7 @@ public function getContentType(): ContentType
     }
 
     /**
-     * @return \EzSystems\RepositoryForms\Data\Content\FieldData[]
+     * @return \Ibexa\Contracts\ContentForms\Data\Content\FieldData[]
      */
     public function getFieldsData(): array
     {
@@ -90,7 +90,7 @@ public function getFieldsData(): array
     }
 
     /**
-     * @return \EzSystems\RepositoryForms\Data\Content\FieldData[]
+     * @return \Ibexa\Contracts\ContentForms\Data\Content\FieldData[]
      */
     public function getCollectedFields(): array
     {
diff --git a/lib/API/Value/NullUser.php b/lib/API/Value/NullUser.php
index 4896f4bd..f37f8e99 100644
--- a/lib/API/Value/NullUser.php
+++ b/lib/API/Value/NullUser.php
@@ -2,16 +2,16 @@
 
 namespace Netgen\InformationCollection\API\Value;
 
-use eZ\Publish\Core\Repository\Values\Content\VersionInfo as CoreVersionInfo;
-use eZ\Publish\API\Repository\Values\Content\VersionInfo as APIVersionInfo;
-use eZ\Publish\Core\Repository\Values\User\User;
+use Ibexa\Core\Repository\Values\Content\VersionInfo as CoreVersionInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo as APIVersionInfo;
+use Ibexa\Core\Repository\Values\User\User;
 
 class NullUser extends User
 {
     /**
      * Returns the VersionInfo for this version.
      *
-     * @return \eZ\Publish\API\Repository\Values\Content\VersionInfo
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo
      */
     public function getVersionInfo(): APIVersionInfo
     {
diff --git a/lib/Core/Action/ConfigurationUtility.php b/lib/Core/Action/ConfigurationUtility.php
index 63e2d6e0..6303b6a2 100644
--- a/lib/Core/Action/ConfigurationUtility.php
+++ b/lib/Core/Action/ConfigurationUtility.php
@@ -2,8 +2,8 @@
 
 namespace Netgen\InformationCollection\Core\Action;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\API\Action\ActionInterface;
 use OutOfBoundsException;
 use function sprintf;
@@ -61,7 +61,7 @@ public function getActionConfiguration(ActionInterface $action): array
      * Returns configuration for given content type identifier if exists
      * or default one.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
      *
      * @return array
      */
diff --git a/lib/Core/EmailDataProvider/AbstractProvider.php b/lib/Core/EmailDataProvider/AbstractProvider.php
index 215df8aa..e9fa2b2c 100644
--- a/lib/Core/EmailDataProvider/AbstractProvider.php
+++ b/lib/Core/EmailDataProvider/AbstractProvider.php
@@ -2,9 +2,9 @@
 
 namespace Netgen\InformationCollection\Core\EmailDataProvider;
 
-use eZ\Publish\Core\Helper\FieldHelper;
-use eZ\Publish\Core\Helper\TranslationHelper;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Core\Helper\FieldHelper;
+use Ibexa\Core\Helper\TranslationHelper;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\API\Action\EmailDataProviderInterface;
 use Netgen\InformationCollection\Core\Action\EmailAction;
 use Twig\Environment;
@@ -17,12 +17,12 @@ abstract class AbstractProvider implements EmailDataProviderInterface
     protected $configResolver;
 
     /**
-     * @var \eZ\Publish\Core\Helper\TranslationHelper
+     * @var \Ibexa\Core\Helper\TranslationHelper
      */
     protected $translationHelper;
 
     /**
-     * @var \eZ\Publish\Core\Helper\FieldHelper
+     * @var \Ibexa\Core\Helper\FieldHelper
      */
     protected $fieldHelper;
 
@@ -35,8 +35,8 @@ abstract class AbstractProvider implements EmailDataProviderInterface
      * EmailDataFactory constructor.
      *
      * @param array $config
-     * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
-     * @param \eZ\Publish\Core\Helper\FieldHelper $fieldHelper
+     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
+     * @param \Ibexa\Core\Helper\FieldHelper $fieldHelper
      * @param \Twig\Environment $twig
      */
     public function __construct(
diff --git a/lib/Core/EmailDataProvider/DefaultProvider.php b/lib/Core/EmailDataProvider/DefaultProvider.php
index 61dae1e4..58245c93 100644
--- a/lib/Core/EmailDataProvider/DefaultProvider.php
+++ b/lib/Core/EmailDataProvider/DefaultProvider.php
@@ -5,13 +5,13 @@
 use Netgen\InformationCollection\API\Action\EmailDataProviderInterface;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
 use Symfony\Component\Mime\Email;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\Core\Action\EmailAction;
 use function array_key_exists;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\BinaryFile\Value as BinaryFile;
-use eZ\Publish\Core\Helper\FieldHelper;
-use eZ\Publish\Core\Helper\TranslationHelper;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\BinaryFile\Value as BinaryFile;
+use Ibexa\Core\Helper\FieldHelper;
+use Ibexa\Core\Helper\TranslationHelper;
 use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
 use Netgen\InformationCollection\API\Constants;
 use Netgen\InformationCollection\API\ConfigurationConstants;
@@ -29,12 +29,12 @@ class DefaultProvider implements EmailDataProviderInterface
     protected $configResolver;
 
     /**
-     * @var \eZ\Publish\Core\Helper\TranslationHelper
+     * @var \Ibexa\Core\Helper\TranslationHelper
      */
     protected $translationHelper;
 
     /**
-     * @var \eZ\Publish\Core\Helper\FieldHelper
+     * @var \Ibexa\Core\Helper\FieldHelper
      */
     protected $fieldHelper;
 
@@ -47,8 +47,8 @@ class DefaultProvider implements EmailDataProviderInterface
      * EmailDataFactory constructor.
      *
      * @param array $config
-     * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
-     * @param \eZ\Publish\Core\Helper\FieldHelper $fieldHelper
+     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
+     * @param \Ibexa\Core\Helper\FieldHelper $fieldHelper
      * @param \Twig\Environment $twig
      */
     public function __construct(
diff --git a/lib/Core/Export/CsvExportResponseFormatter.php b/lib/Core/Export/CsvExportResponseFormatter.php
index a4f5dade..b985c296 100644
--- a/lib/Core/Export/CsvExportResponseFormatter.php
+++ b/lib/Core/Export/CsvExportResponseFormatter.php
@@ -2,9 +2,9 @@
 
 namespace Netgen\InformationCollection\Core\Export;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\Core\Helper\TranslationHelper;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Helper\TranslationHelper;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use League\Csv\Writer;
 use SplTempFileObject;
 use Netgen\InformationCollection\API\Export\ExportResponseFormatter;
@@ -14,20 +14,20 @@
 final class CsvExportResponseFormatter implements ExportResponseFormatter
 {
     /**
-     * @var \eZ\Publish\Core\Helper\TranslationHelper
+     * @var \Ibexa\Core\Helper\TranslationHelper
      */
     private $translationHelper;
 
     /**
-     * @var \eZ\Publish\Core\MVC\ConfigResolverInterface
+     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
      */
     private $configResolver;
 
     /**
      * CsvExportResponseFormatter constructor.
      *
-     * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
-     * @param \eZ\Publish\Core\MVC\ConfigResolverInterface $configResolver
+     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
+     * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver
      */
     public function __construct(TranslationHelper $translationHelper, ConfigResolverInterface $configResolver)
     {
diff --git a/lib/Core/Export/JsonExportResponseFormatter.php b/lib/Core/Export/JsonExportResponseFormatter.php
index e6e7db7a..8f442d90 100644
--- a/lib/Core/Export/JsonExportResponseFormatter.php
+++ b/lib/Core/Export/JsonExportResponseFormatter.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\InformationCollection\Core\Export;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Netgen\InformationCollection\API\Export\ExportResponseFormatter;
 use Netgen\InformationCollection\API\Value\Export\Export;
 use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/lib/Core/Export/XlsExportResponseFormatter.php b/lib/Core/Export/XlsExportResponseFormatter.php
index 59de9824..5830299f 100644
--- a/lib/Core/Export/XlsExportResponseFormatter.php
+++ b/lib/Core/Export/XlsExportResponseFormatter.php
@@ -2,8 +2,8 @@
 
 namespace Netgen\InformationCollection\Core\Export;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\Core\Helper\TranslationHelper;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Helper\TranslationHelper;
 use Netgen\InformationCollection\API\Export\ExportResponseFormatter;
 use Netgen\InformationCollection\API\Value\Export\Export;
 use Symfony\Component\HttpFoundation\Response;
@@ -13,14 +13,14 @@
 final class XlsExportResponseFormatter implements ExportResponseFormatter
 {
     /**
-     * @var \eZ\Publish\Core\Helper\TranslationHelper
+     * @var \Ibexa\Core\Helper\TranslationHelper
      */
     private $translationHelper;
 
     /**
      * XlsExportResponseFormatter constructor.
      *
-     * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
+     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
      */
     public function __construct(TranslationHelper $translationHelper)
     {
diff --git a/lib/Core/Export/XlsxExportResponseFormatter.php b/lib/Core/Export/XlsxExportResponseFormatter.php
index 452b9170..24c2abc7 100644
--- a/lib/Core/Export/XlsxExportResponseFormatter.php
+++ b/lib/Core/Export/XlsxExportResponseFormatter.php
@@ -2,8 +2,8 @@
 
 namespace Netgen\InformationCollection\Core\Export;
 
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\Core\Helper\TranslationHelper;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Helper\TranslationHelper;
 use Netgen\InformationCollection\API\Export\ExportResponseFormatter;
 use Netgen\InformationCollection\API\Value\Export\Export;
 use Symfony\Component\HttpFoundation\Response;
@@ -13,14 +13,14 @@
 final class XlsxExportResponseFormatter implements ExportResponseFormatter
 {
     /**
-     * @var \eZ\Publish\Core\Helper\TranslationHelper
+     * @var \Ibexa\Core\Helper\TranslationHelper
      */
     private $translationHelper;
 
     /**
      * XlsExportResponseFormatter constructor.
      *
-     * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
+     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
      */
     public function __construct(TranslationHelper $translationHelper)
     {
diff --git a/lib/Core/Factory/AutoResponderDataFactory.php b/lib/Core/Factory/AutoResponderDataFactory.php
index 48894ae5..38b9c686 100644
--- a/lib/Core/Factory/AutoResponderDataFactory.php
+++ b/lib/Core/Factory/AutoResponderDataFactory.php
@@ -5,7 +5,7 @@
 namespace Netgen\InformationCollection\Core\Factory;
 
 use function array_key_exists;
-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Netgen\InformationCollection\API\Constants;
 use Netgen\InformationCollection\API\ConfigurationConstants;
 use Netgen\InformationCollection\API\Exception\MissingValueException;
diff --git a/lib/Core/Factory/EmailDataFactory.php b/lib/Core/Factory/EmailDataFactory.php
index d9b86c61..9daba4cb 100644
--- a/lib/Core/Factory/EmailDataFactory.php
+++ b/lib/Core/Factory/EmailDataFactory.php
@@ -4,13 +4,13 @@
 
 namespace Netgen\InformationCollection\Core\Factory;
 
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\Core\Action\EmailAction;
 use function array_key_exists;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\BinaryFile\Value as BinaryFile;
-use eZ\Publish\Core\Helper\FieldHelper;
-use eZ\Publish\Core\Helper\TranslationHelper;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\BinaryFile\Value as BinaryFile;
+use Ibexa\Core\Helper\FieldHelper;
+use Ibexa\Core\Helper\TranslationHelper;
 use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
 use Netgen\InformationCollection\API\Constants;
 use Netgen\InformationCollection\API\ConfigurationConstants;
@@ -29,12 +29,12 @@ class EmailDataFactory extends BaseEmailDataFactory
     protected $configResolver;
 
     /**
-     * @var \eZ\Publish\Core\Helper\TranslationHelper
+     * @var \Ibexa\Core\Helper\TranslationHelper
      */
     protected $translationHelper;
 
     /**
-     * @var \eZ\Publish\Core\Helper\FieldHelper
+     * @var \Ibexa\Core\Helper\FieldHelper
      */
     protected $fieldHelper;
 
@@ -47,8 +47,8 @@ class EmailDataFactory extends BaseEmailDataFactory
      * EmailDataFactory constructor.
      *
      * @param array $config
-     * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
-     * @param \eZ\Publish\Core\Helper\FieldHelper $fieldHelper
+     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
+     * @param \Ibexa\Core\Helper\FieldHelper $fieldHelper
      * @param \Twig\Environment $twig
      */
     public function __construct(
diff --git a/lib/Core/Factory/FieldDataFactory.php b/lib/Core/Factory/FieldDataFactory.php
index ac3fa9fb..a9bf95d4 100644
--- a/lib/Core/Factory/FieldDataFactory.php
+++ b/lib/Core/Factory/FieldDataFactory.php
@@ -4,8 +4,8 @@
 
 namespace Netgen\InformationCollection\Core\Factory;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\Value;
 use Netgen\InformationCollection\API\FieldHandler\CustomFieldHandlerInterface;
 use Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
@@ -31,8 +31,8 @@ public function __construct(FieldHandlerRegistry $registry)
     /**
      * Returns value object that represents legacy value.
      *
-     * @param \eZ\Publish\Core\FieldType\Value $value
-     * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition $fieldDefinition
+     * @param \Ibexa\Core\FieldType\Value $value
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition
      *
      * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
diff --git a/lib/Core/Mapper/DomainObjectMapper.php b/lib/Core/Mapper/DomainObjectMapper.php
index 7b9bd130..40775a94 100644
--- a/lib/Core/Mapper/DomainObjectMapper.php
+++ b/lib/Core/Mapper/DomainObjectMapper.php
@@ -6,14 +6,14 @@
 
 use DateTimeImmutable;
 use DateTimeInterface;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\Content\Content as APIContent;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCollection;
-use eZ\Publish\API\Repository\Values\User\User;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType as CoreContentType;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content as APIContent;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCollection;
+use Ibexa\Contracts\Core\Repository\Values\User\User;
+use Ibexa\Core\Repository\Values\ContentType\ContentType as CoreContentType;
 use Netgen\InformationCollection\API\Value\Attribute;
 use Netgen\InformationCollection\API\Value\AttributeValue;
 use Netgen\InformationCollection\API\Value\Collection;
@@ -25,22 +25,22 @@
 final class DomainObjectMapper
 {
     /**
-     * @var \eZ\Publish\API\Repository\Repository
+     * @var \Ibexa\Contracts\Core\Repository\Repository
      */
     private $repository;
 
     /**
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     private $contentService;
 
     /**
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     private $contentTypeService;
 
     /**
-     * @var \eZ\Publish\API\Repository\UserService
+     * @var \Ibexa\Contracts\Core\Repository\UserService
      */
     private $userService;
 
diff --git a/lib/Core/Persistence/Anonymizer/AnonymizerService.php b/lib/Core/Persistence/Anonymizer/AnonymizerService.php
index a113b4e4..5750204a 100644
--- a/lib/Core/Persistence/Anonymizer/AnonymizerService.php
+++ b/lib/Core/Persistence/Anonymizer/AnonymizerService.php
@@ -4,8 +4,8 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\Anonymizer;
 
-use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor;
 use Netgen\InformationCollection\API\Service\InformationCollection;
@@ -16,7 +16,7 @@
 class AnonymizerService implements Anonymizer
 {
     /**
-     * @var \eZ\Publish\API\Repository\Repository
+     * @var \Ibexa\Contracts\Core\Repository\Repository
      */
     protected $repository;
 
@@ -33,7 +33,7 @@ class AnonymizerService implements Anonymizer
     /**
      * Anonymizer constructor.
      *
-     * @param \eZ\Publish\API\Repository\Repository $repository
+     * @param \Ibexa\Contracts\Core\Repository\Repository $repository
      * @param \Netgen\InformationCollection\API\Service\InformationCollection $informationCollection
      * @param \Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor $fieldAnonymizerVisitor
      */
@@ -59,8 +59,8 @@ public function anonymizeCollection(int $collectionId, array $fields = []): void
      * @param \Netgen\InformationCollection\API\Value\Collection $collection
      * @param array $fields
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
     protected function destroyData(Collection $collection, array $fields = [])
     {
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
index 24547e2e..dd542b6c 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
@@ -4,7 +4,7 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\Anonymizer\Visitor\Field;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor;
 use Netgen\InformationCollection\API\Value\Attribute;
 use Netgen\InformationCollection\API\Value\AttributeValue;
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
index 3d276f71..da6d102b 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\Anonymizer\Visitor\Field;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor;
 use Netgen\InformationCollection\API\Value\Attribute;
 use Netgen\InformationCollection\API\Value\AttributeValue;
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php
index 052641dd..0f51b597 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php
@@ -4,7 +4,7 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\Anonymizer\Visitor\Field;
 
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor;
 use Netgen\InformationCollection\Doctrine\Entity\EzInfoCollectionAttribute;
 use Netgen\InformationCollection\API\Value\Attribute;
diff --git a/lib/Core/Persistence/ContentTypeUtils.php b/lib/Core/Persistence/ContentTypeUtils.php
index 72d1ae3c..07f22b4c 100644
--- a/lib/Core/Persistence/ContentTypeUtils.php
+++ b/lib/Core/Persistence/ContentTypeUtils.php
@@ -4,28 +4,28 @@
 
 namespace Netgen\InformationCollection\Core\Persistence;
 
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use OutOfBoundsException;
 
 final class ContentTypeUtils
 {
     /**
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     private $contentTypeService;
 
     /**
-     * @var \eZ\Publish\API\Repository\ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
      */
     private $contentService;
 
     /**
      * FieldIdResolver constructor.
      *
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \eZ\Publish\API\Repository\ContentService $contentService
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
      */
     public function __construct(ContentTypeService $contentTypeService, ContentService $contentService)
     {
@@ -40,8 +40,8 @@ public function __construct(ContentTypeService $contentTypeService, ContentServi
      * @param string $fieldDefIdentifier
      *
      * @throws \OutOfBoundsException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      *
      * @return mixed
      */
@@ -66,8 +66,8 @@ public function getFieldId($contentId, $fieldDefIdentifier)
      *
      * @param int $contentId
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      *
      * @return array
      */
diff --git a/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php
index 286055cb..fb5b37b1 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php
@@ -4,9 +4,9 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\FieldHandler\Custom;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
+use Ibexa\Core\FieldType\Value;
 use Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
 
@@ -29,7 +29,7 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
     }
 
     /**
-     * @param \eZ\Publish\Core\FieldType\Checkbox\Value $value
+     * @param \Ibexa\Core\FieldType\Checkbox\Value $value
      *
      * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
diff --git a/lib/Core/Persistence/FieldHandler/Custom/CountryFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/CountryFieldHandler.php
index 331f7d1e..695e3e3b 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/CountryFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/CountryFieldHandler.php
@@ -4,9 +4,9 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\FieldHandler\Custom;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\Country\Value as CountryValue;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\Country\Value as CountryValue;
+use Ibexa\Core\FieldType\Value;
 use \Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
 
@@ -27,7 +27,7 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
     }
 
     /**
-     * @param \eZ\Publish\Core\FieldType\Country\Value $value
+     * @param \Ibexa\Core\FieldType\Country\Value $value
      */
     public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition): FieldValue
     {
diff --git a/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php
index e65a89b7..6dcaf771 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php
@@ -4,9 +4,9 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\FieldHandler\Custom;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\DateAndTime\Value as DateAndTimeValue;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\DateAndTime\Value as DateAndTimeValue;
+use Ibexa\Core\FieldType\Value;
 use Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
 
@@ -32,7 +32,7 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
     }
 
     /**
-     * @param \eZ\Publish\Core\FieldType\DateAndTime\Value $value
+     * @param \Ibexa\Core\FieldType\DateAndTime\Value $value
      *
      * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
diff --git a/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php
index d390f31e..79d07323 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php
@@ -4,9 +4,9 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\FieldHandler\Custom;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\Date\Value as DateValue;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\Date\Value as DateValue;
+use Ibexa\Core\FieldType\Value;
 use Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
 
@@ -29,7 +29,7 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
     }
 
     /**
-     * @param \eZ\Publish\Core\FieldType\Date\Value $value
+     * @param \Ibexa\Core\FieldType\Date\Value $value
      *
      * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
diff --git a/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php
index 70d1e0af..536d3c3a 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php
@@ -4,9 +4,9 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\FieldHandler\Custom;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\FieldType\Value;
 use Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
 
@@ -29,7 +29,7 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
     }
 
     /**
-     * @param \eZ\Publish\Core\FieldType\Float\Value $value
+     * @param \Ibexa\Core\FieldType\Float\Value $value
      *
      * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
diff --git a/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php
index 16fc44ba..1db7d445 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php
@@ -4,9 +4,9 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\FieldHandler\Custom;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\Integer\Value as IntegerValue;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\Integer\Value as IntegerValue;
+use Ibexa\Core\FieldType\Value;
 use Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
 
@@ -29,7 +29,7 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
     }
 
     /**
-     * @param \eZ\Publish\Core\FieldType\Integer\Value $value
+     * @param \Ibexa\Core\FieldType\Integer\Value $value
      *
      * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
diff --git a/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php
index 0dca1d4f..94470eca 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php
@@ -4,9 +4,9 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\FieldHandler\Custom;
 
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\FieldType\Time\Value as TimeValue;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\Time\Value as TimeValue;
+use Ibexa\Core\FieldType\Value;
 use Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
 
@@ -29,7 +29,7 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
     }
 
     /**
-     * @param \eZ\Publish\Core\FieldType\Time\Value $value
+     * @param \Ibexa\Core\FieldType\Time\Value $value
      *
      * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
diff --git a/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php b/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
index 161ef70a..08ca262a 100644
--- a/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
+++ b/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
@@ -4,7 +4,7 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\FieldHandler;
 
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Core\FieldType\Value;
 use Netgen\InformationCollection\API\FieldHandler\CustomFieldHandlerInterface;
 
 final class FieldHandlerRegistry
diff --git a/lib/Core/Service/CaptchaService.php b/lib/Core/Service/CaptchaService.php
index 0f2ce802..5b45158d 100644
--- a/lib/Core/Service/CaptchaService.php
+++ b/lib/Core/Service/CaptchaService.php
@@ -4,10 +4,10 @@
 
 namespace Netgen\InformationCollection\Core\Service;
 
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\Content\Location;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\API\Service\CaptchaService as CaptchaServiceInterface;
 use Netgen\InformationCollection\API\Service\CaptchaValue;
 use Netgen\InformationCollection\API\Value\Captcha\ReCaptcha;
@@ -21,7 +21,7 @@ class CaptchaService implements CaptchaServiceInterface
     protected $config;
 
     /**
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
     /**
@@ -32,7 +32,7 @@ class CaptchaService implements CaptchaServiceInterface
     /**
      * CaptchaService constructor.
      *
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
+     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
      * @param array $config
      */
     public function __construct(ContentTypeService $contentTypeService, ConfigResolverInterface $configResolver)
@@ -100,9 +100,9 @@ public function getCaptcha(Location $location): CaptchaValue
     /**
      * Returns filtered config for current Location.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      *
      * @return array
      */
@@ -118,7 +118,7 @@ public function getConfig(Location $location): array
     /**
      * Returns filtered config for current ContentType.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
      *
      * @return array
      */
@@ -134,7 +134,7 @@ protected function getConfigForContentType(ContentType $contentType)
     /**
      * Checks if override exist for given ContentType.
      *
-     * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
+     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
      *
      * @return bool
      */
@@ -152,11 +152,11 @@ protected function hasConfigForContentType(ContentType $contentType)
     /**
      * Helper method for retrieving ContentType from Location.
      *
-     * @param \eZ\Publish\API\Repository\Values\Content\Location $location
+     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
      *
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      *
-     * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType
+     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     protected function getContentType(Location $location)
     {
diff --git a/lib/Core/Service/InformationCollectionService.php b/lib/Core/Service/InformationCollectionService.php
index c70b8a26..2010d5d1 100644
--- a/lib/Core/Service/InformationCollectionService.php
+++ b/lib/Core/Service/InformationCollectionService.php
@@ -4,9 +4,9 @@
 
 namespace Netgen\InformationCollection\Core\Service;
 
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\User\UserReference;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Values\User\UserReference;
 use Netgen\InformationCollection\API\Exception\PersistingFailedException;
 use Netgen\InformationCollection\API\Exception\StoringAttributeFailedException;
 use Netgen\InformationCollection\API\Exception\StoringCollectionFailedException;
@@ -47,7 +47,7 @@ class InformationCollectionService implements InformationCollection
     protected $ezInfoCollectionAttributeRepository;
 
     /**
-     * @var \eZ\Publish\API\Repository\Repository
+     * @var \Ibexa\Contracts\Core\Repository\Repository
      */
     protected $repository;
 
@@ -71,7 +71,7 @@ class InformationCollectionService implements InformationCollection
      *
      * @param \Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionRepository $ezInfoCollectionRepository
      * @param \Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionAttributeRepository $ezInfoCollectionAttributeRepository
-     * @param \eZ\Publish\API\Repository\Repository $repository
+     * @param \Ibexa\Contracts\Core\Repository\Repository $repository
      * @param \Netgen\InformationCollection\Core\Persistence\Gateway\DoctrineDatabase $gateway
      */
     public function __construct(
@@ -306,7 +306,7 @@ public function updateCollectionAttribute(CollectionId $collectionId, Attribute
      * @param int $userId
      * @param mixed $userId
      *
-     * @return \eZ\Publish\API\Repository\Values\User\User
+     * @return \Ibexa\Contracts\Core\Repository\Values\User\User
      */
     protected function getUser($userId)
     {
diff --git a/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php b/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php
index 7924a27b..e0f75abe 100644
--- a/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php
+++ b/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php
@@ -9,8 +9,8 @@
 use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\ORMException;
 use Doctrine\ORM\ORMInvalidArgumentException;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Netgen\InformationCollection\API\Exception\RemoveAttributeFailedException;
 use Netgen\InformationCollection\API\Exception\RetrieveCountException;
 use Netgen\InformationCollection\API\Exception\StoringAttributeFailedException;
diff --git a/lib/Doctrine/Repository/EzInfoCollectionRepository.php b/lib/Doctrine/Repository/EzInfoCollectionRepository.php
index a12f562b..a1ba15b6 100644
--- a/lib/Doctrine/Repository/EzInfoCollectionRepository.php
+++ b/lib/Doctrine/Repository/EzInfoCollectionRepository.php
@@ -10,8 +10,8 @@
 use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\ORMException;
 use Doctrine\ORM\ORMInvalidArgumentException;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\User\User;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Netgen\InformationCollection\API\Exception\RemoveCollectionFailedException;
 use Netgen\InformationCollection\API\Exception\RetrieveCountException;
 use Netgen\InformationCollection\API\Exception\StoringCollectionFailedException;
diff --git a/lib/Handler.php b/lib/Handler.php
index b5840d84..1d9c76d0 100644
--- a/lib/Handler.php
+++ b/lib/Handler.php
@@ -2,14 +2,14 @@
 
 namespace Netgen\InformationCollection;
 
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Netgen\InformationCollection\API\Events;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
 use Netgen\InformationCollection\API\Value\InformationCollectionStruct;
-use Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionMapper;
-use Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionType;
+use Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionMapper;
+use Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionType;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
@@ -22,7 +22,7 @@ final class Handler
     private $formFactory;
 
     /**
-     * @var \eZ\Publish\API\Repository\ContentTypeService
+     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     private $contentTypeService;
 
diff --git a/lib/Resources/config/actions.yml b/lib/Resources/config/actions.yml
index 45a206f9..a0151c8e 100644
--- a/lib/Resources/config/actions.yml
+++ b/lib/Resources/config/actions.yml
@@ -12,7 +12,7 @@ services:
     netgen_information_collection.action.config_utility:
         class: Netgen\InformationCollection\Core\Action\ConfigurationUtility
         arguments:
-            - "@ezpublish.config.resolver"
+            - "@ibexa.config.resolver"
 
     netgen_information_collection.action.db:
         class: Netgen\InformationCollection\Core\Action\DatabaseAction
diff --git a/lib/Resources/config/admin.yml b/lib/Resources/config/admin.yml
index 5aee1e4c..05388ff4 100644
--- a/lib/Resources/config/admin.yml
+++ b/lib/Resources/config/admin.yml
@@ -5,7 +5,7 @@ services:
         arguments:
             - "@netgen_information_collection.repository.ez_info_collection"
             - "@netgen_information_collection.repository.ez_info_collection_attribute"
-            - "@ezpublish.api.repository"
+            - "@ibexa.api.repository"
             - "@netgen_information_collection.core.persistence.gateway.doctrine"
             - "@netgen_information_collection.factory.field_data"
             - "@netgen_information_collection.domain_object_mapper"
@@ -14,7 +14,7 @@ services:
         class: Netgen\Bundle\InformationCollectionBundle\Templating\Twig\AdminGlobalVariable
         public: true
         arguments:
-            - "@ezpublish.config.resolver"
+            - "@ibexa.config.resolver"
 
     netgen_information_collection.core.persistence.gateway.doctrine:
         class: Netgen\InformationCollection\Core\Persistence\Gateway\DoctrineDatabase
@@ -22,11 +22,10 @@ services:
         arguments:
             - '@database_connection'
 
-    netgen_information_collection.pagerfanta.view.eztags_admin:
+    netgen_information_collection.pagerfanta.view.information_collection_admin:
         class: Netgen\InformationCollection\Core\Pagination\Pagerfanta\View\InformationCollectionAdminView
         public: false
-        # Not being lazy results in out of memory exceptions on eZ Platform 2.0,
-        # probably due to @twig dependency
+        # Not being lazy results in out of memory exceptions, probably due to @twig dependency
         lazy: true
         arguments:
             - "@twig"
@@ -45,8 +44,8 @@ services:
     netgen_information_collection.utils.content_type:
         class: Netgen\InformationCollection\Core\Persistence\ContentTypeUtils
         arguments:
-            - "@ezpublish.api.service.content_type"
-            - "@ezpublish.api.service.content"
+            - "@ibexa.api.service.content_type"
+            - "@ibexa.api.service.content"
 
     netgen_information_collection.core.export.registry:
         class: Netgen\InformationCollection\Core\Export\ExportResponseFormatterRegistry
diff --git a/lib/Resources/config/anonymizers.yml b/lib/Resources/config/anonymizers.yml
index 0ff130bc..1ad4de28 100644
--- a/lib/Resources/config/anonymizers.yml
+++ b/lib/Resources/config/anonymizers.yml
@@ -9,7 +9,7 @@ services:
     netgen_information_collection.anonymizer.service:
         class: Netgen\InformationCollection\Core\Persistence\Anonymizer\AnonymizerService
         arguments:
-            - "@ezpublish.api.repository"
+            - "@ibexa.api.repository"
             - "@netgen_information_collection.api.service"
             - "@netgen_information_collection.anonymizer.visitor.field.aggregate"
 
diff --git a/lib/Resources/config/ezplatform_admin.yml b/lib/Resources/config/ezplatform_admin.yml
deleted file mode 100644
index 7089a18a..00000000
--- a/lib/Resources/config/ezplatform_admin.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-  netgen_information_collection.ezadminui.pagelayout: '@@NetgenInformationCollection/ezadminui/pagelayout.html.twig'
-
-services:
-    netgen_information_collection.ezplatform_admin.menu:
-        class: Netgen\Bundle\InformationCollectionBundle\EzPlatform\EzPlatformAdmin\MenuListener
-        public: true
-        tags:
-            - { name: kernel.event_subscriber }
-
-    netgen_information_collection.ezadminui.event_listener.set_page_layout:
-        class: Netgen\Bundle\InformationCollectionBundle\EzPlatform\EzPlatformAdmin\EventListener\SetPageLayoutListener
-        arguments:
-            - "@netgen_information_collection.templating.admin_global_variable"
-            - "%ezpublish.siteaccess.groups_by_siteaccess%"
-            - "%netgen_information_collection.ezadminui.pagelayout%"
-        tags:
-            - { name: kernel.event_subscriber }
diff --git a/lib/Resources/config/factories.yml b/lib/Resources/config/factories.yml
index 049b43c7..c7c70152 100644
--- a/lib/Resources/config/factories.yml
+++ b/lib/Resources/config/factories.yml
@@ -2,17 +2,17 @@ services:
     netgen_information_collection.factory.email_data:
         class: Netgen\InformationCollection\Core\Factory\EmailDataFactory
         arguments:
-            - '@ezpublish.config.resolver'
-            - '@ezpublish.translation_helper'
-            - '@ezpublish.field_helper'
+            - '@ibexa.config.resolver'
+            - '@Ibexa\Core\Helper\TranslationHelper'
+            - '@Ibexa\Core\Helper\FieldHelper'
             - '@twig'
 
     netgen_information_collection.factory.auto_responder_data:
         class: Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory
         arguments:
-            - '@ezpublish.config.resolver'
-            - '@ezpublish.translation_helper'
-            - '@ezpublish.field_helper'
+            - '@ibexa.config.resolver'
+            - '@Ibexa\Core\Helper\TranslationHelper'
+            - '@Ibexa\Core\Helper\FieldHelper'
             - '@twig'
 
     netgen_information_collection.factory.field_data:
diff --git a/lib/Resources/config/ibexa_admin.yml b/lib/Resources/config/ibexa_admin.yml
new file mode 100644
index 00000000..49d2697c
--- /dev/null
+++ b/lib/Resources/config/ibexa_admin.yml
@@ -0,0 +1,18 @@
+parameters:
+  netgen_information_collection.ibexa.admin.pagelayout: '@@NetgenInformationCollection/ibexa/admin/pagelayout.html.twig'
+
+services:
+    netgen_information_collection.ibexa_admin.menu:
+        class: Netgen\Bundle\InformationCollectionBundle\Ibexa\Admin\MenuListener
+        public: true
+        tags:
+            - { name: kernel.event_subscriber }
+
+    netgen_information_collection.ibexa.admin.event_listener.set_page_layout:
+        class: Netgen\Bundle\InformationCollectionBundle\Ibexa\Admin\EventListener\SetPageLayoutListener
+        arguments:
+            - "@netgen_information_collection.templating.admin_global_variable"
+            - "%ibexa.site_access.groups_by_site_access%"
+            - "%netgen_information_collection.ibexa.admin.pagelayout%"
+        tags:
+            - { name: kernel.event_subscriber }
diff --git a/lib/Resources/config/services.yml b/lib/Resources/config/services.yml
index 399266dc..661d9d91 100644
--- a/lib/Resources/config/services.yml
+++ b/lib/Resources/config/services.yml
@@ -5,7 +5,7 @@ imports:
     - { resource: legacy_handlers.yml }
     - { resource: admin.yml }
     - { resource: anonymizers.yml }
-    - { resource: ezplatform_admin.yml }
+    - { resource: ibexa_admin.yml }
 
 parameters:
 
@@ -28,14 +28,14 @@ services:
             - '@mailer'
 
     netgen_information_collection.form.extension.field_definition:
-        class: Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\FieldDefinitionTypeExtension
+        class: Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\FieldDefinitionTypeExtension
         tags:
-            - { name: form.type_extension, extended_type: EzSystems\EzPlatformAdminUi\Form\Type\FieldDefinition\FieldDefinitionType }
+            - { name: form.type_extension, extended_type: Ibexa\AdminUi\Form\Type\FieldDefinition\FieldDefinitionType }
 
     netgen_information_collection.domain_object_mapper:
         class: Netgen\InformationCollection\Core\Mapper\DomainObjectMapper
         arguments:
-            - '@ezpublish.api.repository'
+            - '@ibexa.api.repository'
 
 
     netgen_information_collection.twig.extension.rendering:
@@ -49,21 +49,21 @@ services:
         # public: false
         arguments:
             - '@twig'
-            - '@ezpublish.config.resolver'
+            - '@ibexa.config.resolver'
         tags:
             - { name: twig.runtime }
 
     netgen_information_collection.form.information_collection_type:
-        class: Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionType
+        class: Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionType
         arguments:
             - '@netgen_information_collection.captcha.service'
         tags:
             - { name: form.type }
 
     netgen_information_collection.form.information_collection_field_type:
-        class: Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionFieldType
+        class: Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionFieldType
         arguments:
-            - "@ezplatform.content_forms.field_type_form_mapper.dispatcher"
+            - '@Ibexa\ContentForms\FieldType\FieldTypeFormMapperDispatcher'
         tags:
             - { name: form.type }
 
@@ -72,14 +72,14 @@ services:
         public: true
         arguments:
             - "@form.factory"
-            - "@ezpublish.api.service.content_type"
+            - "@ibexa.api.service.content_type"
             - "@event_dispatcher"
 
     netgen_information_collection.captcha.service:
         class: Netgen\InformationCollection\Core\Service\CaptchaService
         arguments:
-            - '@ezpublish.api.service.content_type'
-            - '@ezpublish.config.resolver'
+            - '@ibexa.api.service.content_type'
+            - '@ibexa.config.resolver'
 
     netgen_information_collection.export.json:
         class: Netgen\InformationCollection\Core\Export\JsonExportResponseFormatter
diff --git a/phpstan.neon b/phpstan.neon
index 61fb3047..44f352dc 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -12,16 +12,16 @@ parameters:
         - '#Cannot call method fetchColumn\(\) on Doctrine\\DBAL\\Driver\\Statement\|int#'
         - '#Parameter \#2 \$y of method Doctrine\\DBAL\\Query\\Expression\\ExpressionBuilder::in\(\) expects array\<string\>\|string, array\<int, int\> given#'
 
-        # eZ Platform related errors
+        # Ibexa Platform related errors
         -
-            message: '#Access to protected property eZ\\Publish\\API\\Repository\\Values\\Content\\Field::\$value#'
+            message: '#Access to protected property Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Field::\$value#'
             path: lib/Core/Factory/EmailDataFactory.php
         -
-            message: '#Access to protected property eZ\\Publish\\Core\\Repository\\Values\\ContentType\\ContentType::\$fieldDefinitionsById#'
+            message: '#Access to protected property Ibexa\\Core\\Repository\\Values\\ContentType\\ContentType::\$fieldDefinitionsById#'
             path: lib/Core/Mapper/DomainObjectMapper.php
 
-        - '#Access to protected property eZ\\Publish\\API\\Repository\\Values\\Content\\Field::\$value#'
-        - '#Access to an undefined property EzSystems\\RepositoryForms\\Data\\Content\\FieldData::\$email#'
+        - '#Access to protected property Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Field::\$value#'
+        - '#Access to an undefined property Ibexa\\Contracts\\ContentForms\\Data\\Content\\FieldData::\$email#'
 
         # Pagerfanta
         - '#Property Netgen\\InformationCollection\\Core\\Pagination\\Pagerfanta\\View\\InformationCollectionAdminView::\$pagerfanta \(Pagerfanta\\Pagerfanta\) does not accept Pagerfanta\\PagerfantaInterface#'
diff --git a/tests/old/Action/ActionRegistryTest.php b/tests/old/Action/ActionRegistryTest.php
index 3ebcf956..056c4229 100644
--- a/tests/old/Action/ActionRegistryTest.php
+++ b/tests/old/Action/ActionRegistryTest.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Action;
 
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
 use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\InformationCollectionBundle\Action\ActionInterface;
 use Netgen\Bundle\InformationCollectionBundle\Action\ActionRegistry;
diff --git a/tests/old/Action/DatabaseActionTest.php b/tests/old/Action/DatabaseActionTest.php
index 24001747..c05948d6 100644
--- a/tests/old/Action/DatabaseActionTest.php
+++ b/tests/old/Action/DatabaseActionTest.php
@@ -3,17 +3,17 @@
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Action;
 
 use Doctrine\DBAL\DBALException;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\TextLine\Value as TextLineValue;
-use eZ\Publish\Core\Repository\ContentService;
-use eZ\Publish\Core\Repository\Repository;
-use eZ\Publish\Core\Repository\Values\Content\Content;
-use eZ\Publish\Core\Repository\Values\Content\Location;
-use eZ\Publish\Core\Repository\Values\Content\VersionInfo;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\User\User;
-use eZ\Publish\SPI\Persistence\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\TextLine\Value as TextLineValue;
+use Ibexa\Core\Repository\ContentService;
+use Ibexa\Core\Repository\Repository;
+use Ibexa\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Repository\Values\Content\Location;
+use Ibexa\Core\Repository\Values\Content\VersionInfo;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\User\User;
+use Ibexa\Contracts\Core\Persistence\Content\ContentInfo;
 use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\InformationCollectionBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Action\DatabaseAction;
@@ -51,7 +51,7 @@ class DatabaseActionTest extends TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $ezRepository;
+    protected $ibexaRepository;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -95,7 +95,7 @@ public function setUp()
             ->setMethods(array('getInstance', 'save'))
             ->getMock();
 
-        $this->ezRepository = $this->getMockBuilder(Repository::class)
+        $this->ibexaRepository = $this->getMockBuilder(Repository::class)
             ->disableOriginalConstructor()
             ->setMethods(array('getContentService', 'getCurrentUser'))
             ->getMock();
@@ -160,7 +160,7 @@ public function setUp()
 
         $this->legacyData = new LegacyData(123, 0, 0.0, 'some value');
 
-        $this->action = new DatabaseAction($this->factory, $this->repository, $this->secondRepository, $this->ezRepository);
+        $this->action = new DatabaseAction($this->factory, $this->repository, $this->secondRepository, $this->ibexaRepository);
         parent::setUp();
     }
 
@@ -198,7 +198,7 @@ public function testAct()
         $ezInfoCollection = new EzInfoCollection();
         $ezInfoCollectionAttribute = new EzInfoCollectionAttribute();
 
-        $this->ezRepository->expects($this->once())
+        $this->ibexaRepository->expects($this->once())
             ->method('getContentService')
             ->willReturn($this->contentService);
 
@@ -207,7 +207,7 @@ public function testAct()
             ->with(123)
             ->willReturn($content);
 
-        $this->ezRepository->expects($this->once())
+        $this->ibexaRepository->expects($this->once())
             ->method('getCurrentUser')
             ->willReturn($user);
 
@@ -270,7 +270,7 @@ public function testActWithExceptionOnInformationCollectionRepository()
 
         $ezInfoCollection = new EzInfoCollection();
 
-        $this->ezRepository->expects($this->once())
+        $this->ibexaRepository->expects($this->once())
             ->method('getContentService')
             ->willReturn($this->contentService);
 
@@ -279,7 +279,7 @@ public function testActWithExceptionOnInformationCollectionRepository()
             ->with(123)
             ->willReturn($content);
 
-        $this->ezRepository->expects($this->once())
+        $this->ibexaRepository->expects($this->once())
             ->method('getCurrentUser')
             ->willReturn($user);
 
@@ -341,7 +341,7 @@ public function testActWithExceptionOnInformationCollectionAttributeRepository()
         $ezInfoCollection = new EzInfoCollection();
         $ezInfoCollectionAttribute = new EzInfoCollectionAttribute();
 
-        $this->ezRepository->expects($this->once())
+        $this->ibexaRepository->expects($this->once())
             ->method('getContentService')
             ->willReturn($this->contentService);
 
@@ -350,7 +350,7 @@ public function testActWithExceptionOnInformationCollectionAttributeRepository()
             ->with(123)
             ->willReturn($content);
 
-        $this->ezRepository->expects($this->once())
+        $this->ibexaRepository->expects($this->once())
             ->method('getCurrentUser')
             ->willReturn($user);
 
diff --git a/tests/old/ContentViewStub.php b/tests/old/ContentViewStub.php
index 5114ea24..5629c11e 100644
--- a/tests/old/ContentViewStub.php
+++ b/tests/old/ContentViewStub.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests;
 
-use eZ\Publish\Core\MVC\Symfony\View\ContentValueView;
+use Ibexa\Core\MVC\Symfony\View\ContentValueView;
 
 class ContentViewStub implements ContentValueView
 {
diff --git a/tests/old/Controller/InformationCollectionControllerTest.php b/tests/old/Controller/InformationCollectionControllerTest.php
index dc91eca5..bac810f2 100644
--- a/tests/old/Controller/InformationCollectionControllerTest.php
+++ b/tests/old/Controller/InformationCollectionControllerTest.php
@@ -2,8 +2,8 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Controller;
 
-use eZ\Publish\Core\MVC\Symfony\View\ContentView;
-use eZ\Publish\Core\Repository\Values\Content\Location;
+use Ibexa\Core\MVC\Symfony\View\ContentView;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\EzFormsBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Controller\InformationCollectionController;
@@ -211,7 +211,7 @@ public function testDisplayAndHandleWithInvalidFormSubmission()
 
     /**
      * @expectedException \BadMethodCallException
-     * @expectedExceptionMessage eZ view needs to implement LocationValueView interface
+     * @expectedExceptionMessage Ibexa view needs to implement LocationValueView interface
      */
     public function testIfLocationValueViewIsNotProvidedThrowBadMethodCallException()
     {
diff --git a/tests/old/DependencyInjection/NetgenInformationCollectionExtensionTest.php b/tests/old/DependencyInjection/NetgenInformationCollectionExtensionTest.php
index 7fc75e3c..1ce486c0 100644
--- a/tests/old/DependencyInjection/NetgenInformationCollectionExtensionTest.php
+++ b/tests/old/DependencyInjection/NetgenInformationCollectionExtensionTest.php
@@ -9,7 +9,7 @@ class NetgenInformationCollectionExtensionTest extends AbstractExtensionTestCase
 {
     public function testItSetsValidContainerParameters()
     {
-        $this->container->setParameter('ezpublish.siteaccess.list', array());
+        $this->container->setParameter('ibexa.site_access.list', array());
         $this->load();
     }
 
diff --git a/tests/old/Factory/AutoResponderDataFactoryTest.php b/tests/old/Factory/AutoResponderDataFactoryTest.php
index 6a0090e9..28a7e804 100644
--- a/tests/old/Factory/AutoResponderDataFactoryTest.php
+++ b/tests/old/Factory/AutoResponderDataFactoryTest.php
@@ -3,17 +3,17 @@
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Factory;
 
 use Netgen\Bundle\InformationCollectionBundle\Factory\AutoResponderDataFactory;
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\EmailAddress\Value as EmailValue;
-use eZ\Publish\Core\FieldType\TextLine\Value as TextLineValue;
-use eZ\Publish\Core\Helper\FieldHelper;
-use eZ\Publish\Core\Helper\TranslationHelper;
-use eZ\Publish\Core\Repository\ContentService;
-use eZ\Publish\Core\Repository\Values\Content\Content;
-use eZ\Publish\Core\Repository\Values\Content\Location;
-use eZ\Publish\Core\Repository\Values\Content\VersionInfo;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\EmailAddress\Value as EmailValue;
+use Ibexa\Core\FieldType\TextLine\Value as TextLineValue;
+use Ibexa\Core\Helper\FieldHelper;
+use Ibexa\Core\Helper\TranslationHelper;
+use Ibexa\Core\Repository\ContentService;
+use Ibexa\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Repository\Values\Content\Location;
+use Ibexa\Core\Repository\Values\Content\VersionInfo;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
 use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\EzFormsBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
@@ -52,7 +52,7 @@ class AutoResponderDataFactoryTest extends TestCase
     protected $contentService;
 
     /**
-     * @var \eZ\Publish\Core\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Core\Repository\Values\ContentType\ContentType
      */
     protected $contentType;
 
@@ -67,12 +67,12 @@ class AutoResponderDataFactoryTest extends TestCase
     protected $templateWrapper;
 
     /**
-     * @var \eZ\Publish\Core\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Core\Repository\Values\ContentType\ContentType
      */
     protected $contentType2;
 
     /**
-     * @var \eZ\Publish\Core\Repository\Values\Content\VersionInfo
+     * @var \Ibexa\Core\Repository\Values\Content\VersionInfo
      */
     protected $versionInfo;
 
diff --git a/tests/old/Factory/EmailDataFactoryTest.php b/tests/old/Factory/EmailDataFactoryTest.php
index e41b3ece..0fb8daa9 100644
--- a/tests/old/Factory/EmailDataFactoryTest.php
+++ b/tests/old/Factory/EmailDataFactoryTest.php
@@ -2,17 +2,17 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Factory;
 
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\EmailAddress\Value as EmailValue;
-use eZ\Publish\Core\FieldType\TextLine\Value as TextLineValue;
-use eZ\Publish\Core\Helper\FieldHelper;
-use eZ\Publish\Core\Helper\TranslationHelper;
-use eZ\Publish\Core\Repository\ContentService;
-use eZ\Publish\Core\Repository\Values\Content\Content;
-use eZ\Publish\Core\Repository\Values\Content\Location;
-use eZ\Publish\Core\Repository\Values\Content\VersionInfo;
-use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\FieldType\EmailAddress\Value as EmailValue;
+use Ibexa\Core\FieldType\TextLine\Value as TextLineValue;
+use Ibexa\Core\Helper\FieldHelper;
+use Ibexa\Core\Helper\TranslationHelper;
+use Ibexa\Core\Repository\ContentService;
+use Ibexa\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Repository\Values\Content\Location;
+use Ibexa\Core\Repository\Values\Content\VersionInfo;
+use Ibexa\Core\Repository\Values\ContentType\ContentType;
 use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\EzFormsBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
@@ -51,7 +51,7 @@ class EmailDataFactoryTest extends TestCase
     protected $contentService;
 
     /**
-     * @var \eZ\Publish\Core\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Core\Repository\Values\ContentType\ContentType
      */
     protected $contentType;
 
@@ -66,12 +66,12 @@ class EmailDataFactoryTest extends TestCase
     protected $templateWrapper;
 
     /**
-     * @var \eZ\Publish\Core\Repository\Values\ContentType\ContentType
+     * @var \Ibexa\Core\Repository\Values\ContentType\ContentType
      */
     protected $contentType2;
 
     /**
-     * @var \eZ\Publish\Core\Repository\Values\Content\VersionInfo
+     * @var \Ibexa\Core\Repository\Values\Content\VersionInfo
      */
     protected $versionInfo;
 
diff --git a/tests/old/Factory/FieldDataFactoryTest.php b/tests/old/Factory/FieldDataFactoryTest.php
index 43c0a990..22833ebe 100644
--- a/tests/old/Factory/FieldDataFactoryTest.php
+++ b/tests/old/Factory/FieldDataFactoryTest.php
@@ -2,8 +2,8 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Factory;
 
-use eZ\Publish\Core\FieldType\TextLine\Value as TextValue;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\FieldType\TextLine\Value as TextValue;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
 use Netgen\Bundle\InformationCollectionBundle\Factory\FieldDataFactory;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomFieldHandlerInterface;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface;
diff --git a/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php b/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php
index eed48564..e2e93c87 100644
--- a/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php
@@ -2,12 +2,12 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\FieldHandler\Custom;
 
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\FieldType\Integer\Value as IntegerValue;
-use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\FieldType\Integer\Value as IntegerValue;
+use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CheckboxFieldHandler;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
 use PHPUnit\Framework\TestCase;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface;
 
diff --git a/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php b/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php
index 05358be3..0e9e85e6 100644
--- a/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php
@@ -2,11 +2,11 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\FieldHandler\Custom;
 
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
-use eZ\Publish\Core\FieldType\DateAndTime\Value as DateAndTimeValue;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
+use Ibexa\Core\FieldType\DateAndTime\Value as DateAndTimeValue;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\DateAndTimeFieldHandler;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php b/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php
index 5f1a9233..cc16ce96 100644
--- a/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php
@@ -2,11 +2,11 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\FieldHandler\Custom;
 
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
-use eZ\Publish\Core\FieldType\Date\Value as DateValue;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
+use Ibexa\Core\FieldType\Date\Value as DateValue;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\DateFieldHandler;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php b/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php
index 111e834c..6387d50d 100644
--- a/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php
@@ -2,11 +2,11 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\FieldHandler\Custom;
 
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\FieldType\Integer\Value as IntegerValue;
-use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\FieldType\Integer\Value as IntegerValue;
+use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\FloatFieldHandler;
 use PHPUnit\Framework\TestCase;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface;
diff --git a/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php b/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php
index a4e41629..4e28ec51 100644
--- a/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php
@@ -2,12 +2,12 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\FieldHandler\Custom;
 
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\FieldType\Integer\Value as IntegerValue;
-use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\FieldType\Integer\Value as IntegerValue;
+use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\IntegerFieldHandler;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
 use PHPUnit\Framework\TestCase;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface;
 
diff --git a/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php b/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php
index ed158843..041c1294 100644
--- a/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php
@@ -2,11 +2,11 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\FieldHandler\Custom;
 
-use eZ\Publish\Core\FieldType\Float\Value as FloatValue;
-use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
-use eZ\Publish\Core\FieldType\Time\Value as TimeValue;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
+use Ibexa\Core\FieldType\Float\Value as FloatValue;
+use Ibexa\Core\FieldType\Checkbox\Value as CheckboxValue;
+use Ibexa\Core\FieldType\Time\Value as TimeValue;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition as CoreFieldDefinition;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\TimeFieldHandler;
 use PHPUnit\Framework\TestCase;
@@ -25,7 +25,7 @@ class TimeFieldHandlerTest extends TestCase
     protected $dt;
 
     /**
-     * @var \eZ\Publish\Core\FieldType\Time\Value
+     * @var \Ibexa\Core\FieldType\Time\Value
      */
     protected $value;
 
diff --git a/tests/old/FieldHandler/FieldHandlerRegistryTest.php b/tests/old/FieldHandler/FieldHandlerRegistryTest.php
index 8d0e0b72..94cde41f 100644
--- a/tests/old/FieldHandler/FieldHandlerRegistryTest.php
+++ b/tests/old/FieldHandler/FieldHandlerRegistryTest.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\FieldHandler;
 
-use eZ\Publish\Core\FieldType\Integer\Value as TestValue;
+use Ibexa\Core\FieldType\Integer\Value as TestValue;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomFieldHandlerInterface;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\FieldHandlerRegistry;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/old/Form/Builder/FormBuilderTest.php b/tests/old/Form/Builder/FormBuilderTest.php
index d1816fac..b31e7b99 100644
--- a/tests/old/Form/Builder/FormBuilderTest.php
+++ b/tests/old/Form/Builder/FormBuilderTest.php
@@ -2,9 +2,9 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\FieldHandler;
 
-use eZ\Publish\API\Repository\Values\Content\ContentInfo;
-use eZ\Publish\Core\Repository\ContentTypeService;
-use eZ\Publish\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
+use Ibexa\Core\Repository\ContentTypeService;
+use Ibexa\Core\Repository\Values\Content\Location;
 use Netgen\Bundle\InformationCollectionBundle\Form\Builder\FormBuilder;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\FormBuilder as SymfonyFormBuilder;
diff --git a/tests/old/Mailer/MailerTest.php b/tests/old/Mailer/MailerTest.php
index 09569e1b..051308cf 100644
--- a/tests/old/Mailer/MailerTest.php
+++ b/tests/old/Mailer/MailerTest.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Mailer;
 
-use eZ\Publish\Core\FieldType\BinaryFile\Value as BinaryFileValue;
+use Ibexa\Core\FieldType\BinaryFile\Value as BinaryFileValue;
 use Netgen\Bundle\InformationCollectionBundle\Mailer\Mailer;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/old/Value/TemplateDataTest.php b/tests/old/Value/TemplateDataTest.php
index 626b6de1..27b17c8b 100644
--- a/tests/old/Value/TemplateDataTest.php
+++ b/tests/old/Value/TemplateDataTest.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Value;
 
-use eZ\Publish\Core\Repository\Values\Content\Content;
+use Ibexa\Core\Repository\Values\Content\Content;
 use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Value\TemplateData;
@@ -24,7 +24,7 @@ class TemplateDataTest extends TestCase
     protected $event;
 
     /**
-     * @var \eZ\Publish\Core\Repository\Values\Content\Content
+     * @var \Ibexa\Core\Repository\Values\Content\Content
      */
     protected $content;
 

From d5813539b63340a56e679cfbfde3614575436a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Wed, 23 Feb 2022 16:39:04 +0100
Subject: [PATCH 04/30] Fix usage of base controller

---
 bundle/Resources/config/controllers.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundle/Resources/config/controllers.yml b/bundle/Resources/config/controllers.yml
index 823d064b..bb45643b 100644
--- a/bundle/Resources/config/controllers.yml
+++ b/bundle/Resources/config/controllers.yml
@@ -9,7 +9,7 @@ services:
 
     netgen_information_collection.controller.admin:
         class: Netgen\Bundle\InformationCollectionBundle\Controller\Admin\AdminController
-        parent: ibexa.controller.base
+        parent: Ibexa\Core\MVC\Symfony\Controller\Controller
         public: true
         arguments:
             - "@netgen_information_collection.api.service"
@@ -32,7 +32,7 @@ services:
 
     netgen_information_collection.controller.tree:
         class: Netgen\Bundle\InformationCollectionBundle\Controller\Admin\TreeController
-        parent: ibexa.controller.base
+        parent: Ibexa\Core\MVC\Symfony\Controller\Controller
         public: true
         arguments:
             - "@netgen_information_collection.api.service"

From 1c616e04bb7b5ccc6fab826ead3df6059860794e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Mon, 28 Feb 2022 12:04:23 +0100
Subject: [PATCH 05/30] EzFormsBundle is not IbexaFormsBundle

---
 doc/cookbook/override_something_on_form.rst                  | 4 ++--
 tests/old/Action/ActionRegistryTest.php                      | 2 +-
 tests/old/Action/AutoResponderActionTest.php                 | 4 ++--
 tests/old/Action/DatabaseActionTest.php                      | 2 +-
 tests/old/Action/EmailActionTest.php                         | 4 ++--
 tests/old/Controller/InformationCollectionControllerTest.php | 4 ++--
 tests/old/Event/InformationCollectedTest.php                 | 2 +-
 tests/old/Factory/AutoResponderDataFactoryTest.php           | 4 ++--
 tests/old/Factory/EmailDataFactoryTest.php                   | 4 ++--
 tests/old/Listener/InformationCollectedListenerTest.php      | 2 +-
 tests/old/Value/TemplateDataTest.php                         | 2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/doc/cookbook/override_something_on_form.rst b/doc/cookbook/override_something_on_form.rst
index 94d31f4b..36aa6ef1 100644
--- a/doc/cookbook/override_something_on_form.rst
+++ b/doc/cookbook/override_something_on_form.rst
@@ -10,7 +10,7 @@ How to override something on info collector form
     namespace Acme\Form;
 
     use Acme\Validator\Constraints\MyValidator;
-    use Netgen\Bundle\EzFormsBundle\Form\Type\InformationCollectionType;
+    use Netgen\Bundle\IbexaFormsBundle\Form\Type\InformationCollectionType;
     use Netgen\Bundle\EzPlatformSiteApiBundle\View\ContentValueView;
     use Symfony\Component\Form\AbstractTypeExtension;
     use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -66,4 +66,4 @@ How to override something on info collector form
         arguments:
             - '@request_stack'
         tags:
-            - { name: form.type_extension, extended_type: Netgen\Bundle\EzFormsBundle\Form\Type\InformationCollectionType }
+            - { name: form.type_extension, extended_type: Netgen\Bundle\IbexaFormsBundle\Form\Type\InformationCollectionType }
diff --git a/tests/old/Action/ActionRegistryTest.php b/tests/old/Action/ActionRegistryTest.php
index 056c4229..c9e318a7 100644
--- a/tests/old/Action/ActionRegistryTest.php
+++ b/tests/old/Action/ActionRegistryTest.php
@@ -3,7 +3,7 @@
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Action;
 
 use Ibexa\Core\Repository\Values\ContentType\ContentType;
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\InformationCollectionBundle\Action\ActionInterface;
 use Netgen\Bundle\InformationCollectionBundle\Action\ActionRegistry;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
diff --git a/tests/old/Action/AutoResponderActionTest.php b/tests/old/Action/AutoResponderActionTest.php
index fbfb82f8..3aa23443 100644
--- a/tests/old/Action/AutoResponderActionTest.php
+++ b/tests/old/Action/AutoResponderActionTest.php
@@ -2,8 +2,8 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Action;
 
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
-use Netgen\Bundle\EzFormsBundle\Form\Payload\InformationCollectionStruct;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Action\AutoResponderAction;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Exception\EmailNotSentException;
diff --git a/tests/old/Action/DatabaseActionTest.php b/tests/old/Action/DatabaseActionTest.php
index c05948d6..bded25b8 100644
--- a/tests/old/Action/DatabaseActionTest.php
+++ b/tests/old/Action/DatabaseActionTest.php
@@ -14,7 +14,7 @@
 use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
 use Ibexa\Core\Repository\Values\User\User;
 use Ibexa\Contracts\Core\Persistence\Content\ContentInfo;
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\InformationCollectionBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Action\DatabaseAction;
 use Netgen\Bundle\InformationCollectionBundle\Entity\EzInfoCollection;
diff --git a/tests/old/Action/EmailActionTest.php b/tests/old/Action/EmailActionTest.php
index bfede996..65742dc2 100644
--- a/tests/old/Action/EmailActionTest.php
+++ b/tests/old/Action/EmailActionTest.php
@@ -2,8 +2,8 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Action;
 
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
-use Netgen\Bundle\EzFormsBundle\Form\Payload\InformationCollectionStruct;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Action\EmailAction;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Exception\EmailNotSentException;
diff --git a/tests/old/Controller/InformationCollectionControllerTest.php b/tests/old/Controller/InformationCollectionControllerTest.php
index bac810f2..727795cc 100644
--- a/tests/old/Controller/InformationCollectionControllerTest.php
+++ b/tests/old/Controller/InformationCollectionControllerTest.php
@@ -4,8 +4,8 @@
 
 use Ibexa\Core\MVC\Symfony\View\ContentView;
 use Ibexa\Core\Repository\Values\Content\Location;
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
-use Netgen\Bundle\EzFormsBundle\Form\Payload\InformationCollectionStruct;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Controller\InformationCollectionController;
 use Netgen\Bundle\InformationCollectionBundle\Form\Builder\FormBuilder;
 use Netgen\Bundle\InformationCollectionBundle\Tests\ContentViewStub;
diff --git a/tests/old/Event/InformationCollectedTest.php b/tests/old/Event/InformationCollectedTest.php
index b842db27..c9fe2783 100644
--- a/tests/old/Event/InformationCollectedTest.php
+++ b/tests/old/Event/InformationCollectedTest.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Event;
 
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/old/Factory/AutoResponderDataFactoryTest.php b/tests/old/Factory/AutoResponderDataFactoryTest.php
index 28a7e804..4ad2a54e 100644
--- a/tests/old/Factory/AutoResponderDataFactoryTest.php
+++ b/tests/old/Factory/AutoResponderDataFactoryTest.php
@@ -14,8 +14,8 @@
 use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Core\Repository\Values\Content\VersionInfo;
 use Ibexa\Core\Repository\Values\ContentType\ContentType;
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
-use Netgen\Bundle\EzFormsBundle\Form\Payload\InformationCollectionStruct;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
diff --git a/tests/old/Factory/EmailDataFactoryTest.php b/tests/old/Factory/EmailDataFactoryTest.php
index 0fb8daa9..2b4e7407 100644
--- a/tests/old/Factory/EmailDataFactoryTest.php
+++ b/tests/old/Factory/EmailDataFactoryTest.php
@@ -13,8 +13,8 @@
 use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Core\Repository\Values\Content\VersionInfo;
 use Ibexa\Core\Repository\Values\ContentType\ContentType;
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
-use Netgen\Bundle\EzFormsBundle\Form\Payload\InformationCollectionStruct;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\Payload\InformationCollectionStruct;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
diff --git a/tests/old/Listener/InformationCollectedListenerTest.php b/tests/old/Listener/InformationCollectedListenerTest.php
index d47d5a90..9e4f767d 100644
--- a/tests/old/Listener/InformationCollectedListenerTest.php
+++ b/tests/old/Listener/InformationCollectedListenerTest.php
@@ -2,7 +2,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Listener;
 
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\InformationCollectionBundle\Action\ActionRegistry;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Events;
diff --git a/tests/old/Value/TemplateDataTest.php b/tests/old/Value/TemplateDataTest.php
index 27b17c8b..2ea74423 100644
--- a/tests/old/Value/TemplateDataTest.php
+++ b/tests/old/Value/TemplateDataTest.php
@@ -3,7 +3,7 @@
 namespace Netgen\Bundle\InformationCollectionBundle\Tests\Value;
 
 use Ibexa\Core\Repository\Values\Content\Content;
-use Netgen\Bundle\EzFormsBundle\Form\DataWrapper;
+use Netgen\Bundle\IbexaFormsBundle\Form\DataWrapper;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Value\TemplateData;
 use PHPUnit\Framework\TestCase;

From e4aaaca59358a54c01c04b0d3f0a4f8c221d769f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Thu, 3 Mar 2022 11:43:17 +0100
Subject: [PATCH 06/30] Fix namespace

---
 bundle/DataCollector/InformationCollectionCollector.php         | 2 +-
 .../FieldDefinitionTypeExtension.php                            | 2 +-
 .../InformationCollectionFieldType.php                          | 2 +-
 .../InformationCollectionMapper.php                             | 2 +-
 .../InformationCollectionType.php                               | 2 +-
 bundle/Resources/config/validation.yml                          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename bundle/Ibexa/{RepositoryForms => ContentForms}/FieldDefinitionTypeExtension.php (92%)
 rename bundle/Ibexa/{RepositoryForms => ContentForms}/InformationCollectionFieldType.php (96%)
 rename bundle/Ibexa/{RepositoryForms => ContentForms}/InformationCollectionMapper.php (96%)
 rename bundle/Ibexa/{RepositoryForms => ContentForms}/InformationCollectionType.php (98%)

diff --git a/bundle/DataCollector/InformationCollectionCollector.php b/bundle/DataCollector/InformationCollectionCollector.php
index 9e5f3d0c..ba742261 100644
--- a/bundle/DataCollector/InformationCollectionCollector.php
+++ b/bundle/DataCollector/InformationCollectionCollector.php
@@ -10,7 +10,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-use Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms\InformationCollectionType;
+use Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionType;
 
 class InformationCollectionCollector extends DataCollector
 {
diff --git a/bundle/Ibexa/RepositoryForms/FieldDefinitionTypeExtension.php b/bundle/Ibexa/ContentForms/FieldDefinitionTypeExtension.php
similarity index 92%
rename from bundle/Ibexa/RepositoryForms/FieldDefinitionTypeExtension.php
rename to bundle/Ibexa/ContentForms/FieldDefinitionTypeExtension.php
index 63e72823..a72b186c 100644
--- a/bundle/Ibexa/RepositoryForms/FieldDefinitionTypeExtension.php
+++ b/bundle/Ibexa/ContentForms/FieldDefinitionTypeExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms;
 
 use Ibexa\AdminUi\Form\Type\FieldDefinition\FieldDefinitionType;
 use Symfony\Component\Form\AbstractTypeExtension;
diff --git a/bundle/Ibexa/RepositoryForms/InformationCollectionFieldType.php b/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php
similarity index 96%
rename from bundle/Ibexa/RepositoryForms/InformationCollectionFieldType.php
rename to bundle/Ibexa/ContentForms/InformationCollectionFieldType.php
index 7ead3b77..0d8685b2 100644
--- a/bundle/Ibexa/RepositoryForms/InformationCollectionFieldType.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms;
 
 use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
 use Ibexa\ContentForms\FieldType\FieldTypeFormMapperDispatcherInterface;
diff --git a/bundle/Ibexa/RepositoryForms/InformationCollectionMapper.php b/bundle/Ibexa/ContentForms/InformationCollectionMapper.php
similarity index 96%
rename from bundle/Ibexa/RepositoryForms/InformationCollectionMapper.php
rename to bundle/Ibexa/ContentForms/InformationCollectionMapper.php
index 759c04a5..9ccb22f3 100644
--- a/bundle/Ibexa/RepositoryForms/InformationCollectionMapper.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionMapper.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
diff --git a/bundle/Ibexa/RepositoryForms/InformationCollectionType.php b/bundle/Ibexa/ContentForms/InformationCollectionType.php
similarity index 98%
rename from bundle/Ibexa/RepositoryForms/InformationCollectionType.php
rename to bundle/Ibexa/ContentForms/InformationCollectionType.php
index cc0eb2b7..43d56ce5 100644
--- a/bundle/Ibexa/RepositoryForms/InformationCollectionType.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\RepositoryForms;
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms;
 
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\Bundle\InformationCollectionBundle\Form\CaptchaType;
diff --git a/bundle/Resources/config/validation.yml b/bundle/Resources/config/validation.yml
index bad9dee8..7e679eac 100644
--- a/bundle/Resources/config/validation.yml
+++ b/bundle/Resources/config/validation.yml
@@ -1,4 +1,4 @@
-Netgen\InformationCollection\Integration\RepositoryForms\InformationCollectionData:
+Netgen\InformationCollection\Integration\ContentForms\InformationCollectionData:
     properties:
         fieldsData:
             - Valid: ~

From fc742dee02fe278f11d1c3ef4f7e039bfe4bf908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Fri, 4 Mar 2022 10:19:51 +0100
Subject: [PATCH 07/30] Add proper translation for menu item

---
 bundle/Ibexa/Admin/MenuListener.php                            | 3 ++-
 .../translations/netgen_information_collection_admin.en.yml    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bundle/Ibexa/Admin/MenuListener.php b/bundle/Ibexa/Admin/MenuListener.php
index 9ea36152..4b8d05e4 100644
--- a/bundle/Ibexa/Admin/MenuListener.php
+++ b/bundle/Ibexa/Admin/MenuListener.php
@@ -28,9 +28,10 @@ public function onMenuConfigure(ConfigureMenuEvent $event)
         $menu[MainMenuBuilder::ITEM_ADMIN]->addChild(
             'information_collection',
             [
-                'label' => 'Information collection',
+                'label' => 'netgen_information_collection_menu_label',
                 'route' => 'netgen_information_collection.route.admin.overview',
                 'extras' => [
+                    'translation_domain' => 'netgen_information_collection_admin',
                     'routes' => [
                         'collection_list' => 'netgen_information_collection.route.admin.collection_list',
                         'collection_list_search' => 'netgen_information_collection.route.admin.collection_list_search',
diff --git a/bundle/Resources/translations/netgen_information_collection_admin.en.yml b/bundle/Resources/translations/netgen_information_collection_admin.en.yml
index 41459350..a59aa6b6 100644
--- a/bundle/Resources/translations/netgen_information_collection_admin.en.yml
+++ b/bundle/Resources/translations/netgen_information_collection_admin.en.yml
@@ -1,4 +1,7 @@
 pagelayout.title: 'Collected information'
+
+netgen_information_collection_menu_label: 'Information collection'
+
 netgen_information_collection_admin_title: 'Collected information'
 netgen_information_collection_admin_you_are_here: 'You are here'
 netgen_information_collection_admin_path_collected_information: 'Collected information'

From 3b86f4053b78ef56070112dc1ff51bf6fdedec55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Fri, 4 Mar 2022 14:39:58 +0100
Subject: [PATCH 08/30] Bump PHP CS Fixer to v3

---
 .gitignore                   |  2 +-
 .php_cs => .php-cs-fixer.php | 13 +++++++++++--
 composer.json                |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
 rename .php_cs => .php-cs-fixer.php (71%)

diff --git a/.gitignore b/.gitignore
index 2d07a150..2f8a275b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ composer.phar
 composer.lock
 coverage.xml
 phpunit.phar
-.php_cs.cache
+.php-cs-fixer.cache
 grunt.lock
 package-lock.json
 .phpunit.result.cache
diff --git a/.php_cs b/.php-cs-fixer.php
similarity index 71%
rename from .php_cs
rename to .php-cs-fixer.php
index 064932b5..2465f3f4 100644
--- a/.php_cs
+++ b/.php-cs-fixer.php
@@ -1,6 +1,6 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@PhpCsFixer' => true,
@@ -10,7 +10,9 @@
         'concat_space' => ['spacing' => 'one'],
         'method_chaining_indentation' => false,
         'multiline_whitespace_before_semicolons' => false,
-        'native_function_invocation' => false,
+        'native_function_invocation' => ['include' => ['@all']],
+        'no_superfluous_phpdoc_tags' => false,
+        'ordered_imports' => ['imports_order' => ['class', 'function', 'const']],
         'php_unit_internal_class' => false,
         'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
         'php_unit_test_class_requires_covers' => false,
@@ -23,8 +25,15 @@
         // Additional rules
         'date_time_immutable' => true,
         'declare_strict_types' => true,
+        'global_namespace_import' => [
+            'import_classes' => null,
+            'import_constants' => true,
+            'import_functions' => true,
+        ],
         'list_syntax' => ['syntax' => 'short'],
         'mb_str_functions' => true,
+        'native_constant_invocation' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
         'static_lambda' => true,
         'ternary_to_null_coalescing' => true,
     ])
diff --git a/composer.json b/composer.json
index 4b1f8c3b..78681af4 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
         "phpunit/phpunit": "^8.2",
         "matthiasnoback/symfony-config-test": "~4.0",
         "matthiasnoback/symfony-dependency-injection-test": "~4.0",
-        "friendsofphp/php-cs-fixer": "^2.16"
+        "friendsofphp/php-cs-fixer": "^3.3"
     },
     "autoload": {
         "psr-4": {

From 4a544d62e363756667b2350b41b65350561c8f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Fri, 4 Mar 2022 14:45:12 +0100
Subject: [PATCH 09/30] CS fixes

---
 bundle/Controller/Admin/AdminController.php   |  2 -
 bundle/Controller/Admin/TreeController.php    |  2 -
 bundle/Form/ExportType.php                    |  2 -
 .../Listener/InformationCollectedListener.php |  2 -
 .../Twig/Extensions/CaptchaRuntime.php        |  2 -
 lib/API/Action/ActionInterface.php            |  2 -
 lib/API/Action/EmailDataProviderInterface.php |  2 +
 lib/API/ConfigurationConstants.php            | 30 ++++++------
 lib/API/Events.php                            |  2 -
 lib/API/Exception/ActionFailedException.php   |  6 ---
 lib/API/Exception/EmailNotSentException.php   |  6 ---
 .../Exception/MissingEmailBlockException.php  |  8 +--
 lib/API/Exception/MissingValueException.php   |  5 --
 .../Exception/PersistingFailedException.php   |  6 ---
 .../RemoveAttributeFailedException.php        |  6 ---
 .../RemoveCollectionFailedException.php       |  6 ---
 lib/API/Exception/RetrieveCountException.php  |  6 ---
 .../StoringAttributeFailedException.php       |  6 ---
 .../StoringCollectionFailedException.php      |  6 ---
 lib/API/Export/ExportResponseFormatter.php    | 13 ++---
 .../CustomFieldHandlerInterface.php           |  9 ----
 .../CustomLegacyFieldHandlerInterface.php     |  5 --
 lib/API/InformationCollectionTrait.php        |  4 +-
 lib/API/MailerInterface.php                   |  2 -
 lib/API/Permissions.php                       |  2 +
 lib/API/Persistence/Anonymizer/Anonymizer.php |  3 --
 .../Visitor/FieldAnonymizerVisitor.php        | 10 ----
 lib/API/Service/CaptchaService.php            | 12 -----
 lib/API/Service/CaptchaValue.php              |  4 --
 lib/API/Service/Exporter.php                  |  4 --
 lib/API/Service/InformationCollection.php     | 44 -----------------
 lib/API/Value/Attribute.php                   | 15 +-----
 lib/API/Value/AttributeValue.php              | 13 +----
 lib/API/Value/Captcha/ReCaptcha.php           |  8 +--
 lib/API/Value/Collection.php                  | 15 ------
 lib/API/Value/Collections.php                 |  3 --
 lib/API/Value/Content.php                     | 18 -------
 lib/API/Value/ContentsWithCollections.php     |  3 --
 .../Value/DataTransfer/AdditionalContent.php  |  8 ---
 lib/API/Value/DataTransfer/EmailContent.php   | 21 --------
 .../Value/DataTransfer/TemplateContent.php    | 15 ------
 lib/API/Value/Event/InformationCollected.php  | 25 +---------
 lib/API/Value/Export/Export.php               |  6 ---
 lib/API/Value/Export/ExportCriteria.php       |  3 --
 lib/API/Value/Filter/CollectionFields.php     |  9 ----
 lib/API/Value/Filter/Collections.php          |  3 --
 lib/API/Value/Filter/Contents.php             |  3 --
 lib/API/Value/Filter/FilterCriteria.php       | 11 +----
 lib/API/Value/Filter/Query.php                |  6 ---
 lib/API/Value/Filter/SearchQuery.php          |  6 ---
 lib/API/Value/InformationCollectionStruct.php | 16 +-----
 lib/API/Value/Legacy/FieldValue.php           | 12 -----
 lib/API/Value/NullUser.php                    |  7 ++-
 lib/API/Value/ObjectCount.php                 |  3 --
 lib/Core/Action/ActionRegistry.php            | 13 ++---
 lib/Core/Action/BaseEmailAction.php           |  6 ---
 lib/Core/Action/ConfigurationUtility.php      |  8 ++-
 lib/Core/Action/Identifier.php                |  3 ++
 .../EmailDataProvider/AbstractProvider.php    | 12 ++---
 .../AutoResponderProvider.php                 |  3 +-
 .../EmailDataProvider/DefaultProvider.php     | 31 +++---------
 .../Export/CsvExportResponseFormatter.php     | 13 ++---
 .../ExportResponseFormatterRegistry.php       |  9 ++--
 .../Export/JsonExportResponseFormatter.php    |  3 ++
 .../Export/XlsExportResponseFormatter.php     | 14 +++---
 .../Export/XlsxExportResponseFormatter.php    | 14 +++---
 lib/Core/Factory/AutoResponderDataFactory.php | 23 ++++-----
 lib/Core/Factory/EmailDataFactory.php         | 49 ++++++-------------
 lib/Core/Factory/FieldDataFactory.php         | 10 ----
 lib/Core/Mailer/SwiftMailerBasedMailer.php    |  5 --
 lib/Core/Mailer/SymfonyMailerBasedMailer.php  |  6 ++-
 lib/Core/Mapper/DomainObjectMapper.php        |  6 +--
 lib/Core/Pagination/BaseAdapter.php           |  5 --
 .../View/InformationCollectionAdminView.php   |  8 ++-
 .../Anonymizer/AnonymizerService.php          | 25 ++--------
 .../Anonymizer/AnonymizerServiceFacade.php    | 14 +-----
 .../Anonymizer/Visitor/Field/Aggregate.php    |  5 --
 .../Anonymizer/Visitor/Field/Email.php        | 11 +++--
 .../Anonymizer/Visitor/Field/Simple.php       |  1 -
 lib/Core/Persistence/ContentTypeUtils.php     |  9 +---
 .../Custom/CheckboxFieldHandler.php           |  2 -
 .../Custom/CountryFieldHandler.php            |  6 ++-
 .../Custom/DateAndTimeFieldHandler.php        |  3 --
 .../FieldHandler/Custom/DateFieldHandler.php  |  2 -
 .../FieldHandler/Custom/FloatFieldHandler.php |  2 -
 .../Custom/IntegerFieldHandler.php            |  2 -
 .../FieldHandler/Custom/TimeFieldHandler.php  |  4 +-
 .../FieldHandler/FieldHandlerRegistry.php     | 11 +----
 .../Persistence/Gateway/DoctrineDatabase.php  | 16 +-----
 lib/Core/Service/CaptchaService.php           | 28 ++++-------
 lib/Core/Service/ExporterService.php          | 13 ++---
 .../Service/InformationCollectionService.php  | 11 +----
 .../EzInfoCollectionAttributeRepository.php   | 12 ++---
 .../Repository/EzInfoCollectionRepository.php | 10 ++--
 lib/Handler.php                               |  6 ++-
 95 files changed, 171 insertions(+), 711 deletions(-)

diff --git a/bundle/Controller/Admin/AdminController.php b/bundle/Controller/Admin/AdminController.php
index 4e059de1..98cfcc3a 100644
--- a/bundle/Controller/Admin/AdminController.php
+++ b/bundle/Controller/Admin/AdminController.php
@@ -52,8 +52,6 @@ class AdminController extends Controller
     private $translator;
 
     /**
-     * AdminController constructor.
-     *
      * @param \Netgen\InformationCollection\API\Service\InformationCollection $service
      * @param \Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer $anonymizer
      * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
diff --git a/bundle/Controller/Admin/TreeController.php b/bundle/Controller/Admin/TreeController.php
index 9452e204..13398bfe 100644
--- a/bundle/Controller/Admin/TreeController.php
+++ b/bundle/Controller/Admin/TreeController.php
@@ -30,8 +30,6 @@ class TreeController extends Controller
     protected $service;
 
     /**
-     * TreeController constructor.
-     *
      * @param \Netgen\InformationCollection\API\Service\InformationCollection $service
      * @param \Symfony\Contracts\Translation\TranslatorInterface $translator
      * @param \Symfony\Component\Routing\RouterInterface $router
diff --git a/bundle/Form/ExportType.php b/bundle/Form/ExportType.php
index b09fa703..8677af9c 100644
--- a/bundle/Form/ExportType.php
+++ b/bundle/Form/ExportType.php
@@ -29,8 +29,6 @@ class ExportType extends AbstractType implements DataMapperInterface
     protected $exportResponseFormatterRegistry;
 
     /**
-     * ExportType constructor.
-     *
      * @param \Netgen\InformationCollection\Core\Export\ExportResponseFormatterRegistry $exportResponseFormatterRegistry
      */
     public function __construct(ExportResponseFormatterRegistry $exportResponseFormatterRegistry)
diff --git a/bundle/Listener/InformationCollectedListener.php b/bundle/Listener/InformationCollectedListener.php
index 308ee019..304332e8 100644
--- a/bundle/Listener/InformationCollectedListener.php
+++ b/bundle/Listener/InformationCollectedListener.php
@@ -17,8 +17,6 @@ class InformationCollectedListener implements EventSubscriberInterface
     protected $actionAggregate;
 
     /**
-     * InformationCollectedListener constructor.
-     *
      * @param ActionRegistry $actionAggregate
      */
     public function __construct(ActionRegistry $actionAggregate)
diff --git a/bundle/Templating/Twig/Extensions/CaptchaRuntime.php b/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
index e1e813a2..26cc1884 100644
--- a/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
+++ b/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
@@ -15,8 +15,6 @@ class CaptchaRuntime
     protected $captcha;
 
     /**
-     * CaptchaRuntime constructor.
-     *
      * @param \Netgen\InformationCollection\API\Service\CaptchaService $captcha
      */
     public function __construct(CaptchaService $captcha)
diff --git a/lib/API/Action/ActionInterface.php b/lib/API/Action/ActionInterface.php
index 86da3913..192822e3 100644
--- a/lib/API/Action/ActionInterface.php
+++ b/lib/API/Action/ActionInterface.php
@@ -11,8 +11,6 @@ interface ActionInterface
     /**
      * Act on InformationCollected event.
      *
-     * @param \Netgen\InformationCollection\API\Value\Event\InformationCollected $event
-     *
      * @throws \Netgen\InformationCollection\API\Exception\ActionFailedException
      */
     public function act(InformationCollected $event): void;
diff --git a/lib/API/Action/EmailDataProviderInterface.php b/lib/API/Action/EmailDataProviderInterface.php
index ecd2c932..76400e81 100644
--- a/lib/API/Action/EmailDataProviderInterface.php
+++ b/lib/API/Action/EmailDataProviderInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\API\Action;
 
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
diff --git a/lib/API/ConfigurationConstants.php b/lib/API/ConfigurationConstants.php
index d475db34..7a292f76 100644
--- a/lib/API/ConfigurationConstants.php
+++ b/lib/API/ConfigurationConstants.php
@@ -1,32 +1,34 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\API;
 
 class ConfigurationConstants
 {
-    const ACTIONS = 'actions';
+    public const ACTIONS = 'actions';
 
-    const ATTACHMENTS = 'attachments';
+    public const ATTACHMENTS = 'attachments';
 
-    const ACTION_CONFIG = 'action_config';
+    public const ACTION_CONFIG = 'action_config';
 
-    const TEMPLATES = 'templates';
+    public const TEMPLATES = 'templates';
 
-    const DEFAULT_VARIABLES = 'default_variables';
+    public const DEFAULT_VARIABLES = 'default_variables';
 
-    const SETTINGS_ROOT = 'netgen_information_collection';
+    public const SETTINGS_ROOT = 'netgen_information_collection';
 
-    const SETTINGS_DEFAULT = 'default';
+    public const SETTINGS_DEFAULT = 'default';
 
-    const CONTENT_TYPES = 'content_types';
+    public const CONTENT_TYPES = 'content_types';
 
-    const ACTION_EMAIL = 'email';
+    public const ACTION_EMAIL = 'email';
 
-    const ACTION_AUTO_RESPONDER = 'auto_responder';
+    public const ACTION_AUTO_RESPONDER = 'auto_responder';
 
-    const EMAIL_FIELD_IDENTIFIER = 'email_field_identifier';
+    public const EMAIL_FIELD_IDENTIFIER = 'email_field_identifier';
 
-    const EMAIL_SENDER = 'sender';
-    const EMAIL_RECIPIENT = 'recipient';
-    const EMAIL_SUBJECT = 'subject';
+    public const EMAIL_SENDER = 'sender';
+    public const EMAIL_RECIPIENT = 'recipient';
+    public const EMAIL_SUBJECT = 'subject';
 }
diff --git a/lib/API/Events.php b/lib/API/Events.php
index 0615cd20..4f3c4d50 100644
--- a/lib/API/Events.php
+++ b/lib/API/Events.php
@@ -42,6 +42,4 @@ final class Events
      * The BEFORE_AUTO_RESPONDER_ACTION event occurs when the auto responder action has started executing, Email data was prepared but email itself is still not sent.
      */
     public const BEFORE_AUTO_RESPONDER_ACTION = 'netgen_information_collection.events.before_auto_responder_action';
-
 }
-
diff --git a/lib/API/Exception/ActionFailedException.php b/lib/API/Exception/ActionFailedException.php
index 3f109c2f..55168f34 100644
--- a/lib/API/Exception/ActionFailedException.php
+++ b/lib/API/Exception/ActionFailedException.php
@@ -8,12 +8,6 @@
 
 class ActionFailedException extends RuntimeException
 {
-    /**
-     * ActionFailedException constructor.
-     *
-     * @param string $action
-     * @param string $reason
-     */
     public function __construct(string $action, string $reason)
     {
         $message = "InformationCollection action {$action} failed with reason {$reason}";
diff --git a/lib/API/Exception/EmailNotSentException.php b/lib/API/Exception/EmailNotSentException.php
index 90260734..6d4a6a06 100644
--- a/lib/API/Exception/EmailNotSentException.php
+++ b/lib/API/Exception/EmailNotSentException.php
@@ -8,12 +8,6 @@
 
 class EmailNotSentException extends RuntimeException
 {
-    /**
-     * EmailNotSentException constructor.
-     *
-     * @param string $what
-     * @param string $why
-     */
     public function __construct(string $what, string $why)
     {
         $message = "Error occurred while trying to send email: {$what} failed with error {$why}";
diff --git a/lib/API/Exception/MissingEmailBlockException.php b/lib/API/Exception/MissingEmailBlockException.php
index 2fe8bdcf..cb5ae078 100644
--- a/lib/API/Exception/MissingEmailBlockException.php
+++ b/lib/API/Exception/MissingEmailBlockException.php
@@ -5,15 +5,11 @@
 namespace Netgen\InformationCollection\API\Exception;
 
 use RuntimeException;
+use function count;
+use function implode;
 
 class MissingEmailBlockException extends RuntimeException
 {
-    /**
-     * MissingEmailBlockException constructor.
-     *
-     * @param string $template
-     * @param array $blocks
-     */
     public function __construct(string $template, array $blocks)
     {
         $blocksCount = count($blocks);
diff --git a/lib/API/Exception/MissingValueException.php b/lib/API/Exception/MissingValueException.php
index f3d059a9..38f59546 100644
--- a/lib/API/Exception/MissingValueException.php
+++ b/lib/API/Exception/MissingValueException.php
@@ -8,11 +8,6 @@
 
 class MissingValueException extends RuntimeException
 {
-    /**
-     * MissingEmailValueException constructor.
-     *
-     * @param string $field
-     */
     public function __construct(string $field)
     {
         $message = "There is no value for field {$field} specified.";
diff --git a/lib/API/Exception/PersistingFailedException.php b/lib/API/Exception/PersistingFailedException.php
index 7a49a443..4eb473c0 100644
--- a/lib/API/Exception/PersistingFailedException.php
+++ b/lib/API/Exception/PersistingFailedException.php
@@ -8,12 +8,6 @@
 
 class PersistingFailedException extends RuntimeException
 {
-    /**
-     * PersistingFailedException constructor.
-     *
-     * @param string $action
-     * @param string $reason
-     */
     public function __construct(string $action, string $reason)
     {
         $message = "Persisting of {$action} failed with reason {$reason}";
diff --git a/lib/API/Exception/RemoveAttributeFailedException.php b/lib/API/Exception/RemoveAttributeFailedException.php
index 43e187c3..05401b60 100644
--- a/lib/API/Exception/RemoveAttributeFailedException.php
+++ b/lib/API/Exception/RemoveAttributeFailedException.php
@@ -8,12 +8,6 @@
 
 class RemoveAttributeFailedException extends RuntimeException
 {
-    /**
-     * PersistingFailedException constructor.
-     *
-     * @param string $action
-     * @param string $reason
-     */
     public function __construct(string $action, string $reason)
     {
         $message = "Persisting of {$action} failed with reason {$reason}";
diff --git a/lib/API/Exception/RemoveCollectionFailedException.php b/lib/API/Exception/RemoveCollectionFailedException.php
index 578d490c..be215e7b 100644
--- a/lib/API/Exception/RemoveCollectionFailedException.php
+++ b/lib/API/Exception/RemoveCollectionFailedException.php
@@ -8,12 +8,6 @@
 
 class RemoveCollectionFailedException extends RuntimeException
 {
-    /**
-     * PersistingFailedException constructor.
-     *
-     * @param string $action
-     * @param string $reason
-     */
     public function __construct(string $action, string $reason)
     {
         $message = "Persisting of {$action} failed with reason {$reason}";
diff --git a/lib/API/Exception/RetrieveCountException.php b/lib/API/Exception/RetrieveCountException.php
index 3396b3cc..e0ff185b 100644
--- a/lib/API/Exception/RetrieveCountException.php
+++ b/lib/API/Exception/RetrieveCountException.php
@@ -8,12 +8,6 @@
 
 class RetrieveCountException extends RuntimeException
 {
-    /**
-     * RetrieveCountException constructor.
-     *
-     * @param string $action
-     * @param string $reason
-     */
     public function __construct(string $action, string $reason)
     {
         $message = "Persisting of {$action} failed with reason {$reason}";
diff --git a/lib/API/Exception/StoringAttributeFailedException.php b/lib/API/Exception/StoringAttributeFailedException.php
index 6b678f5d..73be433f 100644
--- a/lib/API/Exception/StoringAttributeFailedException.php
+++ b/lib/API/Exception/StoringAttributeFailedException.php
@@ -8,12 +8,6 @@
 
 class StoringAttributeFailedException extends RuntimeException
 {
-    /**
-     * PersistingFailedException constructor.
-     *
-     * @param string $action
-     * @param string $reason
-     */
     public function __construct(string $action, string $reason)
     {
         $message = "Persisting of {$action} failed with reason {$reason}";
diff --git a/lib/API/Exception/StoringCollectionFailedException.php b/lib/API/Exception/StoringCollectionFailedException.php
index 44dd118c..dd674769 100644
--- a/lib/API/Exception/StoringCollectionFailedException.php
+++ b/lib/API/Exception/StoringCollectionFailedException.php
@@ -8,12 +8,6 @@
 
 class StoringCollectionFailedException extends RuntimeException
 {
-    /**
-     * PersistingFailedException constructor.
-     *
-     * @param string $action
-     * @param string $reason
-     */
     public function __construct(string $action, string $reason)
     {
         $message = "Persisting of {$action} failed with reason {$reason}";
diff --git a/lib/API/Export/ExportResponseFormatter.php b/lib/API/Export/ExportResponseFormatter.php
index aefb1505..8154e873 100644
--- a/lib/API/Export/ExportResponseFormatter.php
+++ b/lib/API/Export/ExportResponseFormatter.php
@@ -1,23 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\API\Export;
 
-use Netgen\InformationCollection\API\Value\Export\Export;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Netgen\InformationCollection\API\Value\Export\Export;
 use Symfony\Component\HttpFoundation\Response;
 
 interface ExportResponseFormatter
 {
-    /**
-     * @return string
-     */
     public function getIdentifier(): string;
 
-    /**
-     * @param \Netgen\InformationCollection\API\Value\Export\Export $export
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
     public function format(Export $export, Content $content): Response;
 }
diff --git a/lib/API/FieldHandler/CustomFieldHandlerInterface.php b/lib/API/FieldHandler/CustomFieldHandlerInterface.php
index ff121540..ac64ea8a 100644
--- a/lib/API/FieldHandler/CustomFieldHandlerInterface.php
+++ b/lib/API/FieldHandler/CustomFieldHandlerInterface.php
@@ -11,20 +11,11 @@ interface CustomFieldHandlerInterface
 {
     /**
      * Checks if given Value can be handled.
-     *
-     * @param \Ibexa\Core\FieldType\Value $value
-     *
-     * @return bool
      */
     public function supports(Value $value): bool;
 
     /**
      * Transforms field value object to string.
-     *
-     * @param \Ibexa\Core\FieldType\Value $value
-     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition
-     *
-     * @return string
      */
     public function toString(Value $value, FieldDefinition $fieldDefinition): string;
 }
diff --git a/lib/API/FieldHandler/CustomLegacyFieldHandlerInterface.php b/lib/API/FieldHandler/CustomLegacyFieldHandlerInterface.php
index 8dfe92f3..5db99768 100644
--- a/lib/API/FieldHandler/CustomLegacyFieldHandlerInterface.php
+++ b/lib/API/FieldHandler/CustomLegacyFieldHandlerInterface.php
@@ -13,11 +13,6 @@ interface CustomLegacyFieldHandlerInterface extends CustomFieldHandlerInterface
     /**
      * Transforms Ibexa field value to object persistable
      * in legacy information collection database structure.
-     *
-     * @param \Ibexa\Core\FieldType\Value $value
-     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition
-     *
-     * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
     public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition): FieldValue;
 }
diff --git a/lib/API/InformationCollectionTrait.php b/lib/API/InformationCollectionTrait.php
index 12700bca..09a71694 100644
--- a/lib/API/InformationCollectionTrait.php
+++ b/lib/API/InformationCollectionTrait.php
@@ -16,9 +16,6 @@ trait InformationCollectionTrait
     /**
      * Builds Form, checks if Form is valid and dispatches InformationCollected event.
      *
-     * @param \Ibexa\Core\MVC\Symfony\View\ContentValueView $view
-     * @param array $options
-     *
      * @return array
      */
     protected function collectInformation(ContentValueView $view, array $options): ContentValueView
@@ -31,6 +28,7 @@ protected function collectInformation(ContentValueView $view, array $options): C
 
         /** @var Handler $handler */
         $handler = $this->container->get('netgen_information_collection.handler');
+
         /** @var RequestStack $requestStack */
         $requestStack = $this->container->get('request_stack');
 
diff --git a/lib/API/MailerInterface.php b/lib/API/MailerInterface.php
index 0fd7c3a7..c575c20a 100644
--- a/lib/API/MailerInterface.php
+++ b/lib/API/MailerInterface.php
@@ -11,8 +11,6 @@ interface MailerInterface
     /**
      * Sends email message.
      *
-     * @param \Symfony\Component\Mime\Email $content
-     *
      * @throws \Netgen\InformationCollection\API\Exception\EmailNotSentException
      */
     public function sendEmail(Email $content): void;
diff --git a/lib/API/Permissions.php b/lib/API/Permissions.php
index 1b429076..b4d6d79d 100644
--- a/lib/API/Permissions.php
+++ b/lib/API/Permissions.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\API;
 
 final class Permissions
diff --git a/lib/API/Persistence/Anonymizer/Anonymizer.php b/lib/API/Persistence/Anonymizer/Anonymizer.php
index 89fd4faf..434ca40a 100644
--- a/lib/API/Persistence/Anonymizer/Anonymizer.php
+++ b/lib/API/Persistence/Anonymizer/Anonymizer.php
@@ -8,9 +8,6 @@ interface Anonymizer
 {
     /**
      * Anonymizes collection with option to anonymize only fields identified by passed ids.
-     *
-     * @param int $collection
-     * @param array $fields
      */
     public function anonymizeCollection(int $collection, array $fields = []): void;
 }
diff --git a/lib/API/Persistence/Anonymizer/Visitor/FieldAnonymizerVisitor.php b/lib/API/Persistence/Anonymizer/Visitor/FieldAnonymizerVisitor.php
index e8f0eb97..10b0c297 100644
--- a/lib/API/Persistence/Anonymizer/Visitor/FieldAnonymizerVisitor.php
+++ b/lib/API/Persistence/Anonymizer/Visitor/FieldAnonymizerVisitor.php
@@ -12,21 +12,11 @@ abstract class FieldAnonymizerVisitor
 {
     /**
      * Accept the given $ezInfoCollectionAttribute for visiting.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Attribute $attribute
-     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
-     *
-     * @return bool
      */
     abstract public function accept(Attribute $attribute, ContentType $contentType): bool;
 
     /**
      * Visit given $ezInfoCollectionAttribute and return string.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Attribute $attribute
-     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
-     *
-     * @return \Netgen\InformationCollection\API\Value\AttributeValue
      */
     abstract public function visit(Attribute $attribute, ContentType $contentType): AttributeValue;
 }
diff --git a/lib/API/Service/CaptchaService.php b/lib/API/Service/CaptchaService.php
index 7d1d6df1..44343b34 100644
--- a/lib/API/Service/CaptchaService.php
+++ b/lib/API/Service/CaptchaService.php
@@ -11,35 +11,23 @@ interface CaptchaService
     /**
      * Returns Captcha implementation.
      *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
-     *
      * @return \Netgen\InformationCollection\API\Service\CaptchaValue
      */
     public function getCaptcha(Location $location): CaptchaValue;
 
     /**
      * Checks if captcha is enabled for given Location.
-     *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
-     *
-     * @return bool
      */
     public function isEnabled(Location $location): bool;
 
     /**
      * Returns configured captcha site key for given Location.
-     *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
-     *
-     * @return string
      */
     public function getSiteKey(Location $location): string;
 
     /**
      * Returns the captcha configuration for given Location.
      *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
-     *
      * @return string
      */
     public function getConfig(Location $location): array;
diff --git a/lib/API/Service/CaptchaValue.php b/lib/API/Service/CaptchaValue.php
index c5862ff7..50f1433a 100644
--- a/lib/API/Service/CaptchaValue.php
+++ b/lib/API/Service/CaptchaValue.php
@@ -11,10 +11,6 @@ interface CaptchaValue
     /**
      * Returns information if processed
      * $request has valid captcha response.
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     *
-     * @return bool
      */
     public function isValid(Request $request): bool;
 }
diff --git a/lib/API/Service/Exporter.php b/lib/API/Service/Exporter.php
index 95cc8fcd..38003f56 100644
--- a/lib/API/Service/Exporter.php
+++ b/lib/API/Service/Exporter.php
@@ -11,10 +11,6 @@ interface Exporter
 {
     /**
      * Generate Export for given ExportCriteria.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Export\ExportCriteria $criteria
-     *
-     * @return \Netgen\InformationCollection\API\Value\Export\Export
      */
     public function export(ExportCriteria $criteria): Export;
 }
diff --git a/lib/API/Service/InformationCollection.php b/lib/API/Service/InformationCollection.php
index 951e9a55..a9df6efd 100644
--- a/lib/API/Service/InformationCollection.php
+++ b/lib/API/Service/InformationCollection.php
@@ -25,102 +25,58 @@
 interface InformationCollection
 {
     /**
-     * @param \Netgen\InformationCollection\API\Value\InformationCollectionStruct $struct
-     *
      * @throws \Netgen\InformationCollection\API\Exception\PersistingFailedException
      */
     public function createCollection(InformationCollectionStruct $struct): void;
 
-    /**
-     * @return \Netgen\InformationCollection\API\Value\ObjectCount
-     */
     public function getObjectsWithCollectionsCount(): ObjectCount;
 
-    /**
-     * @param \Netgen\InformationCollection\API\Value\Filter\Query $query
-     *
-     * @return \Netgen\InformationCollection\API\Value\ContentsWithCollections
-     */
     public function getObjectsWithCollections(Query $query): ContentsWithCollections;
 
-    /**
-     * @param \Netgen\InformationCollection\API\Value\Filter\ContentId $contentId
-     *
-     * @return \Netgen\InformationCollection\API\Value\CollectionCount
-     */
     public function getCollectionsCount(ContentId $contentId): CollectionCount;
 
     /**
      * Returns collections for given content object.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Filter\ContentId $contentId
-     *
-     * @return \Netgen\InformationCollection\API\Value\Collections
      */
     public function getCollections(ContentId $contentId): Collections;
 
     /**
      * Returns collections for given content object.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Filter\ContentId $contentId
-     *
-     * @return \Netgen\InformationCollection\API\Value\Collections
      */
     public function filterCollections(FilterCriteria $criteria): Collections;
 
     /**
      * Returns single collection.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Filter\CollectionId $collectionId
-     *
-     * @return \Netgen\InformationCollection\API\Value\Collection
      */
     public function getCollection(CollectionId $collectionId): Collection;
 
     /**
      * Returns collection based on search criteria.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Filter\SearchQuery $query
-     *
-     * @return \Netgen\InformationCollection\API\Value\Collections
      */
     public function search(SearchQuery $query): Collections;
 
     /**
      * Returns collection count based on search criteria.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Filter\SearchCountQuery $query
-     *
-     * @return \Netgen\InformationCollection\API\Value\SearchCount
      */
     public function searchCount(SearchCountQuery $query): SearchCount;
 
     /**
      * Removes selected collection fields.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Filter\CollectionFields $collectionFields
      */
     public function deleteCollectionFields(CollectionFields $collectionFields): void;
 
     /**
      * Removes whole collections.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Filter\Collections $collections
      */
     public function deleteCollections(FilterCollections $collections): void;
 
     /**
      * Removes whole collections per content.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Filter\Contents $contents
      */
     public function deleteCollectionByContent(Contents $contents): void;
 
     /**
      * Updates Attribute value for given Attribute.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Filter\CollectionId $collectionId
-     * @param \Netgen\InformationCollection\API\Value\Attribute $attribute
      */
     public function updateCollectionAttribute(CollectionId $collectionId, Attribute $attribute): void;
 }
diff --git a/lib/API/Value/Attribute.php b/lib/API/Value/Attribute.php
index eea1bde1..1262a2a1 100644
--- a/lib/API/Value/Attribute.php
+++ b/lib/API/Value/Attribute.php
@@ -6,7 +6,6 @@
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
-use Netgen\InformationCollection\Doctrine\Entity\EzInfoCollectionAttribute;
 
 final class Attribute extends ValueObject
 {
@@ -42,38 +41,26 @@ public function __construct(
         $this->value = $value;
     }
 
-    public static function createFromAttributeAndValue(Attribute $attribute, AttributeValue $attributeValue)
+    public static function createFromAttributeAndValue(self $attribute, AttributeValue $attributeValue)
     {
         return new self($attribute->getId(), $attribute->getField(), $attribute->getFieldDefinition(), $attributeValue);
     }
 
-    /**
-     * @return Field
-     */
     public function getField(): Field
     {
         return $this->field;
     }
 
-    /**
-     * @return FieldDefinition
-     */
     public function getFieldDefinition(): FieldDefinition
     {
         return $this->fieldDefinition;
     }
 
-    /**
-     * @return int
-     */
     public function getId(): int
     {
         return $this->id;
     }
 
-    /**
-     * @return AttributeValue
-     */
     public function getValue(): AttributeValue
     {
         return $this->value;
diff --git a/lib/API/Value/AttributeValue.php b/lib/API/Value/AttributeValue.php
index 9f8c32e8..351a7d2e 100644
--- a/lib/API/Value/AttributeValue.php
+++ b/lib/API/Value/AttributeValue.php
@@ -35,35 +35,26 @@ public function __toString()
         }
 
         if (!empty($this->dataInt)) {
-            return (string)$this->dataInt;
+            return (string) $this->dataInt;
         }
 
         if (!empty($this->dataFloat)) {
-            return (string)$this->dataFloat;
+            return (string) $this->dataFloat;
         }
 
         return '';
     }
 
-    /**
-     * @return int
-     */
     public function getDataInt(): int
     {
         return $this->dataInt;
     }
 
-    /**
-     * @return float
-     */
     public function getDataFloat(): float
     {
         return $this->dataFloat;
     }
 
-    /**
-     * @return string
-     */
     public function getDataText(): string
     {
         return $this->dataText;
diff --git a/lib/API/Value/Captcha/ReCaptcha.php b/lib/API/Value/Captcha/ReCaptcha.php
index 399c6d03..eee97c93 100644
--- a/lib/API/Value/Captcha/ReCaptcha.php
+++ b/lib/API/Value/Captcha/ReCaptcha.php
@@ -7,6 +7,7 @@
 use Netgen\InformationCollection\API\Service\CaptchaValue;
 use ReCaptcha\ReCaptcha as BaseReCaptcha;
 use Symfony\Component\HttpFoundation\Request;
+use function dump;
 
 class ReCaptcha implements CaptchaValue
 {
@@ -15,11 +16,6 @@ class ReCaptcha implements CaptchaValue
      */
     protected $reCaptcha;
 
-    /**
-     * ReCaptcha constructor.
-     *
-     * @param \ReCaptcha\ReCaptcha $reCaptcha
-     */
     public function __construct(BaseReCaptcha $reCaptcha)
     {
         $this->reCaptcha = $reCaptcha;
@@ -44,8 +40,6 @@ public function isValid(Request $request): bool
 
     /**
      * Returns aggregated captcha implementation.
-     *
-     * @return \ReCaptcha\ReCaptcha
      */
     public function getInnerCaptcha(): BaseReCaptcha
     {
diff --git a/lib/API/Value/Collection.php b/lib/API/Value/Collection.php
index da29c223..e92ec8de 100644
--- a/lib/API/Value/Collection.php
+++ b/lib/API/Value/Collection.php
@@ -50,41 +50,26 @@ public function __construct(int $id, Content $content, User $creator, DateTimeIn
         $this->attributes = $attributes;
     }
 
-    /**
-     * @return int
-     */
     public function getId(): int
     {
         return $this->id;
     }
 
-    /**
-     * @return Content
-     */
     public function getContent(): Content
     {
         return $this->content;
     }
 
-    /**
-     * @return User
-     */
     public function getCreator(): User
     {
         return $this->creator;
     }
 
-    /**
-     * @return \DateTimeInterface
-     */
     public function getCreated(): DateTimeInterface
     {
         return $this->created;
     }
 
-    /**
-     * @return \DateTimeInterface
-     */
     public function getModified(): DateTimeInterface
     {
         return $this->modified;
diff --git a/lib/API/Value/Collections.php b/lib/API/Value/Collections.php
index aba5dbfb..5cc12ed2 100644
--- a/lib/API/Value/Collections.php
+++ b/lib/API/Value/Collections.php
@@ -30,9 +30,6 @@ public function getCollections(): array
         return $this->collections;
     }
 
-    /**
-     * @return int
-     */
     public function getCount(): int
     {
         return $this->count;
diff --git a/lib/API/Value/Content.php b/lib/API/Value/Content.php
index 798d2361..442692f8 100644
--- a/lib/API/Value/Content.php
+++ b/lib/API/Value/Content.php
@@ -55,49 +55,31 @@ public function __construct(
         $this->childCount = $childCount;
     }
 
-    /**
-     * @return APIContent
-     */
     public function getContent(): APIContent
     {
         return $this->content;
     }
 
-    /**
-     * @return ContentType
-     */
     public function getContentType(): ContentType
     {
         return $this->contentType;
     }
 
-    /**
-     * @return Collection
-     */
     public function getFirstCollection(): Collection
     {
         return $this->firstCollection;
     }
 
-    /**
-     * @return Collection
-     */
     public function getLastCollection(): Collection
     {
         return $this->lastCollection;
     }
 
-    /**
-     * @return int
-     */
     public function getCount(): int
     {
         return $this->childCount;
     }
 
-    /**
-     * @return bool
-     */
     public function hasLocation(): bool
     {
         return $this->hasLocation;
diff --git a/lib/API/Value/ContentsWithCollections.php b/lib/API/Value/ContentsWithCollections.php
index 353ec003..5b3aff0c 100644
--- a/lib/API/Value/ContentsWithCollections.php
+++ b/lib/API/Value/ContentsWithCollections.php
@@ -30,9 +30,6 @@ public function getContents(): array
         return $this->contents;
     }
 
-    /**
-     * @return int
-     */
     public function getCount(): int
     {
         return $this->count;
diff --git a/lib/API/Value/DataTransfer/AdditionalContent.php b/lib/API/Value/DataTransfer/AdditionalContent.php
index bee062a4..0014c86a 100644
--- a/lib/API/Value/DataTransfer/AdditionalContent.php
+++ b/lib/API/Value/DataTransfer/AdditionalContent.php
@@ -14,19 +14,11 @@ class AdditionalContent extends ValueObject
      */
     protected $content;
 
-    /**
-     * AdditionalContent constructor.
-     *
-     * @param Content|null $content
-     */
     public function __construct(?Content $content = null)
     {
         $this->content = $content;
     }
 
-    /**
-     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content|null
-     */
     public function getContent(): ?Content
     {
         return $this->content;
diff --git a/lib/API/Value/DataTransfer/EmailContent.php b/lib/API/Value/DataTransfer/EmailContent.php
index e025b943..d0692cd7 100644
--- a/lib/API/Value/DataTransfer/EmailContent.php
+++ b/lib/API/Value/DataTransfer/EmailContent.php
@@ -35,12 +35,6 @@ class EmailContent extends ValueObject
     protected $attachments = [];
 
     /**
-     * EmailData constructor.
-     *
-     * @param array $recipients
-     * @param array $sender
-     * @param string $subject
-     * @param string $body
      * @param BinaryFile[] $attachments
      */
     public function __construct(array $recipients, array $sender, string $subject, string $body, array $attachments = [])
@@ -52,41 +46,26 @@ public function __construct(array $recipients, array $sender, string $subject, s
         $this->attachments = $attachments;
     }
 
-    /**
-     * @return array
-     */
     public function getRecipients(): array
     {
         return $this->recipients;
     }
 
-    /**
-     * @return string
-     */
     public function getSubject(): string
     {
         return $this->subject;
     }
 
-    /**
-     * @return array
-     */
     public function getSender(): array
     {
         return $this->sender;
     }
 
-    /**
-     * @return string
-     */
     public function getBody(): string
     {
         return $this->body;
     }
 
-    /**
-     * @return bool
-     */
     public function hasAttachments(): bool
     {
         return !empty($this->attachments);
diff --git a/lib/API/Value/DataTransfer/TemplateContent.php b/lib/API/Value/DataTransfer/TemplateContent.php
index 85bd35f8..5bba3c36 100644
--- a/lib/API/Value/DataTransfer/TemplateContent.php
+++ b/lib/API/Value/DataTransfer/TemplateContent.php
@@ -21,37 +21,22 @@ class TemplateContent extends ValueObject
      */
     protected $templateWrapper;
 
-    /**
-     * TemplateData constructor.
-     *
-     * @param \Netgen\InformationCollection\API\Value\Event\InformationCollected $event
-     * @param \Twig\TemplateWrapper $templateWrapper
-     */
     public function __construct(InformationCollected $event, TemplateWrapper $templateWrapper)
     {
         $this->event = $event;
         $this->templateWrapper = $templateWrapper;
     }
 
-    /**
-     * @return \Netgen\InformationCollection\API\Value\Event\InformationCollected
-     */
     public function getEvent(): InformationCollected
     {
         return $this->event;
     }
 
-    /**
-     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content
-     */
     public function getContent(): Content
     {
         return $this->event->getContent();
     }
 
-    /**
-     * @return \Twig\TemplateWrapper
-     */
     public function getTemplateWrapper(): TemplateWrapper
     {
         return $this->templateWrapper;
diff --git a/lib/API/Value/Event/InformationCollected.php b/lib/API/Value/Event/InformationCollected.php
index 7fe92721..10624f90 100644
--- a/lib/API/Value/Event/InformationCollected.php
+++ b/lib/API/Value/Event/InformationCollected.php
@@ -5,9 +5,9 @@
 namespace Netgen\InformationCollection\API\Value\Event;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
-use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Netgen\InformationCollection\API\Value\InformationCollectionStruct;
 use Symfony\Contracts\EventDispatcher\Event;
 
@@ -28,13 +28,6 @@ final class InformationCollected extends Event
      */
     protected $location;
 
-    /**
-     * InformationCollected constructor.
-     *
-     * @param \Netgen\InformationCollection\API\Value\InformationCollectionStruct $struct
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
-     * @param array $options
-     */
     public function __construct(
         InformationCollectionStruct $struct,
         array $options
@@ -45,8 +38,6 @@ public function __construct(
 
     /**
      * Return collected data.
-     *
-     * @return \Netgen\InformationCollection\API\Value\InformationCollectionStruct
      */
     public function getInformationCollectionStruct(): InformationCollectionStruct
     {
@@ -55,8 +46,6 @@ public function getInformationCollectionStruct(): InformationCollectionStruct
 
     /**
      * Return ContentType.
-     *
-     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
     public function getContentType(): ContentType
     {
@@ -66,8 +55,6 @@ public function getContentType(): ContentType
 
     /**
      * Return Location.
-     *
-     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content
      */
     public function getContent(): Content
     {
@@ -75,9 +62,6 @@ public function getContent(): Content
             ->getContent();
     }
 
-    /**
-     * @return \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo
-     */
     public function getContentInfo(): ContentInfo
     {
         return $this->struct
@@ -85,9 +69,6 @@ public function getContentInfo(): ContentInfo
             ->contentInfo;
     }
 
-    /**
-     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Location
-     */
     public function getLocation(): Location
     {
         return $this->struct
@@ -95,9 +76,7 @@ public function getLocation(): Location
     }
 
     /**
-     * Returns options
-     *
-     * @return array
+     * Returns options.
      */
     public function getOptions(): array
     {
diff --git a/lib/API/Value/Export/Export.php b/lib/API/Value/Export/Export.php
index aad672b8..2eca1de9 100644
--- a/lib/API/Value/Export/Export.php
+++ b/lib/API/Value/Export/Export.php
@@ -24,17 +24,11 @@ public function __construct(array $header, array $contents)
         $this->contents = $contents;
     }
 
-    /**
-     * @return array
-     */
     public function getContents(): array
     {
         return $this->contents;
     }
 
-    /**
-     * @return array
-     */
     public function getHeader(): array
     {
         return $this->header;
diff --git a/lib/API/Value/Export/ExportCriteria.php b/lib/API/Value/Export/ExportCriteria.php
index c26d78b7..c0d02ec8 100644
--- a/lib/API/Value/Export/ExportCriteria.php
+++ b/lib/API/Value/Export/ExportCriteria.php
@@ -21,9 +21,6 @@ public function __construct(ContentId $contentId, DateTimeInterface $from, DateT
         $this->exportIdentifier = $exportIdentifier;
     }
 
-    /**
-     * @return string
-     */
     public function getExportIdentifier(): string
     {
         return $this->exportIdentifier;
diff --git a/lib/API/Value/Filter/CollectionFields.php b/lib/API/Value/Filter/CollectionFields.php
index 5937e588..4b428996 100644
--- a/lib/API/Value/Filter/CollectionFields.php
+++ b/lib/API/Value/Filter/CollectionFields.php
@@ -28,25 +28,16 @@ public function __construct(int $contentId, int $collectionId, array $fields)
         $this->fields = $fields;
     }
 
-    /**
-     * @return int
-     */
     public function getContentId(): int
     {
         return $this->contentId;
     }
 
-    /**
-     * @return int
-     */
     public function getCollectionId(): int
     {
         return $this->collectionId;
     }
 
-    /**
-     * @return array
-     */
     public function getFields(): array
     {
         return $this->fields;
diff --git a/lib/API/Value/Filter/Collections.php b/lib/API/Value/Filter/Collections.php
index 3c21b55f..8606c12d 100644
--- a/lib/API/Value/Filter/Collections.php
+++ b/lib/API/Value/Filter/Collections.php
@@ -27,9 +27,6 @@ public function getCollectionIds(): array
         return $this->collections;
     }
 
-    /**
-     * @return int
-     */
     public function getContentId(): int
     {
         return $this->contentId;
diff --git a/lib/API/Value/Filter/Contents.php b/lib/API/Value/Filter/Contents.php
index 742e249d..7f79ad99 100644
--- a/lib/API/Value/Filter/Contents.php
+++ b/lib/API/Value/Filter/Contents.php
@@ -16,9 +16,6 @@ public function __construct(array $contents)
         $this->contents = $contents;
     }
 
-    /**
-     * @return array
-     */
     public function getContentIds(): array
     {
         return $this->contents;
diff --git a/lib/API/Value/Filter/FilterCriteria.php b/lib/API/Value/Filter/FilterCriteria.php
index 08592645..5ea61695 100644
--- a/lib/API/Value/Filter/FilterCriteria.php
+++ b/lib/API/Value/Filter/FilterCriteria.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\API\Value\Filter;
 
 use DateTimeInterface;
@@ -29,25 +31,16 @@ public function __construct(ContentId $contentId, DateTimeInterface $from, DateT
         $this->to = $to;
     }
 
-    /**
-     * @return DateTimeInterface
-     */
     public function getFrom(): DateTimeInterface
     {
         return $this->from;
     }
 
-    /**
-     * @return DateTimeInterface
-     */
     public function getTo(): DateTimeInterface
     {
         return $this->to;
     }
 
-    /**
-     * @return ContentId
-     */
     public function getContentId(): ContentId
     {
         return $this->contentId;
diff --git a/lib/API/Value/Filter/Query.php b/lib/API/Value/Filter/Query.php
index 0d96d22b..f2019442 100644
--- a/lib/API/Value/Filter/Query.php
+++ b/lib/API/Value/Filter/Query.php
@@ -38,17 +38,11 @@ public static function countQuery()
         return new self(0, 0);
     }
 
-    /**
-     * @return int
-     */
     public function getLimit(): int
     {
         return $this->limit;
     }
 
-    /**
-     * @return int
-     */
     public function getOffset(): int
     {
         return $this->offset;
diff --git a/lib/API/Value/Filter/SearchQuery.php b/lib/API/Value/Filter/SearchQuery.php
index 7a4197b9..fdafef87 100644
--- a/lib/API/Value/Filter/SearchQuery.php
+++ b/lib/API/Value/Filter/SearchQuery.php
@@ -28,17 +28,11 @@ public static function withContentAndSearchText(int $contentId, string $searchTe
         return new self($contentId, $searchText, 0, 0);
     }
 
-    /**
-     * @return int
-     */
     public function getContentId(): int
     {
         return $this->contentId;
     }
 
-    /**
-     * @return string
-     */
     public function getSearchText(): string
     {
         return $this->searchText;
diff --git a/lib/API/Value/InformationCollectionStruct.php b/lib/API/Value/InformationCollectionStruct.php
index f618457a..c9b0dd02 100644
--- a/lib/API/Value/InformationCollectionStruct.php
+++ b/lib/API/Value/InformationCollectionStruct.php
@@ -4,10 +4,10 @@
 
 namespace Netgen\InformationCollection\API\Value;
 
+use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
-use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
 
 final class InformationCollectionStruct extends ValueObject
 {
@@ -49,33 +49,21 @@ public function __construct(Content $content, Location $location, ContentType $c
         $this->location = $location;
     }
 
-    /**
-     * @return string
-     */
     public function getLanguageCode(): string
     {
         return $this->content->contentInfo->mainLanguageCode;
     }
 
-    /**
-     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content
-     */
     public function getContent(): Content
     {
         return $this->content;
     }
 
-    /**
-     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Location
-     */
     public function getLocation(): Location
     {
         return $this->location;
     }
 
-    /**
-     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
-     */
     public function getContentType(): ContentType
     {
         return $this->contentType;
@@ -94,7 +82,7 @@ public function getFieldsData(): array
      */
     public function getCollectedFields(): array
     {
-       return $this->fields;
+        return $this->fields;
     }
 
     protected function addFieldData(FieldData $fieldData)
diff --git a/lib/API/Value/Legacy/FieldValue.php b/lib/API/Value/Legacy/FieldValue.php
index 2dbec4ad..d05e280b 100644
--- a/lib/API/Value/Legacy/FieldValue.php
+++ b/lib/API/Value/Legacy/FieldValue.php
@@ -38,33 +38,21 @@ public function __construct(int $fieldDefinitionId, string $dataText, int $dataI
         $this->dataText = $dataText;
     }
 
-    /**
-     * @return int
-     */
     public function getFieldDefinitionId(): int
     {
         return $this->fieldDefinitionId;
     }
 
-    /**
-     * @return float
-     */
     public function getDataFloat(): float
     {
         return $this->dataFloat;
     }
 
-    /**
-     * @return int
-     */
     public function getDataInt(): int
     {
         return $this->dataInt;
     }
 
-    /**
-     * @return string
-     */
     public function getDataText(): string
     {
         return $this->dataText;
diff --git a/lib/API/Value/NullUser.php b/lib/API/Value/NullUser.php
index f37f8e99..58587eba 100644
--- a/lib/API/Value/NullUser.php
+++ b/lib/API/Value/NullUser.php
@@ -1,22 +1,21 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\API\Value;
 
-use Ibexa\Core\Repository\Values\Content\VersionInfo as CoreVersionInfo;
 use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo as APIVersionInfo;
+use Ibexa\Core\Repository\Values\Content\VersionInfo as CoreVersionInfo;
 use Ibexa\Core\Repository\Values\User\User;
 
 class NullUser extends User
 {
     /**
      * Returns the VersionInfo for this version.
-     *
-     * @return \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo
      */
     public function getVersionInfo(): APIVersionInfo
     {
         return new VersionInfo();
-
     }
 }
 
diff --git a/lib/API/Value/ObjectCount.php b/lib/API/Value/ObjectCount.php
index 33b25b91..72dd509c 100644
--- a/lib/API/Value/ObjectCount.php
+++ b/lib/API/Value/ObjectCount.php
@@ -13,9 +13,6 @@ public function __construct(int $count)
         $this->count = $count;
     }
 
-    /**
-     * @return int
-     */
     public function getCount(): int
     {
         return $this->count;
diff --git a/lib/Core/Action/ActionRegistry.php b/lib/Core/Action/ActionRegistry.php
index 4da4fd56..a9fce039 100644
--- a/lib/Core/Action/ActionRegistry.php
+++ b/lib/Core/Action/ActionRegistry.php
@@ -4,15 +4,13 @@
 
 namespace Netgen\InformationCollection\Core\Action;
 
-use Netgen\InformationCollection\API\Events;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use function in_array;
 use Netgen\InformationCollection\API\Action\ActionInterface;
 use Netgen\InformationCollection\API\Action\CrucialActionInterface;
+use Netgen\InformationCollection\API\Events;
 use Netgen\InformationCollection\API\Exception\ActionFailedException;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
 use Psr\Log\LoggerInterface;
-use function get_class;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 final class ActionRegistry implements ActionInterface
 {
@@ -42,11 +40,8 @@ final class ActionRegistry implements ActionInterface
     private $eventDispatcher;
 
     /**
-     * ActionAggregate constructor.
-     *
      * @param array $actions
      * @param \Netgen\InformationCollection\Core\Action\ConfigurationUtility $utility
-     * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(iterable $actions, ConfigurationUtility $utility, LoggerInterface $logger, EventDispatcherInterface $eventDispatcher)
     {
@@ -62,16 +57,13 @@ public function act(InformationCollected $event): void
 
         foreach ($this->actions as $action) {
             if ($this->utility->isActionAllowedToRun($action, $config)) {
-
                 $event = $this->eventDispatcher->dispatch($event, Events::BEFORE_ACTION_EXECUTION);
 
                 try {
                     $action->act($event);
 
                     $event = $this->eventDispatcher->dispatch($event, Events::AFTER_ACTION_EXECUTION);
-
                 } catch (ActionFailedException $e) {
-
                     $event = $this->eventDispatcher->dispatch($event, Events::ACTION_EXECUTION_FAIL);
 
                     $this->logger
@@ -83,6 +75,7 @@ public function act(InformationCollected $event): void
 
                     if ($action instanceof CrucialActionInterface) {
                         $event = $this->eventDispatcher->dispatch($event, Events::CRUCIAL_ACTION_EXECUTION_FAIL);
+
                         break;
                     }
                 }
diff --git a/lib/Core/Action/BaseEmailAction.php b/lib/Core/Action/BaseEmailAction.php
index 64605f5f..30791b88 100644
--- a/lib/Core/Action/BaseEmailAction.php
+++ b/lib/Core/Action/BaseEmailAction.php
@@ -22,12 +22,6 @@ abstract class BaseEmailAction implements ActionInterface
      */
     protected $factory;
 
-    /**
-     * EmailAction constructor.
-     *
-     * @param \Netgen\InformationCollection\API\MailerInterface $mailer
-     * @param \Netgen\InformationCollection\Core\Factory\BaseEmailDataFactory $factory
-     */
     public function __construct(MailerInterface $mailer, BaseEmailDataFactory $factory)
     {
         $this->mailer = $mailer;
diff --git a/lib/Core/Action/ConfigurationUtility.php b/lib/Core/Action/ConfigurationUtility.php
index 6303b6a2..26cda1f2 100644
--- a/lib/Core/Action/ConfigurationUtility.php
+++ b/lib/Core/Action/ConfigurationUtility.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\Action;
 
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\API\Action\ActionInterface;
 use OutOfBoundsException;
-use function sprintf;
 use function in_array;
+use function sprintf;
 
 final class ConfigurationUtility
 {
@@ -60,10 +62,6 @@ public function getActionConfiguration(ActionInterface $action): array
     /**
      * Returns configuration for given content type identifier if exists
      * or default one.
-     *
-     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
-     *
-     * @return array
      */
     public function getConfigPerContentType(ContentType $contentType): array
     {
diff --git a/lib/Core/Action/Identifier.php b/lib/Core/Action/Identifier.php
index c8eea954..afef5088 100644
--- a/lib/Core/Action/Identifier.php
+++ b/lib/Core/Action/Identifier.php
@@ -1,10 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\Action;
 
 use Netgen\InformationCollection\API\Action\ActionInterface;
 use ReflectionClass;
 use ReflectionProperty;
+use function get_class;
 
 final class Identifier
 {
diff --git a/lib/Core/EmailDataProvider/AbstractProvider.php b/lib/Core/EmailDataProvider/AbstractProvider.php
index e9fa2b2c..48114f9d 100644
--- a/lib/Core/EmailDataProvider/AbstractProvider.php
+++ b/lib/Core/EmailDataProvider/AbstractProvider.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\EmailDataProvider;
 
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\Helper\FieldHelper;
 use Ibexa\Core\Helper\TranslationHelper;
-use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\API\Action\EmailDataProviderInterface;
 use Netgen\InformationCollection\Core\Action\EmailAction;
 use Twig\Environment;
@@ -31,14 +33,6 @@ abstract class AbstractProvider implements EmailDataProviderInterface
      */
     protected $twig;
 
-    /**
-     * EmailDataFactory constructor.
-     *
-     * @param array $config
-     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
-     * @param \Ibexa\Core\Helper\FieldHelper $fieldHelper
-     * @param \Twig\Environment $twig
-     */
     public function __construct(
         ConfigResolverInterface $configResolver,
         TranslationHelper $translationHelper,
diff --git a/lib/Core/EmailDataProvider/AutoResponderProvider.php b/lib/Core/EmailDataProvider/AutoResponderProvider.php
index 33a3c238..0faf008a 100644
--- a/lib/Core/EmailDataProvider/AutoResponderProvider.php
+++ b/lib/Core/EmailDataProvider/AutoResponderProvider.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace Netgen\InformationCollection\Core\EmailDataProvider;
 
@@ -14,8 +15,6 @@ public function provide(InformationCollected $value): Email
         $email = new Email();
 
         $headers = $email->getHeaders();
-
-        $header = new Header
         $headers->add('Content-Type', '');
 
         return $email;
diff --git a/lib/Core/EmailDataProvider/DefaultProvider.php b/lib/Core/EmailDataProvider/DefaultProvider.php
index 58245c93..eafdd13d 100644
--- a/lib/Core/EmailDataProvider/DefaultProvider.php
+++ b/lib/Core/EmailDataProvider/DefaultProvider.php
@@ -1,24 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\EmailDataProvider;
 
-use Netgen\InformationCollection\API\Action\EmailDataProviderInterface;
-use Netgen\InformationCollection\API\Value\Event\InformationCollected;
-use Symfony\Component\Mime\Email;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
-use Netgen\InformationCollection\Core\Action\EmailAction;
-use function array_key_exists;
-use Ibexa\Contracts\Core\Repository\Values\Content\Field;
-use Ibexa\Core\FieldType\BinaryFile\Value as BinaryFile;
 use Ibexa\Core\Helper\FieldHelper;
 use Ibexa\Core\Helper\TranslationHelper;
-use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
+use Netgen\InformationCollection\API\Action\EmailDataProviderInterface;
 use Netgen\InformationCollection\API\Constants;
-use Netgen\InformationCollection\API\ConfigurationConstants;
-use Netgen\InformationCollection\API\Exception\MissingEmailBlockException;
-use Netgen\InformationCollection\API\Exception\MissingValueException;
+use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
 use Netgen\InformationCollection\API\Value\DataTransfer\TemplateContent;
-use function trim;
+use Netgen\InformationCollection\API\Value\Event\InformationCollected;
+use Netgen\InformationCollection\Core\Action\EmailAction;
+use Symfony\Component\Mime\Email;
 use Twig\Environment;
 
 class DefaultProvider implements EmailDataProviderInterface
@@ -43,14 +38,6 @@ class DefaultProvider implements EmailDataProviderInterface
      */
     protected $twig;
 
-    /**
-     * EmailDataFactory constructor.
-     *
-     * @param array $config
-     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
-     * @param \Ibexa\Core\Helper\FieldHelper $fieldHelper
-     * @param \Twig\Environment $twig
-     */
     public function __construct(
         ConfigResolverInterface $configResolver,
         TranslationHelper $translationHelper,
@@ -66,10 +53,6 @@ public function __construct(
 
     /**
      * Factory method.
-     *
-     * @param InformationCollected $value
-     *
-     * @return EmailContent
      */
     public function build(InformationCollected $value): EmailContent
     {
diff --git a/lib/Core/Export/CsvExportResponseFormatter.php b/lib/Core/Export/CsvExportResponseFormatter.php
index b985c296..23e4236c 100644
--- a/lib/Core/Export/CsvExportResponseFormatter.php
+++ b/lib/Core/Export/CsvExportResponseFormatter.php
@@ -1,14 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\Export;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
-use Ibexa\Core\Helper\TranslationHelper;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
+use Ibexa\Core\Helper\TranslationHelper;
 use League\Csv\Writer;
-use SplTempFileObject;
 use Netgen\InformationCollection\API\Export\ExportResponseFormatter;
 use Netgen\InformationCollection\API\Value\Export\Export;
+use SplTempFileObject;
 use Symfony\Component\HttpFoundation\Response;
 
 final class CsvExportResponseFormatter implements ExportResponseFormatter
@@ -23,12 +25,6 @@ final class CsvExportResponseFormatter implements ExportResponseFormatter
      */
     private $configResolver;
 
-    /**
-     * CsvExportResponseFormatter constructor.
-     *
-     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
-     * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver
-     */
     public function __construct(TranslationHelper $translationHelper, ConfigResolverInterface $configResolver)
     {
         $this->translationHelper = $translationHelper;
@@ -56,6 +52,7 @@ public function format(Export $export, Content $content): Response
         $writer->insertAll($export->getContents());
 
         $writer->output($contentName . '.csv');
+
         return new Response('');
     }
 }
diff --git a/lib/Core/Export/ExportResponseFormatterRegistry.php b/lib/Core/Export/ExportResponseFormatterRegistry.php
index d6405676..608d231f 100644
--- a/lib/Core/Export/ExportResponseFormatterRegistry.php
+++ b/lib/Core/Export/ExportResponseFormatterRegistry.php
@@ -1,20 +1,21 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\Export;
 
 use Netgen\InformationCollection\API\Export\ExportResponseFormatter;
 use RuntimeException;
+use function sprintf;
 
 final class ExportResponseFormatterRegistry
 {
     /**
      * @var \Netgen\InformationCollection\API\Export\ExportResponseFormatter[]
      */
-    protected $exportResponseFormatters;
+    private $exportResponseFormatters;
 
     /**
-     * ExportResponseFormatterRegistry constructor.
-     *
      * @param \Netgen\InformationCollection\API\Export\ExportResponseFormatter[] $exportResponseFormatters
      */
     public function __construct(iterable $exportResponseFormatters)
@@ -24,8 +25,6 @@ public function __construct(iterable $exportResponseFormatters)
 
     /**
      * @param string $identifier
-     *
-     * @return \Netgen\InformationCollection\API\Export\ExportResponseFormatter
      */
     public function getExportResponseFormatter($identifier): ExportResponseFormatter
     {
diff --git a/lib/Core/Export/JsonExportResponseFormatter.php b/lib/Core/Export/JsonExportResponseFormatter.php
index 8f442d90..f34b76f7 100644
--- a/lib/Core/Export/JsonExportResponseFormatter.php
+++ b/lib/Core/Export/JsonExportResponseFormatter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\Export;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
@@ -7,6 +9,7 @@
 use Netgen\InformationCollection\API\Value\Export\Export;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
+use function array_unshift;
 
 class JsonExportResponseFormatter implements ExportResponseFormatter
 {
diff --git a/lib/Core/Export/XlsExportResponseFormatter.php b/lib/Core/Export/XlsExportResponseFormatter.php
index 5830299f..aa445b9e 100644
--- a/lib/Core/Export/XlsExportResponseFormatter.php
+++ b/lib/Core/Export/XlsExportResponseFormatter.php
@@ -1,14 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\Export;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Core\Helper\TranslationHelper;
 use Netgen\InformationCollection\API\Export\ExportResponseFormatter;
 use Netgen\InformationCollection\API\Value\Export\Export;
-use Symfony\Component\HttpFoundation\Response;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xls;
+use Symfony\Component\HttpFoundation\Response;
+use function header;
+use function mb_substr;
 
 final class XlsExportResponseFormatter implements ExportResponseFormatter
 {
@@ -17,11 +21,6 @@ final class XlsExportResponseFormatter implements ExportResponseFormatter
      */
     private $translationHelper;
 
-    /**
-     * XlsExportResponseFormatter constructor.
-     *
-     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
-     */
     public function __construct(TranslationHelper $translationHelper)
     {
         $this->translationHelper = $translationHelper;
@@ -40,7 +39,7 @@ public function format(Export $export, Content $content): Response
         $activeSheet = $spreadsheet->getActiveSheet();
 
         try {
-            $activeSheet->setTitle(substr($contentName, 0, 30));
+            $activeSheet->setTitle(mb_substr($contentName, 0, 30));
         } catch (\Exception $exception) {
             $activeSheet->setTitle('Information collection export');
         }
@@ -48,7 +47,6 @@ public function format(Export $export, Content $content): Response
         $activeSheet->fromArray($export->getHeader(), null, 'A1', true);
         $activeSheet->fromArray($export->getContents(), null, 'A2', true);
 
-
         header('Content-Type: application/vnd.ms-excel');
         header('Content-Disposition: attachment;filename="' . $contentName . '.xls"');
         header('Cache-Control: max-age=0');
diff --git a/lib/Core/Export/XlsxExportResponseFormatter.php b/lib/Core/Export/XlsxExportResponseFormatter.php
index 24c2abc7..f1be748e 100644
--- a/lib/Core/Export/XlsxExportResponseFormatter.php
+++ b/lib/Core/Export/XlsxExportResponseFormatter.php
@@ -1,14 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\Export;
 
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Core\Helper\TranslationHelper;
 use Netgen\InformationCollection\API\Export\ExportResponseFormatter;
 use Netgen\InformationCollection\API\Value\Export\Export;
-use Symfony\Component\HttpFoundation\Response;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use Symfony\Component\HttpFoundation\Response;
+use function header;
+use function mb_substr;
 
 final class XlsxExportResponseFormatter implements ExportResponseFormatter
 {
@@ -17,11 +21,6 @@ final class XlsxExportResponseFormatter implements ExportResponseFormatter
      */
     private $translationHelper;
 
-    /**
-     * XlsExportResponseFormatter constructor.
-     *
-     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
-     */
     public function __construct(TranslationHelper $translationHelper)
     {
         $this->translationHelper = $translationHelper;
@@ -40,7 +39,7 @@ public function format(Export $export, Content $content): Response
         $activeSheet = $spreadsheet->getActiveSheet();
 
         try {
-            $activeSheet->setTitle(substr($contentName, 0, 30));
+            $activeSheet->setTitle(mb_substr($contentName, 0, 30));
         } catch (\Exception $exception) {
             $activeSheet->setTitle('Information collection export');
         }
@@ -48,7 +47,6 @@ public function format(Export $export, Content $content): Response
         $activeSheet->fromArray($export->getHeader(), null, 'A1', true);
         $activeSheet->fromArray($export->getContents(), null, 'A2', true);
 
-
         header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
         header('Content-Disposition: attachment;filename="' . $contentName . '.xlsx"');
         header('Cache-Control: max-age=0');
diff --git a/lib/Core/Factory/AutoResponderDataFactory.php b/lib/Core/Factory/AutoResponderDataFactory.php
index 38b9c686..4671a5d2 100644
--- a/lib/Core/Factory/AutoResponderDataFactory.php
+++ b/lib/Core/Factory/AutoResponderDataFactory.php
@@ -4,24 +4,24 @@
 
 namespace Netgen\InformationCollection\Core\Factory;
 
-use function array_key_exists;
 use Ibexa\Contracts\Core\Repository\Values\Content\Field;
-use Netgen\InformationCollection\API\Constants;
 use Netgen\InformationCollection\API\ConfigurationConstants;
+use Netgen\InformationCollection\API\Constants;
 use Netgen\InformationCollection\API\Exception\MissingValueException;
 use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
 use Netgen\InformationCollection\API\Value\DataTransfer\TemplateContent;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
+use function array_filter;
+use function array_key_exists;
+use function explode;
+use function filter_var;
 use function trim;
+use const FILTER_VALIDATE_EMAIL;
 
 class AutoResponderDataFactory extends EmailDataFactory
 {
     /**
      * Factory method.
-     *
-     * @param InformationCollected $value
-     *
-     * @return EmailContent
      */
     public function build(InformationCollected $value): EmailContent
     {
@@ -46,8 +46,6 @@ public function build(InformationCollected $value): EmailContent
     /**
      * Returns resolved parameter.
      *
-     * @param TemplateContent $data
-     *
      * @return array
      */
     protected function resolveRecipient(TemplateContent $data)
@@ -67,10 +65,9 @@ protected function resolveRecipient(TemplateContent $data)
         }
 
         if (!empty($rendered)) {
-
             $emails = explode(',', $rendered);
 
-            $emails = array_filter($emails, function($var) {
+            $emails = array_filter($emails, static function ($var) {
                 return filter_var($var, FILTER_VALIDATE_EMAIL);
             });
 
@@ -94,8 +91,6 @@ protected function resolveRecipient(TemplateContent $data)
     /**
      * Returns resolved parameter.
      *
-     * @param TemplateContent $data
-     *
      * @return string
      */
     protected function resolveSubject(TemplateContent $data)
@@ -115,8 +110,8 @@ protected function resolveSubject(TemplateContent $data)
         }
 
         $content = $data->getContent();
-        if (array_key_exists(Constants::FIELD_AUTO_RESPONDER_SUBJECT, $content->fields) &&
-            !$this->fieldHelper->isFieldEmpty($content, Constants::FIELD_AUTO_RESPONDER_SUBJECT)
+        if (array_key_exists(Constants::FIELD_AUTO_RESPONDER_SUBJECT, $content->fields)
+            && !$this->fieldHelper->isFieldEmpty($content, Constants::FIELD_AUTO_RESPONDER_SUBJECT)
         ) {
             $fieldValue = $this->translationHelper->getTranslatedField($content, Constants::FIELD_AUTO_RESPONDER_SUBJECT);
 
diff --git a/lib/Core/Factory/EmailDataFactory.php b/lib/Core/Factory/EmailDataFactory.php
index 9daba4cb..2a900c58 100644
--- a/lib/Core/Factory/EmailDataFactory.php
+++ b/lib/Core/Factory/EmailDataFactory.php
@@ -4,22 +4,26 @@
 
 namespace Netgen\InformationCollection\Core\Factory;
 
-use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
-use Netgen\InformationCollection\Core\Action\EmailAction;
-use function array_key_exists;
 use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\FieldType\BinaryFile\Value as BinaryFile;
 use Ibexa\Core\Helper\FieldHelper;
 use Ibexa\Core\Helper\TranslationHelper;
-use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
-use Netgen\InformationCollection\API\Constants;
 use Netgen\InformationCollection\API\ConfigurationConstants;
+use Netgen\InformationCollection\API\Constants;
 use Netgen\InformationCollection\API\Exception\MissingEmailBlockException;
 use Netgen\InformationCollection\API\Exception\MissingValueException;
+use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
 use Netgen\InformationCollection\API\Value\DataTransfer\TemplateContent;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
-use function trim;
+use Netgen\InformationCollection\Core\Action\EmailAction;
 use Twig\Environment;
+use function array_filter;
+use function array_key_exists;
+use function explode;
+use function filter_var;
+use function trim;
+use const FILTER_VALIDATE_EMAIL;
 
 class EmailDataFactory extends BaseEmailDataFactory
 {
@@ -43,14 +47,6 @@ class EmailDataFactory extends BaseEmailDataFactory
      */
     protected $twig;
 
-    /**
-     * EmailDataFactory constructor.
-     *
-     * @param array $config
-     * @param \Ibexa\Core\Helper\TranslationHelper $translationHelper
-     * @param \Ibexa\Core\Helper\FieldHelper $fieldHelper
-     * @param \Twig\Environment $twig
-     */
     public function __construct(
         ConfigResolverInterface $configResolver,
         TranslationHelper $translationHelper,
@@ -66,10 +62,6 @@ public function __construct(
 
     /**
      * Factory method.
-     *
-     * @param InformationCollected $value
-     *
-     * @return EmailContent
      */
     public function build(InformationCollected $value): EmailContent
     {
@@ -94,7 +86,6 @@ public function build(InformationCollected $value): EmailContent
     /**
      * Returns resolved parameter.
      *
-     * @param TemplateContent $data
      * @param string $field
      * @param string $property
      *
@@ -121,8 +112,8 @@ protected function resolve(TemplateContent $data, $field, $property = Constants:
         }
 
         $content = $data->getContent();
-        if (array_key_exists($field, $content->fields) &&
-            !$this->fieldHelper->isFieldEmpty($content, $field)
+        if (array_key_exists($field, $content->fields)
+            && !$this->fieldHelper->isFieldEmpty($content, $field)
         ) {
             $fieldValue = $this->translationHelper->getTranslatedField($content, $field);
 
@@ -141,7 +132,6 @@ protected function resolve(TemplateContent $data, $field, $property = Constants:
     /**
      * Returns resolved email parameter.
      *
-     * @param TemplateContent $data
      * @param string $field
      *
      * @return array
@@ -163,10 +153,9 @@ protected function resolveEmail(TemplateContent $data, $field)
         }
 
         if (!empty($rendered)) {
-
             $emails = explode(',', $rendered);
 
-            $emails = array_filter($emails, function($var) {
+            $emails = array_filter($emails, static function ($var) {
                 return filter_var($var, FILTER_VALIDATE_EMAIL);
             });
 
@@ -176,15 +165,14 @@ protected function resolveEmail(TemplateContent $data, $field)
         }
 
         $content = $data->getContent();
-        if (array_key_exists($field, $content->fields) &&
-            !$this->fieldHelper->isFieldEmpty($content, $field)
+        if (array_key_exists($field, $content->fields)
+            && !$this->fieldHelper->isFieldEmpty($content, $field)
         ) {
             $fieldValue = $this->translationHelper->getTranslatedField($content, $field);
 
             if ($fieldValue instanceof Field) {
                 return [$fieldValue->value->email];
             }
-
         }
 
         if (!empty($this->config[ConfigurationConstants::DEFAULT_VARIABLES][$field])) {
@@ -213,8 +201,6 @@ protected function resolveTemplate($contentTypeIdentifier)
     /**
      * Renders email template.
      *
-     * @param TemplateContent $data
-     *
      * @throws MissingEmailBlockException
      *
      * @return string
@@ -242,9 +228,6 @@ protected function resolveBody(TemplateContent $data)
     }
 
     /**
-     * @param string $contentTypeIdentifier
-     * @param array $collectedFields
-     *
      * @return BinaryFile[]
      */
     protected function resolveAttachments(string $contentTypeIdentifier, array $collectedFields)
@@ -267,8 +250,6 @@ protected function resolveAttachments(string $contentTypeIdentifier, array $coll
     }
 
     /**
-     * @param array $collectedFields
-     *
      * @return BinaryFile[]
      */
     protected function getBinaryFileFields(array $collectedFields)
diff --git a/lib/Core/Factory/FieldDataFactory.php b/lib/Core/Factory/FieldDataFactory.php
index a9bf95d4..28994620 100644
--- a/lib/Core/Factory/FieldDataFactory.php
+++ b/lib/Core/Factory/FieldDataFactory.php
@@ -18,11 +18,6 @@ class FieldDataFactory
      */
     protected $registry;
 
-    /**
-     * FieldDataFactory constructor.
-     *
-     * @param \Netgen\InformationCollection\Core\Persistence\FieldHandler\FieldHandlerRegistry $registry
-     */
     public function __construct(FieldHandlerRegistry $registry)
     {
         $this->registry = $registry;
@@ -30,11 +25,6 @@ public function __construct(FieldHandlerRegistry $registry)
 
     /**
      * Returns value object that represents legacy value.
-     *
-     * @param \Ibexa\Core\FieldType\Value $value
-     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition
-     *
-     * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
     public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition): FieldValue
     {
diff --git a/lib/Core/Mailer/SwiftMailerBasedMailer.php b/lib/Core/Mailer/SwiftMailerBasedMailer.php
index 964e4e48..949b91a2 100644
--- a/lib/Core/Mailer/SwiftMailerBasedMailer.php
+++ b/lib/Core/Mailer/SwiftMailerBasedMailer.php
@@ -15,11 +15,6 @@ class SwiftMailerBasedMailer implements MailerInterface
      */
     protected $internalMailer;
 
-    /**
-     * Mailer constructor.
-     *
-     * @param \Swift_Mailer $internalMailer
-     */
     public function __construct(\Swift_Mailer $internalMailer)
     {
         $this->internalMailer = $internalMailer;
diff --git a/lib/Core/Mailer/SymfonyMailerBasedMailer.php b/lib/Core/Mailer/SymfonyMailerBasedMailer.php
index 0c92fad5..a8ebad31 100644
--- a/lib/Core/Mailer/SymfonyMailerBasedMailer.php
+++ b/lib/Core/Mailer/SymfonyMailerBasedMailer.php
@@ -1,10 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\Mailer;
 
 use Netgen\InformationCollection\API\MailerInterface;
 use Symfony\Component\Mailer\MailerInterface as SfMailerInterface;
 use Symfony\Component\Mime\Email;
+use Throwable;
 
 class SymfonyMailerBasedMailer implements MailerInterface
 {
@@ -22,8 +25,7 @@ public function sendEmail(Email $content): void
     {
         try {
             $this->mailer->send($content);
-        } catch () {
-
+        } catch (Throwable $t) {
         }
     }
 }
diff --git a/lib/Core/Mapper/DomainObjectMapper.php b/lib/Core/Mapper/DomainObjectMapper.php
index 40775a94..0d3ef608 100644
--- a/lib/Core/Mapper/DomainObjectMapper.php
+++ b/lib/Core/Mapper/DomainObjectMapper.php
@@ -70,6 +70,7 @@ public function mapContent(array $data, EzInfoCollection $first, EzInfoCollectio
     public function mapCollection(EzInfoCollection $collection, array $attributes): Collection
     {
         $content = $this->contentService->loadContent($collection->getContentObjectId());
+
         /** @var CoreContentType $contentType */
         $contentType = $this->contentTypeService
             ->loadContentType(
@@ -80,7 +81,6 @@ public function mapCollection(EzInfoCollection $collection, array $attributes):
         $attributeValues = [];
 
         foreach ($attributes as $attr) {
-
             $fieldDefinition = $this->getFieldDefinition($fieldDefinitions, $attr);
 
             if (!$fieldDefinition instanceof FieldDefinition) {
@@ -114,6 +114,7 @@ public function mapAttribute(EzInfoCollectionAttribute $attribute, APIContent $c
         }
 
         $value = new AttributeValue($attribute->getDataInt(), $attribute->getDataFloat(), $attribute->getDataText());
+
         return new Attribute(
             $attribute->getId(),
             $classField,
@@ -129,7 +130,6 @@ private function getUser($userId): User
                 ->getUserService()
                 ->loadUser($userId);
         } catch (NotFoundException $exception) {
-
         }
 
         return new NullUser();
@@ -143,7 +143,7 @@ private function getDateTime(int $timestamp): DateTimeInterface
     private function getFieldDefinition(FieldDefinitionCollection $fieldDefinitionCollection, EzInfoCollectionAttribute $attribute): ?FieldDefinition
     {
         /** @var FieldDefinitionCollection $collection */
-        $collection = $fieldDefinitionCollection->filter(function(FieldDefinition $definition) use ($attribute) {
+        $collection = $fieldDefinitionCollection->filter(static function (FieldDefinition $definition) use ($attribute) {
             return $definition->id === $attribute->getContentClassAttributeId();
         });
 
diff --git a/lib/Core/Pagination/BaseAdapter.php b/lib/Core/Pagination/BaseAdapter.php
index 148fb59e..2ff08e39 100644
--- a/lib/Core/Pagination/BaseAdapter.php
+++ b/lib/Core/Pagination/BaseAdapter.php
@@ -19,11 +19,6 @@ abstract class BaseAdapter implements AdapterInterface
      */
     protected $informationCollectionService;
 
-    /**
-     * InformationCollectionCollectionListAdapter constructor.
-     *
-     * @param \Netgen\InformationCollection\API\Service\InformationCollection $informationCollectionService
-     */
     public function __construct(InformationCollection $informationCollectionService)
     {
         $this->informationCollectionService = $informationCollectionService;
diff --git a/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php b/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
index 7a4c8783..345f1cc6 100644
--- a/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
+++ b/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
@@ -7,6 +7,9 @@
 use Pagerfanta\PagerfantaInterface;
 use Pagerfanta\View\ViewInterface;
 use Twig\Environment;
+use function max;
+use function min;
+use function trim;
 
 class InformationCollectionAdminView implements ViewInterface
 {
@@ -45,11 +48,6 @@ class InformationCollectionAdminView implements ViewInterface
      */
     protected $endPage;
 
-    /**
-     * Constructor.
-     *
-     * @param \Twig\Environment $twig
-     */
     public function __construct(Environment $twig)
     {
         $this->twig = $twig;
diff --git a/lib/Core/Persistence/Anonymizer/AnonymizerService.php b/lib/Core/Persistence/Anonymizer/AnonymizerService.php
index 5750204a..5d34a96b 100644
--- a/lib/Core/Persistence/Anonymizer/AnonymizerService.php
+++ b/lib/Core/Persistence/Anonymizer/AnonymizerService.php
@@ -9,9 +9,10 @@
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor;
 use Netgen\InformationCollection\API\Service\InformationCollection;
+use Netgen\InformationCollection\API\Value\Attribute;
 use Netgen\InformationCollection\API\Value\Collection;
 use Netgen\InformationCollection\API\Value\Filter\CollectionId;
-use Netgen\InformationCollection\API\Value\Attribute;
+use function in_array;
 
 class AnonymizerService implements Anonymizer
 {
@@ -30,13 +31,6 @@ class AnonymizerService implements Anonymizer
      */
     protected $informationCollection;
 
-    /**
-     * Anonymizer constructor.
-     *
-     * @param \Ibexa\Contracts\Core\Repository\Repository $repository
-     * @param \Netgen\InformationCollection\API\Service\InformationCollection $informationCollection
-     * @param \Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor $fieldAnonymizerVisitor
-     */
     public function __construct(
         Repository $repository,
         InformationCollection $informationCollection,
@@ -56,9 +50,6 @@ public function anonymizeCollection(int $collectionId, array $fields = []): void
     }
 
     /**
-     * @param \Netgen\InformationCollection\API\Value\Collection $collection
-     * @param array $fields
-     *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
@@ -71,7 +62,7 @@ protected function destroyData(Collection $collection, array $fields = [])
         $attributes = $this->filterAttributes($collection, $fields);
 
         if (empty($attributes)) {
-            throw new \OutOfRangeException("The is no valid fields selected for anonymization");
+            throw new \OutOfRangeException('The is no valid fields selected for anonymization');
         }
 
         $collectionId = new CollectionId($collection->getId());
@@ -93,12 +84,7 @@ protected function anonymize(CollectionId $collectionId, array $attributes, Cont
     }
 
     /**
-     * Filter attributes based on the user selection of fields to anonymize
-     *
-     * @param Collection $collection
-     * @param array $fields
-     *
-     * @return array
+     * Filter attributes based on the user selection of fields to anonymize.
      */
     protected function filterAttributes(Collection $collection, array $fields): array
     {
@@ -110,8 +96,7 @@ protected function filterAttributes(Collection $collection, array $fields): arra
 
         $filtered = [];
         foreach ($attributes as $attribute) {
-
-            if (in_array($attribute->getFieldDefinition()->id, $fields)) {
+            if (in_array($attribute->getFieldDefinition()->id, $fields, true)) {
                 $filtered[] = $attribute;
             }
         }
diff --git a/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php b/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php
index 3046ea5f..84f260ae 100644
--- a/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php
+++ b/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php
@@ -4,11 +4,11 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\Anonymizer;
 
-use DateTime;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer;
 use Netgen\InformationCollection\Core\Persistence\ContentTypeUtils;
 use Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionRepository;
 use OutOfBoundsException;
+use function count;
 
 final class AnonymizerServiceFacade
 {
@@ -27,13 +27,6 @@ final class AnonymizerServiceFacade
      */
     private $ezInfoCollectionRepository;
 
-    /**
-     * AnonymizerServiceFacade constructor.
-     *
-     * @param \Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer $anonymizer
-     * @param \Netgen\InformationCollection\Core\Persistence\ContentTypeUtils $contentTypeUtils
-     * @param \Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionRepository $ezInfoCollectionRepository
-     */
     public function __construct(
         Anonymizer $anonymizer,
         ContentTypeUtils $contentTypeUtils,
@@ -73,9 +66,6 @@ public function anonymize($contentId, array $fields = [], ?\DateTimeImmutable $d
     /**
      * Map field id's to list of field identifiers.
      *
-     * @param int $contentId
-     * @param array $fieldIdentifiers
-     *
      * @return array
      */
     private function getFieldIds(int $contentId, array $fieldIdentifiers)
@@ -92,7 +82,7 @@ private function getFieldIds(int $contentId, array $fieldIdentifiers)
         return $ids;
     }
 
-    private function getCollections($contentId, \DateTimeImmutable $date = null)
+    private function getCollections($contentId, ?\DateTimeImmutable $date = null)
     {
         if (null === $date) {
             $collections = $this->ezInfoCollectionRepository->findByContentId($contentId);
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
index dd542b6c..6cc6a95f 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
@@ -18,8 +18,6 @@ class Aggregate extends FieldAnonymizerVisitor
     protected $visitors;
 
     /**
-     * Aggregate constructor.
-     *
      * @param array $visitors
      */
     public function __construct(iterable $visitors)
@@ -27,9 +25,6 @@ public function __construct(iterable $visitors)
         $this->visitors = $visitors;
     }
 
-    /**
-     * @param \Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor $visitor
-     */
     public function addVisitor(FieldAnonymizerVisitor $visitor)
     {
         $this->visitors[] = $visitor;
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
index da6d102b..73be3b98 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
@@ -1,11 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection\Core\Persistence\Anonymizer\Visitor\Field;
 
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor;
 use Netgen\InformationCollection\API\Value\Attribute;
 use Netgen\InformationCollection\API\Value\AttributeValue;
+use function implode;
+use function in_array;
+use function mb_str_split;
 
 class Email extends FieldAnonymizerVisitor
 {
@@ -26,17 +31,17 @@ public function visit(Attribute $attribute, ContentType $contentType): Attribute
     {
         $email = $attribute->getValue()->getDataText();
 
-        $split = str_split($email);
+        $split = mb_str_split($email);
 
         $email = [];
         foreach ($split as $character) {
-            if (!in_array($character, $this->allowedCharacters)) {
+            if (!in_array($character, $this->allowedCharacters, true)) {
                 $email[] = 'X';
             } else {
                 $email[] = $character;
             }
         }
 
-        return new AttributeValue(0, 0, implode($email, ''));
+        return new AttributeValue(0, 0, implode('', $email));
     }
 }
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php
index 0f51b597..aa7f1414 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php
@@ -6,7 +6,6 @@
 
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor;
-use Netgen\InformationCollection\Doctrine\Entity\EzInfoCollectionAttribute;
 use Netgen\InformationCollection\API\Value\Attribute;
 use Netgen\InformationCollection\API\Value\AttributeValue;
 
diff --git a/lib/Core/Persistence/ContentTypeUtils.php b/lib/Core/Persistence/ContentTypeUtils.php
index 07f22b4c..e8febcc9 100644
--- a/lib/Core/Persistence/ContentTypeUtils.php
+++ b/lib/Core/Persistence/ContentTypeUtils.php
@@ -8,6 +8,7 @@
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use OutOfBoundsException;
+use function sprintf;
 
 final class ContentTypeUtils
 {
@@ -21,12 +22,6 @@ final class ContentTypeUtils
      */
     private $contentService;
 
-    /**
-     * FieldIdResolver constructor.
-     *
-     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
-     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
-     */
     public function __construct(ContentTypeService $contentTypeService, ContentService $contentService)
     {
         $this->contentTypeService = $contentTypeService;
@@ -42,8 +37,6 @@ public function __construct(ContentTypeService $contentTypeService, ContentServi
      * @throws \OutOfBoundsException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
-     *
-     * @return mixed
      */
     public function getFieldId($contentId, $fieldDefIdentifier)
     {
diff --git a/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php
index fb5b37b1..c1bc71a9 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php
@@ -30,8 +30,6 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
 
     /**
      * @param \Ibexa\Core\FieldType\Checkbox\Value $value
-     *
-     * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
     public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition): FieldValue
     {
diff --git a/lib/Core/Persistence/FieldHandler/Custom/CountryFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/CountryFieldHandler.php
index 695e3e3b..65f5ce8f 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/CountryFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/CountryFieldHandler.php
@@ -7,8 +7,10 @@
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use Ibexa\Core\FieldType\Country\Value as CountryValue;
 use Ibexa\Core\FieldType\Value;
-use \Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
+use Netgen\InformationCollection\API\FieldHandler\CustomLegacyFieldHandlerInterface;
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
+use function array_column;
+use function implode;
 
 /**
  * Overrides the original country handler to save country alpha2 code to collected info
@@ -23,7 +25,7 @@ public function supports(Value $value): bool
 
     public function toString(Value $value, FieldDefinition $fieldDefinition): string
     {
-        return (string)$value;
+        return (string) $value;
     }
 
     /**
diff --git a/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php
index 6dcaf771..1747a9a3 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php
@@ -28,13 +28,10 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
         if ($value instanceof DateAndTimeValue) {
             return (string) $value;
         }
-
     }
 
     /**
      * @param \Ibexa\Core\FieldType\DateAndTime\Value $value
-     *
-     * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
     public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition): FieldValue
     {
diff --git a/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php
index 79d07323..a505ff2b 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php
@@ -30,8 +30,6 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
 
     /**
      * @param \Ibexa\Core\FieldType\Date\Value $value
-     *
-     * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
     public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition): FieldValue
     {
diff --git a/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php
index 536d3c3a..7cd18458 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php
@@ -30,8 +30,6 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
 
     /**
      * @param \Ibexa\Core\FieldType\Float\Value $value
-     *
-     * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
     public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition): FieldValue
     {
diff --git a/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php
index 1db7d445..696f5505 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php
@@ -30,8 +30,6 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
 
     /**
      * @param \Ibexa\Core\FieldType\Integer\Value $value
-     *
-     * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
     public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition): FieldValue
     {
diff --git a/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php
index 94470eca..2900dab6 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php
@@ -30,11 +30,9 @@ public function toString(Value $value, FieldDefinition $fieldDefinition): string
 
     /**
      * @param \Ibexa\Core\FieldType\Time\Value $value
-     *
-     * @return \Netgen\InformationCollection\API\Value\Legacy\FieldValue
      */
     public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition): FieldValue
     {
-        return FieldValue::withIntValue($fieldDefinition->id, (int)$value->time);
+        return FieldValue::withIntValue($fieldDefinition->id, (int) $value->time);
     }
 }
diff --git a/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php b/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
index 08ca262a..a380adc0 100644
--- a/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
+++ b/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
@@ -12,11 +12,9 @@ final class FieldHandlerRegistry
     /**
      * @var array
      */
-    protected $handlers;
+    private $handlers;
 
     /**
-     * FieldHandlerRegistry constructor.
-     *
      * @param array $handlers
      */
     public function __construct(iterable $handlers)
@@ -26,19 +24,12 @@ public function __construct(iterable $handlers)
 
     /**
      * Adds new handler.
-     *
-     * @param CustomFieldHandlerInterface $handler
      */
     public function addHandler(CustomFieldHandlerInterface $handler): void
     {
         $this->handlers[] = $handler;
     }
 
-    /**
-     * @param Value $value
-     *
-     * @return CustomFieldHandlerInterface|null
-     */
     public function handle(Value $value): ?CustomFieldHandlerInterface
     {
         /** @var CustomFieldHandlerInterface $handler */
diff --git a/lib/Core/Persistence/Gateway/DoctrineDatabase.php b/lib/Core/Persistence/Gateway/DoctrineDatabase.php
index d1a2eb1f..ada688ad 100644
--- a/lib/Core/Persistence/Gateway/DoctrineDatabase.php
+++ b/lib/Core/Persistence/Gateway/DoctrineDatabase.php
@@ -12,13 +12,8 @@ final class DoctrineDatabase
     /**
      * @var \Doctrine\DBAL\Connection
      */
-    protected $connection;
+    private $connection;
 
-    /**
-     * DoctrineDatabase constructor.
-     *
-     * @param \Doctrine\DBAL\Connection $connection
-     */
     public function __construct(Connection $connection)
     {
         $this->connection = $connection;
@@ -28,15 +23,13 @@ public function __construct(Connection $connection)
      * Returns number of content objects that have any collection.
      *
      * @throws \Doctrine\DBAL\DBALException
-     *
-     * @return int
      */
     public function getContentsWithCollectionsCount(): int
     {
         $query = $this->connection->createQueryBuilder();
         $query->select(
             'COUNT(DISTINCT eic.contentobject_id) AS count'
-            )
+        )
             ->from($this->connection->quoteIdentifier('ezinfocollection'), 'eic')
             ->innerJoin(
                 'eic',
@@ -65,12 +58,7 @@ public function getContentsWithCollectionsCount(): int
     /**
      * Returns content objects with their collections.
      *
-     * @param int $limit
-     * @param int $offset
-     *
      * @throws \Doctrine\DBAL\DBALException
-     *
-     * @return array
      */
     public function getObjectsWithCollections(int $limit, int $offset): array
     {
diff --git a/lib/Core/Service/CaptchaService.php b/lib/Core/Service/CaptchaService.php
index 5b45158d..74598bfa 100644
--- a/lib/Core/Service/CaptchaService.php
+++ b/lib/Core/Service/CaptchaService.php
@@ -10,8 +10,12 @@
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Netgen\InformationCollection\API\Service\CaptchaService as CaptchaServiceInterface;
 use Netgen\InformationCollection\API\Service\CaptchaValue;
-use Netgen\InformationCollection\API\Value\Captcha\ReCaptcha;
 use Netgen\InformationCollection\API\Value\Captcha\NullObject;
+use Netgen\InformationCollection\API\Value\Captcha\ReCaptcha;
+use function array_keys;
+use function array_replace;
+use function dump;
+use function in_array;
 
 class CaptchaService implements CaptchaServiceInterface
 {
@@ -24,17 +28,12 @@ class CaptchaService implements CaptchaServiceInterface
      * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
      */
     protected $contentTypeService;
+
     /**
      * @var ConfigResolverInterface
      */
     private $configResolver;
 
-    /**
-     * CaptchaService constructor.
-     *
-     * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService
-     * @param array $config
-     */
     public function __construct(ContentTypeService $contentTypeService, ConfigResolverInterface $configResolver)
     {
         $this->config = $configResolver->getParameter('captcha', 'netgen_information_collection');
@@ -74,7 +73,7 @@ public function getCaptcha(Location $location): CaptchaValue
 
             if (!empty($config['options'])) {
 //                if (!empty($config['options']['hostname'])) {
-                    $reCaptcha->setExpectedHostname('localhost');
+                $reCaptcha->setExpectedHostname('localhost');
 //                }
 //                if (!empty($config['options']['apk_package_name'])) {
 //                    $reCaptcha->setExpectedApkPackageName($config['options']['apk_package_name']);
@@ -91,6 +90,7 @@ public function getCaptcha(Location $location): CaptchaValue
             }
 
             dump($reCaptcha);
+
             return new ReCaptcha($reCaptcha);
         }
 
@@ -100,11 +100,7 @@ public function getCaptcha(Location $location): CaptchaValue
     /**
      * Returns filtered config for current Location.
      *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
-     *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
-     *
-     * @return array
      */
     public function getConfig(Location $location): array
     {
@@ -112,14 +108,12 @@ public function getConfig(Location $location): array
             $this->getContentType($location)
         );
 
-        return (array)array_replace($this->config, $contentTypeConfig);
+        return (array) array_replace($this->config, $contentTypeConfig);
     }
 
     /**
      * Returns filtered config for current ContentType.
      *
-     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
-     *
      * @return array
      */
     protected function getConfigForContentType(ContentType $contentType)
@@ -134,8 +128,6 @@ protected function getConfigForContentType(ContentType $contentType)
     /**
      * Checks if override exist for given ContentType.
      *
-     * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType
-     *
      * @return bool
      */
     protected function hasConfigForContentType(ContentType $contentType)
@@ -152,8 +144,6 @@ protected function hasConfigForContentType(ContentType $contentType)
     /**
      * Helper method for retrieving ContentType from Location.
      *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
-     *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      *
      * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
diff --git a/lib/Core/Service/ExporterService.php b/lib/Core/Service/ExporterService.php
index b3060c34..ca6f1dd0 100644
--- a/lib/Core/Service/ExporterService.php
+++ b/lib/Core/Service/ExporterService.php
@@ -12,6 +12,10 @@
 use Netgen\InformationCollection\API\Value\Filter\ContentId;
 use Netgen\InformationCollection\Core\Persistence\ContentTypeUtils;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_values;
+use function preg_replace;
+use function str_replace;
+use function strip_tags;
 
 class ExporterService implements Exporter
 {
@@ -66,7 +70,7 @@ public function export(ExportCriteria $criteria): Export
                     continue;
                 }
 
-                $row[] = $this->getAttributeValue((int)$fieldId, $collection->getAttributes());
+                $row[] = $this->getAttributeValue((int) $fieldId, $collection->getAttributes());
             }
 
             $rows[] = $row;
@@ -80,9 +84,6 @@ public function export(ExportCriteria $criteria): Export
     /**
      * Get attribute value string.
      *
-     * @param int $fieldId
-     * @param array $attributes
-     *
      * @return string
      */
     protected function getAttributeValue(int $fieldId, array $attributes)
@@ -91,8 +92,8 @@ protected function getAttributeValue(int $fieldId, array $attributes)
         foreach ($attributes as $attribute) {
             if ($fieldId === $attribute->getFieldDefinition()->id) {
                 $value = $attribute->getValue();
-                $value = str_replace('"', '""', (string)$value);
-                $value = str_replace(';', ', ', (string)$value);
+                $value = str_replace('"', '""', (string) $value);
+                $value = str_replace(';', ', ', (string) $value);
                 $value = strip_tags($value);
 
                 $res = preg_replace(['/\r|\n/'], [' '], $value);
diff --git a/lib/Core/Service/InformationCollectionService.php b/lib/Core/Service/InformationCollectionService.php
index 2010d5d1..1879f006 100644
--- a/lib/Core/Service/InformationCollectionService.php
+++ b/lib/Core/Service/InformationCollectionService.php
@@ -6,7 +6,6 @@
 
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Repository\Repository;
-use Ibexa\Contracts\Core\Repository\Values\User\UserReference;
 use Netgen\InformationCollection\API\Exception\PersistingFailedException;
 use Netgen\InformationCollection\API\Exception\StoringAttributeFailedException;
 use Netgen\InformationCollection\API\Exception\StoringCollectionFailedException;
@@ -33,6 +32,7 @@
 use Netgen\InformationCollection\Core\Persistence\Gateway\DoctrineDatabase;
 use Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionAttributeRepository;
 use Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionRepository;
+use function count;
 
 class InformationCollectionService implements InformationCollection
 {
@@ -66,14 +66,6 @@ class InformationCollectionService implements InformationCollection
      */
     protected $objectMapper;
 
-    /**
-     * InformationCollectionService constructor.
-     *
-     * @param \Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionRepository $ezInfoCollectionRepository
-     * @param \Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionAttributeRepository $ezInfoCollectionAttributeRepository
-     * @param \Ibexa\Contracts\Core\Repository\Repository $repository
-     * @param \Netgen\InformationCollection\Core\Persistence\Gateway\DoctrineDatabase $gateway
-     */
     public function __construct(
         EzInfoCollectionRepository $ezInfoCollectionRepository,
         EzInfoCollectionAttributeRepository $ezInfoCollectionAttributeRepository,
@@ -304,7 +296,6 @@ public function updateCollectionAttribute(CollectionId $collectionId, Attribute
 
     /**
      * @param int $userId
-     * @param mixed $userId
      *
      * @return \Ibexa\Contracts\Core\Repository\Values\User\User
      */
diff --git a/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php b/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php
index e0f75abe..e08609d3 100644
--- a/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php
+++ b/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php
@@ -19,6 +19,8 @@
 use Netgen\InformationCollection\API\Value\Legacy\FieldValue;
 use Netgen\InformationCollection\Doctrine\Entity\EzInfoCollection;
 use Netgen\InformationCollection\Doctrine\Entity\EzInfoCollectionAttribute;
+use function array_column;
+use function mb_strtolower;
 
 class EzInfoCollectionAttributeRepository extends EntityRepository
 {
@@ -55,8 +57,6 @@ public function createNewFromValues(Content $content, EzInfoCollection $collecti
     /**
      * Save object.
      *
-     * @param \Netgen\InformationCollection\Doctrine\Entity\EzInfoCollectionAttribute $infoCollectionAttribute
-     *
      * @throws StoringAttributeFailedException
      */
     public function save(EzInfoCollectionAttribute $infoCollectionAttribute)
@@ -64,7 +64,7 @@ public function save(EzInfoCollectionAttribute $infoCollectionAttribute)
         try {
             $this->_em->persist($infoCollectionAttribute);
             $this->_em->flush($infoCollectionAttribute);
-        } catch (ORMException | ORMInvalidArgumentException $exception) {
+        } catch (ORMException|ORMInvalidArgumentException $exception) {
             throw new StoringAttributeFailedException('', '');
         }
     }
@@ -82,8 +82,8 @@ public function remove(array $attributes)
             }
 
             $this->_em->flush();
-        } catch (ORMException | ORMInvalidArgumentException $exception) {
-            throw  new RemoveAttributeFailedException('', '');
+        } catch (ORMException|ORMInvalidArgumentException $exception) {
+            throw new RemoveAttributeFailedException('', '');
         }
     }
 
@@ -139,7 +139,7 @@ public function getCountByContentId($contentId)
                 ->select('COUNT(eica) as children_count')
                 ->getQuery()
                 ->getSingleScalarResult();
-        } catch (NonUniqueResultException | NoResultException $exception) {
+        } catch (NonUniqueResultException|NoResultException $exception) {
             throw new RetrieveCountException('', '');
         }
     }
diff --git a/lib/Doctrine/Repository/EzInfoCollectionRepository.php b/lib/Doctrine/Repository/EzInfoCollectionRepository.php
index a1ba15b6..9853276e 100644
--- a/lib/Doctrine/Repository/EzInfoCollectionRepository.php
+++ b/lib/Doctrine/Repository/EzInfoCollectionRepository.php
@@ -87,8 +87,6 @@ public function createNewFromValues(Content $content, User $user): EzInfoCollect
     /**
      * Save object.
      *
-     * @param \Netgen\InformationCollection\Doctrine\Entity\EzInfoCollection $informationCollection
-     *
      * @throws StoringCollectionFailedException
      */
     public function save(EzInfoCollection $informationCollection)
@@ -96,14 +94,12 @@ public function save(EzInfoCollection $informationCollection)
         try {
             $this->_em->persist($informationCollection);
             $this->_em->flush($informationCollection);
-        } catch (ORMException | ORMInvalidArgumentException $e) {
+        } catch (ORMException|ORMInvalidArgumentException $e) {
             throw new StoringCollectionFailedException('', '');
         }
     }
 
     /**
-     * @param array $collections
-     *
      * @throws RemoveCollectionFailedException
      */
     public function remove(array $collections)
@@ -114,7 +110,7 @@ public function remove(array $collections)
             }
 
             $this->_em->flush();
-        } catch (ORMException | ORMInvalidArgumentException $e) {
+        } catch (ORMException|ORMInvalidArgumentException $e) {
             throw new RemoveCollectionFailedException('', '');
         }
     }
@@ -151,7 +147,7 @@ public function getChildrenCount($contentId)
                 ->select('COUNT(ezc) as children_count')
                 ->getQuery()
                 ->getSingleScalarResult();
-        } catch (NonUniqueResultException | NoResultException $e) {
+        } catch (NonUniqueResultException|NoResultException $e) {
             throw new RetrieveCountException('', '');
         }
     }
diff --git a/lib/Handler.php b/lib/Handler.php
index 1d9c76d0..2c5c70d7 100644
--- a/lib/Handler.php
+++ b/lib/Handler.php
@@ -1,15 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Netgen\InformationCollection;
 
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionMapper;
+use Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionType;
 use Netgen\InformationCollection\API\Events;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
 use Netgen\InformationCollection\API\Value\InformationCollectionStruct;
-use Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionMapper;
-use Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionType;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;

From 18fb23faecaf6ceda01bcc492b8384050614bdfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Fri, 4 Mar 2022 15:40:33 +0100
Subject: [PATCH 10/30] Add return and parameter typehints

---
 bundle/Command/DataAnonymizerCommand.php      | 26 +++---
 bundle/Controller/Admin/AdminController.php   | 66 +++------------
 bundle/Controller/Admin/Export/Export.php     |  8 +-
 bundle/Controller/Admin/TreeController.php    | 22 ++---
 bundle/Controller/CollectInformation.php      |  6 +-
 .../InformationCollectionCollector.php        |  2 +-
 bundle/DependencyInjection/Configuration.php  | 13 ++-
 .../NetgenInformationCollectionExtension.php  |  9 +--
 bundle/Form/CaptchaType.php                   |  6 +-
 bundle/Form/ExportType.php                    | 16 ++--
 .../EventListener/SetPageLayoutListener.php   |  4 +-
 bundle/Ibexa/Admin/MenuListener.php           |  4 +-
 .../FieldDefinitionTypeExtension.php          |  4 +-
 .../InformationCollectionFieldType.php        | 12 +--
 .../InformationCollectionMapper.php           |  7 +-
 .../InformationCollectionType.php             | 14 ++--
 .../InformationCollectionPolicyProvider.php   |  7 +-
 bundle/Listener/CaptchaValidationListener.php |  4 +-
 .../Listener/InformationCollectedListener.php |  8 --
 bundle/NetgenInformationCollectionBundle.php  | 11 +--
 .../CollectionParamConverter.php              | 10 +--
 .../Templating/Twig/AdminGlobalVariable.php   |  2 -
 .../Twig/Extensions/CaptchaRuntime.php        | 11 ---
 doc/cookbook/custom_action.rst                |  6 +-
 doc/cookbook/custom_field_handler.rst         | 10 +--
 lib/API/InformationCollectionTrait.php        |  2 -
 lib/API/Service/CaptchaService.php            |  4 -
 lib/API/Value/Attribute.php                   |  2 +-
 lib/API/Value/AttributeValue.php              |  2 +-
 lib/API/Value/Captcha/NullObject.php          |  3 -
 lib/API/Value/Captcha/ReCaptcha.php           |  3 -
 lib/API/Value/Collection.php                  |  2 +-
 lib/API/Value/DataTransfer/EmailContent.php   |  7 +-
 lib/API/Value/Filter/Query.php                |  4 +-
 lib/API/Value/InformationCollectionStruct.php |  2 +-
 lib/API/Value/NullUser.php                    |  5 +-
 lib/Core/Action/ActionRegistry.php            |  8 +-
 lib/Core/Action/AutoResponderAction.php       |  2 +-
 lib/Core/Action/BaseEmailAction.php           |  3 -
 lib/Core/Action/DatabaseAction.php            |  3 -
 lib/Core/Action/EmailAction.php               |  2 +-
 .../ExportResponseFormatterRegistry.php       |  5 +-
 .../Export/XlsExportResponseFormatter.php     |  2 +-
 .../Export/XlsxExportResponseFormatter.php    |  3 +-
 lib/Core/Factory/AutoResponderDataFactory.php | 12 +--
 lib/Core/Factory/EmailDataFactory.php         | 40 +++-------
 lib/Core/Mailer/SwiftMailerBasedMailer.php    |  3 -
 lib/Core/Mapper/DomainObjectMapper.php        |  8 +-
 ...rmationCollectionCollectionListAdapter.php |  4 +-
 ...nCollectionCollectionListSearchAdapter.php |  4 +-
 .../InformationCollectionContentsAdapter.php  |  4 +-
 .../View/InformationCollectionAdminView.php   | 46 +++--------
 .../Anonymizer/AnonymizerService.php          |  4 +-
 .../Anonymizer/AnonymizerServiceFacade.php    | 15 +---
 .../Anonymizer/Visitor/Field/Aggregate.php    | 11 +--
 .../Anonymizer/Visitor/Field/Email.php        |  6 --
 .../Anonymizer/Visitor/Field/Simple.php       |  6 --
 lib/Core/Persistence/ContentTypeUtils.php     | 13 +--
 .../Custom/CheckboxFieldHandler.php           |  6 --
 .../Custom/DateAndTimeFieldHandler.php        |  6 --
 .../FieldHandler/Custom/DateFieldHandler.php  |  6 --
 .../FieldHandler/Custom/FloatFieldHandler.php |  6 --
 .../Custom/IntegerFieldHandler.php            |  6 --
 .../FieldHandler/Custom/TimeFieldHandler.php  |  6 --
 .../FieldHandler/FieldHandlerRegistry.php     |  3 -
 lib/Core/Service/CaptchaService.php           | 23 +-----
 lib/Core/Service/ExporterService.php          |  7 +-
 .../Service/InformationCollectionService.php  | 37 +--------
 lib/Doctrine/Entity/EzInfoCollection.php      | 60 +++-----------
 .../Entity/EzInfoCollectionAttribute.php      | 80 ++++---------------
 .../EzInfoCollectionAttributeRepository.php   | 22 +++--
 .../Repository/EzInfoCollectionRepository.php | 42 ++++------
 tests/lib/FakeTest.php                        |  2 +-
 .../Value/InformationCollection/QueryTest.php |  6 +-
 tests/old/Action/ActionRegistryTest.php       | 20 ++---
 tests/old/Action/AutoResponderActionTest.php  |  6 +-
 tests/old/Action/DatabaseActionTest.php       |  8 +-
 tests/old/Action/EmailActionTest.php          |  2 +-
 tests/old/ContentViewStub.php                 |  5 +-
 .../InformationCollectionControllerTest.php   | 15 ++--
 .../Compiler/ActionsPassTest.php              | 14 ++--
 .../Compiler/CustomFieldHandlersPassTest.php  |  4 +-
 .../FieldAnonymizerVisitorPassTest.php        | 16 ++--
 .../DependencyInjection/ConfigurationTest.php |  8 +-
 ...tgenInformationCollectionExtensionTest.php |  6 +-
 .../Entity/EzInfoCollectionAttributeTest.php  |  4 +-
 tests/old/Entity/EzInfoCollectionTest.php     |  4 +-
 tests/old/Event/InformationCollectedTest.php  |  4 +-
 .../Exception/ActionFailedExceptionTest.php   |  2 +-
 .../Exception/EmailNotSentExceptionTest.php   |  2 +-
 .../MissingEmailBlockExceptionTest.php        |  6 +-
 .../Exception/MissingValueExceptionTest.php   |  2 +-
 .../Factory/AutoResponderDataFactoryTest.php  | 26 +++---
 tests/old/Factory/EmailDataFactoryTest.php    | 42 +++++-----
 tests/old/Factory/FieldDataFactoryTest.php    |  8 +-
 .../Custom/CheckboxFieldHandlerTest.php       | 10 +--
 .../Custom/DateAndTimeFieldHandlerTest.php    | 10 +--
 .../Custom/DateFieldHandlerTest.php           | 10 +--
 .../Custom/FloatFieldHandlerTest.php          | 10 +--
 .../Custom/IntegerFieldHandlerTest.php        | 10 +--
 .../Custom/TimeFieldHandlerTest.php           | 10 +--
 .../FieldHandler/FieldHandlerRegistryTest.php |  8 +-
 tests/old/Form/Builder/FormBuilderTest.php    |  6 +-
 .../InformationCollectedListenerTest.php      |  6 +-
 tests/old/Mailer/MailerTest.php               | 12 +--
 .../Twig/AdminGlobalVariableTest.php          |  2 +-
 tests/old/Value/EmailDataTest.php             |  4 +-
 tests/old/Value/LegacyDataTest.php            |  4 +-
 tests/old/Value/TemplateDataTest.php          | 18 ++---
 109 files changed, 376 insertions(+), 794 deletions(-)

diff --git a/bundle/Command/DataAnonymizerCommand.php b/bundle/Command/DataAnonymizerCommand.php
index cf26a8f0..2d3f6fc1 100644
--- a/bundle/Command/DataAnonymizerCommand.php
+++ b/bundle/Command/DataAnonymizerCommand.php
@@ -10,6 +10,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use DateTimeInterface;
 use DateInterval;
 use DateTime;
 use Exception;
@@ -36,7 +37,7 @@ public function __construct(AnonymizerServiceFacade $anonymizerServiceFacade)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName("nginfocollector:anonymize");
         $this->setDescription("Anonymizes collected data in collected info tables.");
@@ -58,14 +59,16 @@ protected function configure()
         $this->addUsage("--info-collection-id=456 --field-identifiers=title,name,last_name");
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if (is_null($input->getOption('content-id'))) {
             $output->writeln("<error>                                       </error>");
             $output->writeln("<error>     Missing content-id parameter.     </error>");
             $output->writeln("<error>                                       </error>");
 
-            return $this->displayHelp($input, $output);
+            $this->displayHelp($input, $output);
+
+            return 1;
         }
 
         if (is_null($input->getOption('field-identifiers')) && !$input->getOption('all')) {
@@ -73,7 +76,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln("<error>     Missing field-identifiers parameter.     </error>");
             $output->writeln("<error>                                              </error>");
 
-            return $this->displayHelp($input, $output);
+            $this->displayHelp($input, $output);
+
+            return 1;
         }
 
         $contentId = intval($input->getOption('content-id'));
@@ -87,13 +92,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $count = $this->anonymizer->anonymize($contentId, $fields, $this->getDateFromPeriod());
             $output->writeln("<info>Done.</info>");
             $output->writeln("<info>Anonymized #{$count} collections.</info>");
+
             return 0;
         }
 
         $output->writeln("<info>Canceled.</info>");
+
+        return 0;
     }
 
-    protected function initialize(InputInterface $input, OutputInterface $output)
+    protected function initialize(InputInterface $input, OutputInterface $output): void
     {
         if (!empty($input->getOption('period'))) {
 
@@ -109,7 +117,7 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         }
     }
 
-    protected function displayHelp(InputInterface $input, OutputInterface $output)
+    protected function displayHelp(InputInterface $input, OutputInterface $output): void
     {
         $help = new HelpCommand();
         $help->setCommand($this);
@@ -117,7 +125,7 @@ protected function displayHelp(InputInterface $input, OutputInterface $output)
         return $help->run($input, $output);
     }
 
-    protected function getFields(InputInterface $input)
+    protected function getFields(InputInterface $input): array
     {
         if (!empty($input->getOption('all'))) {
             return [];
@@ -142,7 +150,7 @@ protected function getFields(InputInterface $input)
         return [];
     }
 
-    protected function proceedWithAction(InputInterface $input, OutputInterface $output)
+    protected function proceedWithAction(InputInterface $input, OutputInterface $output): bool
     {
         if ($input->getOption('neglect')) {
             return true;
@@ -157,7 +165,7 @@ protected function proceedWithAction(InputInterface $input, OutputInterface $out
         return false;
     }
 
-    protected function getDateFromPeriod()
+    protected function getDateFromPeriod(): DateTimeInterface
     {
         $dt = new DateTime();
         $dt->sub($this->period);
diff --git a/bundle/Controller/Admin/AdminController.php b/bundle/Controller/Admin/AdminController.php
index 98cfcc3a..2e469a20 100644
--- a/bundle/Controller/Admin/AdminController.php
+++ b/bundle/Controller/Admin/AdminController.php
@@ -21,7 +21,9 @@
 use Netgen\InformationCollection\Core\Pagination\InformationCollectionContentsAdapter;
 use Pagerfanta\Adapter\AdapterInterface;
 use Pagerfanta\Pagerfanta;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AdminController extends Controller
@@ -51,13 +53,6 @@ class AdminController extends Controller
      */
     private $translator;
 
-    /**
-     * @param \Netgen\InformationCollection\API\Service\InformationCollection $service
-     * @param \Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer $anonymizer
-     * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService
-     * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver
-     * @param \Symfony\Contracts\Translation\TranslatorInterface $translator
-     */
     public function __construct(
         InformationCollection $service,
         Anonymizer $anonymizer,
@@ -75,12 +70,8 @@ public function __construct(
 
     /**
      * Displays overview page
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function overviewAction(Request $request)
+    public function overviewAction(Request $request): Response
     {
         $this->checkReadPermissions();
 
@@ -92,13 +83,8 @@ public function overviewAction(Request $request)
 
     /**
      * Displays list of collection for selected Content
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function collectionListAction(Request $request, Content $content)
+    public function collectionListAction(Request $request, Content $content): Response
     {
         $this->checkReadPermissions();
 
@@ -113,13 +99,8 @@ public function collectionListAction(Request $request, Content $content)
 
     /**
      * Handles collection search
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function searchAction(Request $request, Content $content)
+    public function searchAction(Request $request, Content $content): Response
     {
         $this->checkReadPermissions();
 
@@ -138,12 +119,8 @@ public function searchAction(Request $request, Content $content)
 
     /**
      * Displays individual collection details
-     *
-     * @param \Netgen\InformationCollection\API\Value\Collection $collection
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function viewAction(Collection $collection)
+    public function viewAction(Collection $collection): Response
     {
         $this->checkReadPermissions();
 
@@ -155,12 +132,8 @@ public function viewAction(Collection $collection)
 
     /**
      * Handles actions performed on overview page
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function handleContentsAction(Request $request)
+    public function handleContentsAction(Request $request): RedirectResponse
     {
         $this->checkReadPermissions();
 
@@ -193,12 +166,8 @@ public function handleContentsAction(Request $request)
 
     /**
      * Handles actions performed on collection list page
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function handleCollectionListAction(Request $request)
+    public function handleCollectionListAction(Request $request): RedirectResponse
     {
         $this->checkReadPermissions();
 
@@ -245,12 +214,8 @@ public function handleCollectionListAction(Request $request)
 
     /**
      * Handles action on collection details page
-     *
-     * @param \Symfony\Component\HttpFoundation\Request $request
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function handleCollectionAction(Request $request)
+    public function handleCollectionAction(Request $request): RedirectResponse
     {
         $this->checkReadPermissions();
 
@@ -323,13 +288,8 @@ public function handleCollectionAction(Request $request)
 
     /**
      * Adds a flash message with specified parameters.
-     *
-     * @param string $messageType
-     * @param string $message
-     * @param int $count
-     * @param array $parameters
      */
-    protected function addFlashMessage(string $messageType, string $message, int $count = 1, array $parameters = array())
+    protected function addFlashMessage(string $messageType, string $message, int $count = 1, array $parameters = array()): void
     {
         $parameters = array_merge($parameters, ['count' => $count]);
 
@@ -345,15 +305,9 @@ protected function addFlashMessage(string $messageType, string $message, int $co
 
     /**
      * Returns configured instance of Pagerfanta
-     *
-     * @param \Pagerfanta\Adapter\AdapterInterface $adapter
-     * @param int $currentPage
-     *
-     * @return \Pagerfanta\Pagerfanta
      */
     protected function getPager(AdapterInterface $adapter, int $currentPage): Pagerfanta
     {
-        $currentPage = (int) $currentPage;
         $pager = new Pagerfanta($adapter);
         $pager->setNormalizeOutOfRangePages(true);
         $pager->setMaxPerPage(
diff --git a/bundle/Controller/Admin/Export/Export.php b/bundle/Controller/Admin/Export/Export.php
index 35f1186d..41b113ea 100644
--- a/bundle/Controller/Admin/Export/Export.php
+++ b/bundle/Controller/Admin/Export/Export.php
@@ -10,6 +10,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Netgen\InformationCollection\Form\Type\ExportType;
 use Ibexa\Contracts\Core\Repository\ContentService;
+use Symfony\Component\HttpFoundation\Response;
 
 final class Export extends AbstractController
 {
@@ -39,12 +40,15 @@ public function __construct(
         $this->formatterRegistry = $formatterRegistry;
     }
 
-    public function __invoke($contentId, Request $request)
+    /**
+     * @param int $contentId
+     */
+    public function __invoke($contentId, Request $request): Response
     {
         $attribute = new Attribute('infocollector', 'export');
         $this->denyAccessUnlessGranted($attribute);
 
-        $content = $this->contentService->loadContent($contentId);
+        $content = $this->contentService->loadContent((int) $contentId);
 
         $form = $this->createForm(ExportType::class, null, [
             'contentId' => $content->id,
diff --git a/bundle/Controller/Admin/TreeController.php b/bundle/Controller/Admin/TreeController.php
index 13398bfe..2bafc58b 100644
--- a/bundle/Controller/Admin/TreeController.php
+++ b/bundle/Controller/Admin/TreeController.php
@@ -29,11 +29,6 @@ class TreeController extends Controller
      */
     protected $service;
 
-    /**
-     * @param \Netgen\InformationCollection\API\Service\InformationCollection $service
-     * @param \Symfony\Contracts\Translation\TranslatorInterface $translator
-     * @param \Symfony\Component\Routing\RouterInterface $router
-     */
     public function __construct(
         InformationCollection $service,
         TranslatorInterface $translator,
@@ -48,17 +43,16 @@ public function __construct(
      * Get contents with collections
      *
      * @param bool $isRoot
-     *
-     * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-    public function getChildrenAction($isRoot = false)
+    public function getChildrenAction($isRoot = false): JsonResponse
     {
+        $isRoot = (bool) $isRoot;
         $attribute = new Attribute('infocollector', 'read');
         $this->denyAccessUnlessGranted($attribute);
 
         $result = array();
 
-        if ((bool) $isRoot) {
+        if ($isRoot) {
             $result[] = $this->getRootTreeData();
         } else {
 
@@ -75,10 +69,8 @@ public function getChildrenAction($isRoot = false)
 
     /**
      * Generates data for root of the tree.
-     *
-     * @return array
      */
-    protected function getRootTreeData()
+    protected function getRootTreeData(): array
     {
         $count = $this->service->getObjectsWithCollectionsCount();
 
@@ -102,13 +94,11 @@ protected function getRootTreeData()
     /**
      * Creates tree structure for Content
      *
-     * @param \Netgen\InformationCollection\API\Value\Content $content
      * @param bool $isRoot
-     *
-     * @return array
      */
-    protected function getCollections(Content $content, $isRoot = false)
+    protected function getCollections(Content $content, $isRoot = false): array
     {
+        $isRoot = (bool) $isRoot;
         $languages = $this->getConfigResolver()->getParameter('languages');
 
         $query = ContentId::countWithContentId($content->getContent()->id);
diff --git a/bundle/Controller/CollectInformation.php b/bundle/Controller/CollectInformation.php
index 76acb163..e83ce6f2 100644
--- a/bundle/Controller/CollectInformation.php
+++ b/bundle/Controller/CollectInformation.php
@@ -14,12 +14,8 @@ class CollectInformation implements ContainerAwareInterface
 
     /**
      * Displays and handles information collection.
-     *
-     * @param ContentValueView $view
-     *
-     * @return ContentValueView
      */
-    public function __invoke(ContentValueView $view)
+    public function __invoke(ContentValueView $view): ContentValueView
     {
         return $this->collectInformation($view, []);
     }
diff --git a/bundle/DataCollector/InformationCollectionCollector.php b/bundle/DataCollector/InformationCollectionCollector.php
index ba742261..a0c30aba 100644
--- a/bundle/DataCollector/InformationCollectionCollector.php
+++ b/bundle/DataCollector/InformationCollectionCollector.php
@@ -37,7 +37,7 @@ public function __construct(Repository $repository, TranslationHelper $translati
         $this->translationHelper = $translationHelper;
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
         if ($request->get(InformationCollectionType::FORM_BLOCK_PREFIX) !== null) {
             $this->mapCollectedData($request);
diff --git a/bundle/DependencyInjection/Configuration.php b/bundle/DependencyInjection/Configuration.php
index 9a66a947..82129a65 100644
--- a/bundle/DependencyInjection/Configuration.php
+++ b/bundle/DependencyInjection/Configuration.php
@@ -16,10 +16,7 @@
  */
 class Configuration extends SiteAccessConfiguration
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder(ConfigurationConstants::SETTINGS_ROOT);
         $rootNode = $treeBuilder->getRootNode();
@@ -37,7 +34,7 @@ public function getConfigTreeBuilder()
         return $treeBuilder;
     }
 
-    private function addCaptchaSection(NodeBuilder $nodeBuilder)
+    private function addCaptchaSection(NodeBuilder $nodeBuilder): void
     {
         $nodeBuilder
             ->arrayNode('captcha')
@@ -107,7 +104,7 @@ private function addCaptchaSection(NodeBuilder $nodeBuilder)
             ->end();
     }
 
-    private function addActionsSection(NodeBuilder $nodeBuilder)
+    private function addActionsSection(NodeBuilder $nodeBuilder): void
     {
         $nodeBuilder
             ->arrayNode(ConfigurationConstants::ACTIONS)
@@ -133,7 +130,7 @@ private function addActionsSection(NodeBuilder $nodeBuilder)
         ->end();
     }
 
-    private function addActionConfigSection(NodeBuilder $nodeBuilder)
+    private function addActionConfigSection(NodeBuilder $nodeBuilder): void
     {
         $nodeBuilder
             ->arrayNode(ConfigurationConstants::ACTION_CONFIG)
@@ -226,7 +223,7 @@ private function addActionConfigSection(NodeBuilder $nodeBuilder)
             ->end();
     }
 
-    private function addExportSection(NodeBuilder $nodeBuilder)
+    private function addExportSection(NodeBuilder $nodeBuilder): void
     {
         $nodeBuilder
             ->arrayNode('export')
diff --git a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
index 8147a347..a3057c75 100644
--- a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
+++ b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
@@ -25,10 +25,7 @@
  */
 class NetgenInformationCollectionExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
@@ -73,7 +70,7 @@ public function load(array $configs, ContainerBuilder $container)
         $this->registerServiceDefinitions($container);
     }
 
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $this->addTwigConfig($container);
         $this->addDoctrineConfig($container);
@@ -96,7 +93,7 @@ static function ($config, $scope, ContextualizerInterface $c): void {
         );
     }
 
-    protected function addDoctrineConfig(ContainerBuilder $container)
+    protected function addDoctrineConfig(ContainerBuilder $container): void
     {
         $configDir = __DIR__ . '/../../lib/Doctrine/mappings';
 
diff --git a/bundle/Form/CaptchaType.php b/bundle/Form/CaptchaType.php
index 7039c65e..9d3ff692 100644
--- a/bundle/Form/CaptchaType.php
+++ b/bundle/Form/CaptchaType.php
@@ -21,7 +21,7 @@ public function __construct(CaptchaValidationListener $validationListener)
         $this->validationListener = $validationListener;
     }
 
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['type'] = $options['type'];
         $view->vars['theme'] = $options['theme'];
@@ -30,12 +30,12 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['captcha_action'] = $options['captcha_action'];
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->addEventSubscriber($this->validationListener);
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
             [
diff --git a/bundle/Form/ExportType.php b/bundle/Form/ExportType.php
index 8677af9c..aa23db43 100644
--- a/bundle/Form/ExportType.php
+++ b/bundle/Form/ExportType.php
@@ -4,6 +4,7 @@
 
 namespace Netgen\Bundle\InformationCollectionBundle\Form;
 
+use DateTimeInterface;
 use Netgen\InformationCollection\API\Value\Export\ExportCriteria;
 use Netgen\InformationCollection\API\Value\Filter\ContentId;
 use Symfony\Component\Form\AbstractType;
@@ -28,9 +29,6 @@ class ExportType extends AbstractType implements DataMapperInterface
      */
     protected $exportResponseFormatterRegistry;
 
-    /**
-     * @param \Netgen\InformationCollection\Core\Export\ExportResponseFormatterRegistry $exportResponseFormatterRegistry
-     */
     public function __construct(ExportResponseFormatterRegistry $exportResponseFormatterRegistry)
     {
         $this->exportResponseFormatterRegistry = $exportResponseFormatterRegistry;
@@ -46,7 +44,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'translation_domain' => 'netgen_information_collection_admin',
             'constraints' => [
                 new Assert\NotBlank(),
-                new Assert\Type(\DateTimeInterface::class),
+                new Assert\Type(DateTimeInterface::class),
             ],
         ]);
 
@@ -58,7 +56,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'translation_domain' => 'netgen_information_collection_admin',
             'constraints' => [
                 new Assert\NotBlank(),
-                new Assert\Type(\DateTimeInterface::class),
+                new Assert\Type(DateTimeInterface::class),
             ],
         ]);
 
@@ -119,7 +117,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
 
         $builder->setDataMapper($this);
 
-        $builder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) use ($availableFormatters) {
+        $builder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) use ($availableFormatters): void {
             if (empty($availableFormatters)) {
                 $formError = new FormError('netgen_information_collection_admin_export_no_formatters');
                 $event->getForm()->addError($formError);
@@ -127,7 +125,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         });
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => ExportCriteria::class,
@@ -138,12 +136,12 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('contentId', 'int');
     }
 
-    public function mapDataToForms($viewData, iterable $forms)
+    public function mapDataToForms($viewData, iterable $forms): void
     {
 
     }
 
-    public function mapFormsToData(iterable $forms, &$viewData)
+    public function mapFormsToData(iterable $forms, &$viewData): void
     {
         $forms = iterator_to_array($forms);
 
diff --git a/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php b/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php
index bc1ddfb7..dfcf62f8 100644
--- a/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php
+++ b/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php
@@ -37,14 +37,14 @@ public function __construct(
         $this->groupsBySiteAccess = $groupsBySiteAccess;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             KernelEvents::REQUEST => 'onKernelRequest',
         ];
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         if (!$event->isMasterRequest()) {
             return;
diff --git a/bundle/Ibexa/Admin/MenuListener.php b/bundle/Ibexa/Admin/MenuListener.php
index 4b8d05e4..dbd12896 100644
--- a/bundle/Ibexa/Admin/MenuListener.php
+++ b/bundle/Ibexa/Admin/MenuListener.php
@@ -10,14 +10,14 @@
 
 class MenuListener implements EventSubscriberInterface
 {
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             ConfigureMenuEvent::MAIN_MENU => ['onMenuConfigure', 0],
         ];
     }
 
-    public function onMenuConfigure(ConfigureMenuEvent $event)
+    public function onMenuConfigure(ConfigureMenuEvent $event): void
     {
         $menu = $event->getMenu();
 
diff --git a/bundle/Ibexa/ContentForms/FieldDefinitionTypeExtension.php b/bundle/Ibexa/ContentForms/FieldDefinitionTypeExtension.php
index a72b186c..ebd1bf80 100644
--- a/bundle/Ibexa/ContentForms/FieldDefinitionTypeExtension.php
+++ b/bundle/Ibexa/ContentForms/FieldDefinitionTypeExtension.php
@@ -11,7 +11,7 @@
 
 class FieldDefinitionTypeExtension extends AbstractTypeExtension
 {
-    public function getExtendedType()
+    public function getExtendedType(): string
     {
         return FieldDefinitionType::class;
     }
@@ -21,7 +21,7 @@ public static function getExtendedTypes(): iterable
         return [FieldDefinitionType::class];
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $isTranslation = $options['languageCode'] !== $options['mainLanguageCode'];
 
diff --git a/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php b/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php
index 0d8685b2..9a87d811 100644
--- a/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php
@@ -25,17 +25,17 @@ public function __construct(FieldTypeFormMapperDispatcherInterface $fieldTypeFor
         $this->fieldTypeFormMapper = $fieldTypeFormMapper;
     }
 
-    public function getName()
+    public function getName(): string
     {
         return $this->getBlockPrefix();
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'ezplatform_content_forms_content_field';
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
             ->setDefaults([
@@ -48,15 +48,15 @@ public function configureOptions(OptionsResolver $resolver)
             ->setRequired(['languageCode', 'mainLanguageCode']);
     }
 
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['languageCode'] = $options['languageCode'];
         $view->vars['mainLanguageCode'] = $options['mainLanguageCode'];
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event): void {
             $this->fieldTypeFormMapper->map($event->getForm(), $event->getData());
         });
     }
diff --git a/bundle/Ibexa/ContentForms/InformationCollectionMapper.php b/bundle/Ibexa/ContentForms/InformationCollectionMapper.php
index 9ccb22f3..ee8a8ec4 100644
--- a/bundle/Ibexa/ContentForms/InformationCollectionMapper.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionMapper.php
@@ -18,13 +18,8 @@ final class InformationCollectionMapper
 {
     /**
      * Maps a ValueObject from Ibexa content repository to a data usable as underlying form data (e.g. create/update struct).
-     *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $contentDraft
-     * @param array $params
-     *
-     * @return InformationCollectionStruct
      */
-    public function mapToFormData(Content $content, Location $location, ContentType $contentType)
+    public function mapToFormData(Content $content, Location $location, ContentType $contentType): InformationCollectionStruct
     {
         $fields = $content->getFieldsByLanguage($content->contentInfo->mainLanguageCode);
 
diff --git a/bundle/Ibexa/ContentForms/InformationCollectionType.php b/bundle/Ibexa/ContentForms/InformationCollectionType.php
index 43d56ce5..98b4f213 100644
--- a/bundle/Ibexa/ContentForms/InformationCollectionType.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionType.php
@@ -31,17 +31,17 @@ public function __construct(CaptchaService $captchaService)
         $this->captchaService = $captchaService;
     }
 
-    public function getName()
+    public function getName(): string
     {
         $this->getBlockPrefix();
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return self::FORM_BLOCK_PREFIX;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         /** @var InformationCollectionStruct $struct */
         $struct = $options['data'];
@@ -73,20 +73,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->setDataMapper($this);
     }
 
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['languageCode'] = $options['languageCode'];
         $view->vars['mainLanguageCode'] = $options['mainLanguageCode'];
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
             ->setDefaults(['translation_domain' => 'ezplatform_content_forms_content'])
             ->setRequired(['languageCode', 'mainLanguageCode']);
     }
 
-    public function mapDataToForms($viewData, iterable $forms)
+    public function mapDataToForms($viewData, iterable $forms): void
     {
         if (null === $viewData) {
             return;
@@ -104,7 +104,7 @@ public function mapDataToForms($viewData, iterable $forms)
         }
     }
 
-    public function mapFormsToData(iterable $forms, &$viewData)
+    public function mapFormsToData(iterable $forms, &$viewData): void
     {
 
     }
diff --git a/bundle/Ibexa/PolicyProvider/InformationCollectionPolicyProvider.php b/bundle/Ibexa/PolicyProvider/InformationCollectionPolicyProvider.php
index 8ff079fe..20d7ad24 100644
--- a/bundle/Ibexa/PolicyProvider/InformationCollectionPolicyProvider.php
+++ b/bundle/Ibexa/PolicyProvider/InformationCollectionPolicyProvider.php
@@ -10,12 +10,7 @@
 
 class InformationCollectionPolicyProvider implements PolicyProviderInterface
 {
-    /**
-     * @param \Ibexa\Bundle\Core\DependencyInjection\Configuration\ConfigBuilderInterface $configBuilder
-     *
-     * @return array
-     */
-    public function addPolicies(ConfigBuilderInterface $configBuilder)
+    public function addPolicies(ConfigBuilderInterface $configBuilder): array
     {
         $configBuilder->addConfig([
             Permissions::NAME => [
diff --git a/bundle/Listener/CaptchaValidationListener.php b/bundle/Listener/CaptchaValidationListener.php
index 2e93b1ad..9048eb0b 100644
--- a/bundle/Listener/CaptchaValidationListener.php
+++ b/bundle/Listener/CaptchaValidationListener.php
@@ -37,14 +37,14 @@ public function __construct(RequestStack $requestStack, CaptchaService $captchaS
         $this->translator = $translator;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             FormEvents::POST_SUBMIT => 'onPostSubmit',
         ];
     }
 
-    public function onPostSubmit(FormEvent $event)
+    public function onPostSubmit(FormEvent $event): void
     {
         $captchaValue = $event->getForm()
             ->getConfig()
diff --git a/bundle/Listener/InformationCollectedListener.php b/bundle/Listener/InformationCollectedListener.php
index 304332e8..745b238c 100644
--- a/bundle/Listener/InformationCollectedListener.php
+++ b/bundle/Listener/InformationCollectedListener.php
@@ -16,17 +16,11 @@ class InformationCollectedListener implements EventSubscriberInterface
      */
     protected $actionAggregate;
 
-    /**
-     * @param ActionRegistry $actionAggregate
-     */
     public function __construct(ActionRegistry $actionAggregate)
     {
         $this->actionAggregate = $actionAggregate;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -36,8 +30,6 @@ public static function getSubscribedEvents(): array
 
     /**
      * Run all actions.
-     *
-     * @param InformationCollected $event
      */
     public function onInformationCollected(InformationCollected $event): void
     {
diff --git a/bundle/NetgenInformationCollectionBundle.php b/bundle/NetgenInformationCollectionBundle.php
index 93762972..b11eaedf 100644
--- a/bundle/NetgenInformationCollectionBundle.php
+++ b/bundle/NetgenInformationCollectionBundle.php
@@ -9,16 +9,13 @@
 
 class NetgenInformationCollectionBundle extends Bundle
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
-        $eZExtension = $container->getExtension('ibexa');
-        if ($eZExtension instanceof IbexaCoreExtension) {
-            $eZExtension->addPolicyProvider(new InformationCollectionPolicyProvider());
+        $ibexaExtension = $container->getExtension('ibexa');
+        if ($ibexaExtension instanceof IbexaCoreExtension) {
+            $ibexaExtension->addPolicyProvider(new InformationCollectionPolicyProvider());
         }
     }
 }
diff --git a/bundle/ParamConverter/CollectionParamConverter.php b/bundle/ParamConverter/CollectionParamConverter.php
index a454dcda..2e48e629 100644
--- a/bundle/ParamConverter/CollectionParamConverter.php
+++ b/bundle/ParamConverter/CollectionParamConverter.php
@@ -24,12 +24,8 @@ public function __construct(InformationCollection $informationCollection)
 
     /**
      * Stores the object in the request.
-     *
-     * @param ParamConverter $configuration Contains the name, class and options of the object
-     *
-     * @return bool True if the object has been successfully set, else false
      */
-    public function apply(Request $request, ParamConverter $configuration)
+    public function apply(Request $request, ParamConverter $configuration): bool
     {
         if (!$request->attributes->has('collectionId')) {
             return false;
@@ -49,10 +45,8 @@ public function apply(Request $request, ParamConverter $configuration)
 
     /**
      * Checks if the object is supported.
-     *
-     * @return bool True if the object is supported, else false
      */
-    public function supports(ParamConverter $configuration)
+    public function supports(ParamConverter $configuration): bool
     {
         return is_a($configuration->getClass(), Collection::class, true);
     }
diff --git a/bundle/Templating/Twig/AdminGlobalVariable.php b/bundle/Templating/Twig/AdminGlobalVariable.php
index f2adeb12..22940f94 100644
--- a/bundle/Templating/Twig/AdminGlobalVariable.php
+++ b/bundle/Templating/Twig/AdminGlobalVariable.php
@@ -30,8 +30,6 @@ public function setPageLayoutTemplate(string $pageLayoutTemplate): void
 
     /**
      * Returns the pagelayout template.
-     *
-     * @return string|null
      */
     public function getPageLayoutTemplate(): ?string
     {
diff --git a/bundle/Templating/Twig/Extensions/CaptchaRuntime.php b/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
index 26cc1884..8bb1bb54 100644
--- a/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
+++ b/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
@@ -14,9 +14,6 @@ class CaptchaRuntime
      */
     protected $captcha;
 
-    /**
-     * @param \Netgen\InformationCollection\API\Service\CaptchaService $captcha
-     */
     public function __construct(CaptchaService $captcha)
     {
         $this->captcha = $captcha;
@@ -24,10 +21,6 @@ public function __construct(CaptchaService $captcha)
 
     /**
      * Checks if captcha is enabled for given Location.
-     *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
-     *
-     * @return bool
      */
     public function isEnabled(Location $location): bool
     {
@@ -36,10 +29,6 @@ public function isEnabled(Location $location): bool
 
     /**
      * Return configured site key for given Location.
-     *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
-     *
-     * @return string
      */
     public function getSiteKey(Location $location): string
     {
diff --git a/doc/cookbook/custom_action.rst b/doc/cookbook/custom_action.rst
index 63a2ce99..81d2b13a 100644
--- a/doc/cookbook/custom_action.rst
+++ b/doc/cookbook/custom_action.rst
@@ -18,11 +18,7 @@ Action example:
 
     class CustomAction implements ActionInterface
     {
-
-        /**
-         * @inheritDoc
-         */
-        public function act(InformationCollected $event)
+        public function act(InformationCollected $event): void
         {
             // do some magic ...
         }
diff --git a/doc/cookbook/custom_field_handler.rst b/doc/cookbook/custom_field_handler.rst
index 5884b515..1e71eb53 100644
--- a/doc/cookbook/custom_field_handler.rst
+++ b/doc/cookbook/custom_field_handler.rst
@@ -22,18 +22,12 @@ Field handler example:
 
     class IntegerFieldHandler implements CustomFieldHandlerInterface
     {
-        /**
-         * @inheritdoc
-         */
-        public function supports(Value $value)
+        public function supports(Value $value): bool
         {
             return $value instanceof IntegerValue;
         }
 
-        /**
-         * @inheritdoc
-         */
-        public function toString(Value $value, FieldDefinition $fieldDefinition)
+        public function toString(Value $value, FieldDefinition $fieldDefinition): string
         {
             // do some magic ..
         }
diff --git a/lib/API/InformationCollectionTrait.php b/lib/API/InformationCollectionTrait.php
index 09a71694..5e43f986 100644
--- a/lib/API/InformationCollectionTrait.php
+++ b/lib/API/InformationCollectionTrait.php
@@ -15,8 +15,6 @@ trait InformationCollectionTrait
 {
     /**
      * Builds Form, checks if Form is valid and dispatches InformationCollected event.
-     *
-     * @return array
      */
     protected function collectInformation(ContentValueView $view, array $options): ContentValueView
     {
diff --git a/lib/API/Service/CaptchaService.php b/lib/API/Service/CaptchaService.php
index 44343b34..a58d1d02 100644
--- a/lib/API/Service/CaptchaService.php
+++ b/lib/API/Service/CaptchaService.php
@@ -10,8 +10,6 @@ interface CaptchaService
 {
     /**
      * Returns Captcha implementation.
-     *
-     * @return \Netgen\InformationCollection\API\Service\CaptchaValue
      */
     public function getCaptcha(Location $location): CaptchaValue;
 
@@ -27,8 +25,6 @@ public function getSiteKey(Location $location): string;
 
     /**
      * Returns the captcha configuration for given Location.
-     *
-     * @return string
      */
     public function getConfig(Location $location): array;
 }
diff --git a/lib/API/Value/Attribute.php b/lib/API/Value/Attribute.php
index 1262a2a1..1b05859a 100644
--- a/lib/API/Value/Attribute.php
+++ b/lib/API/Value/Attribute.php
@@ -41,7 +41,7 @@ public function __construct(
         $this->value = $value;
     }
 
-    public static function createFromAttributeAndValue(self $attribute, AttributeValue $attributeValue)
+    public static function createFromAttributeAndValue(self $attribute, AttributeValue $attributeValue): self
     {
         return new self($attribute->getId(), $attribute->getField(), $attribute->getFieldDefinition(), $attributeValue);
     }
diff --git a/lib/API/Value/AttributeValue.php b/lib/API/Value/AttributeValue.php
index 351a7d2e..7ea78b8c 100644
--- a/lib/API/Value/AttributeValue.php
+++ b/lib/API/Value/AttributeValue.php
@@ -28,7 +28,7 @@ public function __construct(int $dataInt, float $dataFloat, string $dataText)
         $this->dataText = $dataText;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         if (!empty($this->dataText)) {
             return $this->dataText;
diff --git a/lib/API/Value/Captcha/NullObject.php b/lib/API/Value/Captcha/NullObject.php
index 178a1490..a92297c4 100644
--- a/lib/API/Value/Captcha/NullObject.php
+++ b/lib/API/Value/Captcha/NullObject.php
@@ -9,9 +9,6 @@
 
 class NullObject implements CaptchaValue
 {
-    /**
-     * {@inheritdoc}
-     */
     public function isValid(Request $request): bool
     {
         return true;
diff --git a/lib/API/Value/Captcha/ReCaptcha.php b/lib/API/Value/Captcha/ReCaptcha.php
index eee97c93..52cbe47f 100644
--- a/lib/API/Value/Captcha/ReCaptcha.php
+++ b/lib/API/Value/Captcha/ReCaptcha.php
@@ -21,9 +21,6 @@ public function __construct(BaseReCaptcha $reCaptcha)
         $this->reCaptcha = $reCaptcha;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isValid(Request $request): bool
     {
         $clientIp = $request->getClientIp() === '::1' ? 'localhost' : $request->getClientIp();
diff --git a/lib/API/Value/Collection.php b/lib/API/Value/Collection.php
index e92ec8de..22f4abf0 100644
--- a/lib/API/Value/Collection.php
+++ b/lib/API/Value/Collection.php
@@ -76,7 +76,7 @@ public function getModified(): DateTimeInterface
     }
 
     /**
-     * @return Attribute[]
+     * @return \Netgen\InformationCollection\API\Value\Attribute[]
      */
     public function getAttributes(): array
     {
diff --git a/lib/API/Value/DataTransfer/EmailContent.php b/lib/API/Value/DataTransfer/EmailContent.php
index d0692cd7..07d11a49 100644
--- a/lib/API/Value/DataTransfer/EmailContent.php
+++ b/lib/API/Value/DataTransfer/EmailContent.php
@@ -4,7 +4,6 @@
 
 namespace Netgen\InformationCollection\API\Value\DataTransfer;
 
-use Ibexa\Core\FieldType\BinaryFile\Value as BinaryFile;
 use Netgen\InformationCollection\API\Value\ValueObject;
 
 class EmailContent extends ValueObject
@@ -30,12 +29,12 @@ class EmailContent extends ValueObject
     protected $body;
 
     /**
-     * @var BinaryFile[]
+     * @var \Ibexa\Core\FieldType\BinaryFile\Value[]
      */
     protected $attachments = [];
 
     /**
-     * @param BinaryFile[] $attachments
+     * @param \Ibexa\Core\FieldType\BinaryFile\Value[] $attachments
      */
     public function __construct(array $recipients, array $sender, string $subject, string $body, array $attachments = [])
     {
@@ -72,7 +71,7 @@ public function hasAttachments(): bool
     }
 
     /**
-     * @return BinaryFile[]
+     * @return \Ibexa\Core\FieldType\BinaryFile\Value[]
      */
     public function getAttachments(): array
     {
diff --git a/lib/API/Value/Filter/Query.php b/lib/API/Value/Filter/Query.php
index f2019442..24afeb39 100644
--- a/lib/API/Value/Filter/Query.php
+++ b/lib/API/Value/Filter/Query.php
@@ -28,12 +28,12 @@ public function __construct(int $offset, int $limit)
         $this->limit = $limit;
     }
 
-    public static function withLimit(int $limit)
+    public static function withLimit(int $limit): self
     {
         return new self(0, $limit);
     }
 
-    public static function countQuery()
+    public static function countQuery(): self
     {
         return new self(0, 0);
     }
diff --git a/lib/API/Value/InformationCollectionStruct.php b/lib/API/Value/InformationCollectionStruct.php
index c9b0dd02..bfc62da4 100644
--- a/lib/API/Value/InformationCollectionStruct.php
+++ b/lib/API/Value/InformationCollectionStruct.php
@@ -85,7 +85,7 @@ public function getCollectedFields(): array
         return $this->fields;
     }
 
-    protected function addFieldData(FieldData $fieldData)
+    protected function addFieldData(FieldData $fieldData): void
     {
         $this->fields[$fieldData->fieldDefinition->identifier] = $fieldData;
     }
diff --git a/lib/API/Value/NullUser.php b/lib/API/Value/NullUser.php
index 58587eba..d59bcf2c 100644
--- a/lib/API/Value/NullUser.php
+++ b/lib/API/Value/NullUser.php
@@ -21,10 +21,7 @@ public function getVersionInfo(): APIVersionInfo
 
 class VersionInfo extends CoreVersionInfo
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getName($languageCode = null)
+    public function getName($languageCode = null): string
     {
         return 'user removed';
     }
diff --git a/lib/Core/Action/ActionRegistry.php b/lib/Core/Action/ActionRegistry.php
index a9fce039..59b4d4a7 100644
--- a/lib/Core/Action/ActionRegistry.php
+++ b/lib/Core/Action/ActionRegistry.php
@@ -39,10 +39,6 @@ final class ActionRegistry implements ActionInterface
      */
     private $eventDispatcher;
 
-    /**
-     * @param array $actions
-     * @param \Netgen\InformationCollection\Core\Action\ConfigurationUtility $utility
-     */
     public function __construct(iterable $actions, ConfigurationUtility $utility, LoggerInterface $logger, EventDispatcherInterface $eventDispatcher)
     {
         $this->actions = $actions;
@@ -85,10 +81,8 @@ public function act(InformationCollected $event): void
 
     /**
      * Sets debug variable based on kernel.debug param.
-     *
-     * @param bool $debug
      */
-    public function setDebug($debug)
+    public function setDebug(bool $debug): void
     {
         $this->debug = $debug;
     }
diff --git a/lib/Core/Action/AutoResponderAction.php b/lib/Core/Action/AutoResponderAction.php
index bac0e343..ac936766 100644
--- a/lib/Core/Action/AutoResponderAction.php
+++ b/lib/Core/Action/AutoResponderAction.php
@@ -11,7 +11,7 @@ final class AutoResponderAction extends BaseEmailAction
 {
     public static $defaultName = 'auto_responder';
 
-    protected function throwException(EmailNotSentException $exception)
+    protected function throwException(EmailNotSentException $exception): void
     {
         throw new ActionFailedException(static::$defaultName, $exception->getMessage());
     }
diff --git a/lib/Core/Action/BaseEmailAction.php b/lib/Core/Action/BaseEmailAction.php
index 30791b88..cf6286c2 100644
--- a/lib/Core/Action/BaseEmailAction.php
+++ b/lib/Core/Action/BaseEmailAction.php
@@ -28,9 +28,6 @@ public function __construct(MailerInterface $mailer, BaseEmailDataFactory $facto
         $this->factory = $factory;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function act(InformationCollected $event): void
     {
         $emailData = $this->factory->build($event);
diff --git a/lib/Core/Action/DatabaseAction.php b/lib/Core/Action/DatabaseAction.php
index 313de2d3..ff4c91b7 100644
--- a/lib/Core/Action/DatabaseAction.php
+++ b/lib/Core/Action/DatabaseAction.php
@@ -25,9 +25,6 @@ public function __construct(InformationCollection $informationCollection)
         $this->informationCollection = $informationCollection;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function act(InformationCollected $event): void
     {
         $struct = $event->getInformationCollectionStruct();
diff --git a/lib/Core/Action/EmailAction.php b/lib/Core/Action/EmailAction.php
index b6d41d63..8cad866f 100644
--- a/lib/Core/Action/EmailAction.php
+++ b/lib/Core/Action/EmailAction.php
@@ -11,7 +11,7 @@ final class EmailAction extends BaseEmailAction
 {
     public static $defaultName = 'email';
 
-    protected function throwException(EmailNotSentException $exception)
+    protected function throwException(EmailNotSentException $exception): void
     {
         throw new ActionFailedException(static::$defaultName, $exception->getMessage());
     }
diff --git a/lib/Core/Export/ExportResponseFormatterRegistry.php b/lib/Core/Export/ExportResponseFormatterRegistry.php
index 608d231f..7434a564 100644
--- a/lib/Core/Export/ExportResponseFormatterRegistry.php
+++ b/lib/Core/Export/ExportResponseFormatterRegistry.php
@@ -23,10 +23,7 @@ public function __construct(iterable $exportResponseFormatters)
         $this->exportResponseFormatters = $exportResponseFormatters;
     }
 
-    /**
-     * @param string $identifier
-     */
-    public function getExportResponseFormatter($identifier): ExportResponseFormatter
+    public function getExportResponseFormatter(string $identifier): ExportResponseFormatter
     {
         foreach ($this->exportResponseFormatters as $formatter) {
             if ($formatter->getIdentifier() === $identifier) {
diff --git a/lib/Core/Export/XlsExportResponseFormatter.php b/lib/Core/Export/XlsExportResponseFormatter.php
index aa445b9e..a5ff4b79 100644
--- a/lib/Core/Export/XlsExportResponseFormatter.php
+++ b/lib/Core/Export/XlsExportResponseFormatter.php
@@ -40,7 +40,7 @@ public function format(Export $export, Content $content): Response
 
         try {
             $activeSheet->setTitle(mb_substr($contentName, 0, 30));
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $activeSheet->setTitle('Information collection export');
         }
 
diff --git a/lib/Core/Export/XlsxExportResponseFormatter.php b/lib/Core/Export/XlsxExportResponseFormatter.php
index f1be748e..b0e95c87 100644
--- a/lib/Core/Export/XlsxExportResponseFormatter.php
+++ b/lib/Core/Export/XlsxExportResponseFormatter.php
@@ -4,6 +4,7 @@
 
 namespace Netgen\InformationCollection\Core\Export;
 
+use Exception;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Core\Helper\TranslationHelper;
 use Netgen\InformationCollection\API\Export\ExportResponseFormatter;
@@ -40,7 +41,7 @@ public function format(Export $export, Content $content): Response
 
         try {
             $activeSheet->setTitle(mb_substr($contentName, 0, 30));
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $activeSheet->setTitle('Information collection export');
         }
 
diff --git a/lib/Core/Factory/AutoResponderDataFactory.php b/lib/Core/Factory/AutoResponderDataFactory.php
index 4671a5d2..de6122ec 100644
--- a/lib/Core/Factory/AutoResponderDataFactory.php
+++ b/lib/Core/Factory/AutoResponderDataFactory.php
@@ -45,10 +45,8 @@ public function build(InformationCollected $value): EmailContent
 
     /**
      * Returns resolved parameter.
-     *
-     * @return array
      */
-    protected function resolveRecipient(TemplateContent $data)
+    protected function resolveRecipient(TemplateContent $data): array
     {
         $fields = $data->getEvent()->getInformationCollectionStruct()->getCollectedFields();
         if ($data->getTemplateWrapper()->hasBlock(Constants::FIELD_RECIPIENT)) {
@@ -67,9 +65,7 @@ protected function resolveRecipient(TemplateContent $data)
         if (!empty($rendered)) {
             $emails = explode(',', $rendered);
 
-            $emails = array_filter($emails, static function ($var) {
-                return filter_var($var, FILTER_VALIDATE_EMAIL);
-            });
+            $emails = array_filter($emails, static fn ($var) => filter_var($var, FILTER_VALIDATE_EMAIL));
 
             if (!empty($emails)) {
                 return $emails;
@@ -90,10 +86,8 @@ protected function resolveRecipient(TemplateContent $data)
 
     /**
      * Returns resolved parameter.
-     *
-     * @return string
      */
-    protected function resolveSubject(TemplateContent $data)
+    protected function resolveSubject(TemplateContent $data): string
     {
         $fields = $data->getEvent()->getInformationCollectionStruct()->getCollectedFields();
         if ($data->getTemplateWrapper()->hasBlock(Constants::FIELD_AUTO_RESPONDER_SUBJECT)) {
diff --git a/lib/Core/Factory/EmailDataFactory.php b/lib/Core/Factory/EmailDataFactory.php
index 2a900c58..13eef06e 100644
--- a/lib/Core/Factory/EmailDataFactory.php
+++ b/lib/Core/Factory/EmailDataFactory.php
@@ -83,15 +83,7 @@ public function build(InformationCollected $value): EmailContent
         );
     }
 
-    /**
-     * Returns resolved parameter.
-     *
-     * @param string $field
-     * @param string $property
-     *
-     * @return string
-     */
-    protected function resolve(TemplateContent $data, $field, $property = Constants::FIELD_TYPE_TEXT)
+    protected function resolve(TemplateContent $data, string $field, string $property = Constants::FIELD_TYPE_TEXT): string
     {
         $rendered = '';
         if ($data->getTemplateWrapper()->hasBlock($field)) {
@@ -131,12 +123,8 @@ protected function resolve(TemplateContent $data, $field, $property = Constants:
 
     /**
      * Returns resolved email parameter.
-     *
-     * @param string $field
-     *
-     * @return array
      */
-    protected function resolveEmail(TemplateContent $data, $field)
+    protected function resolveEmail(TemplateContent $data, string $field): array
     {
         $rendered = '';
         if ($data->getTemplateWrapper()->hasBlock($field)) {
@@ -155,9 +143,7 @@ protected function resolveEmail(TemplateContent $data, $field)
         if (!empty($rendered)) {
             $emails = explode(',', $rendered);
 
-            $emails = array_filter($emails, static function ($var) {
-                return filter_var($var, FILTER_VALIDATE_EMAIL);
-            });
+            $emails = array_filter($emails, static fn ($var) => filter_var($var, FILTER_VALIDATE_EMAIL));
 
             if (!empty($emails)) {
                 return $emails;
@@ -184,12 +170,8 @@ protected function resolveEmail(TemplateContent $data, $field)
 
     /**
      * Returns resolved template name.
-     *
-     * @param string $contentTypeIdentifier
-     *
-     * @return string
      */
-    protected function resolveTemplate($contentTypeIdentifier)
+    protected function resolveTemplate(string $contentTypeIdentifier): string
     {
         if (array_key_exists($contentTypeIdentifier, $this->config[ConfigurationConstants::TEMPLATES][ConfigurationConstants::CONTENT_TYPES])) {
             return $this->config[ConfigurationConstants::TEMPLATES][ConfigurationConstants::CONTENT_TYPES][$contentTypeIdentifier];
@@ -201,11 +183,9 @@ protected function resolveTemplate($contentTypeIdentifier)
     /**
      * Renders email template.
      *
-     * @throws MissingEmailBlockException
-     *
-     * @return string
+     * @throws \Netgen\InformationCollection\API\Exception\MissingEmailBlockException
      */
-    protected function resolveBody(TemplateContent $data)
+    protected function resolveBody(TemplateContent $data): string
     {
         if ($data->getTemplateWrapper()->hasBlock(Constants::BLOCK_EMAIL)) {
             return $data->getTemplateWrapper()
@@ -228,9 +208,9 @@ protected function resolveBody(TemplateContent $data)
     }
 
     /**
-     * @return BinaryFile[]
+     * @return \Ibexa\Core\FieldType\BinaryFile\Value[]
      */
-    protected function resolveAttachments(string $contentTypeIdentifier, array $collectedFields)
+    protected function resolveAttachments(string $contentTypeIdentifier, array $collectedFields): array
     {
         if (empty($this->config[ConfigurationConstants::ATTACHMENTS])) {
             return [];
@@ -250,9 +230,9 @@ protected function resolveAttachments(string $contentTypeIdentifier, array $coll
     }
 
     /**
-     * @return BinaryFile[]
+     * @return \Ibexa\Core\FieldType\BinaryFile\Value[]
      */
-    protected function getBinaryFileFields(array $collectedFields)
+    protected function getBinaryFileFields(array $collectedFields): array
     {
         $filtered = [];
         foreach ($collectedFields as $identifier => $value) {
diff --git a/lib/Core/Mailer/SwiftMailerBasedMailer.php b/lib/Core/Mailer/SwiftMailerBasedMailer.php
index 949b91a2..e2c719a0 100644
--- a/lib/Core/Mailer/SwiftMailerBasedMailer.php
+++ b/lib/Core/Mailer/SwiftMailerBasedMailer.php
@@ -20,9 +20,6 @@ public function __construct(\Swift_Mailer $internalMailer)
         $this->internalMailer = $internalMailer;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function sendEmail(Email $content): void
     {
         $message = new \Swift_Message();
diff --git a/lib/Core/Mapper/DomainObjectMapper.php b/lib/Core/Mapper/DomainObjectMapper.php
index 0d3ef608..96692ef8 100644
--- a/lib/Core/Mapper/DomainObjectMapper.php
+++ b/lib/Core/Mapper/DomainObjectMapper.php
@@ -123,7 +123,7 @@ public function mapAttribute(EzInfoCollectionAttribute $attribute, APIContent $c
         );
     }
 
-    private function getUser($userId): User
+    private function getUser(int $userId): User
     {
         try {
             return $this->repository
@@ -143,9 +143,9 @@ private function getDateTime(int $timestamp): DateTimeInterface
     private function getFieldDefinition(FieldDefinitionCollection $fieldDefinitionCollection, EzInfoCollectionAttribute $attribute): ?FieldDefinition
     {
         /** @var FieldDefinitionCollection $collection */
-        $collection = $fieldDefinitionCollection->filter(static function (FieldDefinition $definition) use ($attribute) {
-            return $definition->id === $attribute->getContentClassAttributeId();
-        });
+        $collection = $fieldDefinitionCollection->filter(
+            static fn (FieldDefinition $definition): bool => $definition->id === $attribute->getContentClassAttributeId()
+        );
 
         if ($collection->isEmpty()) {
             return null;
diff --git a/lib/Core/Pagination/InformationCollectionCollectionListAdapter.php b/lib/Core/Pagination/InformationCollectionCollectionListAdapter.php
index 8313ca00..c1a0776b 100644
--- a/lib/Core/Pagination/InformationCollectionCollectionListAdapter.php
+++ b/lib/Core/Pagination/InformationCollectionCollectionListAdapter.php
@@ -20,7 +20,7 @@ public function __construct(InformationCollection $informationCollectionService,
         parent::__construct($informationCollectionService);
     }
 
-    public function getNbResults()
+    public function getNbResults(): int
     {
         if (!isset($this->nbResults)) {
             $query = ContentId::countWithContentId($this->query->getContentId());
@@ -33,7 +33,7 @@ public function getNbResults()
         return $this->nbResults;
     }
 
-    public function getSlice($offset, $length)
+    public function getSlice($offset, $length): iterable
     {
         $query = new ContentId($this->query->getContentId(), $offset, $length);
 
diff --git a/lib/Core/Pagination/InformationCollectionCollectionListSearchAdapter.php b/lib/Core/Pagination/InformationCollectionCollectionListSearchAdapter.php
index 88d453d9..ae4dfe62 100644
--- a/lib/Core/Pagination/InformationCollectionCollectionListSearchAdapter.php
+++ b/lib/Core/Pagination/InformationCollectionCollectionListSearchAdapter.php
@@ -21,7 +21,7 @@ public function __construct(InformationCollection $informationCollectionService,
         parent::__construct($informationCollectionService);
     }
 
-    public function getNbResults()
+    public function getNbResults(): int
     {
         if (!isset($this->nbResults)) {
             $query = new SearchCountQuery(
@@ -39,7 +39,7 @@ public function getNbResults()
         return $this->nbResults;
     }
 
-    public function getSlice($offset, $length)
+    public function getSlice($offset, $length): iterable
     {
         $query = new SearchQuery(
             $this->query->getContentId(),
diff --git a/lib/Core/Pagination/InformationCollectionContentsAdapter.php b/lib/Core/Pagination/InformationCollectionContentsAdapter.php
index 07296680..91c43acd 100644
--- a/lib/Core/Pagination/InformationCollectionContentsAdapter.php
+++ b/lib/Core/Pagination/InformationCollectionContentsAdapter.php
@@ -20,7 +20,7 @@ public function __construct(InformationCollection $informationCollectionService,
         parent::__construct($informationCollectionService);
     }
 
-    public function getNbResults()
+    public function getNbResults(): int
     {
         if (!isset($this->nbResults)) {
             $this->nbResults = $this->informationCollectionService
@@ -31,7 +31,7 @@ public function getNbResults()
         return $this->nbResults;
     }
 
-    public function getSlice($offset, $length)
+    public function getSlice($offset, $length): iterable
     {
         $query = new Query($offset, $length);
 
diff --git a/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php b/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
index 345f1cc6..273ee845 100644
--- a/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
+++ b/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
@@ -55,20 +55,16 @@ public function __construct(Environment $twig)
 
     /**
      * Sets the default template.
-     *
-     * @param string $template
      */
-    public function setDefaultTemplate($template)
+    public function setDefaultTemplate(string $template): void
     {
         $this->template = $template;
     }
 
     /**
      * Returns the canonical name.
-     *
-     * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return 'netgen_information_collection_admin';
     }
@@ -80,13 +76,9 @@ public function getName()
      * the routes receiving the page number as first and
      * unique argument.
      *
-     * @param \Pagerfanta\PagerfantaInterface $pagerfanta A pagerfanta
      * @param \Closure $routeGenerator A callable to generate the routes
-     * @param array $options An array of options (optional)
-     *
-     * @return string
      */
-    public function render(PagerfantaInterface $pagerfanta, $routeGenerator, array $options = [])
+    public function render(PagerfantaInterface $pagerfanta, $routeGenerator, array $options = []): string
     {
         $this->pagerfanta = $pagerfanta;
         $this->routeGenerator = $routeGenerator;
@@ -105,10 +97,8 @@ public function render(PagerfantaInterface $pagerfanta, $routeGenerator, array $
 
     /**
      * Initializes the proximity.
-     *
-     * @param array $options
      */
-    protected function initializeProximity($options)
+    protected function initializeProximity(array $options): void
     {
         $this->proximity = isset($options['proximity']) ?
             (int) $options['proximity'] :
@@ -118,7 +108,7 @@ protected function initializeProximity($options)
     /**
      * Calculates start and end page that will be shown in the middle of pager.
      */
-    protected function calculateStartAndEndPage()
+    protected function calculateStartAndEndPage(): void
     {
         $currentPage = $this->pagerfanta->getCurrentPage();
         $nbPages = $this->pagerfanta->getNbPages();
@@ -142,38 +132,24 @@ protected function calculateStartAndEndPage()
 
     /**
      * Calculates the end page when start page is underflowed.
-     *
-     * @param int $startPage
-     * @param int $endPage
-     * @param int $nbPages
-     *
-     * @return int
      */
-    protected function calculateEndPageForStartPageUnderflow($startPage, $endPage, $nbPages)
+    protected function calculateEndPageForStartPageUnderflow(int $startPage, int $endPage, int $nbPages): int
     {
         return min($endPage + (1 - $startPage), $nbPages);
     }
 
     /**
      * Calculates the start page when end page is overflowed.
-     *
-     * @param int $startPage
-     * @param int $endPage
-     * @param int $nbPages
-     *
-     * @return int
      */
-    protected function calculateStartPageForEndPageOverflow($startPage, $endPage, $nbPages)
+    protected function calculateStartPageForEndPageOverflow(int $startPage, int $endPage, int $nbPages): int
     {
         return max($startPage - ($endPage - $nbPages), 1);
     }
 
     /**
      * Returns the list of all pages that need to be displayed.
-     *
-     * @return array
      */
-    protected function getPages()
+    protected function getPages(): array
     {
         $pages = [];
 
@@ -218,12 +194,8 @@ protected function getPages()
 
     /**
      * Generates the URL based on provided page.
-     *
-     * @param int $page
-     *
-     * @return string
      */
-    protected function generateUrl($page)
+    protected function generateUrl(int $page): string
     {
         $routeGenerator = $this->routeGenerator;
 
diff --git a/lib/Core/Persistence/Anonymizer/AnonymizerService.php b/lib/Core/Persistence/Anonymizer/AnonymizerService.php
index 5d34a96b..7769d9e4 100644
--- a/lib/Core/Persistence/Anonymizer/AnonymizerService.php
+++ b/lib/Core/Persistence/Anonymizer/AnonymizerService.php
@@ -53,7 +53,7 @@ public function anonymizeCollection(int $collectionId, array $fields = []): void
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
-    protected function destroyData(Collection $collection, array $fields = [])
+    protected function destroyData(Collection $collection, array $fields = []): void
     {
         $contentType = $this->repository
             ->getContentTypeService()
@@ -72,7 +72,7 @@ protected function destroyData(Collection $collection, array $fields = [])
     /**
      * @param \Netgen\InformationCollection\API\Value\Attribute[] $attributes
      */
-    protected function anonymize(CollectionId $collectionId, array $attributes, ContentType $contentType)
+    protected function anonymize(CollectionId $collectionId, array $attributes, ContentType $contentType): void
     {
         foreach ($attributes as $attribute) {
             $value = $this->fieldAnonymizerVisitor->visit($attribute, $contentType);
diff --git a/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php b/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php
index 84f260ae..4e63ac67 100644
--- a/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php
+++ b/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php
@@ -4,6 +4,7 @@
 
 namespace Netgen\InformationCollection\Core\Persistence\Anonymizer;
 
+use DateTimeImmutable;
 use Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer;
 use Netgen\InformationCollection\Core\Persistence\ContentTypeUtils;
 use Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionRepository;
@@ -39,14 +40,8 @@ public function __construct(
 
     /**
      * Anonymize collections by content id.
-     *
-     * @param int $contentId Content id
-     * @param array $fields Fields list
-     * @param \DateTimeImmutable|null $date Anonymize collections older that this date
-     *
-     * @return int
      */
-    public function anonymize($contentId, array $fields = [], ?\DateTimeImmutable $date = null)
+    public function anonymize(int $contentId, array $fields = [], ?DateTimeImmutable $date = null): int
     {
         $fieldsWithIds = $this->getFieldIds($contentId, $fields);
 
@@ -65,10 +60,8 @@ public function anonymize($contentId, array $fields = [], ?\DateTimeImmutable $d
 
     /**
      * Map field id's to list of field identifiers.
-     *
-     * @return array
      */
-    private function getFieldIds(int $contentId, array $fieldIdentifiers)
+    private function getFieldIds(int $contentId, array $fieldIdentifiers): array
     {
         $ids = [];
         foreach ($fieldIdentifiers as $identifier) {
@@ -82,7 +75,7 @@ private function getFieldIds(int $contentId, array $fieldIdentifiers)
         return $ids;
     }
 
-    private function getCollections($contentId, ?\DateTimeImmutable $date = null)
+    private function getCollections(int $contentId, ?DateTimeImmutable $date = null): array
     {
         if (null === $date) {
             $collections = $this->ezInfoCollectionRepository->findByContentId($contentId);
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
index 6cc6a95f..b5f4b727 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
@@ -17,30 +17,21 @@ class Aggregate extends FieldAnonymizerVisitor
      */
     protected $visitors;
 
-    /**
-     * @param array $visitors
-     */
     public function __construct(iterable $visitors)
     {
         $this->visitors = $visitors;
     }
 
-    public function addVisitor(FieldAnonymizerVisitor $visitor)
+    public function addVisitor(FieldAnonymizerVisitor $visitor): void
     {
         $this->visitors[] = $visitor;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function accept(Attribute $attribute, ContentType $contentType): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function visit(Attribute $attribute, ContentType $contentType): AttributeValue
     {
         foreach ($this->visitors as $visitor) {
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
index 73be3b98..bb87dce9 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
@@ -16,17 +16,11 @@ class Email extends FieldAnonymizerVisitor
 {
     protected $allowedCharacters = ['.', '@', '-', '+'];
 
-    /**
-     * {@inheritdoc}
-     */
     public function accept(Attribute $attribute, ContentType $contentType): bool
     {
         return 'ezemail' === $attribute->getFieldDefinition()->fieldTypeIdentifier;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function visit(Attribute $attribute, ContentType $contentType): AttributeValue
     {
         $email = $attribute->getValue()->getDataText();
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php
index aa7f1414..f92d961f 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Simple.php
@@ -11,17 +11,11 @@
 
 class Simple extends FieldAnonymizerVisitor
 {
-    /**
-     * {@inheritdoc}
-     */
     public function accept(Attribute $attribute, ContentType $contentType): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function visit(Attribute $attribute, ContentType $contentType): AttributeValue
     {
         return new AttributeValue(0, 0, 'XXXXXXXXXX');
diff --git a/lib/Core/Persistence/ContentTypeUtils.php b/lib/Core/Persistence/ContentTypeUtils.php
index e8febcc9..f4b4b945 100644
--- a/lib/Core/Persistence/ContentTypeUtils.php
+++ b/lib/Core/Persistence/ContentTypeUtils.php
@@ -29,16 +29,13 @@ public function __construct(ContentTypeService $contentTypeService, ContentServi
     }
 
     /**
-     * Return field id for fiven field definition identifier.
-     *
-     * @param int $contentId
-     * @param string $fieldDefIdentifier
+     * Return field id for given field definition identifier.
      *
      * @throws \OutOfBoundsException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      */
-    public function getFieldId($contentId, $fieldDefIdentifier)
+    public function getFieldId(int $contentId, string $fieldDefIdentifier): int
     {
         $content = $this->contentService->loadContent($contentId);
 
@@ -57,14 +54,10 @@ public function getFieldId($contentId, $fieldDefIdentifier)
     /**
      * Returns fields that are marked as info collectors.
      *
-     * @param int $contentId
-     *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
-     *
-     * @return array
      */
-    public function getInfoCollectorFields($contentId)
+    public function getInfoCollectorFields(int $contentId): array
     {
         $fields = [];
 
diff --git a/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php
index c1bc71a9..8d416daf 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/CheckboxFieldHandler.php
@@ -12,17 +12,11 @@
 
 class CheckboxFieldHandler implements CustomLegacyFieldHandlerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function supports(Value $value): bool
     {
         return $value instanceof CheckboxValue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function toString(Value $value, FieldDefinition $fieldDefinition): string
     {
         return (string) $value;
diff --git a/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php
index 1747a9a3..07db39f4 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/DateAndTimeFieldHandler.php
@@ -12,17 +12,11 @@
 
 class DateAndTimeFieldHandler implements CustomLegacyFieldHandlerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function supports(Value $value): bool
     {
         return $value instanceof DateAndTimeValue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function toString(Value $value, FieldDefinition $fieldDefinition): string
     {
         if ($value instanceof DateAndTimeValue) {
diff --git a/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php
index a505ff2b..be53e50b 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/DateFieldHandler.php
@@ -12,17 +12,11 @@
 
 class DateFieldHandler implements CustomLegacyFieldHandlerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function supports(Value $value): bool
     {
         return $value instanceof DateValue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function toString(Value $value, FieldDefinition $fieldDefinition): string
     {
         return (string) $value;
diff --git a/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php
index 7cd18458..566910aa 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/FloatFieldHandler.php
@@ -12,17 +12,11 @@
 
 class FloatFieldHandler implements CustomLegacyFieldHandlerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function supports(Value $value): bool
     {
         return $value instanceof FloatValue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function toString(Value $value, FieldDefinition $fieldDefinition): string
     {
         return (string) $value;
diff --git a/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php
index 696f5505..7f3e5631 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/IntegerFieldHandler.php
@@ -12,17 +12,11 @@
 
 class IntegerFieldHandler implements CustomLegacyFieldHandlerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function supports(Value $value): bool
     {
         return $value instanceof IntegerValue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function toString(Value $value, FieldDefinition $fieldDefinition): string
     {
         return (string) $value;
diff --git a/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php b/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php
index 2900dab6..22e97a27 100644
--- a/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php
+++ b/lib/Core/Persistence/FieldHandler/Custom/TimeFieldHandler.php
@@ -12,17 +12,11 @@
 
 class TimeFieldHandler implements CustomLegacyFieldHandlerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function supports(Value $value): bool
     {
         return $value instanceof TimeValue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function toString(Value $value, FieldDefinition $fieldDefinition): string
     {
         return (string) $value;
diff --git a/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php b/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
index a380adc0..fa4f326e 100644
--- a/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
+++ b/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
@@ -14,9 +14,6 @@ final class FieldHandlerRegistry
      */
     private $handlers;
 
-    /**
-     * @param array $handlers
-     */
     public function __construct(iterable $handlers)
     {
         $this->handlers = $handlers;
diff --git a/lib/Core/Service/CaptchaService.php b/lib/Core/Service/CaptchaService.php
index 74598bfa..05a6bc64 100644
--- a/lib/Core/Service/CaptchaService.php
+++ b/lib/Core/Service/CaptchaService.php
@@ -41,9 +41,6 @@ public function __construct(ContentTypeService $contentTypeService, ConfigResolv
         $this->configResolver = $configResolver;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isEnabled(Location $location): bool
     {
         $config = $this->getConfig($location);
@@ -51,9 +48,6 @@ public function isEnabled(Location $location): bool
         return $config['enabled'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSiteKey(Location $location): string
     {
         $config = $this->getConfig($location);
@@ -61,9 +55,6 @@ public function getSiteKey(Location $location): string
         return $config['site_key'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCaptcha(Location $location): CaptchaValue
     {
         $config = $this->getConfig($location);
@@ -108,15 +99,13 @@ public function getConfig(Location $location): array
             $this->getContentType($location)
         );
 
-        return (array) array_replace($this->config, $contentTypeConfig);
+        return array_replace($this->config, $contentTypeConfig);
     }
 
     /**
      * Returns filtered config for current ContentType.
-     *
-     * @return array
      */
-    protected function getConfigForContentType(ContentType $contentType)
+    protected function getConfigForContentType(ContentType $contentType): array
     {
         if ($this->hasConfigForContentType($contentType)) {
             return $this->config['override_by_type'][$contentType->identifier];
@@ -127,10 +116,8 @@ protected function getConfigForContentType(ContentType $contentType)
 
     /**
      * Checks if override exist for given ContentType.
-     *
-     * @return bool
      */
-    protected function hasConfigForContentType(ContentType $contentType)
+    protected function hasConfigForContentType(ContentType $contentType): bool
     {
         if (!empty($this->config['override_by_type'])) {
             if (in_array($contentType->identifier, array_keys($this->config['override_by_type']), true)) {
@@ -145,10 +132,8 @@ protected function hasConfigForContentType(ContentType $contentType)
      * Helper method for retrieving ContentType from Location.
      *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
-     *
-     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
      */
-    protected function getContentType(Location $location)
+    protected function getContentType(Location $location): ContentType
     {
         return $this->contentTypeService
             ->loadContentType($location->contentInfo->contentTypeId);
diff --git a/lib/Core/Service/ExporterService.php b/lib/Core/Service/ExporterService.php
index ca6f1dd0..13eeabaf 100644
--- a/lib/Core/Service/ExporterService.php
+++ b/lib/Core/Service/ExporterService.php
@@ -44,9 +44,6 @@ public function __construct(
         $this->informationCollection = $informationCollection;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function export(ExportCriteria $criteria): Export
     {
         $fields = $this->contentTypeUtils
@@ -83,10 +80,8 @@ public function export(ExportCriteria $criteria): Export
 
     /**
      * Get attribute value string.
-     *
-     * @return string
      */
-    protected function getAttributeValue(int $fieldId, array $attributes)
+    protected function getAttributeValue(int $fieldId, array $attributes): string
     {
         /** @var Attribute $attribute */
         foreach ($attributes as $attribute) {
diff --git a/lib/Core/Service/InformationCollectionService.php b/lib/Core/Service/InformationCollectionService.php
index 1879f006..1c666f1a 100644
--- a/lib/Core/Service/InformationCollectionService.php
+++ b/lib/Core/Service/InformationCollectionService.php
@@ -6,6 +6,7 @@
 
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Netgen\InformationCollection\API\Exception\PersistingFailedException;
 use Netgen\InformationCollection\API\Exception\StoringAttributeFailedException;
 use Netgen\InformationCollection\API\Exception\StoringCollectionFailedException;
@@ -128,9 +129,6 @@ public function getObjectsWithCollectionsCount(): ObjectCount
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getObjectsWithCollections(Query $query): ContentsWithCollections
     {
         $objects = $this->gateway->getObjectsWithCollections($query->getLimit(), $query->getOffset());
@@ -182,6 +180,7 @@ public function getCollections(ContentId $contentId): Collections
     public function filterCollections(FilterCriteria $criteria): Collections
     {
         // TODO: Implement filterCollections() method.
+        return new Collections([], 0);
     }
 
     public function searchCount(SearchCountQuery $query): SearchCount
@@ -199,9 +198,6 @@ public function searchCount(SearchCountQuery $query): SearchCount
         return new SearchCount(count($collections));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function search(SearchQuery $query): Collections
     {
         $collections = $this->ezInfoCollectionAttributeRepository
@@ -224,17 +220,11 @@ public function search(SearchQuery $query): Collections
         return new Collections($objects, count($objects));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCollection(CollectionId $collectionId): Collection
     {
         return $this->loadCollection($collectionId->getCollectionId());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteCollectionFields(CollectionFields $collectionFields): void
     {
         $attributes = $this->ezInfoCollectionAttributeRepository
@@ -249,9 +239,6 @@ public function deleteCollectionFields(CollectionFields $collectionFields): void
         $this->ezInfoCollectionAttributeRepository->remove($attributes);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteCollections(FilterCollections $collections): void
     {
         $collections = $this->ezInfoCollectionRepository
@@ -268,9 +255,6 @@ public function deleteCollections(FilterCollections $collections): void
         $this->ezInfoCollectionRepository->remove($collections);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteCollectionByContent(Contents $contents): void
     {
         $collections = $this->ezInfoCollectionRepository
@@ -286,20 +270,12 @@ public function deleteCollectionByContent(Contents $contents): void
         $this->ezInfoCollectionRepository->remove($collections);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function updateCollectionAttribute(CollectionId $collectionId, Attribute $attribute): void
     {
         $this->ezInfoCollectionAttributeRepository->updateByCollectionId($collectionId, $attribute);
     }
 
-    /**
-     * @param int $userId
-     *
-     * @return \Ibexa\Contracts\Core\Repository\Values\User\User
-     */
-    protected function getUser($userId)
+    protected function getUser(int $userId): User
     {
         try {
             return $this->repository
@@ -309,12 +285,7 @@ protected function getUser($userId)
         }
     }
 
-    /**
-     * @param int $collectionId
-     *
-     * @return \Netgen\InformationCollection\API\Value\Collection
-     */
-    protected function loadCollection($collectionId)
+    protected function loadCollection(int $collectionId): Collection
     {
         $collection = $this->ezInfoCollectionRepository->loadCollection($collectionId);
         $attributes = $this->ezInfoCollectionAttributeRepository->findBy(
diff --git a/lib/Doctrine/Entity/EzInfoCollection.php b/lib/Doctrine/Entity/EzInfoCollection.php
index ff29ee31..b3694fbc 100644
--- a/lib/Doctrine/Entity/EzInfoCollection.php
+++ b/lib/Doctrine/Entity/EzInfoCollection.php
@@ -36,98 +36,62 @@ class EzInfoCollection
      */
     private $userIdentifier;
 
-    /**
-     * @return int
-     */
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
 
-    /**
-     * @return int
-     */
-    public function getContentObjectId()
+    public function getContentObjectId(): int
     {
         return $this->contentObjectId;
     }
 
-    /**
-     * @param int $id
-     */
-    public function setId($id)
+    public function setId(int $id): void
     {
         $this->id = $id;
     }
 
-    /**
-     * @param int $contentObjectId
-     */
-    public function setContentObjectId($contentObjectId)
+    public function setContentObjectId(int $contentObjectId): void
     {
         $this->contentObjectId = $contentObjectId;
     }
 
-    /**
-     * @param int $created
-     */
-    public function setCreated($created)
+    public function setCreated(int $created): void
     {
         $this->created = $created;
     }
 
-    /**
-     * @param int $creatorId
-     */
-    public function setCreatorId($creatorId)
+    public function setCreatorId(int $creatorId): void
     {
         $this->creatorId = $creatorId;
     }
 
-    /**
-     * @param int $modified
-     */
-    public function setModified($modified)
+    public function setModified(int $modified): void
     {
         $this->modified = $modified;
     }
 
-    /**
-     * @param string $userIdentifier
-     */
-    public function setUserIdentifier($userIdentifier)
+    public function setUserIdentifier(string $userIdentifier): void
     {
         $this->userIdentifier = $userIdentifier;
     }
 
-    /**
-     * @return int
-     */
-    public function getCreated()
+    public function getCreated(): int
     {
         return $this->created;
     }
 
-    /**
-     * @return int
-     */
-    public function getCreatorId()
+    public function getCreatorId(): int
     {
         return $this->creatorId;
     }
 
-    /**
-     * @return int
-     */
-    public function getModified()
+    public function getModified(): int
     {
         return $this->modified;
     }
 
-    /**
-     * @return string
-     */
-    public function getUserIdentifier()
+    public function getUserIdentifier(): string
     {
         return $this->userIdentifier;
     }
diff --git a/lib/Doctrine/Entity/EzInfoCollectionAttribute.php b/lib/Doctrine/Entity/EzInfoCollectionAttribute.php
index 548ec999..c36a8da9 100644
--- a/lib/Doctrine/Entity/EzInfoCollectionAttribute.php
+++ b/lib/Doctrine/Entity/EzInfoCollectionAttribute.php
@@ -46,130 +46,82 @@ class EzInfoCollectionAttribute
      */
     private $informationCollectionId;
 
-    /**
-     * @param int $id
-     */
-    public function setId($id)
+    public function setId(int $id): void
     {
         $this->id = $id;
     }
 
-    /**
-     * @param int $contentClassAttributeId
-     */
-    public function setContentClassAttributeId($contentClassAttributeId)
+    public function setContentClassAttributeId(int $contentClassAttributeId): void
     {
         $this->contentClassAttributeId = $contentClassAttributeId;
     }
 
-    /**
-     * @param int $contentObjectAttributeId
-     */
-    public function setContentObjectAttributeId($contentObjectAttributeId)
+    public function setContentObjectAttributeId(int $contentObjectAttributeId): void
     {
         $this->contentObjectAttributeId = $contentObjectAttributeId;
     }
 
-    /**
-     * @param int $contentObjectId
-     */
-    public function setContentObjectId($contentObjectId)
+    public function setContentObjectId(int $contentObjectId): void
     {
         $this->contentObjectId = $contentObjectId;
     }
 
-    /**
-     * @param float $dataFloat
-     */
-    public function setDataFloat($dataFloat)
+    public function setDataFloat(float $dataFloat): void
     {
         $this->dataFloat = $dataFloat;
     }
 
-    /**
-     * @param int $dataInt
-     */
-    public function setDataInt($dataInt)
+    public function setDataInt(int $dataInt): void
     {
         $this->dataInt = $dataInt;
     }
 
-    /**
-     * @param string $dataText
-     */
-    public function setDataText($dataText)
+    public function setDataText(string $dataText): void
     {
         $this->dataText = $dataText;
     }
 
-    /**
-     * @param int $informationCollectionId
-     */
-    public function setInformationCollectionId($informationCollectionId)
+    public function setInformationCollectionId(int $informationCollectionId): void
     {
         $this->informationCollectionId = $informationCollectionId;
     }
 
-    /**
-     * @return int
-     */
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
 
-    /**
-     * @return int
-     */
-    public function getContentClassAttributeId()
+    public function getContentClassAttributeId(): int
     {
         return $this->contentClassAttributeId;
     }
 
-    /**
-     * @return int
-     */
-    public function getContentObjectAttributeId()
+    public function getContentObjectAttributeId(): int
     {
         return $this->contentObjectAttributeId;
     }
 
-    /**
-     * @return int
-     */
-    public function getContentObjectId()
+    public function getContentObjectId(): int
     {
         return $this->contentObjectId;
     }
 
-    /**
-     * @return float
-     */
-    public function getDataFloat()
+    public function getDataFloat(): float
     {
         return $this->dataFloat;
     }
 
-    /**
-     * @return int
-     */
-    public function getDataInt()
+    public function getDataInt(): int
     {
         return $this->dataInt;
     }
 
-    /**
-     * @return string
-     */
-    public function getDataText()
+    public function getDataText(): string
     {
         return $this->dataText;
     }
 
-    /**
-     * @return int
-     */
-    public function getInformationCollectionId()
+    public function getInformationCollectionId(): int
     {
         return $this->informationCollectionId;
     }
diff --git a/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php b/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php
index e08609d3..f4069e79 100644
--- a/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php
+++ b/lib/Doctrine/Repository/EzInfoCollectionAttributeRepository.php
@@ -26,10 +26,8 @@ class EzInfoCollectionAttributeRepository extends EntityRepository
 {
     /**
      * Get new \Netgen\InformationCollection\Doctrine\Entity\EzInfoCollectionAttribute instance.
-     *
-     * @return \Netgen\InformationCollection\Doctrine\Entity\EzInfoCollectionAttribute
      */
-    public function getInstance()
+    public function getInstance(): EzInfoCollectionAttribute
     {
         return new EzInfoCollectionAttribute();
     }
@@ -57,9 +55,9 @@ public function createNewFromValues(Content $content, EzInfoCollection $collecti
     /**
      * Save object.
      *
-     * @throws StoringAttributeFailedException
+     * @throws \Netgen\InformationCollection\API\Exception\StoringAttributeFailedException
      */
-    public function save(EzInfoCollectionAttribute $infoCollectionAttribute)
+    public function save(EzInfoCollectionAttribute $infoCollectionAttribute): void
     {
         try {
             $this->_em->persist($infoCollectionAttribute);
@@ -72,9 +70,9 @@ public function save(EzInfoCollectionAttribute $infoCollectionAttribute)
     /**
      * @param \Netgen\InformationCollection\Doctrine\Entity\EzInfoCollectionAttribute[] $attributes
      *
-     * @throws ORMException
+     * @throws \Doctrine\ORM\ORMException
      */
-    public function remove(array $attributes)
+    public function remove(array $attributes): void
     {
         try {
             foreach ($attributes as $attribute) {
@@ -87,7 +85,7 @@ public function remove(array $attributes)
         }
     }
 
-    public function findByCollectionIdAndFieldDefinitionIds($collectionId, $fieldDefinitionIds)
+    public function findByCollectionIdAndFieldDefinitionIds(int $collectionId, array $fieldDefinitionIds): array
     {
         $qb = $this->createQueryBuilder('eica');
 
@@ -100,7 +98,7 @@ public function findByCollectionIdAndFieldDefinitionIds($collectionId, $fieldDef
             ->getResult();
     }
 
-    public function updateByCollectionId(CollectionId $collectionId, Attribute $attribute)
+    public function updateByCollectionId(CollectionId $collectionId, Attribute $attribute): void
     {
         $entity = $this->findOneBy([
             'informationCollectionId' => $collectionId->getCollectionId(),
@@ -119,7 +117,7 @@ public function updateByCollectionId(CollectionId $collectionId, Attribute $attr
         $this->_em->flush();
     }
 
-    public function findByCollectionId($collectionId)
+    public function findByCollectionId(int $collectionId): array
     {
         $qb = $this->createQueryBuilder('eica');
 
@@ -130,7 +128,7 @@ public function findByCollectionId($collectionId)
             ->getResult();
     }
 
-    public function getCountByContentId($contentId)
+    public function getCountByContentId(int $contentId): int
     {
         try {
             return (int) $this->createQueryBuilder('eica')
@@ -144,7 +142,7 @@ public function getCountByContentId($contentId)
         }
     }
 
-    public function search($contentId, $searchText)
+    public function search(int $contentId, string $searchText): array
     {
         $searchText = mb_strtolower($searchText);
 
diff --git a/lib/Doctrine/Repository/EzInfoCollectionRepository.php b/lib/Doctrine/Repository/EzInfoCollectionRepository.php
index 9853276e..1f9f775c 100644
--- a/lib/Doctrine/Repository/EzInfoCollectionRepository.php
+++ b/lib/Doctrine/Repository/EzInfoCollectionRepository.php
@@ -21,26 +21,20 @@ class EzInfoCollectionRepository extends EntityRepository
 {
     /**
      * Get new \Netgen\InformationCollection\Doctrine\Entity\EzInfoCollection instance.
-     *
-     * @return \Netgen\InformationCollection\Doctrine\Entity\EzInfoCollection
      */
-    public function getInstance()
+    public function getInstance(): EzInfoCollection
     {
         return new EzInfoCollection();
     }
 
-    public function loadCollection(int $collectionId)
+    public function loadCollection(int $collectionId): ?EzInfoCollection
     {
-        $collection = $this->findOneBy(['id' => $collectionId]);
-
-        if ($collection instanceof EzInfoCollection) {
-            return $collection;
-        }
+        return $this->findOneBy(['id' => $collectionId]);
     }
 
-    public function getFirstCollection(int $contentId): EzInfoCollection
+    public function getFirstCollection(int $contentId): ?EzInfoCollection
     {
-        $collection = $this->findOneBy(
+        return $this->findOneBy(
             [
                 'contentObjectId' => $contentId,
             ],
@@ -48,15 +42,11 @@ public function getFirstCollection(int $contentId): EzInfoCollection
                 'created' => 'ASC',
             ]
         );
-
-        if ($collection instanceof EzInfoCollection) {
-            return $collection;
-        }
     }
 
-    public function getLastCollection(int $contentId): EzInfoCollection
+    public function getLastCollection(int $contentId): ?EzInfoCollection
     {
-        $collection = $this->findOneBy(
+        return $this->findOneBy(
             [
                 'contentObjectId' => $contentId,
             ],
@@ -64,10 +54,6 @@ public function getLastCollection(int $contentId): EzInfoCollection
                 'created' => 'DESC',
             ]
         );
-
-        if ($collection instanceof EzInfoCollection) {
-            return $collection;
-        }
     }
 
     public function createNewFromValues(Content $content, User $user): EzInfoCollection
@@ -87,9 +73,9 @@ public function createNewFromValues(Content $content, User $user): EzInfoCollect
     /**
      * Save object.
      *
-     * @throws StoringCollectionFailedException
+     * @throws \Netgen\InformationCollection\API\Exception\StoringCollectionFailedException
      */
-    public function save(EzInfoCollection $informationCollection)
+    public function save(EzInfoCollection $informationCollection): void
     {
         try {
             $this->_em->persist($informationCollection);
@@ -100,9 +86,9 @@ public function save(EzInfoCollection $informationCollection)
     }
 
     /**
-     * @throws RemoveCollectionFailedException
+     * @throws \Netgen\InformationCollection\API\Exception\RemoveCollectionFailedException
      */
-    public function remove(array $collections)
+    public function remove(array $collections): void
     {
         try {
             foreach ($collections as $collection) {
@@ -115,7 +101,7 @@ public function remove(array $collections)
         }
     }
 
-    public function findByContentId($contentId)
+    public function findByContentId(int $contentId): array
     {
         $qb = $this->createQueryBuilder('ezc');
 
@@ -126,7 +112,7 @@ public function findByContentId($contentId)
             ->getResult();
     }
 
-    public function findByContentIdOlderThan($contentId, DateTimeImmutable $date)
+    public function findByContentIdOlderThan(int $contentId, DateTimeImmutable $date): array
     {
         $qb = $this->createQueryBuilder('ezc');
 
@@ -138,7 +124,7 @@ public function findByContentIdOlderThan($contentId, DateTimeImmutable $date)
             ->getResult();
     }
 
-    public function getChildrenCount($contentId)
+    public function getChildrenCount(int $contentId): int
     {
         try {
             return (int) $this->createQueryBuilder('ezc')
diff --git a/tests/lib/FakeTest.php b/tests/lib/FakeTest.php
index a83b7748..5048a383 100644
--- a/tests/lib/FakeTest.php
+++ b/tests/lib/FakeTest.php
@@ -6,7 +6,7 @@
 
 class FakeTest extends TestCase
 {
-    public function testItWorks()
+    public function testItWorks(): void
     {
         $this->assertTrue(true);
     }
diff --git a/tests/old/API/Value/InformationCollection/QueryTest.php b/tests/old/API/Value/InformationCollection/QueryTest.php
index 16ccfe39..ea1112cb 100644
--- a/tests/old/API/Value/InformationCollection/QueryTest.php
+++ b/tests/old/API/Value/InformationCollection/QueryTest.php
@@ -7,7 +7,7 @@
 
 class QueryTest extends TestCase
 {
-    public function testWithContent()
+    public function testWithContent(): void
     {
         $query = Query::withContent(12);
 
@@ -17,7 +17,7 @@ public function testWithContent()
         $this->assertEmpty($query->fields);
     }
 
-    public function testCount()
+    public function testCount(): void
     {
         $query = Query::count();
 
@@ -25,7 +25,7 @@ public function testCount()
         $this->assertEquals(0, $query->offset);
     }
 
-    public function testConstructor()
+    public function testConstructor(): void
     {
         $values = [
             'offset' => 15,
diff --git a/tests/old/Action/ActionRegistryTest.php b/tests/old/Action/ActionRegistryTest.php
index c9e318a7..987dcc65 100644
--- a/tests/old/Action/ActionRegistryTest.php
+++ b/tests/old/Action/ActionRegistryTest.php
@@ -173,13 +173,13 @@ public function setUp(): void
         parent::setUp();
     }
 
-    public function testAddingActions()
+    public function testAddingActions(): void
     {
         $this->registry->addAction('database', $this->action1, 1);
         $this->registry->addAction('email', $this->action2, 100);
     }
 
-    public function testAct()
+    public function testAct(): void
     {
         $this->registry->addAction('database', $this->action1, 1);
         $this->registry->addAction('email', $this->action2, 2);
@@ -194,7 +194,7 @@ public function testAct()
         $this->registry->act($this->event);
     }
 
-    public function testActWithContentTypeThatDoesNotHaveConfiguration()
+    public function testActWithContentTypeThatDoesNotHaveConfiguration(): void
     {
         $this->registry->addAction('database', $this->action1, 1);
         $this->registry->addAction('email', $this->action2, 2);
@@ -208,7 +208,7 @@ public function testActWithContentTypeThatDoesNotHaveConfiguration()
         $this->registry->act($this->event2);
     }
 
-    public function testActWithDefaultConfigOnly()
+    public function testActWithDefaultConfigOnly(): void
     {
         $this->registryWithOnlyDefaultConf->addAction('database', $this->action1, 1);
         $this->registryWithOnlyDefaultConf->addAction('email', $this->action2, 2);
@@ -222,7 +222,7 @@ public function testActWithDefaultConfigOnly()
         $this->registryWithOnlyDefaultConf->act($this->event2);
     }
 
-    public function testActWithEmptyConfig()
+    public function testActWithEmptyConfig(): void
     {
         $this->registryWithEmptyConf->addAction('database', $this->action1, 1);
         $this->registryWithEmptyConf->addAction('email', $this->action2, 2);
@@ -236,7 +236,7 @@ public function testActWithEmptyConfig()
         $this->registryWithEmptyConf->act($this->event2);
     }
 
-    public function testActWithActionFailedException()
+    public function testActWithActionFailedException(): void
     {
         $this->registry->addAction('database', $this->action1, 1);
         $this->registry->addAction('email', $this->action2, 2);
@@ -257,7 +257,7 @@ public function testActWithActionFailedException()
         $this->registry->act($this->event);
     }
 
-    public function testActionsAreExecutedByPriority()
+    public function testActionsAreExecutedByPriority(): void
     {
         $prioritizedActions = array(
             array(
@@ -308,7 +308,7 @@ public function testActionsAreExecutedByPriority()
         $this->assertEquals($prioritizedActions, $actions->getValue($this->registryForPriority));
     }
 
-    public function testActionsAreExecutedByPriorityWithSamePriorities()
+    public function testActionsAreExecutedByPriorityWithSamePriorities(): void
     {
         $prioritizedActions = array(
             array(
@@ -359,7 +359,7 @@ public function testActionsAreExecutedByPriorityWithSamePriorities()
         $this->assertEquals($prioritizedActions, $actions->getValue($this->registryForPriority));
     }
 
-    public function testSetDebugMethod()
+    public function testSetDebugMethod(): void
     {
         $this->registryForPriority->addAction('database', $this->action1, 44);
 
@@ -380,7 +380,7 @@ public function testSetDebugMethod()
      * @expectedExceptionMessage InformationCollection action database failed with reason cannot write to database
 
      */
-    public function testThrowExceptionWhenDebugIsTrue()
+    public function testThrowExceptionWhenDebugIsTrue(): void
     {
         $this->registry->addAction('database', $this->action1, 1);
         $this->registry->addAction('email', $this->action2, 2);
diff --git a/tests/old/Action/AutoResponderActionTest.php b/tests/old/Action/AutoResponderActionTest.php
index 3aa23443..696cefa4 100644
--- a/tests/old/Action/AutoResponderActionTest.php
+++ b/tests/old/Action/AutoResponderActionTest.php
@@ -34,7 +34,7 @@ class AutoResponderActionTest extends TestCase
      */
     protected $emailData;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->factory = $this->getMockBuilder(AutoResponderDataFactory::class)
             ->disableOriginalConstructor()
@@ -55,7 +55,7 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testAct()
+    public function testAct(): void
     {
         $informationCollectionStruct = new InformationCollectionStruct();
         $dataWrapper = new DataWrapper($informationCollectionStruct, null, null);
@@ -77,7 +77,7 @@ public function testAct()
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\ActionFailedException
      * @expectedExceptionMessage Error occurred while trying to send email: test@example.com failed with error invalid email address
      */
-    public function testActWithException()
+    public function testActWithException(): void
     {
         $informationCollectionStruct = new InformationCollectionStruct();
         $dataWrapper = new DataWrapper($informationCollectionStruct, null, null);
diff --git a/tests/old/Action/DatabaseActionTest.php b/tests/old/Action/DatabaseActionTest.php
index bded25b8..3afd0c93 100644
--- a/tests/old/Action/DatabaseActionTest.php
+++ b/tests/old/Action/DatabaseActionTest.php
@@ -78,7 +78,7 @@ class DatabaseActionTest extends TestCase
      */
     protected $legacyData;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->factory = $this->getMockBuilder(FieldDataFactory::class)
             ->disableOriginalConstructor()
@@ -164,7 +164,7 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testAct()
+    public function testAct(): void
     {
         $location = new Location(array(
             'contentInfo' => new ContentInfo(array(
@@ -237,7 +237,7 @@ public function testAct()
     /**
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\ActionFailedException
      */
-    public function testActWithExceptionOnInformationCollectionRepository()
+    public function testActWithExceptionOnInformationCollectionRepository(): void
     {
         $location = new Location(array(
             'contentInfo' => new ContentInfo(array(
@@ -307,7 +307,7 @@ public function testActWithExceptionOnInformationCollectionRepository()
     /**
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\ActionFailedException
      */
-    public function testActWithExceptionOnInformationCollectionAttributeRepository()
+    public function testActWithExceptionOnInformationCollectionAttributeRepository(): void
     {
         $location = new Location(array(
             'contentInfo' => new ContentInfo(array(
diff --git a/tests/old/Action/EmailActionTest.php b/tests/old/Action/EmailActionTest.php
index 65742dc2..24484ca0 100644
--- a/tests/old/Action/EmailActionTest.php
+++ b/tests/old/Action/EmailActionTest.php
@@ -34,7 +34,7 @@ class EmailActionTest extends TestCase
      */
     protected $emailData;
 
-    public function setUp()
+    public function setUp(): void()
     {
         $this->factory = $this->getMockBuilder(EmailDataFactory::class)
             ->disableOriginalConstructor()
diff --git a/tests/old/ContentViewStub.php b/tests/old/ContentViewStub.php
index 5629c11e..073dc01e 100644
--- a/tests/old/ContentViewStub.php
+++ b/tests/old/ContentViewStub.php
@@ -6,10 +6,7 @@
 
 class ContentViewStub implements ContentValueView
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
+    public function getContent(): void
     {
     }
 }
diff --git a/tests/old/Controller/InformationCollectionControllerTest.php b/tests/old/Controller/InformationCollectionControllerTest.php
index 727795cc..ec2ec2c7 100644
--- a/tests/old/Controller/InformationCollectionControllerTest.php
+++ b/tests/old/Controller/InformationCollectionControllerTest.php
@@ -14,6 +14,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormBuilder as SymfonyFormBuilder;
 use Symfony\Component\HttpFoundation\Request;
 
 class InformationCollectionControllerTest extends TestCase
@@ -58,7 +59,7 @@ class InformationCollectionControllerTest extends TestCase
      */
     protected $container;
 
-    public function setUp()
+    public function setUp(): void
     {
         if (!class_exists(ContentView::class)) {
             $this->markTestSkipped();
@@ -89,7 +90,7 @@ public function setUp()
             ->setMethods(array())
             ->getMock();
 
-        $this->formBuilder = $this->getMockBuilder(\Symfony\Component\Form\FormBuilder::class)
+        $this->formBuilder = $this->getMockBuilder(SymfonyFormBuilder::class)
             ->disableOriginalConstructor()
             ->setMethods(array('getForm'))
             ->getMock();
@@ -105,12 +106,12 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testInstanceOfContainerAwareInterface()
+    public function testInstanceOfContainerAwareInterface(): void
     {
         $this->assertInstanceOf(ContainerAwareInterface::class, $this->controller);
     }
 
-    public function testDisplayAndHandleWithValidFormSubmission()
+    public function testDisplayAndHandleWithValidFormSubmission(): void
     {
         $location = new Location();
 
@@ -163,7 +164,7 @@ public function testDisplayAndHandleWithValidFormSubmission()
         $this->controller->displayAndHandle($this->contentView, $this->request);
     }
 
-    public function testDisplayAndHandleWithInvalidFormSubmission()
+    public function testDisplayAndHandleWithInvalidFormSubmission(): void
     {
         $location = new Location();
 
@@ -213,7 +214,7 @@ public function testDisplayAndHandleWithInvalidFormSubmission()
      * @expectedException \BadMethodCallException
      * @expectedExceptionMessage Ibexa view needs to implement LocationValueView interface
      */
-    public function testIfLocationValueViewIsNotProvidedThrowBadMethodCallException()
+    public function testIfLocationValueViewIsNotProvidedThrowBadMethodCallException(): void
     {
         $this->container->expects($this->never())
             ->method('get')
@@ -223,7 +224,7 @@ public function testIfLocationValueViewIsNotProvidedThrowBadMethodCallException(
         $this->controller->displayAndHandle(new ContentViewStub(), $this->request);
     }
 
-    public function getService($id)
+    public function getService(string $id): object
     {
         switch ($id) {
             case 'netgen_information_collection.form.builder':
diff --git a/tests/old/DependencyInjection/Compiler/ActionsPassTest.php b/tests/old/DependencyInjection/Compiler/ActionsPassTest.php
index bccdc7ad..6b8e0da6 100644
--- a/tests/old/DependencyInjection/Compiler/ActionsPassTest.php
+++ b/tests/old/DependencyInjection/Compiler/ActionsPassTest.php
@@ -11,7 +11,7 @@
 
 class ActionsPassTest extends AbstractCompilerPassTestCase
 {
-    public function testCompilerPassCollectsValidServices()
+    public function testCompilerPassCollectsValidServices(): void
     {
         $actionsRegistry = new Definition();
         $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -37,7 +37,7 @@ public function testCompilerPassCollectsValidServices()
      * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
      * @expectedExceptionMessage 'netgen_information_collection.action' service tag needs an 'alias' attribute to identify the action. None given.
      */
-    public function testCompilerPassMustThrowExceptionIfActionServiceHasntGotAlias()
+    public function testCompilerPassMustThrowExceptionIfActionServiceHasntGotAlias(): void
     {
         $actionsRegistry = new Definition();
         $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -61,7 +61,7 @@ public function testCompilerPassMustThrowExceptionIfActionServiceHasntGotAlias()
      * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
      * @expectedExceptionMessage Service my_action uses priority less than allowed. Priority must be greater than or equal to -255.
      */
-    public function testCompilerWithServicePriorityLessThanAllowed()
+    public function testCompilerWithServicePriorityLessThanAllowed(): void
     {
         $actionsRegistry = new Definition();
         $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -88,7 +88,7 @@ public function testCompilerWithServicePriorityLessThanAllowed()
      * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
      * @expectedExceptionMessage Service my_action uses priority greater than allowed. Priority must be lower than or equal to 255.
      */
-    public function testCompilerWithServicePriorityGreaterThanAllowed()
+    public function testCompilerWithServicePriorityGreaterThanAllowed(): void
     {
         $actionsRegistry = new Definition();
         $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -111,7 +111,7 @@ public function testCompilerWithServicePriorityGreaterThanAllowed()
         );
     }
 
-    public function testCompilerWithServiceThatIsMissingPriority()
+    public function testCompilerWithServiceThatIsMissingPriority(): void
     {
         $actionsRegistry = new Definition();
         $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -133,7 +133,7 @@ public function testCompilerWithServiceThatIsMissingPriority()
         );
     }
 
-    public function testCompilerWithDatabasePriority()
+    public function testCompilerWithDatabasePriority(): void
     {
         $actionsRegistry = new Definition();
         $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -155,7 +155,7 @@ public function testCompilerWithDatabasePriority()
         );
     }
 
-    protected function registerCompilerPass(ContainerBuilder $container)
+    protected function registerCompilerPass(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new ActionsPass());
     }
diff --git a/tests/old/DependencyInjection/Compiler/CustomFieldHandlersPassTest.php b/tests/old/DependencyInjection/Compiler/CustomFieldHandlersPassTest.php
index ee5279bf..188c89f5 100644
--- a/tests/old/DependencyInjection/Compiler/CustomFieldHandlersPassTest.php
+++ b/tests/old/DependencyInjection/Compiler/CustomFieldHandlersPassTest.php
@@ -10,7 +10,7 @@
 
 class CustomFieldHandlersPassTest extends AbstractCompilerPassTestCase
 {
-    public function testCompilerPassCollectsValidServices()
+    public function testCompilerPassCollectsValidServices(): void
     {
         $registry = new Definition();
         $this->setDefinition(CustomFieldHandlersPass::FIELD_HANDLER_REGISTRY, $registry);
@@ -30,7 +30,7 @@ public function testCompilerPassCollectsValidServices()
         );
     }
 
-    protected function registerCompilerPass(ContainerBuilder $container)
+    protected function registerCompilerPass(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new CustomFieldHandlersPass());
     }
diff --git a/tests/old/DependencyInjection/Compiler/FieldAnonymizerVisitorPassTest.php b/tests/old/DependencyInjection/Compiler/FieldAnonymizerVisitorPassTest.php
index e3b7c191..fb519fe1 100644
--- a/tests/old/DependencyInjection/Compiler/FieldAnonymizerVisitorPassTest.php
+++ b/tests/old/DependencyInjection/Compiler/FieldAnonymizerVisitorPassTest.php
@@ -11,7 +11,7 @@
 
 class FieldAnonymizerVisitorPassTest extends AbstractCompilerPassTestCase
 {
-    public function testCompilerPassCollectsValidServices()
+    public function testCompilerPassCollectsValidServices(): void
     {
         $aggregate = new Definition();
         $this->setDefinition('netgen_information_collection.anonymizer.visitor.field.aggregate', $aggregate);
@@ -31,7 +31,7 @@ public function testCompilerPassCollectsValidServices()
         );
     }
 
-    public function testCompilerPassCollectsAndSortsServices()
+    public function testCompilerPassCollectsAndSortsServices(): void
     {
         $aggregate = new Definition();
         $this->setDefinition('netgen_information_collection.anonymizer.visitor.field.aggregate', $aggregate);
@@ -65,7 +65,7 @@ public function testCompilerPassCollectsAndSortsServices()
 //     * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
 //     * @expectedExceptionMessage 'netgen_information_collection.action' service tag needs an 'alias' attribute to identify the action. None given.
 //     */
-//    public function testCompilerPassMustThrowExceptionIfActionServiceHasntGotAlias()
+//    public function testCompilerPassMustThrowExceptionIfActionServiceHasntGotAlias(): void
 //    {
 //        $actionsRegistry = new Definition();
 //        $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -89,7 +89,7 @@ public function testCompilerPassCollectsAndSortsServices()
 //     * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
 //     * @expectedExceptionMessage Service my_action uses priority less than allowed. Priority must be greater than or equal to -255.
 //     */
-//    public function testCompilerWithServicePriorityLessThanAllowed()
+//    public function testCompilerWithServicePriorityLessThanAllowed(): void
 //    {
 //        $actionsRegistry = new Definition();
 //        $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -116,7 +116,7 @@ public function testCompilerPassCollectsAndSortsServices()
 //     * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
 //     * @expectedExceptionMessage Service my_action uses priority greater than allowed. Priority must be lower than or equal to 255.
 //     */
-//    public function testCompilerWithServicePriorityGreaterThanAllowed()
+//    public function testCompilerWithServicePriorityGreaterThanAllowed(): void
 //    {
 //        $actionsRegistry = new Definition();
 //        $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -139,7 +139,7 @@ public function testCompilerPassCollectsAndSortsServices()
 //        );
 //    }
 //
-//    public function testCompilerWithServiceThatIsMissingPriority()
+//    public function testCompilerWithServiceThatIsMissingPriority(): void
 //    {
 //        $actionsRegistry = new Definition();
 //        $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -161,7 +161,7 @@ public function testCompilerPassCollectsAndSortsServices()
 //        );
 //    }
 //
-//    public function testCompilerWithDatabasePriority()
+//    public function testCompilerWithDatabasePriority(): void
 //    {
 //        $actionsRegistry = new Definition();
 //        $this->setDefinition('netgen_information_collection.action.registry', $actionsRegistry);
@@ -183,7 +183,7 @@ public function testCompilerPassCollectsAndSortsServices()
 //        );
 //    }
 
-    protected function registerCompilerPass(ContainerBuilder $container)
+    protected function registerCompilerPass(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new FieldAnonymizerVisitorPass());
     }
diff --git a/tests/old/DependencyInjection/ConfigurationTest.php b/tests/old/DependencyInjection/ConfigurationTest.php
index 6591cf03..13b836eb 100644
--- a/tests/old/DependencyInjection/ConfigurationTest.php
+++ b/tests/old/DependencyInjection/ConfigurationTest.php
@@ -10,7 +10,7 @@ class ConfigurationTest extends TestCase
 {
     use ConfigurationTestCaseTrait;
 
-    public function testConfigurationValuesAreOkAndValid()
+    public function testConfigurationValuesAreOkAndValid(): void
     {
         $this->assertConfigurationIsValid(
             array(
@@ -56,7 +56,7 @@ public function testConfigurationValuesAreOkAndValid()
         );
     }
 
-    public function testConfigurationIsInvalidForDefaultTemplateValue()
+    public function testConfigurationIsInvalidForDefaultTemplateValue(): void
     {
         $this->assertConfigurationIsInvalid(
             array(
@@ -103,7 +103,7 @@ public function testConfigurationIsInvalidForDefaultTemplateValue()
         );
     }
 
-    public function testConfigurationIsInvalidForDefaultActionsValue()
+    public function testConfigurationIsInvalidForDefaultActionsValue(): void
     {
         $this->assertConfigurationIsInvalid(
             array(
@@ -149,7 +149,7 @@ public function testConfigurationIsInvalidForDefaultActionsValue()
         );
     }
 
-    protected function getConfiguration()
+    protected function getConfiguration(): Configuration
     {
         return new Configuration();
     }
diff --git a/tests/old/DependencyInjection/NetgenInformationCollectionExtensionTest.php b/tests/old/DependencyInjection/NetgenInformationCollectionExtensionTest.php
index 1ce486c0..219aae38 100644
--- a/tests/old/DependencyInjection/NetgenInformationCollectionExtensionTest.php
+++ b/tests/old/DependencyInjection/NetgenInformationCollectionExtensionTest.php
@@ -7,20 +7,20 @@
 
 class NetgenInformationCollectionExtensionTest extends AbstractExtensionTestCase
 {
-    public function testItSetsValidContainerParameters()
+    public function testItSetsValidContainerParameters(): void
     {
         $this->container->setParameter('ibexa.site_access.list', array());
         $this->load();
     }
 
-    protected function getContainerExtensions()
+    protected function getContainerExtensions(): array
     {
         return array(
             new NetgenInformationCollectionExtension(),
         );
     }
 
-    protected function getMinimalConfiguration()
+    protected function getMinimalConfiguration(): array
     {
         return array(
             'system' => array(
diff --git a/tests/old/Entity/EzInfoCollectionAttributeTest.php b/tests/old/Entity/EzInfoCollectionAttributeTest.php
index 0764cc13..6c56ad15 100644
--- a/tests/old/Entity/EzInfoCollectionAttributeTest.php
+++ b/tests/old/Entity/EzInfoCollectionAttributeTest.php
@@ -12,13 +12,13 @@ class EzInfoCollectionAttributeTest extends TestCase
      */
     protected $entity;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->entity = new EzInfoCollectionAttribute();
         parent::setUp();
     }
 
-    public function testSetters()
+    public function testSetters(): void
     {
         $this->entity->setId(2342);
         $this->entity->setContentObjectId(24343);
diff --git a/tests/old/Entity/EzInfoCollectionTest.php b/tests/old/Entity/EzInfoCollectionTest.php
index 9ea18bcd..841a5a39 100644
--- a/tests/old/Entity/EzInfoCollectionTest.php
+++ b/tests/old/Entity/EzInfoCollectionTest.php
@@ -12,13 +12,13 @@ class EzInfoCollectionTest extends TestCase
      */
     protected $entity;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->entity = new EzInfoCollection();
         parent::setUp();
     }
 
-    public function testGettersAndSetters()
+    public function testGettersAndSetters(): void
     {
         $id = 123;
         $this->entity->setId($id);
diff --git a/tests/old/Event/InformationCollectedTest.php b/tests/old/Event/InformationCollectedTest.php
index c9fe2783..140c422e 100644
--- a/tests/old/Event/InformationCollectedTest.php
+++ b/tests/old/Event/InformationCollectedTest.php
@@ -13,7 +13,7 @@ class InformationCollectedTest extends TestCase
      */
     protected $event;
 
-    public function setUp()
+    public function setUp(): void
     {
         $data = new DataWrapper('payload', 'definition', 'target');
         $this->event = new InformationCollected($data, 'additional content');
@@ -21,7 +21,7 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testGetters()
+    public function testGetters(): void
     {
         $this->assertEquals('payload', $this->event->getInformationCollectionStruct());
         $this->assertEquals('definition', $this->event->getContentType());
diff --git a/tests/old/Exception/ActionFailedExceptionTest.php b/tests/old/Exception/ActionFailedExceptionTest.php
index 69b4f8a0..bb43aa3a 100644
--- a/tests/old/Exception/ActionFailedExceptionTest.php
+++ b/tests/old/Exception/ActionFailedExceptionTest.php
@@ -11,7 +11,7 @@ class ActionFailedExceptionTest extends TestCase
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\ActionFailedException
      * @expectedExceptionMessage InformationCollection action test failed with reason some reason
      */
-    public function testException()
+    public function testException(): void
     {
         throw new ActionFailedException('test', 'some reason');
     }
diff --git a/tests/old/Exception/EmailNotSentExceptionTest.php b/tests/old/Exception/EmailNotSentExceptionTest.php
index 2e04424c..505243a1 100644
--- a/tests/old/Exception/EmailNotSentExceptionTest.php
+++ b/tests/old/Exception/EmailNotSentExceptionTest.php
@@ -11,7 +11,7 @@ class EmailNotSentExceptionTest extends TestCase
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\EmailNotSentException
      * @expectedExceptionMessage Error occurred while trying to send email: test@example.com failed with error invalid email
      */
-    public function testException()
+    public function testException(): void
     {
         throw new EmailNotSentException('test@example.com', 'invalid email');
     }
diff --git a/tests/old/Exception/MissingEmailBlockExceptionTest.php b/tests/old/Exception/MissingEmailBlockExceptionTest.php
index 9f0ef78b..f75b06ad 100644
--- a/tests/old/Exception/MissingEmailBlockExceptionTest.php
+++ b/tests/old/Exception/MissingEmailBlockExceptionTest.php
@@ -11,7 +11,7 @@ class MissingEmailBlockExceptionTest extends TestCase
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\MissingEmailBlockException
      * @expectedExceptionMessage Missing email block in @Acme/email.html.twig template, currently there is none available.
      */
-    public function testExceptionWithNoBlocks()
+    public function testExceptionWithNoBlocks(): void
     {
         throw new MissingEmailBlockException('@Acme/email.html.twig', array());
     }
@@ -20,7 +20,7 @@ public function testExceptionWithNoBlocks()
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\MissingEmailBlockException
      * @expectedExceptionMessage Missing email block in @Acme/email.html.twig template, currently there is email available.
      */
-    public function testExceptionWithSingleBlock()
+    public function testExceptionWithSingleBlock(): void
     {
         throw new MissingEmailBlockException('@Acme/email.html.twig', array('email'));
     }
@@ -29,7 +29,7 @@ public function testExceptionWithSingleBlock()
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\MissingEmailBlockException
      * @expectedExceptionMessage Missing email block in @Acme/email.html.twig template, currently there are recipient, email available.
      */
-    public function testExceptionWithMultipleBlocks()
+    public function testExceptionWithMultipleBlocks(): void
     {
         throw new MissingEmailBlockException('@Acme/email.html.twig', array('recipient', 'email'));
     }
diff --git a/tests/old/Exception/MissingValueExceptionTest.php b/tests/old/Exception/MissingValueExceptionTest.php
index ccfe0e6b..6bd2b830 100644
--- a/tests/old/Exception/MissingValueExceptionTest.php
+++ b/tests/old/Exception/MissingValueExceptionTest.php
@@ -11,7 +11,7 @@ class MissingValueExceptionTest extends TestCase
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\MissingValueException
      * @expectedExceptionMessage There is no value for field my_field specified.
      */
-    public function testException()
+    public function testException(): void
     {
         throw new MissingValueException('my_field');
     }
diff --git a/tests/old/Factory/AutoResponderDataFactoryTest.php b/tests/old/Factory/AutoResponderDataFactoryTest.php
index 4ad2a54e..41c348fb 100644
--- a/tests/old/Factory/AutoResponderDataFactoryTest.php
+++ b/tests/old/Factory/AutoResponderDataFactoryTest.php
@@ -20,9 +20,9 @@
 use Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
 use PHPUnit\Framework\TestCase;
-use Twig_Environment;
-use Twig_Loader_Array;
-use Twig_TemplateWrapper;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+use Twig\TemplateWrapper;
 
 class AutoResponderDataFactoryTest extends TestCase
 {
@@ -76,7 +76,7 @@ class AutoResponderDataFactoryTest extends TestCase
      */
     protected $versionInfo;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->config = array(
             'templates' => array(
@@ -107,7 +107,7 @@ public function setUp()
             ->setMethods(array('loadContent'))
             ->getMock();
 
-        $this->twig = $this->getMockBuilder(\Twig_Environment::class)
+        $this->twig = $this->getMockBuilder(Environment::class)
             ->disableOriginalConstructor()
             ->setMethods(array('load'))
             ->getMock();
@@ -138,17 +138,17 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testBuildingWithSenderAndSubjectFromContent()
+    public function testBuildingWithSenderAndSubjectFromContent(): void
     {
-        $twig = new Twig_Environment(
-            new Twig_Loader_Array(
+        $twig = new Environment(
+            new ArrayLoader(
                 array(
                     'index' => '{% block email %}{{ "email body" }}{% endblock %}',
                 )
             )
         );
 
-        $templateWrapper = new Twig_TemplateWrapper($twig, $twig->loadTemplate('index'));
+        $templateWrapper = new TemplateWrapper($twig, $twig->loadTemplate('index'));
 
         $this->factory = new AutoResponderDataFactory(
             $this->config,
@@ -227,17 +227,17 @@ public function testBuildingWithSenderAndSubjectFromContent()
         $this->assertEquals('email body', $value->getBody());
     }
 
-    public function testBuildingWithSenderFromContentAndSubjectFromTemplate()
+    public function testBuildingWithSenderFromContentAndSubjectFromTemplate(): void
     {
-        $twig = new Twig_Environment(
-            new Twig_Loader_Array(
+        $twig = new Environment(
+            new ArrayLoader(
                 array(
                     'index' => '{% block email %}{{ "email body" }}{% endblock %}{% block auto_responder_subject %}{{ "subject from template" }}{% endblock %}',
                 )
             )
         );
 
-        $templateWrapper = new Twig_TemplateWrapper($twig, $twig->loadTemplate('index'));
+        $templateWrapper = new TemplateWrapper($twig, $twig->loadTemplate('index'));
 
         $this->factory = new AutoResponderDataFactory(
             $this->config,
diff --git a/tests/old/Factory/EmailDataFactoryTest.php b/tests/old/Factory/EmailDataFactoryTest.php
index 2b4e7407..fdc3ab39 100644
--- a/tests/old/Factory/EmailDataFactoryTest.php
+++ b/tests/old/Factory/EmailDataFactoryTest.php
@@ -19,9 +19,9 @@
 use Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
 use PHPUnit\Framework\TestCase;
-use Twig_Environment;
-use Twig_Loader_Array;
-use Twig_TemplateWrapper;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+use Twig\TemplateWrapper;
 
 class EmailDataFactoryTest extends TestCase
 {
@@ -75,7 +75,7 @@ class EmailDataFactoryTest extends TestCase
      */
     protected $versionInfo;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->config = array(
             'templates' => array(
@@ -106,7 +106,7 @@ public function setUp()
             ->setMethods(array('loadContent'))
             ->getMock();
 
-        $this->twig = $this->getMockBuilder(\Twig_Environment::class)
+        $this->twig = $this->getMockBuilder(Environment::class)
             ->disableOriginalConstructor()
             ->setMethods(array('load'))
             ->getMock();
@@ -137,17 +137,17 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testBuildingWithSenderRecipientAndSubjectFromContent()
+    public function testBuildingWithSenderRecipientAndSubjectFromContent(): void
     {
-        $twig = new Twig_Environment(
-            new Twig_Loader_Array(
+        $twig = new Environment(
+            new ArrayLoader(
                 array(
                     'index' => '{% block email %}{{ "email body" }}{% endblock %}',
                 )
             )
         );
 
-        $templateWrapper = new Twig_TemplateWrapper($twig, $twig->loadTemplate('index'));
+        $templateWrapper = new TemplateWrapper($twig, $twig->loadTemplate('index'));
 
         $this->factory = new EmailDataFactory(
             $this->config,
@@ -237,7 +237,7 @@ public function testBuildingWithSenderRecipientAndSubjectFromContent()
         $this->assertEquals('email body', $value->getBody());
     }
 
-    public function testBuildingWithSenderRecipientAndSubjectFromTemplate()
+    public function testBuildingWithSenderRecipientAndSubjectFromTemplate(): void
     {
         $template = <<<TEMPLATE
             {% block email %}{{ 'My email body' }}{% endblock %}
@@ -246,15 +246,15 @@ public function testBuildingWithSenderRecipientAndSubjectFromTemplate()
             {% block sender %}{{ 'sender@template.com' }}{% endblock %}
 TEMPLATE;
 
-        $twig = new Twig_Environment(
-            new Twig_Loader_Array(
+        $twig = new Environment(
+            new ArrayLoader(
                 array(
                     'index' => $template,
                 )
             )
         );
 
-        $templateWrapper = new Twig_TemplateWrapper($twig, $twig->loadTemplate('index'));
+        $templateWrapper = new TemplateWrapper($twig, $twig->loadTemplate('index'));
 
         $this->factory = new EmailDataFactory(
             $this->config,
@@ -334,17 +334,17 @@ public function testBuildingWithSenderRecipientAndSubjectFromTemplate()
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\MissingEmailBlockException
      * @expectedExceptionMessage Missing email block in index template, currently there is foo available.
      */
-    public function testBuildingWithNoEmailBlockInTemplate()
+    public function testBuildingWithNoEmailBlockInTemplate(): void
     {
-        $twig = new Twig_Environment(
-            new Twig_Loader_Array(
+        $twig = new Environment(
+            new ArrayLoader(
                 array(
                     'index' => '{% block foo %}{% endblock %}',
                 )
             )
         );
 
-        $templateWrapper = new Twig_TemplateWrapper($twig, $twig->loadTemplate('index'));
+        $templateWrapper = new TemplateWrapper($twig, $twig->loadTemplate('index'));
 
         $recipientField = new Field(array(
             'value' => new EmailValue('recipient@test.com'),
@@ -412,17 +412,17 @@ public function testBuildingWithNoEmailBlockInTemplate()
         $this->assertEquals('body test', $value->getBody());
     }
 
-    public function testBuildingWithSenderRecipientAndSubjectFromConfiguration()
+    public function testBuildingWithSenderRecipientAndSubjectFromConfiguration(): void
     {
-        $twig = new Twig_Environment(
-            new Twig_Loader_Array(
+        $twig = new Environment(
+            new ArrayLoader(
                 array(
                     'index' => '{% block email %}{% endblock %}',
                 )
             )
         );
 
-        $templateWrapper = new Twig_TemplateWrapper($twig, $twig->loadTemplate('index'));
+        $templateWrapper = new TemplateWrapper($twig, $twig->loadTemplate('index'));
 
         $recipientField = new Field(array(
             'value' => new EmailValue('recipient@test.com'),
diff --git a/tests/old/Factory/FieldDataFactoryTest.php b/tests/old/Factory/FieldDataFactoryTest.php
index 22833ebe..b8040df0 100644
--- a/tests/old/Factory/FieldDataFactoryTest.php
+++ b/tests/old/Factory/FieldDataFactoryTest.php
@@ -23,7 +23,7 @@ class FieldDataFactoryTest extends TestCase
      */
     protected $registry;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->registry = $this->getMockBuilder(FieldHandlerRegistry::class)
             ->disableOriginalConstructor()
@@ -35,7 +35,7 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testGetLegacyValueWithoutCustomHandler()
+    public function testGetLegacyValueWithoutCustomHandler(): void
     {
         $value = new TextValue('some value');
         $definition = new FieldDefinition(array(
@@ -56,7 +56,7 @@ public function testGetLegacyValueWithoutCustomHandler()
         $this->assertEquals((string) $value, $data->getDataText());
     }
 
-    public function testGetLegacyValueWithCustomHandler()
+    public function testGetLegacyValueWithCustomHandler(): void
     {
         $value = new TextValue('some value');
         $definition = new FieldDefinition(array(
@@ -87,7 +87,7 @@ public function testGetLegacyValueWithCustomHandler()
         $this->assertEquals((string) $value, $data->getDataText());
     }
 
-    public function testGetLegacyValueWithCustomLegacyHandler()
+    public function testGetLegacyValueWithCustomLegacyHandler(): void
     {
         $value = new TextValue('some value');
         $definition = new FieldDefinition(array(
diff --git a/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php b/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php
index e2e93c87..fc14203a 100644
--- a/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php
@@ -18,31 +18,31 @@ class CheckboxFieldHandlerTest extends TestCase
      */
     protected $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->handler = new CheckboxFieldHandler();
     }
 
-    public function testInstanceOfCustomLegacyFieldHandler()
+    public function testInstanceOfCustomLegacyFieldHandler(): void
     {
         $this->assertInstanceOf(CustomLegacyFieldHandlerInterface::class, $this->handler);
     }
 
-    public function testSupportsHasValidBehaviour()
+    public function testSupportsHasValidBehaviour(): void
     {
         $this->assertTrue($this->handler->supports(new CheckboxValue(true)));
         $this->assertFalse($this->handler->supports(new IntegerValue(1)));
         $this->assertFalse($this->handler->supports(new FloatValue(2.0)));
     }
 
-    public function testToString()
+    public function testToString(): void
     {
         $fieldDefinition = $this->createMock(FieldDefinition::class);
         $this->assertEquals('1', $this->handler->toString(new CheckboxValue(true), $fieldDefinition));
         $this->assertEquals('0', $this->handler->toString(new CheckboxValue(false), $fieldDefinition));
     }
 
-    public function testGetLegacyValue()
+    public function testGetLegacyValue(): void
     {
         $fieldDefinition = new CoreFieldDefinition([
             'id' => 123,
diff --git a/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php b/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php
index 0e9e85e6..e659d47e 100644
--- a/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php
@@ -24,25 +24,25 @@ class DateAndTimeFieldHandlerTest extends TestCase
      */
     protected $dt;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->handler = new DateAndTimeFieldHandler();
         $this->dt = new DateTime();
     }
 
-    public function testInstanceOfCustomLegacyFieldHandler()
+    public function testInstanceOfCustomLegacyFieldHandler(): void
     {
         $this->assertInstanceOf(CustomLegacyFieldHandlerInterface::class, $this->handler);
     }
 
-    public function testSupportsHasValidBehaviour()
+    public function testSupportsHasValidBehaviour(): void
     {
         $this->assertFalse($this->handler->supports(new CheckboxValue(true)));
         $this->assertTrue($this->handler->supports(new DateAndTimeValue($this->dt)));
         $this->assertFalse($this->handler->supports(new FloatValue(2.0)));
     }
 
-    public function testToString()
+    public function testToString(): void
     {
         $fieldDefinition = $this->createMock(FieldDefinition::class);
 
@@ -51,7 +51,7 @@ public function testToString()
         $this->assertEquals($this->dt->format('U'), $this->handler->toString($value, $fieldDefinition));
     }
 
-    public function testGetLegacyValue()
+    public function testGetLegacyValue(): void
     {
         $fieldDefinition = new CoreFieldDefinition([
             'id' => 123,
diff --git a/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php b/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php
index cc16ce96..c3817bee 100644
--- a/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php
@@ -24,26 +24,26 @@ class DateFieldHandlerTest extends TestCase
      */
     protected $dt;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->handler = new DateFieldHandler();
         $this->dt = new DateTime();
         $this->dt->setTime(0, 0, 0);
     }
 
-    public function testInstanceOfCustomLegacyFieldHandler()
+    public function testInstanceOfCustomLegacyFieldHandler(): void
     {
         $this->assertInstanceOf(CustomLegacyFieldHandlerInterface::class, $this->handler);
     }
 
-    public function testSupportsHasValidBehaviour()
+    public function testSupportsHasValidBehaviour(): void
     {
         $this->assertFalse($this->handler->supports(new CheckboxValue(true)));
         $this->assertTrue($this->handler->supports(new DateValue($this->dt)));
         $this->assertFalse($this->handler->supports(new FloatValue(2.0)));
     }
 
-    public function testToString()
+    public function testToString(): void
     {
         $fieldDefinition = $this->createMock(FieldDefinition::class);
 
@@ -52,7 +52,7 @@ public function testToString()
         $this->assertEquals($this->dt->format('l d F Y'), $this->handler->toString($value, $fieldDefinition));
     }
 
-    public function testGetLegacyValue()
+    public function testGetLegacyValue(): void
     {
         $fieldDefinition = new CoreFieldDefinition([
             'id' => 123,
diff --git a/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php b/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php
index 6387d50d..36fdbfad 100644
--- a/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php
@@ -18,24 +18,24 @@ class FloatFieldHandlerTest extends TestCase
      */
     protected $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->handler = new FloatFieldHandler();
     }
 
-    public function testInstanceOfCustomLegacyFieldHandler()
+    public function testInstanceOfCustomLegacyFieldHandler(): void
     {
         $this->assertInstanceOf(CustomLegacyFieldHandlerInterface::class, $this->handler);
     }
 
-    public function testSupportsHasValidBehaviour()
+    public function testSupportsHasValidBehaviour(): void
     {
         $this->assertFalse($this->handler->supports(new CheckboxValue(true)));
         $this->assertFalse($this->handler->supports(new IntegerValue(1)));
         $this->assertTrue($this->handler->supports(new FloatValue(2.0)));
     }
 
-    public function testToString()
+    public function testToString(): void
     {
         $fieldDefinition = $this->createMock(FieldDefinition::class);
 
@@ -43,7 +43,7 @@ public function testToString()
         $this->assertEquals('55.7', $this->handler->toString(new FloatValue(55.7), $fieldDefinition));
     }
 
-    public function testGetLegacyValue()
+    public function testGetLegacyValue(): void
     {
         $fieldDefinition = new CoreFieldDefinition([
             'id' => 123,
diff --git a/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php b/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php
index 4e28ec51..628e8e03 100644
--- a/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php
@@ -18,31 +18,31 @@ class IntegerFieldHandlerTest extends TestCase
      */
     protected $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->handler = new IntegerFieldHandler();
     }
 
-    public function testInstanceOfCustomLegacyFieldHandler()
+    public function testInstanceOfCustomLegacyFieldHandler(): void
     {
         $this->assertInstanceOf(CustomLegacyFieldHandlerInterface::class, $this->handler);
     }
 
-    public function testSupportsHasValidBehaviour()
+    public function testSupportsHasValidBehaviour(): void
     {
         $this->assertFalse($this->handler->supports(new CheckboxValue(true)));
         $this->assertTrue($this->handler->supports(new IntegerValue(1)));
         $this->assertFalse($this->handler->supports(new FloatValue(2.0)));
     }
 
-    public function testToString()
+    public function testToString(): void
     {
         $fieldDefinition = $this->createMock(FieldDefinition::class);
         $this->assertEquals('55', $this->handler->toString(new IntegerValue(55), $fieldDefinition));
         $this->assertEquals('32', $this->handler->toString(new IntegerValue(32), $fieldDefinition));
     }
 
-    public function testGetLegacyValue()
+    public function testGetLegacyValue(): void
     {
         $fieldDefinition = new CoreFieldDefinition([
             'id' => 123,
diff --git a/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php b/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php
index 041c1294..888dff24 100644
--- a/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php
@@ -29,33 +29,33 @@ class TimeFieldHandlerTest extends TestCase
      */
     protected $value;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->handler = new TimeFieldHandler();
         $this->dt = new DateTime();
         $this->value = TimeValue::fromDateTime($this->dt);
     }
 
-    public function testInstanceOfCustomLegacyFieldHandler()
+    public function testInstanceOfCustomLegacyFieldHandler(): void
     {
         $this->assertInstanceOf(CustomLegacyFieldHandlerInterface::class, $this->handler);
     }
 
-    public function testSupportsHasValidBehaviour()
+    public function testSupportsHasValidBehaviour(): void
     {
         $this->assertFalse($this->handler->supports(new CheckboxValue(true)));
         $this->assertTrue($this->handler->supports($this->value));
         $this->assertFalse($this->handler->supports(new FloatValue(2.0)));
     }
 
-    public function testToString()
+    public function testToString(): void
     {
         $fieldDefinition = $this->createMock(FieldDefinition::class);
 
         $this->assertEquals($this->dt->format('H:i:s'), $this->handler->toString($this->value, $fieldDefinition));
     }
 
-    public function testGetLegacyValue()
+    public function testGetLegacyValue(): void
     {
         $fieldDefinition = new CoreFieldDefinition([
             'id' => 123,
diff --git a/tests/old/FieldHandler/FieldHandlerRegistryTest.php b/tests/old/FieldHandler/FieldHandlerRegistryTest.php
index 94cde41f..433e5acd 100644
--- a/tests/old/FieldHandler/FieldHandlerRegistryTest.php
+++ b/tests/old/FieldHandler/FieldHandlerRegistryTest.php
@@ -24,7 +24,7 @@ class FieldHandlerRegistryTest extends TestCase
      */
     protected $customHandler2;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->registry = new FieldHandlerRegistry();
         $this->customHandler1 = $this->getMockBuilder(CustomFieldHandlerInterface::class)
@@ -40,13 +40,13 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testAddingHandlers()
+    public function testAddingHandlers(): void
     {
         $this->registry->addHandler($this->customHandler1);
         $this->registry->addHandler($this->customHandler2);
     }
 
-    public function testItReturnsProperHandler()
+    public function testItReturnsProperHandler(): void
     {
         $value = new TestValue(2);
 
@@ -66,7 +66,7 @@ public function testItReturnsProperHandler()
         $this->assertSame($this->customHandler2, $handler);
     }
 
-    public function testItReturnsNullWhenSupportedHandlerNotFound()
+    public function testItReturnsNullWhenSupportedHandlerNotFound(): void
     {
         $value = new TestValue(2);
 
diff --git a/tests/old/Form/Builder/FormBuilderTest.php b/tests/old/Form/Builder/FormBuilderTest.php
index b31e7b99..c6752ba6 100644
--- a/tests/old/Form/Builder/FormBuilderTest.php
+++ b/tests/old/Form/Builder/FormBuilderTest.php
@@ -38,7 +38,7 @@ class FormBuilderTest extends TestCase
      */
     protected $innerFormBuilder;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->formFactory = $this->getMockBuilder(FormFactory::class)
             ->disableOriginalConstructor()
@@ -64,7 +64,7 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testFormBuildUp()
+    public function testFormBuildUp(): void
     {
         $location = new Location(array(
             'contentInfo' => new ContentInfo(array(
@@ -88,7 +88,7 @@ public function testFormBuildUp()
         $this->assertSame($this->innerFormBuilder, $builder);
     }
 
-    public function testFormBuildUpWithCustomURL()
+    public function testFormBuildUpWithCustomURL(): void
     {
         $location = new Location(array(
             'contentInfo' => new ContentInfo(array(
diff --git a/tests/old/Listener/InformationCollectedListenerTest.php b/tests/old/Listener/InformationCollectedListenerTest.php
index 9e4f767d..1c6c4993 100644
--- a/tests/old/Listener/InformationCollectedListenerTest.php
+++ b/tests/old/Listener/InformationCollectedListenerTest.php
@@ -21,7 +21,7 @@ class InformationCollectedListenerTest extends TestCase
      */
     protected $registry;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->registry = $this->getMockBuilder(ActionRegistry::class)
             ->disableOriginalConstructor()
@@ -33,7 +33,7 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testListenerConfiguration()
+    public function testListenerConfiguration(): void
     {
         $this->assertEquals(
             array(Events::INFORMATION_COLLECTED => 'onInformationCollected'),
@@ -41,7 +41,7 @@ public function testListenerConfiguration()
         );
     }
 
-    public function testItRunsActions()
+    public function testItRunsActions(): void
     {
         $event = new InformationCollected(new DataWrapper('payload'));
 
diff --git a/tests/old/Mailer/MailerTest.php b/tests/old/Mailer/MailerTest.php
index 051308cf..2dfb4414 100644
--- a/tests/old/Mailer/MailerTest.php
+++ b/tests/old/Mailer/MailerTest.php
@@ -19,7 +19,7 @@ class MailerTest extends TestCase
      */
     protected $swiftMailer;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->swiftMailer = $this->getMockBuilder(\Swift_Mailer::class)
             ->disableOriginalConstructor()
@@ -33,7 +33,7 @@ public function setUp()
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\EmailNotSentException
      * @expectedExceptionMessage Error occurred while trying to send email: recipient failed with error Address in mailbox given [[][][]][]] does not comply with RFC 2822, 3.6.2.
      */
-    public function testCreateAndSendMessageWithWrongRecipient()
+    public function testCreateAndSendMessageWithWrongRecipient(): void
     {
         $data = new EmailData('[][][]][]', 'sender@example.com', 'Test', 'Body');
 
@@ -47,7 +47,7 @@ public function testCreateAndSendMessageWithWrongRecipient()
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\EmailNotSentException
      * @expectedExceptionMessage Error occurred while trying to send email: sender failed with error Address in mailbox given [[][][]][]] does not comply with RFC 2822, 3.6.2.
      */
-    public function testCreateAndSendMessageWithWrongSender()
+    public function testCreateAndSendMessageWithWrongSender(): void
     {
         $data = new EmailData('recipient@example.com', '[][][]][]', 'Test', 'Body');
 
@@ -61,7 +61,7 @@ public function testCreateAndSendMessageWithWrongSender()
      * @expectedException \Netgen\Bundle\InformationCollectionBundle\Exception\EmailNotSentException
      * @expectedExceptionMessage Error occurred while trying to send email: send failed with error invalid mailer configuration?
      */
-    public function testCreateAndSendMessageWithErrorFromInternalMailer()
+    public function testCreateAndSendMessageWithErrorFromInternalMailer(): void
     {
         $data = new EmailData('recipient@example.com', 'sender@example.com', 'Test', 'Body');
 
@@ -72,7 +72,7 @@ public function testCreateAndSendMessageWithErrorFromInternalMailer()
         $this->mailer->createAndSendMessage($data);
     }
 
-    public function testCreateAndSendMessage()
+    public function testCreateAndSendMessage(): void
     {
         $data = new EmailData('recipient@example.com', 'sender@example.com', 'Test', 'Body');
 
@@ -83,7 +83,7 @@ public function testCreateAndSendMessage()
         $this->mailer->createAndSendMessage($data);
     }
 
-    public function testCreateAndSendMessageWithAttachments()
+    public function testCreateAndSendMessageWithAttachments(): void
     {
         $attachments = [
             new BinaryFileValue(
diff --git a/tests/old/Templating/Twig/AdminGlobalVariableTest.php b/tests/old/Templating/Twig/AdminGlobalVariableTest.php
index ad27409a..92042a23 100644
--- a/tests/old/Templating/Twig/AdminGlobalVariableTest.php
+++ b/tests/old/Templating/Twig/AdminGlobalVariableTest.php
@@ -7,7 +7,7 @@
 
 class AdminGlobalVariableTest extends TestCase
 {
-    public function testGetterSetter()
+    public function testGetterSetter(): void
     {
         $admin = new AdminGlobalVariable();
 
diff --git a/tests/old/Value/EmailDataTest.php b/tests/old/Value/EmailDataTest.php
index 56111ee4..8923cf8c 100644
--- a/tests/old/Value/EmailDataTest.php
+++ b/tests/old/Value/EmailDataTest.php
@@ -15,7 +15,7 @@ class EmailDataTest extends TestCase
      * @param mixed $subject
      * @param mixed $body
      */
-    public function testGetters($recipient, $sender, $subject, $body)
+    public function testGetters($recipient, $sender, $subject, $body): void
     {
         $emailData = new EmailData($recipient, $sender, $subject, $body);
 
@@ -26,7 +26,7 @@ public function testGetters($recipient, $sender, $subject, $body)
         $this->assertNull($emailData->getAttachments());
     }
 
-    public function emailDataProvider()
+    public function emailDataProvider(): void
     {
         return array(
             array('recipient@example.com', 'sender@example.com', 'Test subject', 'Email body'),
diff --git a/tests/old/Value/LegacyDataTest.php b/tests/old/Value/LegacyDataTest.php
index e64bccf3..c5357620 100644
--- a/tests/old/Value/LegacyDataTest.php
+++ b/tests/old/Value/LegacyDataTest.php
@@ -15,7 +15,7 @@ class LegacyDataTest extends TestCase
      * @param mixed $dataInt
      * @param mixed $dataText
      */
-    public function testGetters($contentClassAttributeId, $dataFloat, $dataInt, $dataText)
+    public function testGetters($contentClassAttributeId, $dataFloat, $dataInt, $dataText): void
     {
         $legacyData = new LegacyData($contentClassAttributeId, $dataFloat, $dataInt, $dataText);
 
@@ -25,7 +25,7 @@ public function testGetters($contentClassAttributeId, $dataFloat, $dataInt, $dat
         $this->assertEquals($dataText, $legacyData->getDataText());
     }
 
-    public function legacyDataProvider()
+    public function legacyDataProvider(): void
     {
         return array(
             array(123456, 2.67, 34, 'text'),
diff --git a/tests/old/Value/TemplateDataTest.php b/tests/old/Value/TemplateDataTest.php
index 2ea74423..214f6b3a 100644
--- a/tests/old/Value/TemplateDataTest.php
+++ b/tests/old/Value/TemplateDataTest.php
@@ -7,9 +7,9 @@
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Value\TemplateData;
 use PHPUnit\Framework\TestCase;
-use Twig_Environment;
-use Twig_Loader_Array;
-use Twig_TemplateWrapper;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+use Twig\TemplateWrapper;
 
 class TemplateDataTest extends TestCase
 {
@@ -29,14 +29,14 @@ class TemplateDataTest extends TestCase
     protected $content;
 
     /**
-     * @var \Twig_TemplateWrapper
+     * @var \Twig\TemplateWrapper
      */
     protected $templateWrapper;
 
-    public function setUp()
+    public function setUp(): void
     {
-        $twig = new Twig_Environment(
-            new Twig_Loader_Array(
+        $twig = new Environment(
+            new ArrayLoader(
                 array(
                     'index' => '{% block foo %}{% endblock %}',
                 )
@@ -45,12 +45,12 @@ public function setUp()
 
         $this->event = new InformationCollected(new DataWrapper('test', null, null));
         $this->content = new Content();
-        $this->templateWrapper = new Twig_TemplateWrapper($twig, $twig->loadTemplate('index'));
+        $this->templateWrapper = new TemplateWrapper($twig, $twig->loadTemplate('index'));
 
         $this->templateData = new TemplateData($this->event, $this->content, $this->templateWrapper);
     }
 
-    public function testGetters()
+    public function testGetters(): void
     {
         $this->assertEquals($this->event, $this->templateData->getEvent());
         $this->assertEquals($this->content, $this->templateData->getContent());

From d4ca39fb4887687d28fcc6cd0fc1337023207265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Fri, 4 Mar 2022 16:36:17 +0100
Subject: [PATCH 11/30] Add property typehints

---
 bundle/Command/DataAnonymizerCommand.php      | 12 +--
 bundle/Controller/Admin/AdminController.php   | 25 ++----
 bundle/Controller/Admin/Export/Export.php     | 15 +---
 bundle/Controller/Admin/TreeController.php    | 15 +---
 .../InformationCollectionCollector.php        | 12 +--
 bundle/Form/CaptchaType.php                   |  5 +-
 bundle/Form/ExportType.php                    |  5 +-
 .../EventListener/SetPageLayoutListener.php   | 17 +----
 .../InformationCollectionFieldType.php        |  5 +-
 .../InformationCollectionType.php             |  5 +-
 bundle/Listener/CaptchaValidationListener.php | 15 +---
 .../Listener/InformationCollectedListener.php |  5 +-
 .../CollectionParamConverter.php              |  5 +-
 .../Templating/Twig/AdminGlobalVariable.php   | 10 +--
 .../Twig/Extensions/CaptchaRuntime.php        |  5 +-
 .../Twig/Extensions/FieldRenderingRuntime.php | 12 +--
 doc/cookbook/override_something_on_form.rst   |  5 +-
 lib/API/Value/Attribute.php                   | 20 +----
 lib/API/Value/AttributeValue.php              | 19 ++---
 lib/API/Value/Captcha/ReCaptcha.php           |  5 +-
 lib/API/Value/Collection.php                  | 27 ++-----
 lib/API/Value/Collections.php                 |  7 +-
 lib/API/Value/Content.php                     | 40 +++-------
 lib/API/Value/ContentsWithCollections.php     |  7 +-
 .../Value/DataTransfer/AdditionalContent.php  |  5 +-
 lib/API/Value/DataTransfer/EmailContent.php   | 22 ++----
 .../Value/DataTransfer/TemplateContent.php    | 12 +--
 lib/API/Value/Event/InformationCollected.php  | 15 +---
 lib/API/Value/Export/Export.php               | 12 +--
 lib/API/Value/Export/ExportCriteria.php       |  5 +-
 lib/API/Value/Filter/CollectionFields.php     | 19 ++---
 lib/API/Value/Filter/CollectionId.php         |  5 +-
 lib/API/Value/Filter/Collections.php          | 10 +--
 lib/API/Value/Filter/ContentId.php            |  5 +-
 lib/API/Value/Filter/Contents.php             |  5 +-
 lib/API/Value/Filter/FilterCriteria.php       | 19 ++---
 lib/API/Value/Filter/Query.php                | 16 +---
 lib/API/Value/Filter/SearchQuery.php          | 12 +--
 lib/API/Value/InformationCollectionStruct.php | 21 ++---
 lib/API/Value/Legacy/FieldValue.php           | 22 +-----
 lib/API/Value/ObjectCount.php                 |  2 +-
 lib/Core/Action/ActionRegistry.php            | 25 ++----
 lib/Core/Action/BaseEmailAction.php           | 12 +--
 lib/Core/Action/ConfigurationUtility.php      | 10 +--
 lib/Core/Action/DatabaseAction.php            |  5 +-
 lib/Core/Action/Identifier.php                |  5 +-
 .../EmailDataProvider/AbstractProvider.php    | 26 ++-----
 .../EmailDataProvider/DefaultProvider.php     | 20 +----
 .../Export/CsvExportResponseFormatter.php     | 12 +--
 .../ExportResponseFormatterRegistry.php       |  2 +-
 .../Export/XlsExportResponseFormatter.php     |  5 +-
 .../Export/XlsxExportResponseFormatter.php    |  5 +-
 lib/Core/Factory/EmailDataFactory.php         | 20 +----
 lib/Core/Factory/FieldDataFactory.php         |  5 +-
 lib/Core/Mailer/SwiftMailerBasedMailer.php    | 19 ++---
 lib/Core/Mailer/SymfonyMailerBasedMailer.php  |  5 +-
 lib/Core/Mapper/DomainObjectMapper.php        | 29 +++----
 lib/Core/Pagination/BaseAdapter.php           | 10 +--
 ...rmationCollectionCollectionListAdapter.php |  5 +-
 ...nCollectionCollectionListSearchAdapter.php |  5 +-
 .../InformationCollectionContentsAdapter.php  |  5 +-
 .../View/InformationCollectionAdminView.php   | 36 ++-------
 .../Anonymizer/AnonymizerService.php          | 15 +---
 .../Anonymizer/AnonymizerServiceFacade.php    | 15 +---
 .../Anonymizer/Visitor/Field/Aggregate.php    |  2 +-
 .../Anonymizer/Visitor/Field/Email.php        |  2 +-
 lib/Core/Persistence/ContentTypeUtils.php     | 10 +--
 .../FieldHandler/FieldHandlerRegistry.php     |  5 +-
 .../Persistence/Gateway/DoctrineDatabase.php  |  5 +-
 lib/Core/Service/CaptchaService.php           | 15 +---
 lib/Core/Service/ExporterService.php          | 15 +---
 .../Service/InformationCollectionService.php  | 40 +++-------
 lib/Doctrine/Entity/EzInfoCollection.php      | 40 +++-------
 .../Entity/EzInfoCollectionAttribute.php      | 54 ++++---------
 lib/Handler.php                               | 19 ++---
 tests/old/Action/ActionRegistryTest.php       | 76 ++++---------------
 tests/old/Action/AutoResponderActionTest.php  | 21 ++---
 tests/old/Action/DatabaseActionTest.php       | 51 +++----------
 tests/old/Action/EmailActionTest.php          | 23 ++----
 .../InformationCollectionControllerTest.php   | 41 +++-------
 .../Entity/EzInfoCollectionAttributeTest.php  |  5 +-
 tests/old/Entity/EzInfoCollectionTest.php     |  5 +-
 tests/old/Event/InformationCollectedTest.php  |  5 +-
 .../Factory/AutoResponderDataFactoryTest.php  | 69 +++++------------
 tests/old/Factory/EmailDataFactoryTest.php    | 51 +++----------
 tests/old/Factory/FieldDataFactoryTest.php    | 13 +---
 .../Custom/CheckboxFieldHandlerTest.php       |  5 +-
 .../Custom/DateAndTimeFieldHandlerTest.php    | 10 +--
 .../Custom/DateFieldHandlerTest.php           | 10 +--
 .../Custom/FloatFieldHandlerTest.php          |  5 +-
 .../Custom/IntegerFieldHandlerTest.php        |  5 +-
 .../Custom/TimeFieldHandlerTest.php           | 15 +---
 .../FieldHandler/FieldHandlerRegistryTest.php | 20 ++---
 tests/old/Form/Builder/FormBuilderTest.php    | 34 +++------
 .../InformationCollectedListenerTest.php      | 13 +---
 tests/old/Mailer/MailerTest.php               | 14 ++--
 tests/old/Value/TemplateDataTest.php          | 26 ++-----
 97 files changed, 369 insertions(+), 1156 deletions(-)

diff --git a/bundle/Command/DataAnonymizerCommand.php b/bundle/Command/DataAnonymizerCommand.php
index 2d3f6fc1..f1e682e4 100644
--- a/bundle/Command/DataAnonymizerCommand.php
+++ b/bundle/Command/DataAnonymizerCommand.php
@@ -19,15 +19,9 @@ class DataAnonymizerCommand extends Command
 {
     protected static $defaultName = 'nginfocollector:anonymize';
 
-    /**
-     * @var \Netgen\InformationCollection\Core\Persistence\Anonymizer\AnonymizerServiceFacade
-     */
-    protected $anonymizer;
+    protected AnonymizerServiceFacade $anonymizer;
 
-    /**
-     * @var \DateInterval
-     */
-    protected $period;
+    protected DateInterval $period;
 
     public function __construct(AnonymizerServiceFacade $anonymizerServiceFacade)
     {
@@ -122,7 +116,7 @@ protected function displayHelp(InputInterface $input, OutputInterface $output):
         $help = new HelpCommand();
         $help->setCommand($this);
 
-        return $help->run($input, $output);
+        $help->run($input, $output);
     }
 
     protected function getFields(InputInterface $input): array
diff --git a/bundle/Controller/Admin/AdminController.php b/bundle/Controller/Admin/AdminController.php
index 2e469a20..b211c2f2 100644
--- a/bundle/Controller/Admin/AdminController.php
+++ b/bundle/Controller/Admin/AdminController.php
@@ -28,30 +28,15 @@
 
 class AdminController extends Controller
 {
-    /**
-     * @var \Netgen\InformationCollection\API\Service\InformationCollection
-     */
-    protected $service;
+    protected InformationCollection $service;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\ContentService
-     */
-    protected $contentService;
+    protected ContentService $contentService;
 
-    /**
-     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
-     */
-    protected $configResolver;
+    protected ConfigResolverInterface $configResolver;
 
-    /**
-     * @var \Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer
-     */
-    protected $anonymizer;
+    protected Anonymizer $anonymizer;
 
-    /**
-     * @var \Symfony\Contracts\Translation\TranslatorInterface
-     */
-    private $translator;
+    private TranslatorInterface $translator;
 
     public function __construct(
         InformationCollection $service,
diff --git a/bundle/Controller/Admin/Export/Export.php b/bundle/Controller/Admin/Export/Export.php
index 41b113ea..4098edf5 100644
--- a/bundle/Controller/Admin/Export/Export.php
+++ b/bundle/Controller/Admin/Export/Export.php
@@ -14,20 +14,11 @@
 
 final class Export extends AbstractController
 {
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\ContentService
-     */
-    protected $contentService;
+    protected ContentService $contentService;
 
-    /**
-     * @var \Netgen\InformationCollection\API\Service\Exporter
-     */
-    protected $exporter;
+    protected Exporter $exporter;
 
-    /**
-     * @var \Netgen\InformationCollection\Core\Export\ExportResponseFormatterRegistry
-     */
-    protected $formatterRegistry;
+    protected ExportResponseFormatterRegistry $formatterRegistry;
 
     public function __construct(
         ContentService $contentService,
diff --git a/bundle/Controller/Admin/TreeController.php b/bundle/Controller/Admin/TreeController.php
index 2bafc58b..0d57243f 100644
--- a/bundle/Controller/Admin/TreeController.php
+++ b/bundle/Controller/Admin/TreeController.php
@@ -14,20 +14,11 @@
 
 class TreeController extends Controller
 {
-    /**
-     * @var \Symfony\Contracts\Translation\TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
-    /**
-     * @var \Symfony\Component\Routing\RouterInterface
-     */
-    protected $router;
+    protected RouterInterface $router;
 
-    /**
-     * @var \Netgen\InformationCollection\API\Service\InformationCollection
-     */
-    protected $service;
+    protected InformationCollection $service;
 
     public function __construct(
         InformationCollection $service,
diff --git a/bundle/DataCollector/InformationCollectionCollector.php b/bundle/DataCollector/InformationCollectionCollector.php
index a0c30aba..3dc9e628 100644
--- a/bundle/DataCollector/InformationCollectionCollector.php
+++ b/bundle/DataCollector/InformationCollectionCollector.php
@@ -14,15 +14,9 @@
 
 class InformationCollectionCollector extends DataCollector
 {
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Repository
-     */
-    private $repository;
-
-    /**
-     * @var \Ibexa\Core\Helper\TranslationHelper
-     */
-    private $translationHelper;
+    private Repository $repository;
+
+    private TranslationHelper $translationHelper;
 
     public function __construct(Repository $repository, TranslationHelper $translationHelper)
     {
diff --git a/bundle/Form/CaptchaType.php b/bundle/Form/CaptchaType.php
index 9d3ff692..43de5d84 100644
--- a/bundle/Form/CaptchaType.php
+++ b/bundle/Form/CaptchaType.php
@@ -11,10 +11,7 @@
 
 class CaptchaType extends AbstractType
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Listener\CaptchaValidationListener
-     */
-    private $validationListener;
+    private CaptchaValidationListener $validationListener;
 
     public function __construct(CaptchaValidationListener $validationListener)
     {
diff --git a/bundle/Form/ExportType.php b/bundle/Form/ExportType.php
index aa23db43..4b6d3bf5 100644
--- a/bundle/Form/ExportType.php
+++ b/bundle/Form/ExportType.php
@@ -24,10 +24,7 @@
 
 class ExportType extends AbstractType implements DataMapperInterface
 {
-    /**
-     * @var \Netgen\InformationCollection\Core\Export\ExportResponseFormatterRegistry
-     */
-    protected $exportResponseFormatterRegistry;
+    protected ExportResponseFormatterRegistry $exportResponseFormatterRegistry;
 
     public function __construct(ExportResponseFormatterRegistry $exportResponseFormatterRegistry)
     {
diff --git a/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php b/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php
index dfcf62f8..bbd4ca97 100644
--- a/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php
+++ b/bundle/Ibexa/Admin/EventListener/SetPageLayoutListener.php
@@ -12,25 +12,16 @@
 
 class SetPageLayoutListener implements EventSubscriberInterface
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Templating\Twig\AdminGlobalVariable
-     */
-    protected $globalVariable;
+    protected AdminGlobalVariable $globalVariable;
 
-    /**
-     * @var string
-     */
-    protected $pageLayoutTemplate;
+    protected string $pageLayoutTemplate;
 
-    /**
-     * @var array
-     */
-    protected $groupsBySiteAccess;
+    protected array $groupsBySiteAccess;
 
     public function __construct(
         AdminGlobalVariable $adminGlobalVariable,
         array $groupsBySiteAccess,
-        $pageLayoutTemplate
+        string $pageLayoutTemplate
     ) {
         $this->globalVariable = $adminGlobalVariable;
         $this->pageLayoutTemplate = $pageLayoutTemplate;
diff --git a/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php b/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php
index 9a87d811..e63e6c4f 100644
--- a/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionFieldType.php
@@ -15,10 +15,7 @@
 
 class InformationCollectionFieldType extends AbstractType
 {
-    /**
-     * @var \Ibexa\ContentForms\FieldType\FieldTypeFormMapperDispatcherInterface
-     */
-    private $fieldTypeFormMapper;
+    private FieldTypeFormMapperDispatcherInterface $fieldTypeFormMapper;
 
     public function __construct(FieldTypeFormMapperDispatcherInterface $fieldTypeFormMapper)
     {
diff --git a/bundle/Ibexa/ContentForms/InformationCollectionType.php b/bundle/Ibexa/ContentForms/InformationCollectionType.php
index 98b4f213..9cc74d4b 100644
--- a/bundle/Ibexa/ContentForms/InformationCollectionType.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionType.php
@@ -21,10 +21,7 @@ class InformationCollectionType extends AbstractType implements DataMapperInterf
 {
     public const FORM_BLOCK_PREFIX = 'information_collection';
 
-    /**
-     * @var \Netgen\InformationCollection\API\Service\CaptchaService
-     */
-    private $captchaService;
+    private CaptchaService $captchaService;
 
     public function __construct(CaptchaService $captchaService)
     {
diff --git a/bundle/Listener/CaptchaValidationListener.php b/bundle/Listener/CaptchaValidationListener.php
index 9048eb0b..1e04b8d6 100644
--- a/bundle/Listener/CaptchaValidationListener.php
+++ b/bundle/Listener/CaptchaValidationListener.php
@@ -15,20 +15,11 @@
 
 class CaptchaValidationListener implements EventSubscriberInterface
 {
-    /**
-     * @var \Symfony\Component\HttpFoundation\RequestStack
-     */
-    private $requestStack;
+    private RequestStack $requestStack;
 
-    /**
-     * @var \Netgen\InformationCollection\Core\Service\CaptchaService
-     */
-    private $captchaService;
+    private CaptchaService $captchaService;
 
-    /**
-     * @var \Symfony\Contracts\Translation\TranslatorInterface
-     */
-    private $translator;
+    private TranslatorInterface $translator;
 
     public function __construct(RequestStack $requestStack, CaptchaService $captchaService, TranslatorInterface $translator)
     {
diff --git a/bundle/Listener/InformationCollectedListener.php b/bundle/Listener/InformationCollectedListener.php
index 745b238c..44c362be 100644
--- a/bundle/Listener/InformationCollectedListener.php
+++ b/bundle/Listener/InformationCollectedListener.php
@@ -11,10 +11,7 @@
 
 class InformationCollectedListener implements EventSubscriberInterface
 {
-    /**
-     * @var ActionRegistry
-     */
-    protected $actionAggregate;
+    protected ActionRegistry $actionAggregate;
 
     public function __construct(ActionRegistry $actionAggregate)
     {
diff --git a/bundle/ParamConverter/CollectionParamConverter.php b/bundle/ParamConverter/CollectionParamConverter.php
index 2e48e629..ded5413b 100644
--- a/bundle/ParamConverter/CollectionParamConverter.php
+++ b/bundle/ParamConverter/CollectionParamConverter.php
@@ -12,10 +12,7 @@
 
 final class CollectionParamConverter implements ParamConverterInterface
 {
-    /**
-     * @var InformationCollection
-     */
-    protected $informationCollection;
+    protected InformationCollection $informationCollection;
 
     public function __construct(InformationCollection $informationCollection)
     {
diff --git a/bundle/Templating/Twig/AdminGlobalVariable.php b/bundle/Templating/Twig/AdminGlobalVariable.php
index 22940f94..88229fc7 100644
--- a/bundle/Templating/Twig/AdminGlobalVariable.php
+++ b/bundle/Templating/Twig/AdminGlobalVariable.php
@@ -8,15 +8,9 @@
 
 class AdminGlobalVariable
 {
-    /**
-     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
-     */
-    protected $configResolver;
+    protected ConfigResolverInterface $configResolver;
 
-    /**
-     * @var string|null
-     */
-    protected $pageLayoutTemplate;
+    protected ?string $pageLayoutTemplate;
 
     public function __construct(ConfigResolverInterface $configResolver)
     {
diff --git a/bundle/Templating/Twig/Extensions/CaptchaRuntime.php b/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
index 8bb1bb54..c45934cb 100644
--- a/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
+++ b/bundle/Templating/Twig/Extensions/CaptchaRuntime.php
@@ -9,10 +9,7 @@
 
 class CaptchaRuntime
 {
-    /**
-     * @var \Netgen\InformationCollection\API\Service\CaptchaService
-     */
-    protected $captcha;
+    protected CaptchaService $captcha;
 
     public function __construct(CaptchaService $captcha)
     {
diff --git a/bundle/Templating/Twig/Extensions/FieldRenderingRuntime.php b/bundle/Templating/Twig/Extensions/FieldRenderingRuntime.php
index 889203dc..71c955c7 100644
--- a/bundle/Templating/Twig/Extensions/FieldRenderingRuntime.php
+++ b/bundle/Templating/Twig/Extensions/FieldRenderingRuntime.php
@@ -14,15 +14,9 @@ class FieldRenderingRuntime
 {
     public const FIELD_VIEW_SUFFIX = '_field';
 
-    /**
-     * @var \Twig\Environment
-     */
-    protected $environment;
-
-    /**
-     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
-     */
-    protected $configResolver;
+    protected Environment $environment;
+
+    protected ConfigResolverInterface $configResolver;
 
     public function __construct(Environment $environment, ConfigResolverInterface $configResolver)
     {
diff --git a/doc/cookbook/override_something_on_form.rst b/doc/cookbook/override_something_on_form.rst
index 36aa6ef1..4e266eee 100644
--- a/doc/cookbook/override_something_on_form.rst
+++ b/doc/cookbook/override_something_on_form.rst
@@ -20,10 +20,7 @@ How to override something on info collector form
 
     final class InvoiceNumberFormExtension extends AbstractTypeExtension
     {
-        /**
-         * @var \Symfony\Component\HttpFoundation\RequestStack
-         */
-        private $requestStack;
+        private RequestStack $requestStack;
 
         public function __construct(RequestStack $requestStack)
         {
diff --git a/lib/API/Value/Attribute.php b/lib/API/Value/Attribute.php
index 1b05859a..6e9010f8 100644
--- a/lib/API/Value/Attribute.php
+++ b/lib/API/Value/Attribute.php
@@ -9,25 +9,13 @@
 
 final class Attribute extends ValueObject
 {
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Field
-     */
-    protected $field;
+    protected Field $field;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition
-     */
-    protected $fieldDefinition;
+    protected FieldDefinition $fieldDefinition;
 
-    /**
-     * @var int
-     */
-    protected $id;
+    protected int $id;
 
-    /**
-     * @var \Netgen\InformationCollection\API\Value\AttributeValue
-     */
-    protected $value;
+    protected AttributeValue $value;
 
     public function __construct(
         int $id,
diff --git a/lib/API/Value/AttributeValue.php b/lib/API/Value/AttributeValue.php
index 7ea78b8c..66bd5a9b 100644
--- a/lib/API/Value/AttributeValue.php
+++ b/lib/API/Value/AttributeValue.php
@@ -6,20 +6,11 @@
 
 class AttributeValue extends ValueObject
 {
-    /**
-     * @var int
-     */
-    protected $dataInt;
-
-    /**
-     * @var float
-     */
-    protected $dataFloat;
-
-    /**
-     * @var string
-     */
-    protected $dataText;
+    protected int $dataInt;
+
+    protected float $dataFloat;
+
+    protected string $dataText;
 
     public function __construct(int $dataInt, float $dataFloat, string $dataText)
     {
diff --git a/lib/API/Value/Captcha/ReCaptcha.php b/lib/API/Value/Captcha/ReCaptcha.php
index 52cbe47f..76ce56c2 100644
--- a/lib/API/Value/Captcha/ReCaptcha.php
+++ b/lib/API/Value/Captcha/ReCaptcha.php
@@ -11,10 +11,7 @@
 
 class ReCaptcha implements CaptchaValue
 {
-    /**
-     * @var \ReCaptcha\ReCaptcha
-     */
-    protected $reCaptcha;
+    protected BaseReCaptcha $reCaptcha;
 
     public function __construct(BaseReCaptcha $reCaptcha)
     {
diff --git a/lib/API/Value/Collection.php b/lib/API/Value/Collection.php
index 22f4abf0..975f6789 100644
--- a/lib/API/Value/Collection.php
+++ b/lib/API/Value/Collection.php
@@ -10,35 +10,20 @@
 
 final class Collection extends ValueObject
 {
-    /**
-     * @var int
-     */
-    protected $id;
+    protected int $id;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content
-     */
-    protected $content;
+    protected Content $content;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\User\User
-     */
-    protected $creator;
+    protected User $creator;
 
-    /**
-     * @var \DateTimeInterface
-     */
-    protected $created;
+    protected DateTimeInterface $created;
 
-    /**
-     * @var \DateTimeInterface
-     */
-    protected $modified;
+    protected DateTimeInterface $modified;
 
     /**
      * @var \Netgen\InformationCollection\API\Value\Attribute[]
      */
-    protected $attributes;
+    protected array $attributes;
 
     public function __construct(int $id, Content $content, User $creator, DateTimeInterface $created, DateTimeInterface $modified, array $attributes)
     {
diff --git a/lib/API/Value/Collections.php b/lib/API/Value/Collections.php
index 5cc12ed2..4a8bb7f1 100644
--- a/lib/API/Value/Collections.php
+++ b/lib/API/Value/Collections.php
@@ -9,12 +9,9 @@ class Collections extends ValueObject
     /**
      * @var \Netgen\InformationCollection\API\Value\Collection[]
      */
-    protected $collections;
+    protected array $collections;
 
-    /**
-     * @var int
-     */
-    protected $count;
+    protected int $count;
 
     public function __construct(array $collections, int $count)
     {
diff --git a/lib/API/Value/Content.php b/lib/API/Value/Content.php
index 442692f8..c4875090 100644
--- a/lib/API/Value/Content.php
+++ b/lib/API/Value/Content.php
@@ -9,35 +9,17 @@
 
 final class Content extends ValueObject
 {
-    /**
-     * @var bool
-     */
-    protected $hasLocation;
-
-    /**
-     * @var APIContent
-     */
-    protected $content;
-
-    /**
-     * @var ContentType
-     */
-    protected $contentType;
-
-    /**
-     * @var Collection
-     */
-    protected $firstCollection;
-
-    /**
-     * @var Collection
-     */
-    protected $lastCollection;
-
-    /**
-     * @var int
-     */
-    protected $childCount;
+    protected bool $hasLocation;
+
+    protected APIContent $content;
+
+    protected ContentType $contentType;
+
+    protected Collection $firstCollection;
+
+    protected Collection $lastCollection;
+
+    protected int $childCount;
 
     public function __construct(
         APIContent $content,
diff --git a/lib/API/Value/ContentsWithCollections.php b/lib/API/Value/ContentsWithCollections.php
index 5b3aff0c..49cd39b8 100644
--- a/lib/API/Value/ContentsWithCollections.php
+++ b/lib/API/Value/ContentsWithCollections.php
@@ -9,12 +9,9 @@ class ContentsWithCollections extends ValueObject
     /**
      * @var \Netgen\InformationCollection\API\Value\Content[]
      */
-    protected $contents;
+    protected array $contents;
 
-    /**
-     * @var int
-     */
-    protected $count;
+    protected int $count;
 
     public function __construct(array $contents, int $count)
     {
diff --git a/lib/API/Value/DataTransfer/AdditionalContent.php b/lib/API/Value/DataTransfer/AdditionalContent.php
index 0014c86a..c2817307 100644
--- a/lib/API/Value/DataTransfer/AdditionalContent.php
+++ b/lib/API/Value/DataTransfer/AdditionalContent.php
@@ -9,10 +9,7 @@
 
 class AdditionalContent extends ValueObject
 {
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content|null
-     */
-    protected $content;
+    protected ?Content $content;
 
     public function __construct(?Content $content = null)
     {
diff --git a/lib/API/Value/DataTransfer/EmailContent.php b/lib/API/Value/DataTransfer/EmailContent.php
index 07d11a49..ff6b74a2 100644
--- a/lib/API/Value/DataTransfer/EmailContent.php
+++ b/lib/API/Value/DataTransfer/EmailContent.php
@@ -8,30 +8,18 @@
 
 class EmailContent extends ValueObject
 {
-    /**
-     * @var array
-     */
-    protected $recipients;
+    protected array $recipients;
 
-    /**
-     * @var string
-     */
-    protected $subject;
+    protected string $subject;
 
-    /**
-     * @var array
-     */
-    protected $sender;
+    protected array $sender;
 
-    /**
-     * @var string
-     */
-    protected $body;
+    protected string $body;
 
     /**
      * @var \Ibexa\Core\FieldType\BinaryFile\Value[]
      */
-    protected $attachments = [];
+    protected array $attachments = [];
 
     /**
      * @param \Ibexa\Core\FieldType\BinaryFile\Value[] $attachments
diff --git a/lib/API/Value/DataTransfer/TemplateContent.php b/lib/API/Value/DataTransfer/TemplateContent.php
index 5bba3c36..68a62086 100644
--- a/lib/API/Value/DataTransfer/TemplateContent.php
+++ b/lib/API/Value/DataTransfer/TemplateContent.php
@@ -11,15 +11,9 @@
 
 class TemplateContent extends ValueObject
 {
-    /**
-     * @var \Netgen\InformationCollection\API\Value\Event\InformationCollected
-     */
-    protected $event;
-
-    /**
-     * @var \Twig\TemplateWrapper
-     */
-    protected $templateWrapper;
+    protected InformationCollected $event;
+
+    protected TemplateWrapper $templateWrapper;
 
     public function __construct(InformationCollected $event, TemplateWrapper $templateWrapper)
     {
diff --git a/lib/API/Value/Event/InformationCollected.php b/lib/API/Value/Event/InformationCollected.php
index 10624f90..376ff389 100644
--- a/lib/API/Value/Event/InformationCollected.php
+++ b/lib/API/Value/Event/InformationCollected.php
@@ -13,20 +13,9 @@
 
 final class InformationCollected extends Event
 {
-    /**
-     * @var \Netgen\InformationCollection\API\Value\InformationCollectionStruct
-     */
-    protected $struct;
+    protected InformationCollectionStruct $struct;
 
-    /**
-     * @var array
-     */
-    protected $options;
-
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location
-     */
-    protected $location;
+    protected array $options;
 
     public function __construct(
         InformationCollectionStruct $struct,
diff --git a/lib/API/Value/Export/Export.php b/lib/API/Value/Export/Export.php
index 2eca1de9..b6d6c9f6 100644
--- a/lib/API/Value/Export/Export.php
+++ b/lib/API/Value/Export/Export.php
@@ -8,15 +8,9 @@
 
 class Export extends ValueObject
 {
-    /**
-     * @var array
-     */
-    protected $header;
-
-    /**
-     * @var array
-     */
-    protected $contents;
+    protected array $header;
+
+    protected array $contents;
 
     public function __construct(array $header, array $contents)
     {
diff --git a/lib/API/Value/Export/ExportCriteria.php b/lib/API/Value/Export/ExportCriteria.php
index c0d02ec8..0fc12c2b 100644
--- a/lib/API/Value/Export/ExportCriteria.php
+++ b/lib/API/Value/Export/ExportCriteria.php
@@ -10,10 +10,7 @@
 
 final class ExportCriteria extends FilterCriteria
 {
-    /**
-     * @var string
-     */
-    protected $exportIdentifier;
+    protected string $exportIdentifier;
 
     public function __construct(ContentId $contentId, DateTimeInterface $from, DateTimeInterface $to, string $exportIdentifier)
     {
diff --git a/lib/API/Value/Filter/CollectionFields.php b/lib/API/Value/Filter/CollectionFields.php
index 4b428996..979d9a5f 100644
--- a/lib/API/Value/Filter/CollectionFields.php
+++ b/lib/API/Value/Filter/CollectionFields.php
@@ -6,20 +6,11 @@
 
 final class CollectionFields
 {
-    /**
-     * @var int
-     */
-    private $contentId;
-
-    /**
-     * @var int
-     */
-    private $collectionId;
-
-    /**
-     * @var array
-     */
-    private $fields;
+    private int $contentId;
+
+    private int $collectionId;
+
+    private array $fields;
 
     public function __construct(int $contentId, int $collectionId, array $fields)
     {
diff --git a/lib/API/Value/Filter/CollectionId.php b/lib/API/Value/Filter/CollectionId.php
index c3a5d2e6..7775001c 100644
--- a/lib/API/Value/Filter/CollectionId.php
+++ b/lib/API/Value/Filter/CollectionId.php
@@ -6,10 +6,7 @@
 
 final class CollectionId
 {
-    /**
-     * @var int
-     */
-    private $id;
+    private int $id;
 
     public function __construct(int $id)
     {
diff --git a/lib/API/Value/Filter/Collections.php b/lib/API/Value/Filter/Collections.php
index 8606c12d..12371a4b 100644
--- a/lib/API/Value/Filter/Collections.php
+++ b/lib/API/Value/Filter/Collections.php
@@ -6,15 +6,9 @@
 
 final class Collections
 {
-    /**
-     * @var array
-     */
-    private $collections;
+    private array $collections;
 
-    /**
-     * @var int
-     */
-    private $contentId;
+    private int $contentId;
 
     public function __construct(int $contentId, array $collections)
     {
diff --git a/lib/API/Value/Filter/ContentId.php b/lib/API/Value/Filter/ContentId.php
index b5f50b7a..1f6ca159 100644
--- a/lib/API/Value/Filter/ContentId.php
+++ b/lib/API/Value/Filter/ContentId.php
@@ -6,10 +6,7 @@
 
 final class ContentId extends Query
 {
-    /**
-     * @var int
-     */
-    protected $id;
+    protected int $id;
 
     public function __construct(int $id, int $offset, int $limit)
     {
diff --git a/lib/API/Value/Filter/Contents.php b/lib/API/Value/Filter/Contents.php
index 7f79ad99..8ddfe857 100644
--- a/lib/API/Value/Filter/Contents.php
+++ b/lib/API/Value/Filter/Contents.php
@@ -6,10 +6,7 @@
 
 class Contents
 {
-    /**
-     * @var array
-     */
-    protected $contents;
+    protected array $contents;
 
     public function __construct(array $contents)
     {
diff --git a/lib/API/Value/Filter/FilterCriteria.php b/lib/API/Value/Filter/FilterCriteria.php
index 5ea61695..90c08cc1 100644
--- a/lib/API/Value/Filter/FilterCriteria.php
+++ b/lib/API/Value/Filter/FilterCriteria.php
@@ -9,20 +9,11 @@
 
 class FilterCriteria extends ValueObject
 {
-    /**
-     * @var \DateTimeInterface
-     */
-    protected $from;
-
-    /**
-     * @var \DateTimeInterface
-     */
-    protected $to;
-
-    /**
-     * @var \Netgen\InformationCollection\API\Value\Filter\ContentId
-     */
-    protected $contentId;
+    protected DateTimeInterface $from;
+
+    protected DateTimeInterface $to;
+
+    protected ContentId $contentId;
 
     public function __construct(ContentId $contentId, DateTimeInterface $from, DateTimeInterface $to)
     {
diff --git a/lib/API/Value/Filter/Query.php b/lib/API/Value/Filter/Query.php
index 24afeb39..07adf752 100644
--- a/lib/API/Value/Filter/Query.php
+++ b/lib/API/Value/Filter/Query.php
@@ -8,19 +8,9 @@
 
 class Query extends ValueObject
 {
-    /**
-     * Search limit.
-     *
-     * @var int
-     */
-    protected $limit = 10;
-
-    /**
-     * Search offset.
-     *
-     * @var int
-     */
-    protected $offset = 0;
+    protected int $limit;
+
+    protected int $offset;
 
     public function __construct(int $offset, int $limit)
     {
diff --git a/lib/API/Value/Filter/SearchQuery.php b/lib/API/Value/Filter/SearchQuery.php
index fdafef87..c5f50eb2 100644
--- a/lib/API/Value/Filter/SearchQuery.php
+++ b/lib/API/Value/Filter/SearchQuery.php
@@ -6,15 +6,9 @@
 
 class SearchQuery extends Query
 {
-    /**
-     * @var int
-     */
-    protected $contentId;
-
-    /**
-     * @var string
-     */
-    protected $searchText;
+    protected int $contentId;
+
+    protected string $searchText;
 
     public function __construct(int $contentId, string $searchText, int $offset, int $limit)
     {
diff --git a/lib/API/Value/InformationCollectionStruct.php b/lib/API/Value/InformationCollectionStruct.php
index bfc62da4..e19615fe 100644
--- a/lib/API/Value/InformationCollectionStruct.php
+++ b/lib/API/Value/InformationCollectionStruct.php
@@ -13,30 +13,19 @@ final class InformationCollectionStruct extends ValueObject
 {
     /**
      * The language code of the version.
-     *
-     * @var string
      */
-    protected $languageCode;
+    protected string $languageCode;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content
-     */
-    protected $content;
+    protected Content $content;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
-     */
-    protected $contentType;
+    protected ContentType $contentType;
 
     /**
      * @var \Ibexa\Contracts\ContentForms\Data\Content\FieldData[]
      */
-    protected $fields;
+    protected array $fields;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location
-     */
-    private $location;
+    private Location $location;
 
     public function __construct(Content $content, Location $location, ContentType $contentType, array $fields)
     {
diff --git a/lib/API/Value/Legacy/FieldValue.php b/lib/API/Value/Legacy/FieldValue.php
index d05e280b..09ce1d7d 100644
--- a/lib/API/Value/Legacy/FieldValue.php
+++ b/lib/API/Value/Legacy/FieldValue.php
@@ -8,27 +8,13 @@
 
 class FieldValue extends ValueObject
 {
-    /**
-     * @var int
-     *
-     * previous $contentClassAttributeId
-     */
-    protected $fieldDefinitionId;
+    protected int $fieldDefinitionId;
 
-    /**
-     * @var float
-     */
-    protected $dataFloat = 0.0;
+    protected float $dataFloat;
 
-    /**
-     * @var int
-     */
-    protected $dataInt = 0;
+    protected int $dataInt;
 
-    /**
-     * @var string
-     */
-    protected $dataText = '';
+    protected string $dataText;
 
     public function __construct(int $fieldDefinitionId, string $dataText, int $dataInt = 0, float $dataFloat = 0.0)
     {
diff --git a/lib/API/Value/ObjectCount.php b/lib/API/Value/ObjectCount.php
index 72dd509c..61f2bae6 100644
--- a/lib/API/Value/ObjectCount.php
+++ b/lib/API/Value/ObjectCount.php
@@ -6,7 +6,7 @@
 
 class ObjectCount extends ValueObject
 {
-    protected $count;
+    protected int $count;
 
     public function __construct(int $count)
     {
diff --git a/lib/Core/Action/ActionRegistry.php b/lib/Core/Action/ActionRegistry.php
index 59b4d4a7..665e57a7 100644
--- a/lib/Core/Action/ActionRegistry.php
+++ b/lib/Core/Action/ActionRegistry.php
@@ -14,30 +14,15 @@
 
 final class ActionRegistry implements ActionInterface
 {
-    /**
-     * @var array
-     */
-    private $actions;
+    private iterable $actions;
 
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    private $logger;
+    private LoggerInterface $logger;
 
-    /**
-     * @var bool
-     */
-    private $debug = false;
+    private bool $debug = false;
 
-    /**
-     * @var \Netgen\InformationCollection\Core\Action\ConfigurationUtility
-     */
-    private $utility;
+    private ConfigurationUtility $utility;
 
-    /**
-     * @var EventDispatcherInterface
-     */
-    private $eventDispatcher;
+    private EventDispatcherInterface $eventDispatcher;
 
     public function __construct(iterable $actions, ConfigurationUtility $utility, LoggerInterface $logger, EventDispatcherInterface $eventDispatcher)
     {
diff --git a/lib/Core/Action/BaseEmailAction.php b/lib/Core/Action/BaseEmailAction.php
index cf6286c2..d032c64d 100644
--- a/lib/Core/Action/BaseEmailAction.php
+++ b/lib/Core/Action/BaseEmailAction.php
@@ -12,15 +12,9 @@
 
 abstract class BaseEmailAction implements ActionInterface
 {
-    /**
-     * @var \Netgen\InformationCollection\API\MailerInterface
-     */
-    protected $mailer;
-
-    /**
-     * @var \Netgen\InformationCollection\Core\Factory\BaseEmailDataFactory
-     */
-    protected $factory;
+    protected MailerInterface $mailer;
+
+    protected BaseEmailDataFactory $factory;
 
     public function __construct(MailerInterface $mailer, BaseEmailDataFactory $factory)
     {
diff --git a/lib/Core/Action/ConfigurationUtility.php b/lib/Core/Action/ConfigurationUtility.php
index 26cda1f2..5beb6e92 100644
--- a/lib/Core/Action/ConfigurationUtility.php
+++ b/lib/Core/Action/ConfigurationUtility.php
@@ -13,15 +13,9 @@
 
 final class ConfigurationUtility
 {
-    /**
-     * @var array
-     */
-    private $actionsdConfiguration;
+    private array $actionsdConfiguration;
 
-    /**
-     * @var array
-     */
-    private $singleActionConfiguration;
+    private array $singleActionConfiguration;
 
     public function __construct(ConfigResolverInterface $configResolver)
     {
diff --git a/lib/Core/Action/DatabaseAction.php b/lib/Core/Action/DatabaseAction.php
index ff4c91b7..78b9fcbf 100644
--- a/lib/Core/Action/DatabaseAction.php
+++ b/lib/Core/Action/DatabaseAction.php
@@ -15,10 +15,7 @@ final class DatabaseAction implements ActionInterface, CrucialActionInterface
 {
     public static $defaultName = 'database';
 
-    /**
-     * @var InformationCollection
-     */
-    private $informationCollection;
+    private InformationCollection $informationCollection;
 
     public function __construct(InformationCollection $informationCollection)
     {
diff --git a/lib/Core/Action/Identifier.php b/lib/Core/Action/Identifier.php
index afef5088..a5afba35 100644
--- a/lib/Core/Action/Identifier.php
+++ b/lib/Core/Action/Identifier.php
@@ -11,10 +11,7 @@
 
 final class Identifier
 {
-    /**
-     * @var string
-     */
-    private $classConstant;
+    private string $classConstant;
 
     public function __construct(ActionInterface $action)
     {
diff --git a/lib/Core/EmailDataProvider/AbstractProvider.php b/lib/Core/EmailDataProvider/AbstractProvider.php
index 48114f9d..26bc7c62 100644
--- a/lib/Core/EmailDataProvider/AbstractProvider.php
+++ b/lib/Core/EmailDataProvider/AbstractProvider.php
@@ -13,25 +13,13 @@
 
 abstract class AbstractProvider implements EmailDataProviderInterface
 {
-    /**
-     * @var array
-     */
-    protected $configResolver;
-
-    /**
-     * @var \Ibexa\Core\Helper\TranslationHelper
-     */
-    protected $translationHelper;
-
-    /**
-     * @var \Ibexa\Core\Helper\FieldHelper
-     */
-    protected $fieldHelper;
-
-    /**
-     * @var \Twig\Environment
-     */
-    protected $twig;
+    protected ConfigResolverInterface $configResolver;
+
+    protected TranslationHelper $translationHelper;
+
+    protected FieldHelper $fieldHelper;
+
+    protected Environment $twig;
 
     public function __construct(
         ConfigResolverInterface $configResolver,
diff --git a/lib/Core/EmailDataProvider/DefaultProvider.php b/lib/Core/EmailDataProvider/DefaultProvider.php
index eafdd13d..f4d754f6 100644
--- a/lib/Core/EmailDataProvider/DefaultProvider.php
+++ b/lib/Core/EmailDataProvider/DefaultProvider.php
@@ -18,25 +18,13 @@
 
 class DefaultProvider implements EmailDataProviderInterface
 {
-    /**
-     * @var array
-     */
-    protected $configResolver;
+    protected ConfigResolverInterface $configResolver;
 
-    /**
-     * @var \Ibexa\Core\Helper\TranslationHelper
-     */
-    protected $translationHelper;
+    protected TranslationHelper $translationHelper;
 
-    /**
-     * @var \Ibexa\Core\Helper\FieldHelper
-     */
-    protected $fieldHelper;
+    protected FieldHelper $fieldHelper;
 
-    /**
-     * @var \Twig\Environment
-     */
-    protected $twig;
+    protected Environment $twig;
 
     public function __construct(
         ConfigResolverInterface $configResolver,
diff --git a/lib/Core/Export/CsvExportResponseFormatter.php b/lib/Core/Export/CsvExportResponseFormatter.php
index 23e4236c..34b3426d 100644
--- a/lib/Core/Export/CsvExportResponseFormatter.php
+++ b/lib/Core/Export/CsvExportResponseFormatter.php
@@ -15,15 +15,9 @@
 
 final class CsvExportResponseFormatter implements ExportResponseFormatter
 {
-    /**
-     * @var \Ibexa\Core\Helper\TranslationHelper
-     */
-    private $translationHelper;
-
-    /**
-     * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
-     */
-    private $configResolver;
+    private TranslationHelper $translationHelper;
+
+    private ConfigResolverInterface $configResolver;
 
     public function __construct(TranslationHelper $translationHelper, ConfigResolverInterface $configResolver)
     {
diff --git a/lib/Core/Export/ExportResponseFormatterRegistry.php b/lib/Core/Export/ExportResponseFormatterRegistry.php
index 7434a564..a429ac3b 100644
--- a/lib/Core/Export/ExportResponseFormatterRegistry.php
+++ b/lib/Core/Export/ExportResponseFormatterRegistry.php
@@ -13,7 +13,7 @@ final class ExportResponseFormatterRegistry
     /**
      * @var \Netgen\InformationCollection\API\Export\ExportResponseFormatter[]
      */
-    private $exportResponseFormatters;
+    private array $exportResponseFormatters;
 
     /**
      * @param \Netgen\InformationCollection\API\Export\ExportResponseFormatter[] $exportResponseFormatters
diff --git a/lib/Core/Export/XlsExportResponseFormatter.php b/lib/Core/Export/XlsExportResponseFormatter.php
index a5ff4b79..52910a0d 100644
--- a/lib/Core/Export/XlsExportResponseFormatter.php
+++ b/lib/Core/Export/XlsExportResponseFormatter.php
@@ -16,10 +16,7 @@
 
 final class XlsExportResponseFormatter implements ExportResponseFormatter
 {
-    /**
-     * @var \Ibexa\Core\Helper\TranslationHelper
-     */
-    private $translationHelper;
+    private TranslationHelper $translationHelper;
 
     public function __construct(TranslationHelper $translationHelper)
     {
diff --git a/lib/Core/Export/XlsxExportResponseFormatter.php b/lib/Core/Export/XlsxExportResponseFormatter.php
index b0e95c87..9b09b586 100644
--- a/lib/Core/Export/XlsxExportResponseFormatter.php
+++ b/lib/Core/Export/XlsxExportResponseFormatter.php
@@ -17,10 +17,7 @@
 
 final class XlsxExportResponseFormatter implements ExportResponseFormatter
 {
-    /**
-     * @var \Ibexa\Core\Helper\TranslationHelper
-     */
-    private $translationHelper;
+    private TranslationHelper $translationHelper;
 
     public function __construct(TranslationHelper $translationHelper)
     {
diff --git a/lib/Core/Factory/EmailDataFactory.php b/lib/Core/Factory/EmailDataFactory.php
index 13eef06e..26d87ef8 100644
--- a/lib/Core/Factory/EmailDataFactory.php
+++ b/lib/Core/Factory/EmailDataFactory.php
@@ -27,25 +27,13 @@
 
 class EmailDataFactory extends BaseEmailDataFactory
 {
-    /**
-     * @var array
-     */
-    protected $configResolver;
+    protected ConfigResolverInterface $configResolver;
 
-    /**
-     * @var \Ibexa\Core\Helper\TranslationHelper
-     */
-    protected $translationHelper;
+    protected TranslationHelper $translationHelper;
 
-    /**
-     * @var \Ibexa\Core\Helper\FieldHelper
-     */
-    protected $fieldHelper;
+    protected FieldHelper $fieldHelper;
 
-    /**
-     * @var \Twig\Environment
-     */
-    protected $twig;
+    protected Environment $twig;
 
     public function __construct(
         ConfigResolverInterface $configResolver,
diff --git a/lib/Core/Factory/FieldDataFactory.php b/lib/Core/Factory/FieldDataFactory.php
index 28994620..c83661f1 100644
--- a/lib/Core/Factory/FieldDataFactory.php
+++ b/lib/Core/Factory/FieldDataFactory.php
@@ -13,10 +13,7 @@
 
 class FieldDataFactory
 {
-    /**
-     * @var \Netgen\InformationCollection\Core\Persistence\FieldHandler\FieldHandlerRegistry
-     */
-    protected $registry;
+    protected FieldHandlerRegistry $registry;
 
     public function __construct(FieldHandlerRegistry $registry)
     {
diff --git a/lib/Core/Mailer/SwiftMailerBasedMailer.php b/lib/Core/Mailer/SwiftMailerBasedMailer.php
index e2c719a0..21f5dc34 100644
--- a/lib/Core/Mailer/SwiftMailerBasedMailer.php
+++ b/lib/Core/Mailer/SwiftMailerBasedMailer.php
@@ -6,33 +6,34 @@
 
 use Netgen\InformationCollection\API\Exception\EmailNotSentException;
 use Netgen\InformationCollection\API\MailerInterface;
+use Swift_Attachment;
+use Swift_Mailer;
+use Swift_Message;
+use Swift_RfcComplianceException;
 use Symfony\Component\Mime\Email;
 
 class SwiftMailerBasedMailer implements MailerInterface
 {
-    /**
-     * @var \Swift_Mailer
-     */
-    protected $internalMailer;
+    protected Swift_Mailer $internalMailer;
 
-    public function __construct(\Swift_Mailer $internalMailer)
+    public function __construct(Swift_Mailer $internalMailer)
     {
         $this->internalMailer = $internalMailer;
     }
 
     public function sendEmail(Email $content): void
     {
-        $message = new \Swift_Message();
+        $message = new Swift_Message();
 
         try {
             $message->setTo($content->getFrom());
-        } catch (\Swift_RfcComplianceException $e) {
+        } catch (Swift_RfcComplianceException $e) {
             throw new EmailNotSentException('recipients', $e->getMessage());
         }
 
         try {
             $message->setFrom($data->getSender());
-        } catch (\Swift_RfcComplianceException $e) {
+        } catch (Swift_RfcComplianceException $e) {
             throw new EmailNotSentException('sender', $e->getMessage());
         }
 
@@ -41,7 +42,7 @@ public function sendEmail(Email $content): void
         if ($data->hasAttachments()) {
             foreach ($data->getAttachments() as $attachment) {
                 $message->attach(
-                    \Swift_Attachment::fromPath($attachment->inputUri, $attachment->mimeType)
+                    Swift_Attachment::fromPath($attachment->inputUri, $attachment->mimeType)
                         ->setFilename($attachment->fileName)
                 );
             }
diff --git a/lib/Core/Mailer/SymfonyMailerBasedMailer.php b/lib/Core/Mailer/SymfonyMailerBasedMailer.php
index a8ebad31..5238740d 100644
--- a/lib/Core/Mailer/SymfonyMailerBasedMailer.php
+++ b/lib/Core/Mailer/SymfonyMailerBasedMailer.php
@@ -11,10 +11,7 @@
 
 class SymfonyMailerBasedMailer implements MailerInterface
 {
-    /**
-     * @var \Symfony\Component\Mailer\MailerInterface
-     */
-    private $mailer;
+    private SfMailerInterface $mailer;
 
     public function __construct(SfMailerInterface $mailer)
     {
diff --git a/lib/Core/Mapper/DomainObjectMapper.php b/lib/Core/Mapper/DomainObjectMapper.php
index 96692ef8..950323d7 100644
--- a/lib/Core/Mapper/DomainObjectMapper.php
+++ b/lib/Core/Mapper/DomainObjectMapper.php
@@ -6,8 +6,11 @@
 
 use DateTimeImmutable;
 use DateTimeInterface;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\UserService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content as APIContent;
 use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
@@ -24,25 +27,13 @@
 
 final class DomainObjectMapper
 {
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Repository
-     */
-    private $repository;
-
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\ContentService
-     */
-    private $contentService;
-
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
-     */
-    private $contentTypeService;
-
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\UserService
-     */
-    private $userService;
+    private Repository $repository;
+
+    private ContentService $contentService;
+
+    private ContentTypeService $contentTypeService;
+
+    private UserService $userService;
 
     public function __construct(Repository $repository)
     {
diff --git a/lib/Core/Pagination/BaseAdapter.php b/lib/Core/Pagination/BaseAdapter.php
index 2ff08e39..caee458b 100644
--- a/lib/Core/Pagination/BaseAdapter.php
+++ b/lib/Core/Pagination/BaseAdapter.php
@@ -9,15 +9,9 @@
 
 abstract class BaseAdapter implements AdapterInterface
 {
-    /**
-     * @var int
-     */
-    protected $nbResults;
+    protected int $nbResults;
 
-    /**
-     * @var \Netgen\InformationCollection\API\Service\InformationCollection
-     */
-    protected $informationCollectionService;
+    protected InformationCollection $informationCollectionService;
 
     public function __construct(InformationCollection $informationCollectionService)
     {
diff --git a/lib/Core/Pagination/InformationCollectionCollectionListAdapter.php b/lib/Core/Pagination/InformationCollectionCollectionListAdapter.php
index c1a0776b..5bd00456 100644
--- a/lib/Core/Pagination/InformationCollectionCollectionListAdapter.php
+++ b/lib/Core/Pagination/InformationCollectionCollectionListAdapter.php
@@ -9,10 +9,7 @@
 
 class InformationCollectionCollectionListAdapter extends BaseAdapter
 {
-    /**
-     * @var \Netgen\InformationCollection\API\Value\Filter\ContentId
-     */
-    protected $query;
+    protected ContentId $query;
 
     public function __construct(InformationCollection $informationCollectionService, ContentId $query)
     {
diff --git a/lib/Core/Pagination/InformationCollectionCollectionListSearchAdapter.php b/lib/Core/Pagination/InformationCollectionCollectionListSearchAdapter.php
index ae4dfe62..01812c7d 100644
--- a/lib/Core/Pagination/InformationCollectionCollectionListSearchAdapter.php
+++ b/lib/Core/Pagination/InformationCollectionCollectionListSearchAdapter.php
@@ -10,10 +10,7 @@
 
 class InformationCollectionCollectionListSearchAdapter extends BaseAdapter
 {
-    /**
-     * @var \Netgen\InformationCollection\API\Value\Filter\SearchQuery
-     */
-    protected $query;
+    protected SearchQuery $query;
 
     public function __construct(InformationCollection $informationCollectionService, SearchQuery $query)
     {
diff --git a/lib/Core/Pagination/InformationCollectionContentsAdapter.php b/lib/Core/Pagination/InformationCollectionContentsAdapter.php
index 91c43acd..1f55d04e 100644
--- a/lib/Core/Pagination/InformationCollectionContentsAdapter.php
+++ b/lib/Core/Pagination/InformationCollectionContentsAdapter.php
@@ -9,10 +9,7 @@
 
 class InformationCollectionContentsAdapter extends BaseAdapter
 {
-    /**
-     * @var \Netgen\InformationCollection\API\Value\Filter\Query
-     */
-    protected $query;
+    protected Query $query;
 
     public function __construct(InformationCollection $informationCollectionService, Query $query)
     {
diff --git a/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php b/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
index 273ee845..602cb063 100644
--- a/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
+++ b/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
@@ -4,6 +4,7 @@
 
 namespace Netgen\InformationCollection\Core\Pagination\Pagerfanta\View;
 
+use Closure;
 use Pagerfanta\PagerfantaInterface;
 use Pagerfanta\View\ViewInterface;
 use Twig\Environment;
@@ -13,40 +14,19 @@
 
 class InformationCollectionAdminView implements ViewInterface
 {
-    /**
-     * @var \Twig\Environment
-     */
-    protected $twig;
+    protected Environment $twig;
 
-    /**
-     * @var string
-     */
-    protected $template;
+    protected string $template;
 
-    /**
-     * @var \Pagerfanta\Pagerfanta
-     */
-    protected $pagerfanta;
+    protected PagerfantaInterface $pagerfanta;
 
-    /**
-     * @var \Closure
-     */
-    protected $routeGenerator;
+    protected Closure $routeGenerator;
 
-    /**
-     * @var int
-     */
-    protected $proximity;
+    protected int $proximity;
 
-    /**
-     * @var int
-     */
-    protected $startPage;
+    protected int $startPage;
 
-    /**
-     * @var int
-     */
-    protected $endPage;
+    protected int $endPage;
 
     public function __construct(Environment $twig)
     {
diff --git a/lib/Core/Persistence/Anonymizer/AnonymizerService.php b/lib/Core/Persistence/Anonymizer/AnonymizerService.php
index 7769d9e4..b15f8330 100644
--- a/lib/Core/Persistence/Anonymizer/AnonymizerService.php
+++ b/lib/Core/Persistence/Anonymizer/AnonymizerService.php
@@ -16,20 +16,11 @@
 
 class AnonymizerService implements Anonymizer
 {
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Repository
-     */
-    protected $repository;
+    protected Repository $repository;
 
-    /**
-     * @var \Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor
-     */
-    protected $fieldAnonymizerVisitor;
+    protected FieldAnonymizerVisitor $fieldAnonymizerVisitor;
 
-    /**
-     * @var \Netgen\InformationCollection\API\Service\InformationCollection
-     */
-    protected $informationCollection;
+    protected InformationCollection $informationCollection;
 
     public function __construct(
         Repository $repository,
diff --git a/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php b/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php
index 4e63ac67..ee018330 100644
--- a/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php
+++ b/lib/Core/Persistence/Anonymizer/AnonymizerServiceFacade.php
@@ -13,20 +13,11 @@
 
 final class AnonymizerServiceFacade
 {
-    /**
-     * @var \Netgen\InformationCollection\API\Persistence\Anonymizer\Anonymizer
-     */
-    private $anonymizer;
+    private Anonymizer $anonymizer;
 
-    /**
-     * @var \Netgen\InformationCollection\Core\Persistence\ContentTypeUtils
-     */
-    private $contentTypeUtils;
+    private ContentTypeUtils $contentTypeUtils;
 
-    /**
-     * @var \Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionRepository
-     */
-    private $ezInfoCollectionRepository;
+    private EzInfoCollectionRepository $ezInfoCollectionRepository;
 
     public function __construct(
         Anonymizer $anonymizer,
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
index b5f4b727..eb871638 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Aggregate.php
@@ -15,7 +15,7 @@ class Aggregate extends FieldAnonymizerVisitor
     /**
      * @var \Netgen\InformationCollection\API\Persistence\Anonymizer\Visitor\FieldAnonymizerVisitor[]
      */
-    protected $visitors;
+    protected iterable $visitors;
 
     public function __construct(iterable $visitors)
     {
diff --git a/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php b/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
index bb87dce9..8b3c909b 100644
--- a/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
+++ b/lib/Core/Persistence/Anonymizer/Visitor/Field/Email.php
@@ -14,7 +14,7 @@
 
 class Email extends FieldAnonymizerVisitor
 {
-    protected $allowedCharacters = ['.', '@', '-', '+'];
+    protected array $allowedCharacters = ['.', '@', '-', '+'];
 
     public function accept(Attribute $attribute, ContentType $contentType): bool
     {
diff --git a/lib/Core/Persistence/ContentTypeUtils.php b/lib/Core/Persistence/ContentTypeUtils.php
index f4b4b945..72805a10 100644
--- a/lib/Core/Persistence/ContentTypeUtils.php
+++ b/lib/Core/Persistence/ContentTypeUtils.php
@@ -12,15 +12,9 @@
 
 final class ContentTypeUtils
 {
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
-     */
-    private $contentTypeService;
+    private ContentTypeService $contentTypeService;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\ContentService
-     */
-    private $contentService;
+    private ContentService $contentService;
 
     public function __construct(ContentTypeService $contentTypeService, ContentService $contentService)
     {
diff --git a/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php b/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
index fa4f326e..b3c0e633 100644
--- a/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
+++ b/lib/Core/Persistence/FieldHandler/FieldHandlerRegistry.php
@@ -9,10 +9,7 @@
 
 final class FieldHandlerRegistry
 {
-    /**
-     * @var array
-     */
-    private $handlers;
+    private iterable $handlers;
 
     public function __construct(iterable $handlers)
     {
diff --git a/lib/Core/Persistence/Gateway/DoctrineDatabase.php b/lib/Core/Persistence/Gateway/DoctrineDatabase.php
index ada688ad..fe431a46 100644
--- a/lib/Core/Persistence/Gateway/DoctrineDatabase.php
+++ b/lib/Core/Persistence/Gateway/DoctrineDatabase.php
@@ -9,10 +9,7 @@
 
 final class DoctrineDatabase
 {
-    /**
-     * @var \Doctrine\DBAL\Connection
-     */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
diff --git a/lib/Core/Service/CaptchaService.php b/lib/Core/Service/CaptchaService.php
index 05a6bc64..3a166031 100644
--- a/lib/Core/Service/CaptchaService.php
+++ b/lib/Core/Service/CaptchaService.php
@@ -19,20 +19,11 @@
 
 class CaptchaService implements CaptchaServiceInterface
 {
-    /**
-     * @var array
-     */
-    protected $config;
+    protected array $config;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
-     */
-    protected $contentTypeService;
+    protected ContentTypeService $contentTypeService;
 
-    /**
-     * @var ConfigResolverInterface
-     */
-    private $configResolver;
+    private ConfigResolverInterface $configResolver;
 
     public function __construct(ContentTypeService $contentTypeService, ConfigResolverInterface $configResolver)
     {
diff --git a/lib/Core/Service/ExporterService.php b/lib/Core/Service/ExporterService.php
index 13eeabaf..b2fa0513 100644
--- a/lib/Core/Service/ExporterService.php
+++ b/lib/Core/Service/ExporterService.php
@@ -19,20 +19,11 @@
 
 class ExporterService implements Exporter
 {
-    /**
-     * @var \Symfony\Contracts\Translation\TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
-    /**
-     * @var \Netgen\InformationCollection\Core\Persistence\ContentTypeUtils
-     */
-    protected $contentTypeUtils;
+    protected ContentTypeUtils $contentTypeUtils;
 
-    /**
-     * @var \Netgen\InformationCollection\API\Service\InformationCollection
-     */
-    protected $informationCollection;
+    protected InformationCollection $informationCollection;
 
     public function __construct(
         InformationCollection $informationCollection,
diff --git a/lib/Core/Service/InformationCollectionService.php b/lib/Core/Service/InformationCollectionService.php
index 1c666f1a..66cc9542 100644
--- a/lib/Core/Service/InformationCollectionService.php
+++ b/lib/Core/Service/InformationCollectionService.php
@@ -37,35 +37,17 @@
 
 class InformationCollectionService implements InformationCollection
 {
-    /**
-     * @var \Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionRepository
-     */
-    protected $ezInfoCollectionRepository;
-
-    /**
-     * @var \Netgen\InformationCollection\Doctrine\Repository\EzInfoCollectionAttributeRepository
-     */
-    protected $ezInfoCollectionAttributeRepository;
-
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\Repository
-     */
-    protected $repository;
-
-    /**
-     * @var \Netgen\InformationCollection\Core\Persistence\Gateway\DoctrineDatabase
-     */
-    protected $gateway;
-
-    /**
-     * @var \Netgen\InformationCollection\Core\Factory\FieldDataFactory
-     */
-    protected $fieldsFactory;
-
-    /**
-     * @var \Netgen\InformationCollection\Core\Mapper\DomainObjectMapper
-     */
-    protected $objectMapper;
+    protected EzInfoCollectionRepository $ezInfoCollectionRepository;
+
+    protected EzInfoCollectionAttributeRepository $ezInfoCollectionAttributeRepository;
+
+    protected Repository $repository;
+
+    protected DoctrineDatabase $gateway;
+
+    protected FieldDataFactory $fieldsFactory;
+
+    protected DomainObjectMapper $objectMapper;
 
     public function __construct(
         EzInfoCollectionRepository $ezInfoCollectionRepository,
diff --git a/lib/Doctrine/Entity/EzInfoCollection.php b/lib/Doctrine/Entity/EzInfoCollection.php
index b3694fbc..25dab7b2 100644
--- a/lib/Doctrine/Entity/EzInfoCollection.php
+++ b/lib/Doctrine/Entity/EzInfoCollection.php
@@ -6,35 +6,17 @@
 
 class EzInfoCollection
 {
-    /**
-     * @var int
-     */
-    private $id;
-
-    /**
-     * @var int
-     */
-    private $contentObjectId;
-
-    /**
-     * @var int
-     */
-    private $created;
-
-    /**
-     * @var int
-     */
-    private $creatorId;
-
-    /**
-     * @var int
-     */
-    private $modified;
-
-    /**
-     * @var string
-     */
-    private $userIdentifier;
+    private int $id;
+
+    private int $contentObjectId;
+
+    private int $created;
+
+    private int $creatorId;
+
+    private int $modified;
+
+    private string $userIdentifier;
 
     public function getId(): int
     {
diff --git a/lib/Doctrine/Entity/EzInfoCollectionAttribute.php b/lib/Doctrine/Entity/EzInfoCollectionAttribute.php
index c36a8da9..1c0fd90f 100644
--- a/lib/Doctrine/Entity/EzInfoCollectionAttribute.php
+++ b/lib/Doctrine/Entity/EzInfoCollectionAttribute.php
@@ -6,45 +6,21 @@
 
 class EzInfoCollectionAttribute
 {
-    /**
-     * @var int
-     */
-    private $id;
-
-    /**
-     * @var int
-     */
-    private $contentClassAttributeId;
-
-    /**
-     * @var int
-     */
-    private $contentObjectAttributeId;
-
-    /**
-     * @var int
-     */
-    private $contentObjectId;
-
-    /**
-     * @var float
-     */
-    private $dataFloat;
-
-    /**
-     * @var int
-     */
-    private $dataInt;
-
-    /**
-     * @var string
-     */
-    private $dataText;
-
-    /**
-     * @var int
-     */
-    private $informationCollectionId;
+    private int $id;
+
+    private int $contentClassAttributeId;
+
+    private int $contentObjectAttributeId;
+
+    private int $contentObjectId;
+
+    private float $dataFloat;
+
+    private int $dataInt;
+
+    private string $dataText;
+
+    private int $informationCollectionId;
 
     public function setId(int $id): void
     {
diff --git a/lib/Handler.php b/lib/Handler.php
index 2c5c70d7..0fd0addc 100644
--- a/lib/Handler.php
+++ b/lib/Handler.php
@@ -18,20 +18,11 @@
 
 final class Handler
 {
-    /**
-     * @var \Symfony\Component\Form\FormFactoryInterface
-     */
-    private $formFactory;
-
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
-     */
-    private $contentTypeService;
-
-    /**
-     * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-     */
-    private $eventDispatcher;
+    private FormFactoryInterface $formFactory;
+
+    private ContentTypeService $contentTypeService;
+
+    private EventDispatcherInterface $eventDispatcher;
 
     public function __construct(FormFactoryInterface $formFactory, ContentTypeService $contentTypeService, EventDispatcherInterface $eventDispatcher)
     {
diff --git a/tests/old/Action/ActionRegistryTest.php b/tests/old/Action/ActionRegistryTest.php
index 987dcc65..5e894671 100644
--- a/tests/old/Action/ActionRegistryTest.php
+++ b/tests/old/Action/ActionRegistryTest.php
@@ -8,86 +8,42 @@
 use Netgen\Bundle\InformationCollectionBundle\Action\ActionRegistry;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Exception\ActionFailedException;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use ReflectionObject;
 
 class ActionRegistryTest extends TestCase
 {
-    /**
-     * @var ActionRegistry
-     */
-    protected $registry;
+    protected ActionRegistry $registry;
 
-    /**
-     * @var ActionRegistry
-     */
-    protected $registryForPriority;
+    protected ActionRegistry $registryForPriority;
 
-    /**
-     * @var ActionRegistry
-     */
-    protected $registryWithEmptyConf;
+    protected ActionRegistry $registryWithEmptyConf;
 
-    /**
-     * @var ActionRegistry
-     */
-    protected $registryWithOnlyDefaultConf;
+    protected ActionRegistry $registryWithOnlyDefaultConf;
 
-    /**
-     * @var array
-     */
-    protected $config;
+    protected array $config;
 
-    /**
-     * @var array
-     */
-    protected $config2;
+    protected array $config2;
 
-    /**
-     * @var array
-     */
-    protected $onlyDefaultConfig;
+    protected array $onlyDefaultConfig;
 
-    /**
-     * @var array
-     */
-    protected $emptyConfig;
+    protected array $emptyConfig;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $action1;
+    protected MockObject $action1;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $action2;
+    protected MockObject $action2;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $action3;
+    protected MockObject $action3;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $action4;
+    protected MockObject $action4;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $logger;
+    protected MockObject $logger;
 
-    /**
-     * @var InformationCollected
-     */
-    protected $event;
+    protected InformationCollected $event;
 
-    /**
-     * @var InformationCollected
-     */
-    protected $event2;
+    protected InformationCollected $event2;
 
     public function setUp(): void
     {
diff --git a/tests/old/Action/AutoResponderActionTest.php b/tests/old/Action/AutoResponderActionTest.php
index 696cefa4..52b9f8d4 100644
--- a/tests/old/Action/AutoResponderActionTest.php
+++ b/tests/old/Action/AutoResponderActionTest.php
@@ -10,29 +10,18 @@
 use Netgen\Bundle\InformationCollectionBundle\Factory\AutoResponderDataFactory;
 use Netgen\Bundle\InformationCollectionBundle\Mailer\MailerInterface;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class AutoResponderActionTest extends TestCase
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Action\AutoResponderAction
-     */
-    protected $action;
+    protected AutoResponderAction $action;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $factory;
+    protected MockObject $factory;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $mailer;
+    protected MockObject $mailer;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $emailData;
+    protected MockObject $emailData;
 
     public function setUp(): void
     {
diff --git a/tests/old/Action/DatabaseActionTest.php b/tests/old/Action/DatabaseActionTest.php
index 3afd0c93..785ac9e7 100644
--- a/tests/old/Action/DatabaseActionTest.php
+++ b/tests/old/Action/DatabaseActionTest.php
@@ -24,59 +24,30 @@
 use Netgen\Bundle\InformationCollectionBundle\Repository\EzInfoCollectionAttributeRepository;
 use Netgen\Bundle\InformationCollectionBundle\Repository\EzInfoCollectionRepository;
 use Netgen\Bundle\InformationCollectionBundle\Value\LegacyData;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class DatabaseActionTest extends TestCase
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Action\DatabaseAction
-     */
-    protected $action;
+    protected DatabaseAction $action;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $factory;
+    protected MockObject $factory;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $repository;
+    protected MockObject $repository;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $secondRepository;
+    protected MockObject $secondRepository;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $ibexaRepository;
+    protected MockObject $ibexaRepository;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contentType;
+    protected MockObject $contentType;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contentService;
+    protected MockObject $contentService;
 
-    /**
-     * @var array
-     */
-    protected $fields;
+    protected array $fields;
 
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Form\Payload\InformationCollectionStruct
-     */
-    protected $struct;
+    protected InformationCollectionStruct $struct;
 
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Value\LegacyData
-     */
-    protected $legacyData;
+    protected LegacyData $legacyData;
 
     public function setUp(): void
     {
diff --git a/tests/old/Action/EmailActionTest.php b/tests/old/Action/EmailActionTest.php
index 24484ca0..65c361d1 100644
--- a/tests/old/Action/EmailActionTest.php
+++ b/tests/old/Action/EmailActionTest.php
@@ -10,31 +10,20 @@
 use Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory;
 use Netgen\Bundle\InformationCollectionBundle\Mailer\MailerInterface;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class EmailActionTest extends TestCase
 {
-    /**
-     * @var EmailAction
-     */
-    protected $action;
+    protected EmailAction $action;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $factory;
+    protected MockObject $factory;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $mailer;
+    protected MockObject $mailer;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $emailData;
+    protected MockObject $emailData;
 
-    public function setUp(): void()
+    public function setUp(): void
     {
         $this->factory = $this->getMockBuilder(EmailDataFactory::class)
             ->disableOriginalConstructor()
diff --git a/tests/old/Controller/InformationCollectionControllerTest.php b/tests/old/Controller/InformationCollectionControllerTest.php
index ec2ec2c7..9cf5b375 100644
--- a/tests/old/Controller/InformationCollectionControllerTest.php
+++ b/tests/old/Controller/InformationCollectionControllerTest.php
@@ -9,6 +9,7 @@
 use Netgen\Bundle\InformationCollectionBundle\Controller\InformationCollectionController;
 use Netgen\Bundle\InformationCollectionBundle\Form\Builder\FormBuilder;
 use Netgen\Bundle\InformationCollectionBundle\Tests\ContentViewStub;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -19,45 +20,21 @@
 
 class InformationCollectionControllerTest extends TestCase
 {
-    /**
-     * @var InformationCollectionController
-     */
-    protected $controller;
+    protected InformationCollectionController $controller;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $dispatcher;
+    protected MockObject $dispatcher;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $builder;
+    protected MockObject $builder;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contentView;
+    protected MockObject $contentView;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $request;
+    protected MockObject $request;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $formBuilder;
+    protected MockObject $formBuilder;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $form;
+    protected MockObject $form;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $container;
+    protected MockObject $container;
 
     public function setUp(): void
     {
diff --git a/tests/old/Entity/EzInfoCollectionAttributeTest.php b/tests/old/Entity/EzInfoCollectionAttributeTest.php
index 6c56ad15..806bab1f 100644
--- a/tests/old/Entity/EzInfoCollectionAttributeTest.php
+++ b/tests/old/Entity/EzInfoCollectionAttributeTest.php
@@ -7,10 +7,7 @@
 
 class EzInfoCollectionAttributeTest extends TestCase
 {
-    /**
-     * @var EzInfoCollectionAttribute
-     */
-    protected $entity;
+    protected EzInfoCollectionAttribute $entity;
 
     public function setUp(): void
     {
diff --git a/tests/old/Entity/EzInfoCollectionTest.php b/tests/old/Entity/EzInfoCollectionTest.php
index 841a5a39..df2050ea 100644
--- a/tests/old/Entity/EzInfoCollectionTest.php
+++ b/tests/old/Entity/EzInfoCollectionTest.php
@@ -7,10 +7,7 @@
 
 class EzInfoCollectionTest extends TestCase
 {
-    /**
-     * @var EzInfoCollection
-     */
-    protected $entity;
+    protected EzInfoCollection $entity;
 
     public function setUp(): void
     {
diff --git a/tests/old/Event/InformationCollectedTest.php b/tests/old/Event/InformationCollectedTest.php
index 140c422e..224098f8 100644
--- a/tests/old/Event/InformationCollectedTest.php
+++ b/tests/old/Event/InformationCollectedTest.php
@@ -8,10 +8,7 @@
 
 class InformationCollectedTest extends TestCase
 {
-    /**
-     * @var InformationCollected
-     */
-    protected $event;
+    protected InformationCollected $event;
 
     public function setUp(): void
     {
diff --git a/tests/old/Factory/AutoResponderDataFactoryTest.php b/tests/old/Factory/AutoResponderDataFactoryTest.php
index 41c348fb..1105ee8d 100644
--- a/tests/old/Factory/AutoResponderDataFactoryTest.php
+++ b/tests/old/Factory/AutoResponderDataFactoryTest.php
@@ -19,6 +19,7 @@
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
@@ -26,55 +27,25 @@
 
 class AutoResponderDataFactoryTest extends TestCase
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Factory\AutoResponderDataFactory
-     */
-    protected $factory;
-
-    /**
-     * @var array
-     */
-    protected $config;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $translationHelper;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $fieldHelper;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contentService;
-
-    /**
-     * @var \Ibexa\Core\Repository\Values\ContentType\ContentType
-     */
-    protected $contentType;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $twig;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $templateWrapper;
-
-    /**
-     * @var \Ibexa\Core\Repository\Values\ContentType\ContentType
-     */
-    protected $contentType2;
-
-    /**
-     * @var \Ibexa\Core\Repository\Values\Content\VersionInfo
-     */
-    protected $versionInfo;
+    protected AutoResponderDataFactory $factory;
+
+    protected array $config;
+
+    protected MockObject $translationHelper;
+
+    protected MockObject  $fieldHelper;
+
+    protected MockObject $contentService;
+
+    protected MockObject $contentType;
+
+    protected MockObject $twig;
+
+    protected MockObject $templateWrapper;
+
+    protected ContentType $contentType2;
+
+    protected VersionInfo $versionInfo;
 
     public function setUp(): void
     {
diff --git a/tests/old/Factory/EmailDataFactoryTest.php b/tests/old/Factory/EmailDataFactoryTest.php
index fdc3ab39..d54000c5 100644
--- a/tests/old/Factory/EmailDataFactoryTest.php
+++ b/tests/old/Factory/EmailDataFactoryTest.php
@@ -18,6 +18,7 @@
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
@@ -25,55 +26,25 @@
 
 class EmailDataFactoryTest extends TestCase
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Factory\EmailDataFactory
-     */
-    protected $factory;
+    protected EmailDataFactory $factory;
 
-    /**
-     * @var array
-     */
-    protected $config;
+    protected array $config;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $translationHelper;
+    protected TranslationHelper $translationHelper;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $fieldHelper;
+    protected MockObject $fieldHelper;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contentService;
+    protected MockObject $contentService;
 
-    /**
-     * @var \Ibexa\Core\Repository\Values\ContentType\ContentType
-     */
-    protected $contentType;
+    protected ContentType $contentType;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $twig;
+    protected MockObject $twig;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $templateWrapper;
+    protected MockObject $templateWrapper;
 
-    /**
-     * @var \Ibexa\Core\Repository\Values\ContentType\ContentType
-     */
-    protected $contentType2;
+    protected ContentType $contentType2;
 
-    /**
-     * @var \Ibexa\Core\Repository\Values\Content\VersionInfo
-     */
-    protected $versionInfo;
+    protected VersionInfo $versionInfo;
 
     public function setUp(): void
     {
diff --git a/tests/old/Factory/FieldDataFactoryTest.php b/tests/old/Factory/FieldDataFactoryTest.php
index b8040df0..8c03f5a6 100644
--- a/tests/old/Factory/FieldDataFactoryTest.php
+++ b/tests/old/Factory/FieldDataFactoryTest.php
@@ -9,19 +9,14 @@
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\FieldHandlerRegistry;
 use Netgen\Bundle\InformationCollectionBundle\Value\LegacyData;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class FieldDataFactoryTest extends TestCase
 {
-    /**
-     * @var FieldDataFactory
-     */
-    protected $factory;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $registry;
+    protected FieldDataFactory $factory;
+
+    protected MockObject $registry;
 
     public function setUp(): void
     {
diff --git a/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php b/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php
index fc14203a..28484380 100644
--- a/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/CheckboxFieldHandlerTest.php
@@ -13,10 +13,7 @@
 
 class CheckboxFieldHandlerTest extends TestCase
 {
-    /**
-     * @var CustomLegacyFieldHandlerInterface
-     */
-    protected $handler;
+    protected CustomLegacyFieldHandlerInterface $handler;
 
     public function setUp(): void
     {
diff --git a/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php b/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php
index e659d47e..9f716f05 100644
--- a/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/DateAndTimeFieldHandlerTest.php
@@ -14,15 +14,9 @@
 
 class DateAndTimeFieldHandlerTest extends TestCase
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface
-     */
-    protected $handler;
+    protected CustomLegacyFieldHandlerInterface $handler;
 
-    /**
-     * @var \DateTime
-     */
-    protected $dt;
+    protected DateTime $dt;
 
     public function setUp(): void
     {
diff --git a/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php b/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php
index c3817bee..5655f44f 100644
--- a/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/DateFieldHandlerTest.php
@@ -14,15 +14,9 @@
 
 class DateFieldHandlerTest extends TestCase
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface
-     */
-    protected $handler;
+    protected CustomLegacyFieldHandlerInterface $handler;
 
-    /**
-     * @var \DateTime
-     */
-    protected $dt;
+    protected DateTime $dt;
 
     public function setUp(): void
     {
diff --git a/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php b/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php
index 36fdbfad..37beaf57 100644
--- a/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/FloatFieldHandlerTest.php
@@ -13,10 +13,7 @@
 
 class FloatFieldHandlerTest extends TestCase
 {
-    /**
-     * @var CustomLegacyFieldHandlerInterface
-     */
-    protected $handler;
+    protected CustomLegacyFieldHandlerInterface $handler;
 
     public function setUp(): void
     {
diff --git a/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php b/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php
index 628e8e03..c3fff15f 100644
--- a/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/IntegerFieldHandlerTest.php
@@ -13,10 +13,7 @@
 
 class IntegerFieldHandlerTest extends TestCase
 {
-    /**
-     * @var CustomLegacyFieldHandlerInterface
-     */
-    protected $handler;
+    protected CustomLegacyFieldHandlerInterface $handler;
 
     public function setUp(): void
     {
diff --git a/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php b/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php
index 888dff24..09f5ef39 100644
--- a/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php
+++ b/tests/old/FieldHandler/Custom/TimeFieldHandlerTest.php
@@ -14,20 +14,11 @@
 
 class TimeFieldHandlerTest extends TestCase
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomLegacyFieldHandlerInterface
-     */
-    protected $handler;
+    protected CustomLegacyFieldHandlerInterface $handler;
 
-    /**
-     * @var \DateTime
-     */
-    protected $dt;
+    protected DateTime $dt;
 
-    /**
-     * @var \Ibexa\Core\FieldType\Time\Value
-     */
-    protected $value;
+    protected TimeValue $value;
 
     public function setUp(): void
     {
diff --git a/tests/old/FieldHandler/FieldHandlerRegistryTest.php b/tests/old/FieldHandler/FieldHandlerRegistryTest.php
index 433e5acd..8f5e1f90 100644
--- a/tests/old/FieldHandler/FieldHandlerRegistryTest.php
+++ b/tests/old/FieldHandler/FieldHandlerRegistryTest.php
@@ -5,24 +5,16 @@
 use Ibexa\Core\FieldType\Integer\Value as TestValue;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\Custom\CustomFieldHandlerInterface;
 use Netgen\Bundle\InformationCollectionBundle\FieldHandler\FieldHandlerRegistry;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class FieldHandlerRegistryTest extends TestCase
 {
-    /**
-     * @var FieldHandlerRegistry
-     */
-    protected $registry;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customHandler1;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customHandler2;
+    protected FieldHandlerRegistry $registry;
+
+    protected MockObject $customHandler1;
+
+    protected MockObject $customHandler2;
 
     public function setUp(): void
     {
diff --git a/tests/old/Form/Builder/FormBuilderTest.php b/tests/old/Form/Builder/FormBuilderTest.php
index c6752ba6..8726814b 100644
--- a/tests/old/Form/Builder/FormBuilderTest.php
+++ b/tests/old/Form/Builder/FormBuilderTest.php
@@ -6,6 +6,7 @@
 use Ibexa\Core\Repository\ContentTypeService;
 use Ibexa\Core\Repository\Values\Content\Location;
 use Netgen\Bundle\InformationCollectionBundle\Form\Builder\FormBuilder;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\FormBuilder as SymfonyFormBuilder;
 use Symfony\Component\Form\FormFactory;
@@ -13,30 +14,15 @@
 
 class FormBuilderTest extends TestCase
 {
-    /**
-     * @var FormBuilder
-     */
-    protected $formBuilder;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $formFactory;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $contentTypeService;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $router;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $innerFormBuilder;
+    protected FormBuilder $formBuilder;
+
+    protected MockObject $formFactory;
+
+    protected MockObject $contentTypeService;
+
+    protected MockObject $router;
+
+    protected MockObject $innerFormBuilder;
 
     public function setUp(): void
     {
diff --git a/tests/old/Listener/InformationCollectedListenerTest.php b/tests/old/Listener/InformationCollectedListenerTest.php
index 1c6c4993..82171cf7 100644
--- a/tests/old/Listener/InformationCollectedListenerTest.php
+++ b/tests/old/Listener/InformationCollectedListenerTest.php
@@ -7,19 +7,14 @@
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Events;
 use Netgen\Bundle\InformationCollectionBundle\Listener\InformationCollectedListener;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class InformationCollectedListenerTest extends TestCase
 {
-    /**
-     * @var InformationCollectedListener
-     */
-    protected $listener;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $registry;
+    protected InformationCollectedListener $listener;
+
+    protected MockObject $registry;
 
     public function setUp(): void
     {
diff --git a/tests/old/Mailer/MailerTest.php b/tests/old/Mailer/MailerTest.php
index 2dfb4414..5de73401 100644
--- a/tests/old/Mailer/MailerTest.php
+++ b/tests/old/Mailer/MailerTest.php
@@ -5,23 +5,19 @@
 use Ibexa\Core\FieldType\BinaryFile\Value as BinaryFileValue;
 use Netgen\Bundle\InformationCollectionBundle\Mailer\Mailer;
 use Netgen\Bundle\InformationCollectionBundle\Value\EmailData;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Swift_Mailer;
 
 class MailerTest extends TestCase
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Mailer\MailerInterface
-     */
-    protected $mailer;
+    protected Mailer $mailer;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $swiftMailer;
+    protected MockObject $swiftMailer;
 
     public function setUp(): void
     {
-        $this->swiftMailer = $this->getMockBuilder(\Swift_Mailer::class)
+        $this->swiftMailer = $this->getMockBuilder(Swift_Mailer::class)
             ->disableOriginalConstructor()
             ->setMethods(array('createMessage', 'send'))
             ->getMock();
diff --git a/tests/old/Value/TemplateDataTest.php b/tests/old/Value/TemplateDataTest.php
index 214f6b3a..e96c207a 100644
--- a/tests/old/Value/TemplateDataTest.php
+++ b/tests/old/Value/TemplateDataTest.php
@@ -13,25 +13,13 @@
 
 class TemplateDataTest extends TestCase
 {
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Value\TemplateData
-     */
-    protected $templateData;
-
-    /**
-     * @var \Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected
-     */
-    protected $event;
-
-    /**
-     * @var \Ibexa\Core\Repository\Values\Content\Content
-     */
-    protected $content;
-
-    /**
-     * @var \Twig\TemplateWrapper
-     */
-    protected $templateWrapper;
+    protected TemplateData $templateData;
+
+    protected InformationCollected $event;
+
+    protected Content $content;
+
+    protected TemplateWrapper $templateWrapper;
 
     public function setUp(): void
     {

From 5fc27efad05c813f1bb0eaf530c401b5e61c6b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Wed, 9 Mar 2022 11:44:43 +0100
Subject: [PATCH 12/30] Add missing property typehints

---
 bundle/Command/DataAnonymizerCommand.php | 2 +-
 lib/Core/Action/AutoResponderAction.php  | 2 +-
 lib/Core/Action/DatabaseAction.php       | 2 +-
 lib/Core/Action/EmailAction.php          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundle/Command/DataAnonymizerCommand.php b/bundle/Command/DataAnonymizerCommand.php
index f1e682e4..7be46d77 100644
--- a/bundle/Command/DataAnonymizerCommand.php
+++ b/bundle/Command/DataAnonymizerCommand.php
@@ -17,7 +17,7 @@
 
 class DataAnonymizerCommand extends Command
 {
-    protected static $defaultName = 'nginfocollector:anonymize';
+    protected static string $defaultName = 'nginfocollector:anonymize';
 
     protected AnonymizerServiceFacade $anonymizer;
 
diff --git a/lib/Core/Action/AutoResponderAction.php b/lib/Core/Action/AutoResponderAction.php
index ac936766..7b312679 100644
--- a/lib/Core/Action/AutoResponderAction.php
+++ b/lib/Core/Action/AutoResponderAction.php
@@ -9,7 +9,7 @@
 
 final class AutoResponderAction extends BaseEmailAction
 {
-    public static $defaultName = 'auto_responder';
+    public static string $defaultName = 'auto_responder';
 
     protected function throwException(EmailNotSentException $exception): void
     {
diff --git a/lib/Core/Action/DatabaseAction.php b/lib/Core/Action/DatabaseAction.php
index 78b9fcbf..34d50763 100644
--- a/lib/Core/Action/DatabaseAction.php
+++ b/lib/Core/Action/DatabaseAction.php
@@ -13,7 +13,7 @@
 
 final class DatabaseAction implements ActionInterface, CrucialActionInterface
 {
-    public static $defaultName = 'database';
+    public static string $defaultName = 'database';
 
     private InformationCollection $informationCollection;
 
diff --git a/lib/Core/Action/EmailAction.php b/lib/Core/Action/EmailAction.php
index 8cad866f..0b75da01 100644
--- a/lib/Core/Action/EmailAction.php
+++ b/lib/Core/Action/EmailAction.php
@@ -9,7 +9,7 @@
 
 final class EmailAction extends BaseEmailAction
 {
-    public static $defaultName = 'email';
+    public static string $defaultName = 'email';
 
     protected function throwException(EmailNotSentException $exception): void
     {

From 5c2111a7a1d5e799908136a3580825b8f5ebf6c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Wed, 9 Mar 2022 13:11:38 +0100
Subject: [PATCH 13/30] Remove superfluous typehint due to base property not
 having it

---
 bundle/Command/DataAnonymizerCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundle/Command/DataAnonymizerCommand.php b/bundle/Command/DataAnonymizerCommand.php
index 7be46d77..f1e682e4 100644
--- a/bundle/Command/DataAnonymizerCommand.php
+++ b/bundle/Command/DataAnonymizerCommand.php
@@ -17,7 +17,7 @@
 
 class DataAnonymizerCommand extends Command
 {
-    protected static string $defaultName = 'nginfocollector:anonymize';
+    protected static $defaultName = 'nginfocollector:anonymize';
 
     protected AnonymizerServiceFacade $anonymizer;
 

From a3c36c5681f122a978eddbdda86b221b06c703d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Thu, 10 Mar 2022 15:38:00 +0100
Subject: [PATCH 14/30] CS fixes

---
 lib/Core/Export/CsvExportResponseFormatter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Core/Export/CsvExportResponseFormatter.php b/lib/Core/Export/CsvExportResponseFormatter.php
index 34b3426d..a22fa36a 100644
--- a/lib/Core/Export/CsvExportResponseFormatter.php
+++ b/lib/Core/Export/CsvExportResponseFormatter.php
@@ -41,7 +41,7 @@ public function format(Export $export, Content $content): Response
         $writer->setDelimiter($config['delimiter']);
         $writer->setEnclosure($config['enclosure']);
         $writer->setNewline($config['newline']);
-        $writer->setOutputBOM(Writer::BOM_UTF8); //adding the BOM sequence on output
+        $writer->setOutputBOM(Writer::BOM_UTF8); // adding the BOM sequence on output
         $writer->insertOne($export->getHeader());
         $writer->insertAll($export->getContents());
 

From 9dd5bbd6cd5696f40886e21f10129fd583c1738d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Mon, 14 Mar 2022 17:06:47 +0100
Subject: [PATCH 15/30] Disable isRequired check for info collector fields

---
 .../ContentFieldTypeExtension.php             | 39 +++++++++++++++++++
 .../InfoCollectorContentValidator.php         | 36 +++++++++++++++++
 lib/Resources/config/services.yml             | 10 +++++
 3 files changed, 85 insertions(+)
 create mode 100644 bundle/Ibexa/ContentForms/ContentFieldTypeExtension.php
 create mode 100644 bundle/Ibexa/ContentForms/InfoCollectorContentValidator.php

diff --git a/bundle/Ibexa/ContentForms/ContentFieldTypeExtension.php b/bundle/Ibexa/ContentForms/ContentFieldTypeExtension.php
new file mode 100644
index 00000000..e12ee48c
--- /dev/null
+++ b/bundle/Ibexa/ContentForms/ContentFieldTypeExtension.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms;
+
+use Ibexa\ContentForms\Form\Type\Content\ContentFieldType;
+use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ContentFieldTypeExtension extends AbstractTypeExtension
+{
+    public function getExtendedType(): string
+    {
+        return ContentFieldType::class;
+    }
+
+    public static function getExtendedTypes(): iterable
+    {
+        return [ContentFieldType::class];
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $fieldIdentifier = $builder->getName();
+
+        /** @var \Ibexa\ContentForms\Data\Content\ContentUpdateData $updateStruct */
+        $updateStruct = $options['contentUpdateStruct'];
+
+        $fieldDefinition = $updateStruct->fieldsData[$fieldIdentifier]->fieldDefinition;
+        if ($fieldDefinition->isInfoCollector) {
+            $builder->setRequired(false);
+
+            (function () {
+                $this->isRequired = false;
+            })->call($fieldDefinition);
+        }
+    }
+}
diff --git a/bundle/Ibexa/ContentForms/InfoCollectorContentValidator.php b/bundle/Ibexa/ContentForms/InfoCollectorContentValidator.php
new file mode 100644
index 00000000..a2aab9e7
--- /dev/null
+++ b/bundle/Ibexa/ContentForms/InfoCollectorContentValidator.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms;
+
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Validator\ContentValidator;
+use Ibexa\Contracts\Core\Repository\Values\ValueObject;
+
+final class InfoCollectorContentValidator implements ContentValidator
+{
+    public function supports(ValueObject $object): bool
+    {
+        return true;
+    }
+
+    public function validate(ValueObject $object, array $context = [], ?array $fieldIdentifiers = null): array
+    {
+        $content = $context['content'] ?? null;
+        if (!$content instanceof Content) {
+            return [];
+        }
+
+        foreach ($content->getContentType()->fieldDefinitions as $fieldDefinition) {
+            /** @var \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition */
+            if ($fieldDefinition->isInfoCollector) {
+                (function () {
+                    $this->isRequired = false;
+                })->call($fieldDefinition);
+            }
+        }
+
+        return [];
+    }
+}
diff --git a/lib/Resources/config/services.yml b/lib/Resources/config/services.yml
index 661d9d91..997ec2ba 100644
--- a/lib/Resources/config/services.yml
+++ b/lib/Resources/config/services.yml
@@ -32,6 +32,16 @@ services:
         tags:
             - { name: form.type_extension, extended_type: Ibexa\AdminUi\Form\Type\FieldDefinition\FieldDefinitionType }
 
+    netgen_information_collection.form.extension.content_field:
+        class: Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\ContentFieldTypeExtension
+        tags:
+            - { name: form.type_extension, extended_type: Ibexa\ContentForms\Form\Type\Content\ContentFieldType }
+
+    netgen_information_collection.validator.info_collector:
+        class: Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InfoCollectorContentValidator
+        tags:
+            - { name: ibexa.repository.content.validator, priority: 255 }
+
     netgen_information_collection.domain_object_mapper:
         class: Netgen\InformationCollection\Core\Mapper\DomainObjectMapper
         arguments:

From 204185c797b5003ce1a687f4fb957be92bbc7f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Thu, 14 Apr 2022 09:00:59 +0000
Subject: [PATCH 16/30] feat: fix depencency issues

---
 bundle/Resources/config/services.yml |  6 ++++++
 lib/Resources/config/services.yml    | 16 +++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml
index b637a4ec..6b97e252 100644
--- a/bundle/Resources/config/services.yml
+++ b/bundle/Resources/config/services.yml
@@ -32,3 +32,9 @@ services:
             - '@request_stack'
             - '@netgen_information_collection.captcha.service'
             - '@translator'
+
+    Netgen\InformationCollection\API\Service\CaptchaService:
+        alias: Netgen\InformationCollection\Core\Service\CaptchaService
+
+    eZ\Publish\Core\Helper\TranslationHelper:
+        alias: ezpublish.translation_helper
diff --git a/lib/Resources/config/services.yml b/lib/Resources/config/services.yml
index c6eb7b8b..84e49dec 100644
--- a/lib/Resources/config/services.yml
+++ b/lib/Resources/config/services.yml
@@ -85,17 +85,19 @@ services:
             - "@ezpublish.api.service.content_type"
             - "@event_dispatcher"
 
+    Netgen\InformationCollection\Core\Service\CaptchaService:
+        autowire: true
+
     netgen_information_collection.captcha.service:
-        class: Netgen\InformationCollection\Core\Service\CaptchaService
-        arguments:
-            - '@ezpublish.api.service.content_type'
-            - '@ezpublish.config.resolver'
+        alias: Netgen\InformationCollection\Core\Service\CaptchaService
 
-    netgen_information_collection.export.json:
-        class: Netgen\InformationCollection\Core\Export\JsonExportResponseFormatter
+    Netgen\InformationCollection\Core\Export\JsonExportResponseFormatter:
         tags:
             - { name: netgen_information_collection.export.formatter }
 
+    netgen_information_collection.export.json:
+        alias: Netgen\InformationCollection\Core\Export\JsonExportResponseFormatter
+
     netgen_information_collection.form.captcha_type:
         class: Netgen\Bundle\InformationCollectionBundle\Form\CaptchaType
         arguments:
@@ -103,4 +105,4 @@ services:
         tags:
             - { name: form.type }
 
-    # Autowire the providers
\ No newline at end of file
+    # Autowire the providers

From 2af2ecb11e2c381b752e13fdd4a17961b105572d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Fri, 15 Apr 2022 07:21:55 +0000
Subject: [PATCH 17/30] feat: default to swiftmailer since swiftmailer is
 deprecated

---
 lib/Resources/config/mailers.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Resources/config/mailers.yml b/lib/Resources/config/mailers.yml
index 73454736..fc3bcb78 100644
--- a/lib/Resources/config/mailers.yml
+++ b/lib/Resources/config/mailers.yml
@@ -6,4 +6,4 @@ services:
     Netgen\InformationCollection\Core\Mailer\:
         resource: '../../Core/Mailer/'
 
-    Netgen\InformationCollection\API\MailerInterface: '@Netgen\InformationCollection\Core\Mailer\SwiftMailerBasedMailer'
\ No newline at end of file
+    Netgen\InformationCollection\API\MailerInterface: '@Netgen\InformationCollection\Core\Mailer\SymfonyMailerBasedMailer'

From c2ee6cb969efe8c6bb65e1d644832de096fc65cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Tue, 19 Apr 2022 14:09:36 +0000
Subject: [PATCH 18/30] feat: remove space that breaks doctrine update schema
 command

---
 lib/Doctrine/mappings/EzInfoCollection.orm.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/mappings/EzInfoCollection.orm.xml b/lib/Doctrine/mappings/EzInfoCollection.orm.xml
index 3d3e8068..385e739d 100644
--- a/lib/Doctrine/mappings/EzInfoCollection.orm.xml
+++ b/lib/Doctrine/mappings/EzInfoCollection.orm.xml
@@ -10,7 +10,7 @@
             table="ezinfocollection"
     >
         <indexes>
-            <index name="ezinfocollection_co_id_created" columns="contentobject_id, created" />
+            <index name="ezinfocollection_co_id_created" columns="contentobject_id,created" />
         </indexes>
 
         <id name="id" type="integer" column="id">

From fbc3778d536dac3766b44d582fb64dfc02978dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Tue, 19 Apr 2022 14:10:00 +0000
Subject: [PATCH 19/30] feat: allow more than ezemail datatype for recipient
 field

---
 lib/Core/Factory/EmailDataFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Core/Factory/EmailDataFactory.php b/lib/Core/Factory/EmailDataFactory.php
index 76ea96ce..438fde38 100644
--- a/lib/Core/Factory/EmailDataFactory.php
+++ b/lib/Core/Factory/EmailDataFactory.php
@@ -182,7 +182,7 @@ protected function resolveEmail(TemplateContent $data, $field)
             $fieldValue = $this->translationHelper->getTranslatedField($content, $field);
 
             if ($fieldValue instanceof Field) {
-                return [$fieldValue->value->email];
+                return [(string)$fieldValue->value];
             }
 
         }

From 52b9532964a5dbbb8397a3fb6c9be3291f96c784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Tue, 19 Apr 2022 14:10:16 +0000
Subject: [PATCH 20/30] feat: fix default email template

---
 bundle/Resources/views/email/default.html.twig | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bundle/Resources/views/email/default.html.twig b/bundle/Resources/views/email/default.html.twig
index 6f2b759f..116dbba0 100644
--- a/bundle/Resources/views/email/default.html.twig
+++ b/bundle/Resources/views/email/default.html.twig
@@ -1,5 +1,6 @@
-{# event \Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected #}
-{# content \eZ\Publish\API\Repository\Values\Content\Content #}
+{# @var event \Netgen\InformationCollection\API\Value\Event\InformationCollected #}
+{# @var content \eZ\Publish\API\Repository\Values\Content\Content #}
+{# @var content_type \eZ\Publish\API\Repository\Values\ContentType\ContentType #}
 
 {% block email %}
 
@@ -12,14 +13,14 @@
                 {{ ez_field_name(content, field_name) }}:
             </div>
             <div class="value">
-                {% if content_type.fieldDefinitionsByIdentifier[field_name].fieldTypeIdentifier == 'ezselection' %}
+                {% if content_type.fieldDefinitions.get(field_name).fieldTypeIdentifier == 'ezselection' %}
                     {% set selectionArray=field_value.value|split('-') %}
                     {% if selectionArray|length > 1 %}<ul>{% endif %}
                     {% for selected_key, selected_value in selectionArray %}
                         {% if loop.length == 1 %}
-                            {{ content_type.fieldDefinitionsByIdentifier[field_name].fieldSettings.options[selected_value] }}<br>
+                            {{ content_type.fieldDefinitions.get(field_name).fieldSettings.options[selected_value] }}<br>
                         {% else %}
-                            <li>{{ content_type.fieldDefinitionsByIdentifier[field_name].fieldSettings.options[selected_value] }}</li><br>
+                            <li>{{ content_type.fieldDefinitions.get(field_name).fieldSettings.options[selected_value] }}</li><br>
                         {% endif %}
                     {% endfor %}
                     {% if selectionArray|length > 1 %}</ul>{% endif %}

From 42a2e14a82223d0fc905520a9c3d3634a48d923a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Tue, 19 Apr 2022 15:08:08 +0000
Subject: [PATCH 21/30] feat: add basic graphql integration for information
 collections

---
 .../NetgenInformationCollectionExtension.php  |   1 +
 .../Mutation/CollectInformationMutation.php   | 107 +++++++++
 .../Domain/InformationCollectionDomain.php    | 207 ++++++++++++++++++
 lib/Resources/config/graphql.yml              |  15 ++
 4 files changed, 330 insertions(+)
 create mode 100644 lib/GraphQL/Mutation/CollectInformationMutation.php
 create mode 100644 lib/GraphQL/Schema/Domain/InformationCollectionDomain.php
 create mode 100644 lib/Resources/config/graphql.yml

diff --git a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
index ef4c0d24..24249b72 100644
--- a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
+++ b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
@@ -44,6 +44,7 @@ public function load(array $configs, ContainerBuilder $container)
         $libResourceLoader->load('default_settings.yml');
         $libResourceLoader->load('email_data_providers.yml');
         $libResourceLoader->load('mailers.yml');
+        $libResourceLoader->load('graphql.yml');
 
 
         $this->processSemanticConfig($container, $config);
diff --git a/lib/GraphQL/Mutation/CollectInformationMutation.php b/lib/GraphQL/Mutation/CollectInformationMutation.php
new file mode 100644
index 00000000..0b154b0a
--- /dev/null
+++ b/lib/GraphQL/Mutation/CollectInformationMutation.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Netgen\InformationCollection\GraphQL\Mutation;
+
+use eZ\Publish\API\Repository\LocationService;
+use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
+use EzSystems\EzPlatformGraphQL\Schema\Domain\Content\NameHelper;
+use Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionMapper;
+use Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionType;
+use Netgen\InformationCollection\Handler;
+use Overblog\GraphQLBundle\Definition\Resolver\AliasedInterface;
+use Overblog\GraphQLBundle\Definition\Resolver\MutationInterface;
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\FormFactoryInterface;
+
+class CollectInformationMutation implements AliasedInterface, MutationInterface
+{
+    private LocationService $locationService;
+
+    private Handler $informationCollectionHandler;
+
+    private FormFactoryInterface $formFactory;
+
+    private NameHelper $nameHelper;
+
+    /**
+     * @param LocationService $locationService
+     * @param Handler $informationCollectionHandler
+     */
+    public function __construct(
+        LocationService      $locationService,
+        Handler              $informationCollectionHandler,
+        FormFactoryInterface $formFactory,
+        NameHelper           $nameHelper
+    )
+    {
+        $this->locationService = $locationService;
+        $this->informationCollectionHandler = $informationCollectionHandler;
+        $this->formFactory = $formFactory;
+        $this->nameHelper = $nameHelper;
+    }
+
+    public function performInformationCollection(int $locationId, array $input)
+    {
+        $location = $this->locationService->loadLocation($locationId);
+
+        $content = $location->getContent();
+        $contentType = $content->getContentType();
+        $informationCollectionMapper = new InformationCollectionMapper();
+
+        $data = $informationCollectionMapper->mapToFormData($content, $location, $contentType);
+
+        $form = $this->formFactory->create(
+            InformationCollectionType::class,
+            $data,
+            [
+                'languageCode' => $content->contentInfo->mainLanguageCode,
+                'mainLanguageCode' => $content->contentInfo->mainLanguageCode,
+                'csrf_protection' => false
+            ]
+        );
+
+        $transformedInput = [];
+        /** @var FieldDefinition $fieldDefinition */
+        foreach ($contentType->getFieldDefinitions() as $fieldDefinition) {
+            $graphQlFieldName = $this->nameHelper->fieldDefinitionField($fieldDefinition);
+            $inputElement = $input[$graphQlFieldName] ?? null;
+            if (!$inputElement) {
+                continue;
+            }
+
+            $transformedInput[$fieldDefinition->identifier] = [
+                'value' => $fieldDefinition->fieldTypeIdentifier === 'ezselection' ? implode("-", (array)$inputElement) : $inputElement
+            ];
+        }
+
+        $form->submit($transformedInput);
+        if ($form->isSubmitted() && $form->isValid()) {
+            $collectedData = $form->getData();
+            $this->informationCollectionHandler->handle($collectedData, []);
+            return [
+                'success' => true
+            ];
+        }
+
+        return [
+            'success' => false,
+            'errors' => array_map(
+                static function (FormError $formError) {
+                    return [
+                        'message' => $formError->getMessage(),
+                        'fieldIdentifier' => $formError->getOrigin() ? $formError->getOrigin()->getParent()->getName() : "unknown"
+                    ];
+                },
+                iterator_to_array($form->getErrors(true))
+            )
+        ];
+    }
+
+
+    public static function getAliases(): array
+    {
+        return [
+            'performInformationCollection' => 'CollectInformation'
+        ];
+    }
+}
\ No newline at end of file
diff --git a/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php b/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php
new file mode 100644
index 00000000..aa5f53b1
--- /dev/null
+++ b/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php
@@ -0,0 +1,207 @@
+<?php
+
+namespace Netgen\InformationCollection\GraphQL\Schema\Domain;
+
+use eZ\Publish\API\Repository\ContentTypeService;
+use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
+use EzSystems\EzPlatformGraphQL\Schema;
+use EzSystems\EzPlatformGraphQL\Schema\Builder;
+use EzSystems\EzPlatformGraphQL\Schema\Domain;
+use Generator;
+
+class InformationCollectionDomain implements Domain\Iterator, Schema\Worker
+{
+    const ARG = 'InformationCollectionTypes';
+
+    private ContentTypeService $contentTypeService;
+
+    private Domain\Content\NameHelper $nameHelper;
+
+    private array $typesMap;
+
+    /**
+     * @param ContentTypeService $contentTypeService
+     */
+    public function __construct(ContentTypeService $contentTypeService, Domain\Content\NameHelper $nameHelper, array $typesMap)
+    {
+        $this->contentTypeService = $contentTypeService;
+        $this->nameHelper = $nameHelper;
+        $this->typesMap = $typesMap;
+    }
+
+    public function init(Builder $schema)
+    {
+        $contentTypes = $this->getCollectingContentTypes();
+        if ($contentTypes === null) {
+            return;
+        }
+
+        $schema->addType(
+            new Builder\Input\Type(
+                'InformationCollectionContentTypes',
+                'enum'
+            )
+        );
+
+        foreach ($contentTypes as $contentType) {
+            $schema->addValueToEnum(
+                'InformationCollectionContentTypes',
+                new Builder\Input\EnumValue($this->nameHelper->domainContentTypeName($contentType))
+            );
+        }
+
+
+    }
+
+    public function iterate(): Generator
+    {
+        $types = $this->getCollectingContentTypes();
+        foreach ($types as $type) {
+            yield [self::ARG => $type];
+        }
+    }
+
+    public function work(Builder $schema, array $args)
+    {
+        /** @var ContentType $contentType */
+        $contentType = $args[self::ARG];
+        $fieldDefinitions = $this->getCollectingFieldDefinitions($contentType);
+
+        $collectionContentTypeName = "Collect" . $this->nameHelper->domainContentName($contentType);
+
+        $schema->addType(new Builder\Input\Type(
+            $collectionContentTypeName,
+            'input-object'
+        ));
+
+        array_walk($fieldDefinitions, function (FieldDefinition $fieldDefinition) use ($schema, $collectionContentTypeName, $contentType) {
+            $schema->addFieldToType(
+                $collectionContentTypeName,
+                new Builder\Input\Field(
+                    $this->nameHelper->fieldDefinitionField($fieldDefinition),
+                    $this->typesMap[$fieldDefinition->fieldTypeIdentifier]['input_type'] ?? $this->typesMap[$fieldDefinition->fieldTypeIdentifier]['value_type']
+                )
+            );
+        });
+
+        $this->addInformationCollectionResultTypes($schema);
+
+        $collectionMutationFieldName = str_replace("create", "collect", $this->nameHelper->domainMutationCreateContentField($contentType));
+
+        // add the specific mutation
+        $schema->addFieldToType(
+            'DomainContentMutation',
+            new Builder\Input\Field(
+                $collectionMutationFieldName,
+                'InformationCollectionResult', // update: Return value of collectInformation
+                [
+                    'resolve' => '@=mutation("CollectInformation", [args["locationId"], args["input"]])'
+                ]
+            )
+        );
+
+        $schema->addArgToField(
+            'DomainContentMutation',
+            $collectionMutationFieldName,
+            new Builder\Input\Arg(
+                'input',
+                $collectionContentTypeName
+            )
+        );
+
+        $schema->addArgToField(
+            'DomainContentMutation',
+            $collectionMutationFieldName,
+            new Builder\Input\Arg(
+                'locationId',
+                "Int!"
+            )
+        );
+    }
+
+    private function addInformationCollectionResultTypes(Builder $schema)
+    {
+        // InformationCollectionError
+        $schema->addType(
+            new Builder\Input\Type(
+                'InformationCollectionError',
+                'object'
+            )
+        );
+
+        $schema->addFieldToType(
+            'InformationCollectionError',
+            new Builder\Input\Field(
+                'message',
+                'String!'
+            )
+        );
+
+        $schema->addFieldToType(
+            'InformationCollectionError',
+            new Builder\Input\Field(
+                'fieldIdentifier',
+                'String!'
+            )
+        );
+
+        // InformationCollectionResult
+        $schema->addType(
+            new Builder\Input\Type(
+                'InformationCollectionResult',
+                'object'
+            )
+        );
+
+        $schema->addFieldToType(
+            'InformationCollectionResult',
+            new Builder\Input\Field(
+                'errors',
+                '[InformationCollectionError]'
+            )
+        );
+
+        $schema->addFieldToType(
+            'InformationCollectionResult',
+            new Builder\Input\Field(
+                'success',
+                'Boolean!'
+            )
+        );
+
+    }
+
+    public function canWork(Builder $schema, array $args)
+    {
+        return array_key_exists(self::ARG, $args);
+    }
+
+    private function getCollectingContentTypes(): Generator
+    {
+        foreach ($this->contentTypeService->loadContentTypeGroups() as $group) {
+            foreach ($this->contentTypeService->loadContentTypes($group) as $type) {
+                if ($this->contentTypeCollectsInformation($type)) {
+                    yield $type;
+                }
+            }
+        }
+    }
+
+    private function contentTypeCollectsInformation(ContentType $contentType): bool
+    {
+        return !empty($this->getCollectingFieldDefinitions($contentType));
+    }
+
+    /**
+     * @param ContentType $contentType
+     * @return FieldDefinition[]
+     */
+    private function getCollectingFieldDefinitions(ContentType $contentType): array
+    {
+        $definitions = $contentType->getFieldDefinitions();
+        return array_filter($definitions->toArray(), function (FieldDefinition $fieldDefinition) {
+            return $fieldDefinition->isInfoCollector;
+        });
+    }
+}
\ No newline at end of file
diff --git a/lib/Resources/config/graphql.yml b/lib/Resources/config/graphql.yml
new file mode 100644
index 00000000..65437e32
--- /dev/null
+++ b/lib/Resources/config/graphql.yml
@@ -0,0 +1,15 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Netgen\InformationCollection\GraphQL\Mutation\CollectInformationMutation:
+        arguments:
+            $informationCollectionHandler: '@netgen_information_collection.handler'
+
+    Netgen\InformationCollection\GraphQL\Schema\Domain\InformationCollectionDomain:
+        tags:
+            - "ezplatform_graphql.schema_domain_iterator"
+            - "ezplatform_graphql.domain_schema_worker"
+        arguments:
+            $typesMap: '%ezplatform_graphql.schema.content.mapping.field_definition_type%'
\ No newline at end of file

From 3c764f78caa634743a3efc24cab5c7799a88d12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Fri, 22 Apr 2022 06:54:01 +0000
Subject: [PATCH 22/30] fix: add return types only once

---
 lib/GraphQL/Schema/Domain/InformationCollectionDomain.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php b/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php
index aa5f53b1..748ab658 100644
--- a/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php
+++ b/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php
@@ -51,7 +51,7 @@ public function init(Builder $schema)
             );
         }
 
-
+        $this->addInformationCollectionResultTypes($schema);
     }
 
     public function iterate(): Generator
@@ -85,8 +85,6 @@ public function work(Builder $schema, array $args)
             );
         });
 
-        $this->addInformationCollectionResultTypes($schema);
-
         $collectionMutationFieldName = str_replace("create", "collect", $this->nameHelper->domainMutationCreateContentField($contentType));
 
         // add the specific mutation

From 157f6badd81a377bb0fa550c59dadebca6d5381f Mon Sep 17 00:00:00 2001
From: Edi Modric <edi.modric@gmail.com>
Date: Wed, 8 Jun 2022 12:04:51 +0200
Subject: [PATCH 23/30] Implement use_csrf parameter for
 InformationCollectionType

---
 .../Ibexa/ContentForms/InformationCollectionType.php   | 10 +++++++---
 lib/Resources/config/parameters.yml                    |  2 +-
 lib/Resources/config/services.yml                      |  1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bundle/Ibexa/ContentForms/InformationCollectionType.php b/bundle/Ibexa/ContentForms/InformationCollectionType.php
index 9cc74d4b..6fd164df 100644
--- a/bundle/Ibexa/ContentForms/InformationCollectionType.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionType.php
@@ -23,9 +23,12 @@ class InformationCollectionType extends AbstractType implements DataMapperInterf
 
     private CaptchaService $captchaService;
 
-    public function __construct(CaptchaService $captchaService)
+    private ConfigResolverInterface $configResolver;
+
+    public function __construct(CaptchaService $captchaService, ConfigResolverInterface $configResolver)
     {
         $this->captchaService = $captchaService;
+        $this->configResolver = $configResolver;
     }
 
     public function getName(): string
@@ -79,8 +82,9 @@ public function buildView(FormView $view, FormInterface $form, array $options):
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
-            ->setDefaults(['translation_domain' => 'ezplatform_content_forms_content'])
-            ->setRequired(['languageCode', 'mainLanguageCode']);
+            ->setRequired(['languageCode', 'mainLanguageCode'])
+            ->setDefault('translation_domain', 'ezplatform_content_forms_content')
+            ->setDefault('csrf_protection', $this->configResolver->getParameter('form.use_csrf', 'netgen_information_collection'));
     }
 
     public function mapDataToForms($viewData, iterable $forms): void
diff --git a/lib/Resources/config/parameters.yml b/lib/Resources/config/parameters.yml
index c6060a83..c0dd0d3f 100644
--- a/lib/Resources/config/parameters.yml
+++ b/lib/Resources/config/parameters.yml
@@ -1,3 +1,3 @@
 parameters:
-    netgen.default.information_collection.form.use_csrf: true
+    netgen_information_collection.default.form.use_csrf: true
     netgen_information_collection.default.action_config.auto_responder: []
diff --git a/lib/Resources/config/services.yml b/lib/Resources/config/services.yml
index 997ec2ba..a6e94fde 100644
--- a/lib/Resources/config/services.yml
+++ b/lib/Resources/config/services.yml
@@ -67,6 +67,7 @@ services:
         class: Netgen\Bundle\InformationCollectionBundle\Ibexa\ContentForms\InformationCollectionType
         arguments:
             - '@netgen_information_collection.captcha.service'
+            - '@ibexa.config.resolver'
         tags:
             - { name: form.type }
 

From 4df5ce7b015a5d65902172f08b79d9b070b91eac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Mon, 11 Jul 2022 11:09:03 +0000
Subject: [PATCH 24/30] feat: compatibility with ibexa v4

---
 bundle/Resources/config/services.yml                      | 5 +----
 composer.json                                             | 2 +-
 .../Pagerfanta/View/InformationCollectionAdminView.php    | 8 +++-----
 lib/GraphQL/Mutation/CollectInformationMutation.php       | 6 +++---
 lib/GraphQL/Schema/Domain/InformationCollectionDomain.php | 6 +++---
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml
index 8a828aea..91036968 100644
--- a/bundle/Resources/config/services.yml
+++ b/bundle/Resources/config/services.yml
@@ -34,7 +34,4 @@ services:
             - '@translator'
 
     Netgen\InformationCollection\API\Service\CaptchaService:
-        alias: Netgen\InformationCollection\Core\Service\CaptchaService
-
-    eZ\Publish\Core\Helper\TranslationHelper:
-        alias: ezpublish.translation_helper
+        alias: Netgen\InformationCollection\Core\Service\CaptchaService
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 78681af4..de734570 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-feat-ibexa-4-compatibility": "3.0.x-dev"
         }
     }
 }
diff --git a/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php b/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
index 602cb063..0d2a64eb 100644
--- a/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
+++ b/lib/Core/Pagination/Pagerfanta/View/InformationCollectionAdminView.php
@@ -4,6 +4,7 @@
 
 namespace Netgen\InformationCollection\Core\Pagination\Pagerfanta\View;
 
+use BabDev\PagerfantaBundle\RouteGenerator\RouterAwareRouteGenerator;
 use Closure;
 use Pagerfanta\PagerfantaInterface;
 use Pagerfanta\View\ViewInterface;
@@ -20,7 +21,7 @@ class InformationCollectionAdminView implements ViewInterface
 
     protected PagerfantaInterface $pagerfanta;
 
-    protected Closure $routeGenerator;
+    protected RouterAwareRouteGenerator $routeGenerator;
 
     protected int $proximity;
 
@@ -52,11 +53,8 @@ public function getName(): string
     /**
      * Renders a Pagerfanta.
      *
-     * The route generator can be any callable to generate
-     * the routes receiving the page number as first and
-     * unique argument.
      *
-     * @param \Closure $routeGenerator A callable to generate the routes
+     * @param RouterAwareRouteGenerator $routeGenerator A callable to generate the routes
      */
     public function render(PagerfantaInterface $pagerfanta, $routeGenerator, array $options = []): string
     {
diff --git a/lib/GraphQL/Mutation/CollectInformationMutation.php b/lib/GraphQL/Mutation/CollectInformationMutation.php
index 0b154b0a..2e2bce96 100644
--- a/lib/GraphQL/Mutation/CollectInformationMutation.php
+++ b/lib/GraphQL/Mutation/CollectInformationMutation.php
@@ -2,9 +2,9 @@
 
 namespace Netgen\InformationCollection\GraphQL\Mutation;
 
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
-use EzSystems\EzPlatformGraphQL\Schema\Domain\Content\NameHelper;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\GraphQL\Schema\Domain\Content\NameHelper;
 use Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionMapper;
 use Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionType;
 use Netgen\InformationCollection\Handler;
diff --git a/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php b/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php
index 748ab658..9ea18c91 100644
--- a/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php
+++ b/lib/GraphQL/Schema/Domain/InformationCollectionDomain.php
@@ -2,9 +2,9 @@
 
 namespace Netgen\InformationCollection\GraphQL\Schema\Domain;
 
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
 use EzSystems\EzPlatformGraphQL\Schema;
 use EzSystems\EzPlatformGraphQL\Schema\Builder;
 use EzSystems\EzPlatformGraphQL\Schema\Domain;

From 88b2a64087ac3d407d68b7932f2f487729954b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Wed, 10 Aug 2022 13:49:25 +0000
Subject: [PATCH 25/30] feat: fix possible null pointer

---
 bundle/Ibexa/ContentForms/ContentFieldTypeExtension.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bundle/Ibexa/ContentForms/ContentFieldTypeExtension.php b/bundle/Ibexa/ContentForms/ContentFieldTypeExtension.php
index e12ee48c..99722411 100644
--- a/bundle/Ibexa/ContentForms/ContentFieldTypeExtension.php
+++ b/bundle/Ibexa/ContentForms/ContentFieldTypeExtension.php
@@ -27,6 +27,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         /** @var \Ibexa\ContentForms\Data\Content\ContentUpdateData $updateStruct */
         $updateStruct = $options['contentUpdateStruct'];
 
+        if (null === $updateStruct) {
+            return;
+        }
+
         $fieldDefinition = $updateStruct->fieldsData[$fieldIdentifier]->fieldDefinition;
         if ($fieldDefinition->isInfoCollector) {
             $builder->setRequired(false);

From ddcafee3f7987e04cf34cd285049081aed85e25e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Mon, 22 Aug 2022 08:22:53 +0000
Subject: [PATCH 26/30] feat: fix exporting collections in the admin backend

---
 bundle/Controller/Admin/Export/Export.php     |  2 +-
 .../ExportResponseFormatterRegistry.php       |  2 +-
 lib/Core/Service/ExporterService.php          |  4 ++--
 .../Service/InformationCollectionService.php  |  9 ++++++--
 .../Repository/EzInfoCollectionRepository.php | 21 +++++++++++++++++++
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/bundle/Controller/Admin/Export/Export.php b/bundle/Controller/Admin/Export/Export.php
index 4098edf5..9510166d 100644
--- a/bundle/Controller/Admin/Export/Export.php
+++ b/bundle/Controller/Admin/Export/Export.php
@@ -8,7 +8,7 @@
 use Netgen\InformationCollection\API\Service\Exporter;
 use Netgen\InformationCollection\Core\Export\ExportResponseFormatterRegistry;
 use Symfony\Component\HttpFoundation\Request;
-use Netgen\InformationCollection\Form\Type\ExportType;
+use Netgen\Bundle\InformationCollectionBundle\Form\ExportType;
 use Ibexa\Contracts\Core\Repository\ContentService;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/lib/Core/Export/ExportResponseFormatterRegistry.php b/lib/Core/Export/ExportResponseFormatterRegistry.php
index a429ac3b..92315cde 100644
--- a/lib/Core/Export/ExportResponseFormatterRegistry.php
+++ b/lib/Core/Export/ExportResponseFormatterRegistry.php
@@ -13,7 +13,7 @@ final class ExportResponseFormatterRegistry
     /**
      * @var \Netgen\InformationCollection\API\Export\ExportResponseFormatter[]
      */
-    private array $exportResponseFormatters;
+    private iterable $exportResponseFormatters;
 
     /**
      * @param \Netgen\InformationCollection\API\Export\ExportResponseFormatter[] $exportResponseFormatters
diff --git a/lib/Core/Service/ExporterService.php b/lib/Core/Service/ExporterService.php
index b2fa0513..705387e9 100644
--- a/lib/Core/Service/ExporterService.php
+++ b/lib/Core/Service/ExporterService.php
@@ -42,8 +42,8 @@ public function export(ExportCriteria $criteria): Export
 
         $fields['created'] = $this->translator->trans('netgen_information_collection_admin_export_created', [], 'netgen_information_collection_admin');
 
-        $collections = $this->informationCollection->getCollections(
-            new ContentId($criteria->getContentId()->getContentId(), $criteria->getContentId()->getOffset(), $criteria->getContentId()->getLimit())
+        $collections = $this->informationCollection->filterCollections(
+            $criteria
         );
 
         $rows = [];
diff --git a/lib/Core/Service/InformationCollectionService.php b/lib/Core/Service/InformationCollectionService.php
index 6a708219..88f1268d 100644
--- a/lib/Core/Service/InformationCollectionService.php
+++ b/lib/Core/Service/InformationCollectionService.php
@@ -161,8 +161,13 @@ public function getCollections(ContentId $contentId): Collections
 
     public function filterCollections(FilterCriteria $criteria): Collections
     {
-        // TODO: Implement filterCollections() method.
-        return new Collections([], 0);
+        $collections = $this->ezInfoCollectionRepository->findByExportCriteria($criteria);
+
+        $mapped = array_map(function($collection) {
+            return $this->loadCollection($collection->getId());
+        }, $collections);
+
+        return new Collections($mapped, sizeof($mapped));
     }
 
     public function searchCount(SearchCountQuery $query): SearchCount
diff --git a/lib/Doctrine/Repository/EzInfoCollectionRepository.php b/lib/Doctrine/Repository/EzInfoCollectionRepository.php
index 1f9f775c..4273863b 100644
--- a/lib/Doctrine/Repository/EzInfoCollectionRepository.php
+++ b/lib/Doctrine/Repository/EzInfoCollectionRepository.php
@@ -15,6 +15,7 @@
 use Netgen\InformationCollection\API\Exception\RemoveCollectionFailedException;
 use Netgen\InformationCollection\API\Exception\RetrieveCountException;
 use Netgen\InformationCollection\API\Exception\StoringCollectionFailedException;
+use Netgen\InformationCollection\API\Value\Filter\FilterCriteria;
 use Netgen\InformationCollection\Doctrine\Entity\EzInfoCollection;
 
 class EzInfoCollectionRepository extends EntityRepository
@@ -137,4 +138,24 @@ public function getChildrenCount(int $contentId): int
             throw new RetrieveCountException('', '');
         }
     }
+
+    public function findByExportCriteria(FilterCriteria $criteria): array
+    {
+        $qb = $this->createQueryBuilder('ezc');
+
+        $query = $qb->select('ezc')
+            ->where('ezc.contentObjectId = :contentObjectId')
+            ->setParameter('contentObjectId', $criteria->getContentId()->getContentId())
+            ->setParameter('from', $criteria->getFrom()->getTimestamp())
+            ->setParameter('to', $criteria->getTo()->getTimestamp())
+            ->andWhere($qb->expr()->andX(
+                $qb->expr()->gte('ezc.created', ':from'),
+                $qb->expr()->lte('ezc.created', ':to')
+            ))
+            ->getQuery();
+
+        $sql = $query->getSQL();
+
+        return $query->getResult();
+    }
 }

From 2f65cc5916646b480a2c27c004aadbe38b4ca790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Tue, 3 Jan 2023 10:11:16 +0000
Subject: [PATCH 27/30] feat: fix auto_responder action

---
 lib/Core/Factory/AutoResponderDataFactory.php | 52 +++++++++++++------
 lib/Resources/config/actions.yml              | 23 ++++----
 2 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/lib/Core/Factory/AutoResponderDataFactory.php b/lib/Core/Factory/AutoResponderDataFactory.php
index 3e54f5a7..b915de54 100644
--- a/lib/Core/Factory/AutoResponderDataFactory.php
+++ b/lib/Core/Factory/AutoResponderDataFactory.php
@@ -4,25 +4,36 @@
 
 namespace Netgen\InformationCollection\Core\Factory;
 
-use Ibexa\Contracts\Core\Repository\Values\Content\Field;
-use Netgen\InformationCollection\API\ConfigurationConstants;
+use eZ\Publish\Core\Helper\FieldHelper;
+use eZ\Publish\Core\Helper\TranslationHelper;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Netgen\InformationCollection\Core\Action\AutoResponderAction;
+use Netgen\InformationCollection\Core\Action\EmailAction;
+use Twig\Environment;
+use function array_key_exists;
+use eZ\Publish\API\Repository\Values\Content\Field;
 use Netgen\InformationCollection\API\Constants;
+use Netgen\InformationCollection\API\ConfigurationConstants;
 use Netgen\InformationCollection\API\Exception\MissingValueException;
-use Netgen\InformationCollection\API\Factory\EmailContentFactoryInterface;
 use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
 use Netgen\InformationCollection\API\Value\DataTransfer\TemplateContent;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
-use function array_filter;
-use function array_key_exists;
-use function explode;
-use function filter_var;
 use function trim;
-use const FILTER_VALIDATE_EMAIL;
 
-class AutoResponderDataFactory implements EmailContentFactoryInterface
+class AutoResponderDataFactory extends EmailDataFactory
 {
+    public function __construct(ConfigResolverInterface $configResolver, TranslationHelper $translationHelper, FieldHelper $fieldHelper, Environment $twig)
+    {
+        parent::__construct($configResolver, $translationHelper, $fieldHelper, $twig);
+        $this->config = $this->configResolver->getParameter('action_config', 'netgen_information_collection')[AutoResponderAction::$defaultName];
+    }
+
     /**
      * Factory method.
+     *
+     * @param InformationCollected $value
+     *
+     * @return EmailContent
      */
     public function build(InformationCollected $value): EmailContent
     {
@@ -46,8 +57,12 @@ public function build(InformationCollected $value): EmailContent
 
     /**
      * Returns resolved parameter.
+     *
+     * @param TemplateContent $data
+     *
+     * @return array
      */
-    protected function resolveRecipient(TemplateContent $data): array
+    protected function resolveRecipient(TemplateContent $data)
     {
         $fields = $data->getEvent()->getInformationCollectionStruct()->getCollectedFields();
         if ($data->getTemplateWrapper()->hasBlock(Constants::FIELD_RECIPIENT)) {
@@ -64,9 +79,12 @@ protected function resolveRecipient(TemplateContent $data): array
         }
 
         if (!empty($rendered)) {
+
             $emails = explode(',', $rendered);
 
-            $emails = array_filter($emails, static fn ($var) => filter_var($var, FILTER_VALIDATE_EMAIL));
+            $emails = array_filter($emails, function($var) {
+                return filter_var($var, FILTER_VALIDATE_EMAIL);
+            });
 
             if (!empty($emails)) {
                 return $emails;
@@ -79,7 +97,7 @@ protected function resolveRecipient(TemplateContent $data): array
         }
 
         if (array_key_exists($field, $fields)) {
-            return [$fields[$field]->email];
+            return [$fields[$field]->value->email];
         }
 
         throw new MissingValueException($field);
@@ -87,8 +105,12 @@ protected function resolveRecipient(TemplateContent $data): array
 
     /**
      * Returns resolved parameter.
+     *
+     * @param TemplateContent $data
+     *
+     * @return string
      */
-    protected function resolveSubject(TemplateContent $data): string
+    protected function resolveSubject(TemplateContent $data)
     {
         $fields = $data->getEvent()->getInformationCollectionStruct()->getCollectedFields();
         if ($data->getTemplateWrapper()->hasBlock(Constants::FIELD_AUTO_RESPONDER_SUBJECT)) {
@@ -105,8 +127,8 @@ protected function resolveSubject(TemplateContent $data): string
         }
 
         $content = $data->getContent();
-        if (array_key_exists(Constants::FIELD_AUTO_RESPONDER_SUBJECT, $content->fields)
-            && !$this->fieldHelper->isFieldEmpty($content, Constants::FIELD_AUTO_RESPONDER_SUBJECT)
+        if (array_key_exists(Constants::FIELD_AUTO_RESPONDER_SUBJECT, $content->fields) &&
+            !$this->fieldHelper->isFieldEmpty($content, Constants::FIELD_AUTO_RESPONDER_SUBJECT)
         ) {
             $fieldValue = $this->translationHelper->getTranslatedField($content, Constants::FIELD_AUTO_RESPONDER_SUBJECT);
 
diff --git a/lib/Resources/config/actions.yml b/lib/Resources/config/actions.yml
index ebeba971..3e32d182 100644
--- a/lib/Resources/config/actions.yml
+++ b/lib/Resources/config/actions.yml
@@ -3,19 +3,17 @@ services:
         class: Netgen\InformationCollection\Core\Action\ActionRegistry
         arguments:
             - !tagged_iterator netgen_information_collection.action
-            - "@netgen_information_collection.action.config_utility"
+            - '@Netgen\InformationCollection\Core\Action\ConfigurationUtility'
             - "@logger"
             - "@event_dispatcher"
         calls:
             - [setDebug, ['%kernel.debug%']]
 
-    netgen_information_collection.action.config_utility:
-        class: Netgen\InformationCollection\Core\Action\ConfigurationUtility
+    Netgen\InformationCollection\Core\Action\ConfigurationUtility:
         arguments:
-            - "@ibexa.config.resolver"
+            - '@ibexa.config.resolver'
 
-    netgen_information_collection.action.db:
-        class: Netgen\InformationCollection\Core\Action\DatabaseAction
+    Netgen\InformationCollection\Core\Action\DatabaseAction:
         arguments:
             - '@netgen_information_collection.api.service'
         tags:
@@ -28,10 +26,9 @@ services:
         tags:
             - { name: netgen_information_collection.action }
 
-#    netgen_information_collection.action.auto_responder:
-#        class: Netgen\InformationCollection\Core\Action\AutoResponderAction
-#        arguments:
-#            - '@netgen_information_collection.factory.auto_responder_data'
-#            - '@netgen_information_collection.mailer'
-#        tags:
-#            - { name: netgen_information_collection.action, alias: auto_responder }
+    Netgen\InformationCollection\Core\Action\AutoResponderAction:
+        arguments:
+            - '@Netgen\InformationCollection\API\MailerInterface'
+            - '@Netgen\InformationCollection\Core\EmailDataProvider\AutoResponderProvider'
+        tags:
+            - { name: netgen_information_collection.action }

From 54d9726cbd78886fafc94556563fa80a4a45fdfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Thu, 12 Jan 2023 15:23:27 +0000
Subject: [PATCH 28/30] feat: properly initialize '' array

---
 lib/API/Value/InformationCollectionStruct.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/API/Value/InformationCollectionStruct.php b/lib/API/Value/InformationCollectionStruct.php
index e19615fe..a7ea13c9 100644
--- a/lib/API/Value/InformationCollectionStruct.php
+++ b/lib/API/Value/InformationCollectionStruct.php
@@ -23,7 +23,7 @@ final class InformationCollectionStruct extends ValueObject
     /**
      * @var \Ibexa\Contracts\ContentForms\Data\Content\FieldData[]
      */
-    protected array $fields;
+    protected array $fields = [];
 
     private Location $location;
 

From 3d57022de6c07a2eefac9f53c170ee89ee1f75c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Mon, 6 Mar 2023 09:37:39 +0000
Subject: [PATCH 29/30] feat: properly support translated info collection
 fields

---
 .../InformationCollectionMapper.php           |  2 +-
 lib/Handler.php                               | 33 +++++++++++++++++--
 lib/Resources/config/services.yml             |  1 +
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/bundle/Ibexa/ContentForms/InformationCollectionMapper.php b/bundle/Ibexa/ContentForms/InformationCollectionMapper.php
index ee8a8ec4..ac922dea 100644
--- a/bundle/Ibexa/ContentForms/InformationCollectionMapper.php
+++ b/bundle/Ibexa/ContentForms/InformationCollectionMapper.php
@@ -21,7 +21,7 @@ final class InformationCollectionMapper
      */
     public function mapToFormData(Content $content, Location $location, ContentType $contentType): InformationCollectionStruct
     {
-        $fields = $content->getFieldsByLanguage($content->contentInfo->mainLanguageCode);
+        $fields = $content->getFieldsByLanguage();
 
         $informationCollectionFields = [];
 
diff --git a/lib/Handler.php b/lib/Handler.php
index 0fd0addc..bd308093 100644
--- a/lib/Handler.php
+++ b/lib/Handler.php
@@ -4,6 +4,7 @@
 
 namespace Netgen\InformationCollection;
 
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
@@ -24,11 +25,19 @@ final class Handler
 
     private EventDispatcherInterface $eventDispatcher;
 
-    public function __construct(FormFactoryInterface $formFactory, ContentTypeService $contentTypeService, EventDispatcherInterface $eventDispatcher)
+    private ConfigResolverInterface $configResolver;
+
+    public function __construct(
+        FormFactoryInterface $formFactory,
+        ContentTypeService $contentTypeService,
+        EventDispatcherInterface $eventDispatcher,
+        ConfigResolverInterface $configResolver
+    )
     {
         $this->formFactory = $formFactory;
         $this->contentTypeService = $contentTypeService;
         $this->eventDispatcher = $eventDispatcher;
+        $this->configResolver = $configResolver;
     }
 
     public function getForm(Content $content, Location $location): FormInterface
@@ -40,11 +49,31 @@ public function getForm(Content $content, Location $location): FormInterface
         $data = $informationCollectionMapper->mapToFormData($content, $location, $contentType);
 
         return $this->formFactory->create(InformationCollectionType::class, $data, [
-            'languageCode' => $content->contentInfo->mainLanguageCode,
+            'languageCode' => $this->determineLanguageToLoad($content),
             'mainLanguageCode' => $content->contentInfo->mainLanguageCode,
         ]);
     }
 
+    /**
+     * @param Content $content
+     * @return string
+     */
+    private function determineLanguageToLoad(Content $content): string
+    {
+        $versionInfo = $content->getVersionInfo();
+
+        $siteAccessLanguagesCodes = (array)$this->configResolver->getParameter('languages');
+        foreach($siteAccessLanguagesCodes as $languageCode)
+        {
+            if (in_array($languageCode, $versionInfo->languageCodes, true))
+            {
+                return $languageCode;
+            }
+        }
+
+        return $content->contentInfo->mainLanguageCode;
+    }
+
     public function handle(InformationCollectionStruct $struct, array $options): void
     {
         $event = new InformationCollected($struct, $options);
diff --git a/lib/Resources/config/services.yml b/lib/Resources/config/services.yml
index f8c06573..7c6eda72 100644
--- a/lib/Resources/config/services.yml
+++ b/lib/Resources/config/services.yml
@@ -95,6 +95,7 @@ services:
             - "@form.factory"
             - "@ibexa.api.service.content_type"
             - "@event_dispatcher"
+            - "@ibexa.config.resolver"
 
     Netgen\InformationCollection\Core\Service\CaptchaService:
         autowire: true

From 74d665f7f154b5d4001173e7cab4f8bd974590ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Hrdina?= <rene.hrdina@styleflasher.at>
Date: Wed, 3 May 2023 08:40:41 +0200
Subject: [PATCH 30/30] feat: fix displaying correct boolean values in the
 admin interface

---
 bundle/Resources/views/admin/content_fields.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundle/Resources/views/admin/content_fields.html.twig b/bundle/Resources/views/admin/content_fields.html.twig
index 1afb1402..1d9b0006 100644
--- a/bundle/Resources/views/admin/content_fields.html.twig
+++ b/bundle/Resources/views/admin/content_fields.html.twig
@@ -10,7 +10,7 @@
 {% block ezboolean_field %}
     {% apply spaceless %}
         {% set field_value = attribute.value %}
-        {% if field_value %}
+        {% if field_value.dataInt %}
             {{ 'field_value.yes'|trans }}
         {% else %}
             {{ 'field_value.no'|trans }}