Fix trailing slash used a product & category URL suffix

Use ternary operators instead of if-else blocks

Author: ihor-sviziev

app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php

@@ -98,25 +98,22 @@ protected function doFindOneByData($data)
                 $resultFromDb = current($resultsFromDb);
                 $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
 
-                // If request path matches the DB value or it's redirect
-                if ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath
-                    || in_array((int)$resultFromDb[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true)
-                ) {
-                    $result = $resultFromDb;
-                } else {
-                    // Otherwise return 301 redirect to request path from DB results
-                    $result = [
-                        UrlRewrite::ENTITY_TYPE => 'custom',
-                        UrlRewrite::ENTITY_ID => '0',
-                        UrlRewrite::REQUEST_PATH => $requestPath,
-                        UrlRewrite::TARGET_PATH => $resultFromDb[UrlRewrite::REQUEST_PATH],
-                        UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
-                        UrlRewrite::STORE_ID => $resultFromDb[UrlRewrite::STORE_ID],
-                        UrlRewrite::DESCRIPTION => null,
-                        UrlRewrite::IS_AUTOGENERATED => '0',
-                        UrlRewrite::METADATA => null,
-                    ];
-                }
+                // If request path matches the DB value or it's redirect - we can return result from DB
+                $canReturnResultFromDb = ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath
+                    || in_array((int)$resultFromDb[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true));
+
+                // Otherwise return 301 redirect to request path from DB results
+                $result = $canReturnResultFromDb ? $resultFromDb : [
+                    UrlRewrite::ENTITY_TYPE => 'custom',
+                    UrlRewrite::ENTITY_ID => '0',
+                    UrlRewrite::REQUEST_PATH => $requestPath,
+                    UrlRewrite::TARGET_PATH => $resultFromDb[UrlRewrite::REQUEST_PATH],
+                    UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
+                    UrlRewrite::STORE_ID => $resultFromDb[UrlRewrite::STORE_ID],
+                    UrlRewrite::DESCRIPTION => null,
+                    UrlRewrite::IS_AUTOGENERATED => '0',
+                    UrlRewrite::METADATA => null,
+                ];
             } else {
                 // If we have 2 results - return the row that matches request path
                 foreach ($resultsFromDb as $resultFromDb) {