Merge pull request #1 from Pasquale95/develop

fixed issue with socialMarkup fallback process

Author: pasquale95

Model/Resolver/Category/SocialMarkup.php

@@ -102,9 +102,11 @@ public function resolve(
         // add url
         $this->setUrl($this->retrieveUrl($category->getId(), CategoryUrlRewriteGenerator::ENTITY_TYPE, $store->getId()));
         // add title
-        $this->setTitle($category->getMetaTitle() ?? $category->getName());
+        $this->setTitle(!empty($category->getMetaTitle()) ?
+            $category->getMetaTitle() : $category->getName());
         // add description
-        $this->setDescription($category->getMetaDescription() ?? $category->getDescription());
+        $this->setDescription(!empty($category->getMetaDescription()) ?
+            $category->getMetaDescription() : $category->getDescription());
         // add image, if any
         $this->setImage($this->retrieveImage($category->getId(), $store));
 
@@ -129,14 +131,14 @@ public function retrieveImage($categoryId, $store) {
         $category = $categoryRepository->get($categoryId, $storeId);
 
         $imageUrl = $category->getImage();
-        if (isset($imageUrl) and !empty($imageUrl)) {
+        if (!empty($imageUrl)) {
             $imageUrl = UrlHelper::pinchUrl($store->getBaseUrl(), $imageUrl);
         } else {
             $imageUrl = $this->socialMarkupHelper->getImagePlaceholder(
                 CategoryUrlRewriteGenerator::ENTITY_TYPE,
                 $storeId
             );
-            if (isset($imageUrl) and !empty($imageUrl)) {
+            if (!empty($imageUrl)) {
                 // return placeholder
                 $imageUrl = UrlHelper::pinchUrl(
                     $store->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . self::PLACEHOLDER_FOLDER,

Model/Resolver/CmsPage/SocialMarkup.php

@@ -97,10 +97,11 @@ public function resolve(
         // add url
         $this->setUrl($this->retrieveUrl($value[PageInterface::IDENTIFIER], CmsPageUrlRewriteGenerator::ENTITY_TYPE, $store->getId()));
         // add title
-        // TODO: fix why if not meta title is set, it returns nothing
-        $this->setTitle($value['meta_title'] ?? $page->getTitle());
+        $this->setTitle(!empty($value['meta_title']) ?
+            $value['meta_title'] : $page->getTitle());
         // add description
-        $this->setDescription($value['meta_description'] ?? $page->getContentHeading());
+        $this->setDescription(!empty($value['meta_description']) ?
+            $value['meta_description'] : $page->getContentHeading());
         // add image, if any
         $this->setImage($this->retrieveImage($page, $store));
 
@@ -126,7 +127,7 @@ public function retrieveImage($page, $store) {
                 CmsPageUrlRewriteGenerator::ENTITY_TYPE,
                 $storeId
             );
-            if (isset($imageUrl) and !empty($imageUrl)) {
+            if (!empty($imageUrl)) {
                 // return placeholder
                 $imageUrl = UrlHelper::pinchUrl($storeUrl . self::PLACEHOLDER_FOLDER, $imageUrl);
             }

Model/Resolver/Product/SocialMarkup.php

@@ -102,9 +102,11 @@ public function resolve(
         // add url
         $this->setUrl($this->retrieveUrl($product->getId(), ProductUrlRewriteGenerator::ENTITY_TYPE, $store->getId()));
         // add title
-        $this->setTitle($product->getMetaTitle() ?? $product->getName());
+        $this->setTitle(!empty($product->getMetaTitle()) ?
+            $product->getMetaTitle() : $product->getName());
         // add description
-        $this->setDescription($product->getMetaDescription() ?? $product->getDescription());
+        $this->setDescription(!empty($product->getMetaDescription()) ?
+            $product->getMetaDescription() : $product->getDescription());
         // add image, if any
         $this->setImage($this->retrieveImage($product->getId(), $store));
 
@@ -130,14 +132,14 @@ public function retrieveImage($productId, $store) {
         $product = $productFactory->getById($productId);
 
         $imageUrl = $product->getImage();
-        if (isset($imageUrl) and !empty($imageUrl)) {
+        if (!empty($imageUrl)) {
             $imageUrl = UrlHelper::pinchUrl($storeUrl . 'catalog/product', $imageUrl);
         } else {
             $imageUrl = $this->socialMarkupHelper->getImagePlaceholder(
                 ProductUrlRewriteGenerator::ENTITY_TYPE,
                 $storeId
             );
-            if (isset($imageUrl) and !empty($imageUrl)) {
+            if (!empty($imageUrl)) {
                 // return placeholder
                 $imageUrl = UrlHelper::pinchUrl($storeUrl . self::PLACEHOLDER_FOLDER, $imageUrl);
             }