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;

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/controllers/ChartsController.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
                     'COUNT(handledByRetour = 1 or null) as handled_cnt',
                 ])
                 ->where("hitLastTime >= ( CURDATE() - INTERVAL '{$days}' DAY )");
-            if ((int)$siteId !== 0) {
+            if ((int) $siteId !== 0) {
                 $query->andWhere(['siteId' => $siteId]);
             }
             $query
@@ -99,7 +99,7 @@ 
                     "COUNT(CASE WHEN \"handledByRetour\" = true THEN 1 END) as handled_cnt",
                 ])
                 ->where("\"hitLastTime\" >= ( CURRENT_TIMESTAMP - INTERVAL '{$days} days' )");
-            if ((int)$siteId !== 0) {
+            if ((int) $siteId !== 0) {
                 $query->andWhere(['siteId' => $siteId]);
             }
             $query
@@ -163,8 +163,8 @@ 
         }
         if ($stats) {
             $data = [
-                (int)$stats,
-                (int)$handledStats,
+                (int) $stats,
+                (int) $handledStats,
             ];
         }
 

src/helpers/UrlHelper.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,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/controllers/TablesController.php

Indentation +6 added lines, -6 removed lines

@@ -90,9 +90,9 @@ 
         string $sort = 'hitCount|desc',
         int    $page = 1,
         int    $per_page = 20,
-               $filter = '',
-               $siteId = 0,
-               $handled = 'all'
+                $filter = '',
+                $siteId = 0,
+                $handled = 'all'
     ): Response
     {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
@@ -186,9 +186,9 @@ 
         string $sort = 'hitCount|desc',
         int    $page = 1,
         int    $per_page = 20,
-               $filter = '',
-               $siteId = 0,
-               $shortLinks = false
+                $filter = '',
+                $siteId = 0,
+                $shortLinks = false
     ): Response
     {
         PermissionHelper::controllerPermissionCheck('retour:redirects');

Spacing +5 added lines, -5 removed lines

@@ -122,7 +122,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') {
@@ -134,7 +134,7 @@ 
             foreach ($stats as &$stat) {
                 $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 {
@@ -142,7 +142,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', [
@@ -218,7 +218,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) {
@@ -245,7 +245,7 @@ 
                 }
             }
 
-            $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 +10 added lines, -10 removed lines

@@ -81,7 +81,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,
@@ -89,7 +89,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
@@ -150,13 +150,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;
@@ -192,7 +192,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/edit-redirect/' . $redirectId),
+                'url' => UrlHelper::cpUrl('retour/edit-redirect/'.$redirectId),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
@@ -250,7 +250,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') {
@@ -334,7 +334,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,
@@ -342,7 +342,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/shortlinks' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/shortlinks'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
@@ -397,13 +397,13 @@ 
         if (!preg_match('/\.[^\/]+$/', $url) && 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, '/').'/';
                 }
             }
         }

src/validators/UriValidator.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
             return;
         }
         // Make sure there is a leading /
-        $value = '/' . ltrim($value, '/');
+        $value = '/'.ltrim($value, '/');
         $model->$attribute = $value;
     }
 }