diff --git a/bundles/AdminBundle/Controller/AdminController.php b/bundles/AdminBundle/Controller/AdminController.php
index 21754398ef0..d58edddbd3d 100644
--- a/bundles/AdminBundle/Controller/AdminController.php
+++ b/bundles/AdminBundle/Controller/AdminController.php
@@ -35,7 +35,7 @@ abstract class AdminController extends Controller implements AdminControllerInte
      * {@inheritdoc}
      *
      */
-    public static function getSubscribedServices()/*: array */
+    public static function getSubscribedServices()// : array
     {
         $services = parent::getSubscribedServices();
         $services['translator'] = TranslatorInterface::class;
diff --git a/bundles/AdminBundle/HttpFoundation/JsonResponse.php b/bundles/AdminBundle/HttpFoundation/JsonResponse.php
index 7403670be9e..318aeb7f885 100644
--- a/bundles/AdminBundle/HttpFoundation/JsonResponse.php
+++ b/bundles/AdminBundle/HttpFoundation/JsonResponse.php
@@ -28,7 +28,7 @@ class JsonResponse extends BaseJsonResponse
     /**
      * {@inheritdoc}
      */
-    public function setData($data = [])/*: self */
+    public function setData($data = [])// : self
     {
         $serializer = Serialize::getAdminSerializer();
 
diff --git a/bundles/AdminBundle/Security/User/User.php b/bundles/AdminBundle/Security/User/User.php
index b1218f289e5..5c36f647d98 100644
--- a/bundles/AdminBundle/Security/User/User.php
+++ b/bundles/AdminBundle/Security/User/User.php
@@ -58,7 +58,7 @@ public function getUsername()
     /**
      * {@inheritdoc}
      */
-    public function getUserIdentifier()/*: string */
+    public function getUserIdentifier()// : string
     {
         return $this->user->getName();
     }
@@ -66,7 +66,7 @@ public function getUserIdentifier()/*: string */
     /**
      * @return PimcoreUser
      */
-    public function getUser()/*: PimcoreUser */
+    public function getUser()// : PimcoreUser
     {
         return $this->user;
     }
@@ -74,7 +74,7 @@ public function getUser()/*: PimcoreUser */
     /**
      * {@inheritdoc}
      */
-    public function getRoles()/*: array */
+    public function getRoles()// : array
     {
         $roles = [];
 
@@ -97,7 +97,7 @@ public function getRoles()/*: array */
     /**
      * {@inheritdoc}
      */
-    public function getPassword()/*: ?string */
+    public function getPassword()// : ?string
     {
         return $this->user->getPassword();
     }
@@ -105,7 +105,7 @@ public function getPassword()/*: ?string */
     /**
      * {@inheritdoc}
      */
-    public function getSalt()/*: ?string */
+    public function getSalt()// : ?string
     {
         return null;
     }
@@ -122,7 +122,7 @@ public function eraseCredentials()
     /**
      * {@inheritdoc}
      */
-    public function isEqualTo(UserInterface $user)/*: bool */
+    public function isEqualTo(UserInterface $user)// : bool
     {
         return $user instanceof self && $user->getId() === $this->getId();
     }
diff --git a/lib/Controller/ArgumentValueResolver/WebsiteConfigValueResolver.php b/lib/Controller/ArgumentValueResolver/WebsiteConfigValueResolver.php
index 9161f8178df..6979fb17c4d 100644
--- a/lib/Controller/ArgumentValueResolver/WebsiteConfigValueResolver.php
+++ b/lib/Controller/ArgumentValueResolver/WebsiteConfigValueResolver.php
@@ -28,6 +28,7 @@ final class WebsiteConfigValueResolver implements ArgumentValueResolverInterface
     /**
      * @param Request $request
      * @param ArgumentMetadata $argument
+     *
      * @return bool
      */
     public function supports(Request $request, ArgumentMetadata $argument): bool
diff --git a/lib/Controller/Controller.php b/lib/Controller/Controller.php
index 9094fd69b65..eca87623a1d 100644
--- a/lib/Controller/Controller.php
+++ b/lib/Controller/Controller.php
@@ -85,7 +85,7 @@ protected function renderView(string $view, array $parameters = []): string
      * {@inheritdoc}
      *
      */
-    public static function getSubscribedServices()/* :array */
+    public static function getSubscribedServices()// :array
     {
         $services = parent::getSubscribedServices();
         $services['pimcore.templating'] = '?'.EngineInterface::class;
diff --git a/lib/Controller/FrontendController.php b/lib/Controller/FrontendController.php
index 8a90c2c4ce5..ff8802ba993 100644
--- a/lib/Controller/FrontendController.php
+++ b/lib/Controller/FrontendController.php
@@ -33,7 +33,7 @@ abstract class FrontendController extends Controller
      * {@inheritdoc}
      *
      */
-    public static function getSubscribedServices()/*: array */
+    public static function getSubscribedServices()// : array
     {
         $services = parent::getSubscribedServices();
         $services[EditmodeResolver::class] = '?'.EditmodeResolver::class;
diff --git a/lib/Db/PimcoreExtensionsTrait.php b/lib/Db/PimcoreExtensionsTrait.php
index ef46eec6725..db0eb18e8d3 100644
--- a/lib/Db/PimcoreExtensionsTrait.php
+++ b/lib/Db/PimcoreExtensionsTrait.php
@@ -42,7 +42,7 @@ trait PimcoreExtensionsTrait
      *
      *@see \Doctrine\DBAL\Connection::connect
      */
-    public function connect()/*: bool */
+    public function connect()// : bool
     {
         $returnValue = parent::connect();
 
diff --git a/lib/Routing/Element/Router.php b/lib/Routing/Element/Router.php
index bd3e5b0a689..341613c1702 100644
--- a/lib/Routing/Element/Router.php
+++ b/lib/Routing/Element/Router.php
@@ -67,7 +67,7 @@ public function setContext(RequestContext $context)
      *
      * @return RequestContext
      */
-    public function getContext()/*: RequestContext */
+    public function getContext()// : RequestContext
     {
         return $this->context;
     }
@@ -77,7 +77,7 @@ public function getContext()/*: RequestContext */
      *
      * @return bool
      */
-    public function supports($name)/*: bool */
+    public function supports($name)// : bool
     {
         return $name === 'pimcore_element';
     }
@@ -85,7 +85,7 @@ public function supports($name)/*: bool */
     /**
      * {@inheritdoc}
      */
-    public function getRouteDebugMessage($name, array $parameters = [])/*: string */
+    public function getRouteDebugMessage($name, array $parameters = [])// : string
     {
         $element = $parameters['element'] ?? null;
         if ($element instanceof ElementInterface) {
@@ -98,7 +98,7 @@ public function getRouteDebugMessage($name, array $parameters = [])/*: string */
     /**
      * {@inheritdoc}
      */
-    public function generate(string $name, array $parameters = [], int $referenceType = self::ABSOLUTE_PATH)/*: string */
+    public function generate(string $name, array $parameters = [], int $referenceType = self::ABSOLUTE_PATH)// : string
     {
         $element = $parameters['element'] ?? null;
         if ($element instanceof Document || $element instanceof Asset) {
@@ -202,7 +202,7 @@ public function match($pathinfo)
      *
      * @return RouteCollection
      */
-    public function getRouteCollection()/*: RouteCollection */
+    public function getRouteCollection()// : RouteCollection
     {
         return new RouteCollection();
     }
diff --git a/lib/Test/KernelTestCase.php b/lib/Test/KernelTestCase.php
index bd63b83d8d7..243b7fa15df 100644
--- a/lib/Test/KernelTestCase.php
+++ b/lib/Test/KernelTestCase.php
@@ -26,7 +26,7 @@ abstract class KernelTestCase extends \Symfony\Bundle\FrameworkBundle\Test\Kerne
      *
      * @return KernelInterface
      */
-    protected static function createKernel(array $options = [])/*: KernelInterface */
+    protected static function createKernel(array $options = [])// : KernelInterface
     {
         $kernel = parent::createKernel($options);
 
diff --git a/lib/Test/WebTestCase.php b/lib/Test/WebTestCase.php
index 2e3657a5e17..74677a9d3b0 100644
--- a/lib/Test/WebTestCase.php
+++ b/lib/Test/WebTestCase.php
@@ -26,7 +26,7 @@ abstract class WebTestCase extends \Symfony\Bundle\FrameworkBundle\Test\WebTestC
      *
      * @return KernelInterface
      */
-    protected static function createKernel(array $options = [])/*: KernelInterface */
+    protected static function createKernel(array $options = [])// : KernelInterface
     {
         $kernel = parent::createKernel($options);
 
diff --git a/lib/Translation/Translator.php b/lib/Translation/Translator.php
index 5905c501043..119c455c4d2 100644
--- a/lib/Translation/Translator.php
+++ b/lib/Translation/Translator.php
@@ -148,7 +148,7 @@ public function getLocale()
     /**
      * {@inheritdoc}
      */
-    public function getCatalogue(string $locale = null)/*: MessageCatalogueInterface */
+    public function getCatalogue(string $locale = null)// : MessageCatalogueInterface
     {
         return $this->translator->getCatalogue($locale);
     }
diff --git a/lib/Workflow/MarkingStore/DataObjectSplittedStateMarkingStore.php b/lib/Workflow/MarkingStore/DataObjectSplittedStateMarkingStore.php
index 6c451d893dd..dd79600d3db 100644
--- a/lib/Workflow/MarkingStore/DataObjectSplittedStateMarkingStore.php
+++ b/lib/Workflow/MarkingStore/DataObjectSplittedStateMarkingStore.php
@@ -62,7 +62,7 @@ public function __construct(string $workflowName, array $places, array $stateMap
      *
      * @throws LogicException
      */
-    public function getMarking($subject)/*: Marking */
+    public function getMarking($subject)// : Marking
     {
         $this->checkIfSubjectIsValid($subject);
 
diff --git a/lib/Workflow/MarkingStore/StateTableMarkingStore.php b/lib/Workflow/MarkingStore/StateTableMarkingStore.php
index f161ed62b4b..10c90ee0839 100644
--- a/lib/Workflow/MarkingStore/StateTableMarkingStore.php
+++ b/lib/Workflow/MarkingStore/StateTableMarkingStore.php
@@ -37,7 +37,7 @@ public function __construct(string $workflowName)
     /**
      * {@inheritdoc}
      */
-    public function getMarking($subject)/*: Marking */
+    public function getMarking($subject)// : Marking
     {
         $subject = $this->checkIfSubjectIsValid($subject);