Merge remote-tracking branch 'anzin/php8-compatibility/fix-critical-error-in-functional-test' into platform-health

Author: xmav

app/code/Magento/Bundle/Model/Product/SelectionProductsDisabledRequired.php

@@ -82,6 +82,7 @@ public function __construct(
      * @param int $bundleId
      * @param int|null $websiteId
      * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getChildProductIds(int $bundleId, ?int $websiteId = null): array
     {
@@ -128,10 +129,12 @@ public function getChildProductIds(int $bundleId, ?int $websiteId = null): array
     private function getProducts(array $selectionProductIds, int $websiteId): array
     {
         $productIds = [];
-        $defaultStoreId = $this->storeManager->getWebsite($websiteId)->getDefaultStore()->getId();
+        $defaultStore = $this->storeManager->getWebsite($websiteId)->getDefaultStore();
+        $defaultStoreId = $defaultStore ? $defaultStore->getId() : null;
         foreach ($selectionProductIds as $optionProductIds) {
-            $productIds = array_merge($productIds, $optionProductIds);
+            $productIds[] = $optionProductIds;
         }
+        $productIds = array_merge([], ...$productIds);
         $productCollection = $this->productCollectionFactory->create();
         $productCollection->joinAttribute(
             ProductInterface::STATUS,

lib/internal/Magento/Framework/Filesystem/Driver/Http.php

@@ -246,11 +246,11 @@ protected function getScheme($scheme = null)
      * @param string $hostname
      * @param int $port
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @return array
+     * @return resource|bool
      */
     protected function open($hostname, $port)
     {
-        $result = @fsockopen($hostname, $port, $errorNumber = null, $errorMessage = null);
+        $result = @fsockopen($hostname, $port, $errorNumber, $errorMessage);
         if ($result === false) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(