Fix failing Unit Test due to Page ID that can be INT

lbajsarowicz · lbajsarowicz · commit 4fd4f99410b3 · 2020-03-16T01:19:51.000+01:00
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
@@ -158,7 +158,7 @@ public function __construct(
     public function prepareResultPage(ActionInterface $action, $pageId = null)
     {
         if ($pageId !== null && $pageId !== $this->_page->getId()) {
-            $delimiterPosition = strrpos($pageId, '|');
+            $delimiterPosition = strrpos((string)$pageId, '|');
             if ($delimiterPosition) {
                 $pageId = substr($pageId, 0, $delimiterPosition);
             }

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public function __construct(`
`158`	`158`	`public function prepareResultPage(ActionInterface $action, $pageId = null)`
`159`	`159`	`{`
`160`	`160`	`if ($pageId !== null && $pageId !== $this->_page->getId()) {`
`161`		`- $delimiterPosition = strrpos($pageId, '\|');`
	`161`	`+ $delimiterPosition = strrpos((string)$pageId, '\|');`
`162`	`162`	`if ($delimiterPosition) {`
`163`	`163`	`$pageId = substr($pageId, 0, $delimiterPosition);`
`164`	`164`	`}`