diff --git a/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectHelperController.php b/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectHelperController.php
index ed06da2e65f..db28959f4d5 100644
--- a/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectHelperController.php
+++ b/bundles/AdminBundle/Controller/Admin/DataObject/DataObjectHelperController.php
@@ -335,7 +335,7 @@ public function doGetGridColumnConfig(Request $request, Config $config, $isDelet
                     }
                     $userIds = implode(',', $userIds);
                     $shared = ($savedGridConfig->getOwnerId() != $userId && $savedGridConfig->isShareGlobally()) || $db->fetchOne('select 1 from gridconfig_shares where sharedWithUserId IN ('.$userIds.') and gridConfigId = '.$savedGridConfig->getId());
-//                  $shared = $savedGridConfig->isShareGlobally() || GridConfigShare::getByGridConfigAndSharedWithId($savedGridConfig->getId(), $this->getUser()->getId());
+                    //                  $shared = $savedGridConfig->isShareGlobally() || GridConfigShare::getByGridConfigAndSharedWithId($savedGridConfig->getId(), $this->getUser()->getId());
 
                     if (!$shared && $savedGridConfig->getOwnerId() != $this->getAdminUser()->getId()) {
                         throw new \Exception('You are neither the owner of this config nor it is shared with you');
diff --git a/bundles/AdminBundle/Controller/Searchadmin/SearchController.php b/bundles/AdminBundle/Controller/Searchadmin/SearchController.php
index 199bffc8be2..5082616b5d6 100644
--- a/bundles/AdminBundle/Controller/Searchadmin/SearchController.php
+++ b/bundles/AdminBundle/Controller/Searchadmin/SearchController.php
@@ -116,8 +116,8 @@ public function findAction(Request $request, EventDispatcherInterface $eventDisp
                 $parts = explode('~', $f);
                 if (substr($f, 0, 1) == '~') {
                     //                    $type = $parts[1];
-//                    $field = $parts[2];
-//                    $keyid = $parts[3];
+                    //                    $field = $parts[2];
+                    //                    $keyid = $parts[3];
                     // key value, ignore for now
                 } elseif (count($parts) > 1) {
                     $bricks[$parts[0]] = $parts[0];
diff --git a/models/DataObject/ClassDefinition/Data/Fieldcollections.php b/models/DataObject/ClassDefinition/Data/Fieldcollections.php
index af1b3bc45d1..ca272e29c85 100644
--- a/models/DataObject/ClassDefinition/Data/Fieldcollections.php
+++ b/models/DataObject/ClassDefinition/Data/Fieldcollections.php
@@ -552,9 +552,9 @@ public function getGetterCode($class)
         // TODO else part should not be needed at all as preGetData is always there
         // if ($this instanceof PreGetDataInterface || method_exists($this, 'preGetData')) {
         $code .= "\t" . '$data = $this->getClass()->getFieldDefinition("' . $key . '")->preGetData($this);' . "\n";
-//        } else {
-//            $code .= "\t" . '$data = $this->' . $key . ";\n";
-//        }
+        //        } else {
+        //            $code .= "\t" . '$data = $this->' . $key . ";\n";
+        //        }
 
         $code .= "\t" . 'return $data;' . "\n";
         $code .= "}\n\n";
diff --git a/models/Element/Service.php b/models/Element/Service.php
index 119704f305c..b17c38bc972 100644
--- a/models/Element/Service.php
+++ b/models/Element/Service.php
@@ -863,10 +863,10 @@ public static function renewReferences($data, $initial = true, $key = null)
 
                 if ($originalElement) {
                     //do not override filename for Assets https://github.com/pimcore/pimcore/issues/8316
-//                    if ($data instanceof Asset) {
-//                        /** @var Asset $originalElement */
-//                        $data->setFilename($originalElement->getFilename());
-//                    } else
+                    //                    if ($data instanceof Asset) {
+                    //                        /** @var Asset $originalElement */
+                    //                        $data->setFilename($originalElement->getFilename());
+                    //                    } else
                     if ($data instanceof Document) {
                         /** @var Document $originalElement */
                         $data->setKey($originalElement->getKey());
diff --git a/tests/Ecommerce/PricingManager/Rule/AbstractRuleTest.php b/tests/Ecommerce/PricingManager/Rule/AbstractRuleTest.php
index 8571f6535fc..2d144ab83e8 100644
--- a/tests/Ecommerce/PricingManager/Rule/AbstractRuleTest.php
+++ b/tests/Ecommerce/PricingManager/Rule/AbstractRuleTest.php
@@ -370,9 +370,9 @@ protected function buildRules($ruleDefinitions)
                 $rule->setCondition($condition);
             }
 
-//            if($ruleDefinition['condition']) {
-//                $rule->setValue("condition", $ruleDefinition['condition']);
-//            }
+            //            if($ruleDefinition['condition']) {
+            //                $rule->setValue("condition", $ruleDefinition['condition']);
+            //            }
 
             $rules[] = $rule;
         }
diff --git a/tests/Ecommerce/PricingManager/RuleTest.php b/tests/Ecommerce/PricingManager/RuleTest.php
index 88fbf448cbd..c17e76fa3e6 100644
Binary files a/tests/Ecommerce/PricingManager/RuleTest.php and b/tests/Ecommerce/PricingManager/RuleTest.php differ
diff --git a/tests/Unit/Translation/TranslatorTest.php b/tests/Unit/Translation/TranslatorTest.php
index 3e266971f8e..ff20e2ba5d7 100644
--- a/tests/Unit/Translation/TranslatorTest.php
+++ b/tests/Unit/Translation/TranslatorTest.php
@@ -134,8 +134,8 @@ public function testTranslateTextAsKey()
         $this->assertEquals($this->translations['en']['simple_key'], $this->translator->trans('Text As Key'));
 
         //Returns Key value (no translation + no fallback)
-//        $this->translator->setLocale('fr');
-//        $this->assertEquals('Text As Key', $this->translator->trans('Text As Key'));
+        //        $this->translator->setLocale('fr');
+        //        $this->assertEquals('Text As Key', $this->translator->trans('Text As Key'));
     }
 
     public function testTranslateTextWithParams()