Merge branch 'application-server-part3' of github.com:magento-performance/magento2ce into ACPT-1360

Author: JacobBrownAustin

app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php

@@ -106,18 +106,13 @@ public function execute()
         $fileSize = $this->sampleFileProvider->getSize($entityName);
         $fileName = $entityName . '.csv';
 
-        $this->fileFactory->create(
+        return $this->fileFactory->create(
             $fileName,
-            null,
+            $fileContents,
             DirectoryList::VAR_IMPORT_EXPORT,
             'application/octet-stream',
             $fileSize
         );
-
-        $resultRaw = $this->resultRawFactory->create();
-        $resultRaw->setContents($fileContents);
-
-        return $resultRaw;
     }
 
     /**

dev/tests/static/testsuite/Magento/Test/Integrity/ObserverImplementationTest.php

@@ -57,13 +57,19 @@ public function testObserverHasNoExtraPublicMethods()
         $errors = [];
         foreach (self::$observerClasses as $observerClass) {
             $reflection = (new \ReflectionClass($observerClass));
+            $publicMethodsCount = 0;
             $maxCountMethod = $reflection->getConstructor() ? 2 : 1;
+            $publicMethods = $reflection->getMethods(\ReflectionMethod::IS_PUBLIC);
+            foreach ($publicMethods as $publicMethod) {
+                if (!str_starts_with($publicMethod->getName(), '_')) {
+                    $publicMethodsCount++;
+                }
+            }
 
-            if (count($reflection->getMethods(\ReflectionMethod::IS_PUBLIC)) > $maxCountMethod) {
+            if ($publicMethodsCount > $maxCountMethod) {
                 $errors[] = $observerClass;
             }
         }
-        $errors = array_diff($errors, [GetPriceConfigurationObserver::class]);
 
         if ($errors) {
             $errors = array_unique($errors);