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

@@ -280,13 +280,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(
@@ -302,7 +302,7 @@ 
                     }
                 } catch (\Exception $e) {
                     // That's fine
-                    Craft::error('Invalid exclude URI Regex: ' . $pattern, __METHOD__);
+                    Craft::error('Invalid exclude URI Regex: '.$pattern, __METHOD__);
                 }
             }
         }
@@ -317,7 +317,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) {
@@ -370,10 +370,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(
@@ -418,7 +418,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__);
             }
@@ -439,12 +439,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);
@@ -638,7 +638,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':
@@ -679,12 +679,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'],
@@ -712,7 +712,7 @@ 
                             }
                         } catch (\Exception $e) {
                             // That's fine
-                            Craft::error('Invalid Redirect Regex: ' . $matchRegEx, __METHOD__);
+                            Craft::error('Invalid Redirect Regex: '.$matchRegEx, __METHOD__);
                         }
 
                         break;
@@ -828,7 +828,7 @@ 
                     try {
                         $siteId = $redirect['siteId'] ?? null;
                         if ($siteId !== null) {
-                            $siteId = (int)$siteId;
+                            $siteId = (int) $siteId;
                         }
                         if (!UrlHelper::isAbsoluteUrl($dest) && !UrlHelper::pathHasSitePrefix($path) && Retour::$settings->resolveCraftSites) {
                             $dest = UrlHelper::siteUrl('/', null, null, $siteId);
@@ -850,7 +850,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) {
@@ -865,7 +865,7 @@ 
                     // That's ok
                 }
                 if (!empty($queryString)) {
-                    $dest = strtok($dest, '?') . '?' . $queryString;
+                    $dest = strtok($dest, '?').'?'.$queryString;
                 }
             }
             $redirectMatchType = $redirect['redirectMatchType'] ?? 'notfound';
@@ -939,7 +939,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');
             }
         }
 
@@ -976,7 +976,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'],
@@ -1140,7 +1140,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
@@ -1150,7 +1150,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}}'])
@@ -1163,7 +1163,7 @@ 
             }
         }
         // Trigger a 'beforeSaveRedirect' event
-        $isNew = (int)$redirectConfig['id'] === 0;
+        $isNew = (int) $redirectConfig['id'] === 0;
         $event = new RedirectEvent([
             'isNew' => $isNew,
             'legacyUrl' => $redirectConfig['redirectSrcUrlParsed'],

src/controllers/TablesController.php

Spacing +6 added lines, -6 removed lines

@@ -68,7 +68,7 @@ 
     /**
      * @inerhitdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
     ];
 
     // Public Methods
@@ -123,7 +123,7 @@ 
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'referrerUrl', $filter]);
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($handled !== 'all') {
@@ -144,7 +144,7 @@ 
                 }
                 $stat['addLink'] = '';
                 if (!$stat['handledByRetour']) {
-                    $encodedUrl = urlencode('/' . ltrim($stat['redirectSrcUrl'], '/'));
+                    $encodedUrl = urlencode('/'.ltrim($stat['redirectSrcUrl'], '/'));
                     // Add the siteId to the URL, but keep the current behavior of passing in siteId=0 for "all"
                     $statSiteId = $stat['siteId'] ?? 0;
                     try {
@@ -152,7 +152,7 @@ 
                     } catch (SiteNotFoundException $e) {
                         $primarySite = null;
                     }
-                    if ($primarySite !== null && $statSiteId == (int)$primarySite->id) {
+                    if ($primarySite !== null && $statSiteId == (int) $primarySite->id) {
                         $statSiteId = 0;
                     }
                     $stat['addLink'] = UrlHelper::cpUrl('retour/add-redirect', [
@@ -227,7 +227,7 @@ 
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'redirectDestUrl', $filter]);
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($shortLinks) {
@@ -274,7 +274,7 @@ 
             }
             $redirect['siteBaseUrl'] = $site->getBaseUrl();
 
-            $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-redirect/' . $redirect['id']);
+            $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-redirect/'.$redirect['id']);
         }
         // Format the data for the API
         if ($redirects) {

src/controllers/RedirectsController.php

Spacing +11 added lines, -11 removed lines

@@ -46,7 +46,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected array|bool|int $allowAnonymous = [];
+    protected array | bool | int $allowAnonymous = [];
 
     // Public Methods
     // =========================================================================
@@ -88,7 +88,7 @@ 
         $variables['docsUrl'] = self::DOCUMENTATION_URL;
         $variables['pluginName'] = $pluginName;
         $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -96,7 +96,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
@@ -156,13 +156,13 @@ 
         if ($redirect->siteId) {
             $site = $sites->getSiteById($redirect->siteId);
             if ($site) {
-                MultiSiteHelper::requirePermission('editSite:' . $site->uid);
+                MultiSiteHelper::requirePermission('editSite:'.$site->uid);
             }
         }
         if ($siteId) {
             $site = $sites->getSiteById($siteId);
             if ($site) {
-                MultiSiteHelper::requirePermission('editSite:' . $site->uid);
+                MultiSiteHelper::requirePermission('editSite:'.$site->uid);
             }
         }
         $pluginName = Retour::$settings->pluginName;
@@ -198,7 +198,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/edit-redirect/' . $redirectId),
+                'url' => UrlHelper::cpUrl('retour/edit-redirect/'.$redirectId),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
@@ -254,7 +254,7 @@ 
         if ($redirectConfig === null) {
             throw new NotFoundHttpException('Redirect not found');
         }
-        $redirectConfig['id'] = (int)$redirectConfig['id'];
+        $redirectConfig['id'] = (int) $redirectConfig['id'];
         // Handle enforcing trailing slashes
         $generalConfig = Craft::$app->getConfig()->getGeneral();
         if ($generalConfig->addTrailingSlashesToUrls && $redirectConfig['redirectMatchType'] === 'exactmatch') {
@@ -342,7 +342,7 @@ 
         $variables['docsUrl'] = self::DOCUMENTATION_URL;
         $variables['pluginName'] = $pluginName;
         $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -350,7 +350,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/shortlinks' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/shortlinks'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
@@ -409,13 +409,13 @@ 
         if (!preg_match('/\.[^\/]+$/', $url) && strpos($url, '?') === false && strpos($url, '#') === false) {
             // If it's a root relative URL, assume it's a site URL
             if (UrlHelper::isRootRelativeUrl($url)) {
-                return rtrim($url, '/') . '/';
+                return rtrim($url, '/').'/';
             }
             // If the URL matches any of the site's base URLs, assume it's a site URL
             $sites = Craft::$app->getSites()->getAllSites();
             foreach ($sites as $site) {
                 if (strpos($url, $site->getBaseUrl()) === 0) {
-                    return rtrim($url, '/') . '/';
+                    return rtrim($url, '/').'/';
                 }
             }
         }