nystudio107 / craft-retour

src/helpers/Text.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 
         if (!empty($string)) {
             $string = strip_tags($string);
-            $result = (string)Stringy::create($string)->truncate($length, $substring);
+            $result = (string) Stringy::create($string)->truncate($length, $substring);
         }
 
         return $result;
@@ -67,7 +67,7 @@ 
 
         if (!empty($string)) {
             $string = strip_tags($string);
-            $result = (string)Stringy::create($string)->safeTruncate($length, $substring);
+            $result = (string) Stringy::create($string)->safeTruncate($length, $substring);
         }
 
         return $result;

src/helpers/UrlHelper.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,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/config.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     // Determines whether the Retour API endpoint should be enabled for anonymous frontend access
     'enableApiEndpoint' => false,
 
-     // [Regular expressions](https://regexr.com/) to match URLs to exclude from tracking
+        // [Regular expressions](https://regexr.com/) to match URLs to exclude from tracking
     'excludePatterns' => [
     ],
 

src/controllers/TablesController.php

Indentation +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'redirectDestUrl', $filter])
-           ;
+            ;
         if ((int)$siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }

Spacing +3 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
             ->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 @@ 
                     } 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', [
@@ -219,7 +219,7 @@ 
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'redirectDestUrl', $filter])
            ;
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         $redirects = $query->all();

tests/_bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -5,12 +5,12 @@
 ini_set('date.timezone', 'UTC');
 
 // Use the current installation of Craft
-define('CRAFT_STORAGE_PATH', __DIR__ . '/_craft/storage');
-define('CRAFT_TEMPLATES_PATH', __DIR__ . '/_craft/templates');
-define('CRAFT_CONFIG_PATH', __DIR__ . '/_craft/config');
-define('CRAFT_MIGRATIONS_PATH', __DIR__ . '/_craft/migrations');
-define('CRAFT_TRANSLATIONS_PATH', __DIR__ . '/_craft/translations');
-define('CRAFT_VENDOR_PATH', dirname(__DIR__) . '/vendor');
+define('CRAFT_STORAGE_PATH', __DIR__.'/_craft/storage');
+define('CRAFT_TEMPLATES_PATH', __DIR__.'/_craft/templates');
+define('CRAFT_CONFIG_PATH', __DIR__.'/_craft/config');
+define('CRAFT_MIGRATIONS_PATH', __DIR__.'/_craft/migrations');
+define('CRAFT_TRANSLATIONS_PATH', __DIR__.'/_craft/translations');
+define('CRAFT_VENDOR_PATH', dirname(__DIR__).'/vendor');
 define('CRAFT_TESTS_PATH', __DIR__);
 
 $devMode = true;

src/services/Events.php

Spacing +4 added lines, -4 removed lines

@@ -102,14 +102,14 @@ 
                     if (strcmp($oldUri, $newUri) !== 0) {
                         // Handle trailing slash config setting
                         if (Craft::$app->config->general->addTrailingSlashesToUrls) {
-                            $oldUri = rtrim($oldUri, '/') . '/';
-                            $newUri = rtrim($newUri, '/') . '/';
+                            $oldUri = rtrim($oldUri, '/').'/';
+                            $newUri = rtrim($newUri, '/').'/';
                         }
                         // Handle the URL match type
                         if (Retour::$settings->uriChangeRedirectSrcMatch === 'fullurl') {
                             try {
                                 if ($redirectSiteId !== null) {
-                                    $redirectSiteId = (int)$redirectSiteId;
+                                    $redirectSiteId = (int) $redirectSiteId;
                                 }
                                 $oldUri = \craft\helpers\UrlHelper::siteUrl($oldUri, null, null, $redirectSiteId);
                                 $newUri = UrlHelper::siteUrl($newUri, null, null, $redirectSiteId);
@@ -127,7 +127,7 @@ 
                             'siteId' => $redirectSiteId,
                         ];
                         // Trigger a 'beforeSaveEntryRedirect' event
-                        $isNew = (int)$redirectConfig['id'] === 0;
+                        $isNew = (int) $redirectConfig['id'] === 0;
                         $event = new RedirectEvent([
                             'isNew' => $isNew,
                             'legacyUrl' => $redirectConfig['redirectSrcUrl'],

src/services/Statistics.php

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
     public function getRecentStatistics($days = 1, $handled = false): array
     {
         // Ensure is an int
-        $handledInt = (int)$handled;
+        $handledInt = (int) $handled;
         $stats = [];
         $db = Craft::$app->getDb();
         if ($db->getIsMysql()) {
@@ -210,9 +210,9 @@ 
         $stats->userAgent = $userAgent;
         $stats->exceptionMessage = $exceptionMessage;
         $stats->exceptionFilePath = $exceptionFilePath;
-        $stats->exceptionFileLine = (int)$exceptionFileLine;
+        $stats->exceptionFileLine = (int) $exceptionFileLine;
         $stats->hitLastTime = Db::prepareDateForDb(new \DateTime());
-        $stats->handledByRetour = (int)$handled;
+        $stats->handledByRetour = (int) $handled;
         $stats->hitCount++;
         $statsConfig = $stats->getAttributes();
         // Record the updated statistics
@@ -356,7 +356,7 @@ 
         $now = round(microtime(true) * 1000);
         $cache = Craft::$app->getCache();
         $then = $cache->get(self::LAST_STATISTICS_TRIM_CACHE_KEY);
-        if (($then !== false) && ($now - (int)$then < Retour::$settings->statisticsRateLimitMs)) {
+        if (($then !== false) && ($now - (int) $then < Retour::$settings->statisticsRateLimitMs)) {
             $limited = true;
         }
         $cache->set(self::LAST_STATISTICS_TRIM_CACHE_KEY, $now, 0);

src/services/Redirects.php

Spacing +7 added lines, -7 removed lines

@@ -244,7 +244,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) {
@@ -253,7 +253,7 @@ 
             if (Retour::$settings->preserveQueryString) {
                 $request = Craft::$app->getRequest();
                 if (!empty($request->getQueryStringWithoutPath())) {
-                    $dest .= '?' . $request->getQueryStringWithoutPath();
+                    $dest .= '?'.$request->getQueryStringWithoutPath();
                 }
             }
             $redirectMatchType = $redirect['redirectMatchType'] ?? 'notfound';
@@ -434,7 +434,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':
@@ -480,7 +480,7 @@ 
                             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'],
@@ -791,13 +791,13 @@ 
         // 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
         $db = Craft::$app->getDb();
         // 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}}'])
@@ -810,7 +810,7 @@ 
             }
         }
         // Trigger a 'beforeSaveRedirect' event
-        $isNew = (int)$redirectConfig['id'] === 0;
+        $isNew = (int) $redirectConfig['id'] === 0;
         $event = new RedirectEvent([
             'isNew' => $isNew,
             'legacyUrl' => $redirectConfig['redirectSrcUrlParsed'],

src/helpers/MultiSite.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
             } else {
                 $variables['sitesMenuLabel'] = Craft::t(
                     'site',
-                    $sites->getSiteById((int)$variables['currentSiteId'])->name
+                    $sites->getSiteById((int) $variables['currentSiteId'])->name
                 );
             }
         } else {