From 44cf776a9c879c16320255dcc4785b8f24c79184 Mon Sep 17 00:00:00 2001 From: rainashikha Date: Sat, 19 May 2018 12:48:26 +0530 Subject: [PATCH 1/4] #issue-2956 https://github.com/magento/magento2/issues/2956 Fixed. Added a check to to see if returned content is object or not. As objects will never be converted to string and will throw error for str_replace at line 125 --- .../Magento/Framework/View/Page/Config/Renderer.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php index 9563cbfbcc532..486602395789a 100644 --- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php +++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php @@ -137,7 +137,11 @@ protected function processMetadataContent($name, $content) { $method = 'get' . $this->string->upperCaseWords($name, '_', ''); if (method_exists($this->pageConfig, $method)) { - $content = $this->pageConfig->$method(); + //$content = $this->pageConfig->$method(); + $contentUpdated = $this->pageConfig->$method(); + if(!is_object ($contentUpdated)){ + $content = $contentUpdated; + } } return $content; } From d5d977eb5831c9266b96d3dd50ed4a537c16c9be Mon Sep 17 00:00:00 2001 From: Vishal Gelani Date: Sat, 19 May 2018 21:01:44 +0530 Subject: [PATCH 2/4] Fixed coding standard issue. --- lib/internal/Magento/Framework/View/Page/Config/Renderer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php index 486602395789a..e519fb7e9cfef 100644 --- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php +++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php @@ -137,11 +137,11 @@ protected function processMetadataContent($name, $content) { $method = 'get' . $this->string->upperCaseWords($name, '_', ''); if (method_exists($this->pageConfig, $method)) { - //$content = $this->pageConfig->$method(); $contentUpdated = $this->pageConfig->$method(); - if(!is_object ($contentUpdated)){ + if (!is_object ($contentUpdated)) { $content = $contentUpdated; } + } return $content; } From fe532f9a278a227002cdd86be6769c6e316e49de Mon Sep 17 00:00:00 2001 From: Shikha Raina Date: Mon, 21 May 2018 10:27:42 +0530 Subject: [PATCH 3/4] Update Renderer.php Fixing automated code quality checks. --- lib/internal/Magento/Framework/View/Page/Config/Renderer.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php index e519fb7e9cfef..620b41f8e09d4 100644 --- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php +++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php @@ -138,10 +138,9 @@ protected function processMetadataContent($name, $content) $method = 'get' . $this->string->upperCaseWords($name, '_', ''); if (method_exists($this->pageConfig, $method)) { $contentUpdated = $this->pageConfig->$method(); - if (!is_object ($contentUpdated)) { + if(!is_object ($contentUpdated)) { $content = $contentUpdated; - } - + } } return $content; } From 6ad9065099d59cc605cc23d01e9c321229aa9110 Mon Sep 17 00:00:00 2001 From: Shikha Raina Date: Mon, 21 May 2018 13:30:49 +0530 Subject: [PATCH 4/4] Update Renderer.php --- lib/internal/Magento/Framework/View/Page/Config/Renderer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php index 620b41f8e09d4..fe719938621d6 100644 --- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php +++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php @@ -138,9 +138,9 @@ protected function processMetadataContent($name, $content) $method = 'get' . $this->string->upperCaseWords($name, '_', ''); if (method_exists($this->pageConfig, $method)) { $contentUpdated = $this->pageConfig->$method(); - if(!is_object ($contentUpdated)) { + if (!is_object($contentUpdated)) { $content = $contentUpdated; - } + } } return $content; }