nystudio107 / craft-retour

src/helpers/UrlHelper.php

Spacing +8 added lines, -8 removed lines

@@ -65,14 +65,14 @@ 
         $addSlash = str_ends_with($path, '/');
         if (!empty($sitePath)) {
             // Normalizes a URI path by trimming leading/ trailing slashes and removing double slashes
-            $sitePath = '/' . preg_replace('/\/\/+/', '/', trim($sitePath, '/'));
+            $sitePath = '/'.preg_replace('/\/\/+/', '/', trim($sitePath, '/'));
         }
         // Strip the $sitePath from the incoming $path
         if (str_starts_with($path, $sitePath)) {
             $path = substr($path, strlen($sitePath));
-            $path = '/' . preg_replace('/\/\/+/', '/', trim($path, '/'));
+            $path = '/'.preg_replace('/\/\/+/', '/', trim($path, '/'));
         }
-        $path = $addSlash ? $path . '/' : $path;
+        $path = $addSlash ? $path.'/' : $path;
 
         return $path;
     }
@@ -90,7 +90,7 @@ 
             $sitePath = parse_url($site->baseUrl, PHP_URL_PATH);
             if (!empty($sitePath)) {
                 // Normalizes a URI path by trimming leading/ trailing slashes and removing double slashes
-                $sitePath = '/' . preg_replace('/\/\/+/', '/', trim($sitePath, '/'));
+                $sitePath = '/'.preg_replace('/\/\/+/', '/', trim($sitePath, '/'));
             }
             // See if the path begins with a site path prefix
             if ($sitePath !== '/' && str_starts_with($path, $sitePath)) {
@@ -113,8 +113,8 @@ 
         $overlap = 0;
         $url = $url ?? '';
         $path = $path ?? '';
-        $url = rtrim($url, '/') . '/';
-        $path = '/' . ltrim($path, '/');
+        $url = rtrim($url, '/').'/';
+        $path = '/'.ltrim($path, '/');
         $urlOffset = strlen($url);
         $pathLength = strlen($path);
         $pathOffset = 0;
@@ -126,7 +126,7 @@ 
             }
         }
 
-        return rtrim($url, '/') . '/' . ltrim(substr($path, $overlap), '/');
+        return rtrim($url, '/').'/'.ltrim(substr($path, $overlap), '/');
     }
 
     /**
@@ -146,7 +146,7 @@ 
         /** @noinspection CallableParameterUseCaseInTypeContextInspection */
         $url = preg_replace('/{.*}/', '', $url);
         // Remove any linebreaks that may be errantly in the URL
