Merge pull request #115 from magento-commerce/platform-health

[Platform Health] Dependency Updates & PHP8 Support
magento · Oct 6, 2021 · 60d2cbb · 60d2cbb
2 parents f223e97 + dbb8db9
commit 60d2cbb
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/app/code/Magento/AwsS3PageBuilder/composer.json b/app/code/Magento/AwsS3PageBuilder/composer.json
@@ -3,7 +3,7 @@
     "description": "Aws S3 Page Builder module",
     "require": {
         "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0"
     },
     "suggest": {
         "magento/module-page-builder": "*",

diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/composer.json b/app/code/Magento/CatalogPageBuilderAnalytics/composer.json
@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-catalog": "*",
         "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0"
     },
     "type": "magento2-module",
     "license": [

diff --git a/app/code/Magento/CmsPageBuilderAnalytics/composer.json b/app/code/Magento/CmsPageBuilderAnalytics/composer.json
@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-cms": "*",
         "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0"
     },
     "type": "magento2-module",
     "license": [

diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php
@@ -92,7 +92,7 @@ public function render(array $params): array
             ->load();
 
         if ($blocks->count() === 0) {
-            $result['error'] = sprintf(__('Block with ID: %s doesn\'t exist'), $params['block_id']);
+            $result['error'] = sprintf(__('Block with ID: %s doesn\'t exist')->render(), $params['block_id']);
 
             return $result;
         }

diff --git a/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page/Options.php b/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page/Options.php
@@ -43,7 +43,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return array
      */
@@ -59,7 +59,7 @@ public function toOptionArray() : array
                 $this->options[$pageId] = [
                     'value' => $pageId,
                     'label' => $item->getTitle(),
-                    'identifier' => sprintf(__('ID: %s'), $pageId)
+                    'identifier' => sprintf(__('ID: %s')->render(), $pageId)
                 ];
             }
         }

diff --git a/app/code/Magento/PageBuilder/composer.json b/app/code/Magento/PageBuilder/composer.json
@@ -21,8 +21,8 @@
         "magento/module-wishlist": "*",
         "magento/module-require-js": "*",
         "magento/module-media-storage": "*",
-        "php": "~7.3.0||~7.4.0",
-        "phpgt/dom": "2.1.6"
+        "php": "~7.4.0||~8.0.0",
+        "phpgt/dom": "2.2.1"
     },
     "suggest": {
         "magento/module-review": "*"

diff --git a/app/code/Magento/PageBuilderAdminAnalytics/composer.json b/app/code/Magento/PageBuilderAdminAnalytics/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0"
     },
     "suggest": {
         "magento/module-admin-analytics": "*",

diff --git a/app/code/Magento/PageBuilderAnalytics/composer.json b/app/code/Magento/PageBuilderAnalytics/composer.json
@@ -5,7 +5,7 @@
         "magento/module-analytics": "*",
         "magento/module-page-builder": "*",
         "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "php": "~7.4.0||~8.0.0"
     },
     "type": "magento2-module",
     "license": [

diff --git a/...ests/integration/testsuite/Magento/PageBuilder/Ui/Component/UrlInput/Page/OptionsTest.php b/...ests/integration/testsuite/Magento/PageBuilder/Ui/Component/UrlInput/Page/OptionsTest.php
@@ -34,7 +34,7 @@ private function prepareExpectedResult() : array
             $options[$pageId] = [
                 'value' => $pageId,
                 'label' => $item->getTitle(),
-                'identifier' => sprintf(__('ID: %s'), $pageId)
+                'identifier' => sprintf(__('ID: %s')->render(), $pageId)
             ];
         }
         return $options;