Skip to content

Commit 60d2cbb

Browse files
authored
Merge pull request #115 from magento-commerce/platform-health
[Platform Health] Dependency Updates & PHP8 Support
2 parents f223e97 + dbb8db9 commit 60d2cbb

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

app/code/Magento/AwsS3PageBuilder/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Aws S3 Page Builder module",
44
"require": {
55
"magento/framework": "*",
6-
"php": "~7.3.0||~7.4.0"
6+
"php": "~7.4.0||~8.0.0"
77
},
88
"suggest": {
99
"magento/module-page-builder": "*",

app/code/Magento/CatalogPageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-catalog": "*",
1010
"magento/framework": "*",
11-
"php": "~7.3.0||~7.4.0"
11+
"php": "~7.4.0||~8.0.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

app/code/Magento/CmsPageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-cms": "*",
1010
"magento/framework": "*",
11-
"php": "~7.3.0||~7.4.0"
11+
"php": "~7.4.0||~8.0.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function render(array $params): array
9292
->load();
9393

9494
if ($blocks->count() === 0) {
95-
$result['error'] = sprintf(__('Block with ID: %s doesn\'t exist'), $params['block_id']);
95+
$result['error'] = sprintf(__('Block with ID: %s doesn\'t exist')->render(), $params['block_id']);
9696

9797
return $result;
9898
}

app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page/Options.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function __construct(
4343
}
4444

4545
/**
46-
* {@inheritdoc}
46+
* @inheritdoc
4747
*
4848
* @return array
4949
*/
@@ -59,7 +59,7 @@ public function toOptionArray() : array
5959
$this->options[$pageId] = [
6060
'value' => $pageId,
6161
'label' => $item->getTitle(),
62-
'identifier' => sprintf(__('ID: %s'), $pageId)
62+
'identifier' => sprintf(__('ID: %s')->render(), $pageId)
6363
];
6464
}
6565
}

app/code/Magento/PageBuilder/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"magento/module-wishlist": "*",
2222
"magento/module-require-js": "*",
2323
"magento/module-media-storage": "*",
24-
"php": "~7.3.0||~7.4.0",
25-
"phpgt/dom": "2.1.6"
24+
"php": "~7.4.0||~8.0.0",
25+
"phpgt/dom": "2.2.1"
2626
},
2727
"suggest": {
2828
"magento/module-review": "*"

app/code/Magento/PageBuilderAdminAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"require": {
88
"magento/framework": "*",
9-
"php": "~7.3.0||~7.4.0"
9+
"php": "~7.4.0||~8.0.0"
1010
},
1111
"suggest": {
1212
"magento/module-admin-analytics": "*",

app/code/Magento/PageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"magento/module-analytics": "*",
66
"magento/module-page-builder": "*",
77
"magento/framework": "*",
8-
"php": "~7.3.0||~7.4.0"
8+
"php": "~7.4.0||~8.0.0"
99
},
1010
"type": "magento2-module",
1111
"license": [

dev/tests/integration/testsuite/Magento/PageBuilder/Ui/Component/UrlInput/Page/OptionsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private function prepareExpectedResult() : array
3434
$options[$pageId] = [
3535
'value' => $pageId,
3636
'label' => $item->getTitle(),
37-
'identifier' => sprintf(__('ID: %s'), $pageId)
37+
'identifier' => sprintf(__('ID: %s')->render(), $pageId)
3838
];
3939
}
4040
return $options;

0 commit comments

Comments
 (0)