-        $url = (string)str_replace([
+        $url = (string) str_replace([
                 PHP_EOL,
                 "\r",
                 "\n",

src/services/Redirects.php

Spacing +21 added lines, -21 removed lines

@@ -279,13 +279,13 @@ 
      */
     public function excludeUri($uri): bool
     {
-        $uri = '/' . ltrim($uri, '/');
+        $uri = '/'.ltrim($uri, '/');
         if (!empty(Retour::$settings->excludePatterns)) {
             foreach (Retour::$settings->excludePatterns as $excludePattern) {
                 if (empty($excludePattern['pattern'])) {
                     continue;
                 }
-                $pattern = '`' . $excludePattern['pattern'] . '`i';
+                $pattern = '`'.$excludePattern['pattern'].'`i';
                 try {
                     if (preg_match($pattern, $uri) === 1) {
                         Craft::info(
@@ -301,7 +301,7 @@ 
                     }
                 } catch (\Exception $e) {
                     // That's fine
-                    Craft::error('Invalid exclude URI Regex: ' . $pattern, __METHOD__);
+                    Craft::error('Invalid exclude URI Regex: '.$pattern, __METHOD__);
                 }
             }
         }
@@ -316,7 +316,7 @@ 
      *
      * @return bool|array|null
      */
-    public function findRedirectMatch(string $fullUrl, string $pathOnly, $siteId = null): bool|array|null
+    public function findRedirectMatch(string $fullUrl, string $pathOnly, $siteId = null): bool | array | null
     {
         // Get the current site
         if ($siteId === null) {
@@ -369,10 +369,10 @@ 
      *
      * @return bool|array
      */
-    public function getRedirectFromCache(string $url, int $siteId = 0): bool|array
+    public function getRedirectFromCache(string $url, int $siteId = 0): bool | array
     {
         $cache = Craft::$app->getCache();
-        $cacheKey = $this::CACHE_KEY . md5($url) . $siteId;
+        $cacheKey = $this::CACHE_KEY.md5($url).$siteId;
         $redirect = $cache->get($cacheKey);
         Craft::info(
             Craft::t(
@@ -417,7 +417,7 @@ 
                         'id' => $redirectConfig['id'],
                     ]
                 )->execute();
-                Craft::debug('Rows affected: ' . $rowsAffected, __METHOD__);
+                Craft::debug('Rows affected: '.$rowsAffected, __METHOD__);
             } catch (\Exception $e) {
                 Craft::error($e->getMessage(), __METHOD__);
             }
@@ -438,12 +438,12 @@ 
         } catch (SiteNotFoundException $e) {
             $siteId = 1;
         }
-        $cacheKey = $this::CACHE_KEY . md5($url) . $siteId;
+        $cacheKey = $this::CACHE_KEY.md5($url).$siteId;
         // Create the dependency tags
         $dependency = new TagDependency([
             'tags' => [
                 $this::GLOBAL_REDIRECTS_CACHE_TAG,
-                $this::GLOBAL_REDIRECTS_CACHE_TAG . $siteId,
+                $this::GLOBAL_REDIRECTS_CACHE_TAG.$siteId,
             ],
         ]);
         $cache->set($cacheKey, $redirect, Retour::$cacheDuration, $dependency);
@@ -637,7 +637,7 @@ 
         foreach ($redirects as $redirect) {
             // Figure out what type of source matching to do
             $redirectSrcMatch = $redirect['redirectSrcMatch'] ?? 'pathonly';
-            $redirectEnabled = (bool)$redirect['enabled'];
+            $redirectEnabled = (bool) $redirect['enabled'];
             if ($redirectEnabled === true) {
                 switch ($redirectSrcMatch) {
                     case 'pathonly':
@@ -678,12 +678,12 @@ 
 
                     // Do a regex match
                     case 'regexmatch':
-                        $matchRegEx = '`' . $redirect['redirectSrcUrlParsed'] . '`i';
+                        $matchRegEx = '`'.$redirect['redirectSrcUrlParsed'].'`i';
                         try {
                             if (preg_match($matchRegEx, $url) === 1) {
                                 $this->incrementRedirectHitCount($redirect);
                                 // If we're not associated with an EntryID, handle capture group replacement
-                                if ((int)$redirect['associatedElementId'] === 0) {
+                                if ((int) $redirect['associatedElementId'] === 0) {
                                     $redirect['redirectDestUrl'] = preg_replace(
                                         $matchRegEx,
                                         $redirect['redirectDestUrl'],
@@ -711,7 +711,7 @@ 
                             }
                         } catch (\Exception $e) {
                             // That's fine
-                            Craft::error('Invalid Redirect Regex: ' . $matchRegEx, __METHOD__);
+                            Craft::error('Invalid Redirect Regex: '.$matchRegEx, __METHOD__);
                         }
 
                         break;
@@ -827,7 +827,7 @@ 
                     try {
                         $siteId = $redirect['siteId'] ?? null;
                         if ($siteId !== null) {
-                            $siteId = (int)$siteId;
+                            $siteId = (int) $siteId;
                         }
                         if (!UrlHelper::isAbsoluteUrl($dest) && !UrlHelper::pathHasSitePrefix($path)) {
                             $dest = UrlHelper::siteUrl('/', null, null, $siteId);
@@ -849,7 +849,7 @@ 
                 try {
                     $siteId = $redirect['siteId'] ?? null;
                     if ($siteId !== null) {
-                        $siteId = (int)$siteId;
+                        $siteId = (int) $siteId;
                     }
                     $dest = UrlHelper::siteUrl($dest, null, null, $siteId);
                 } catch (\yii\base\Exception $e) {
@@ -864,7 +864,7 @@ 
                     // That's ok
                 }
                 if (!empty($queryString)) {
-                    $dest = strtok($dest, '?') . '?' . $queryString;
+                    $dest = strtok($dest, '?').'?'.$queryString;
                 }
             }
             $redirectMatchType = $redirect['redirectMatchType'] ?? 'notfound';
@@ -938,7 +938,7 @@ 
         foreach (Craft::$app->getPlugins()->getAllPlugins() as $plugin) {
             /** @var Plugin $plugin */
             if (method_exists($plugin, 'retourMatch')) {
-                $result[$plugin->getHandle()] = $plugin->name . Craft::t('retour', ' Match');
+                $result[$plugin->getHandle()] = $plugin->name.Craft::t('retour', ' Match');
             }
         }
 
@@ -975,7 +975,7 @@ 
         $db = Craft::$app->getDb();
         // Trigger a 'beforeDeleteRedirect' event
         $redirectConfig = $this->getRedirectById($id);
-        $isNew = (int)$redirectConfig['id'] === 0;
+        $isNew = (int) $redirectConfig['id'] === 0;
         $event = new RedirectEvent([
             'isNew' => $isNew,
             'legacyUrl' => $redirectConfig['redirectSrcUrlParsed'],
@@ -1139,7 +1139,7 @@ 
         // Get the validated model attributes and save them to the db
         $redirectConfig = $redirect->getAttributes();
         // 0 for a siteId needs to be converted to null
-        if (empty($redirectConfig['siteId']) || (int)$redirectConfig['siteId'] === 0) {
+        if (empty($redirectConfig['siteId']) || (int) $redirectConfig['siteId'] === 0) {
             $redirectConfig['siteId'] = null;
         }
         // Throw an event to before saving the redirect
@@ -1149,7 +1149,7 @@ 
         }
 
         // See if a redirect exists with this source URL already
-        if ((int)$redirectConfig['id'] === 0) {
+        if ((int) $redirectConfig['id'] === 0) {
             // Query the db table
             $redirect = (new Query())
                 ->from(['{{%retour_static_redirects}}'])
@@ -1162,7 +1162,7 @@ 
             }
         }
         // Trigger a 'beforeSaveRedirect' event
-        $isNew = (int)$redirectConfig['id'] === 0;
+        $isNew = (int) $redirectConfig['id'] === 0;
         $event = new RedirectEvent([
             'isNew' => $isNew,
             'legacyUrl' => $redirectConfig['redirectSrcUrlParsed'],