nystudio107 / craft-retour

src/gql/interfaces/RetourInterface.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
         $type = GqlEntityRegistry::createEntity(self::class, new InterfaceType([
             'name' => static::getName(),
-            'fields' => self::class . '::getFieldDefinitions',
+            'fields' => self::class.'::getFieldDefinitions',
             'description' => 'This is the interface implemented by Retour.',
             'resolveType' => function(array $value) {
                 return GqlEntityRegistry::getEntity(RetourGenerator::getName());

src/gql/queries/RetourQuery.php

Spacing +3 added lines, -3 removed lines

@@ -41,14 +41,14 @@ 
             'retour' => [
                 'type' => RetourInterface::getType(),
                 'args' => RetourArguments::getArguments(),
-                'resolve' => RetourResolver::class . '::resolve',
+                'resolve' => RetourResolver::class.'::resolve',
                 'description' => 'This query is used to query for Retour redirects.',
                 'deprecationReason' => 'This query is deprecated and will be removed in the future. You should use `retourResolveRedirect` instead.',
             ],
             'retourResolveRedirect' => [
                 'type' => RetourInterface::getType(),
                 'args' => RetourArguments::getArguments(),
-                'resolve' => RetourResolver::class . '::resolve',
+                'resolve' => RetourResolver::class.'::resolve',
                 'description' => 'This query is used to query for Retour redirects.',
             ],
             'retourRedirects' => [
@@ -65,7 +65,7 @@ 
                         'description' => 'The siteId to list all redirects for.',
                     ],
                 ],
-                'resolve' => RetourResolver::class . '::resolveAll',
+                'resolve' => RetourResolver::class.'::resolveAll',
                 'description' => 'This query is used to query for all Retour redirects for a site.',
             ],
         ];

src/gql/resolvers/RetourResolver.php

Spacing +2 added lines, -2 removed lines

@@ -65,8 +65,8 @@
                 // Set the `site` virtual field
                 $redirect['site'] = null;
                 $redirect['siteId'] = $siteId;
-                if (isset($redirect['siteId']) && (int)$redirect['siteId'] !== 0) {
-                    $site = Craft::$app->getSites()->getSiteById((int)$redirect['siteId']);
+                if (isset($redirect['siteId']) && (int) $redirect['siteId'] !== 0) {
+                    $site = Craft::$app->getSites()->getSiteById((int) $redirect['siteId']);
                     if ($site !== null) {
                         $redirect['site'] = $site->handle;
                     }

src/helpers/MultiSite.php

Spacing +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
                         $siteId = reset($variables['enabledSiteIds']);
                     }
                 } else {
-                    self::requirePermission('editSite:' . $siteId);
+                    self::requirePermission('editSite:'.$siteId);
                 }
             }
         }
@@ -112,7 +112,7 @@ 
             } else {
                 $variables['sitesMenuLabel'] = Craft::t(
                     'site',
-                    $sites->getSiteById((int)$variables['currentSiteId'])->name
+                    $sites->getSiteById((int) $variables['currentSiteId'])->name
                 );
             }
         } else {
@@ -136,7 +136,7 @@ 
         if ($siteHandle !== null) {
             $site = Craft::$app->getSites()->getSiteByHandle($siteHandle);
             if (!$site) {
-                throw new NotFoundHttpException('Invalid site handle: ' . $siteHandle);
+                throw new NotFoundHttpException('Invalid site handle: '.$siteHandle);
             }
             $siteId = $site->id;
         }

ecs.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 return static function(ECSConfig $ecsConfig): void {
     $ecsConfig->paths([
-        __DIR__ . '/src',
+        __DIR__.'/src',
         __FILE__,
     ]);
     $ecsConfig->parallel();

src/services/Statistics.php

Spacing +4 added lines, -4 removed lines

@@ -77,7 +77,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()) {
@@ -212,9 +212,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
@@ -358,7 +358,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 +18 added lines, -18 removed lines

@@ -282,7 +282,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) {
@@ -297,7 +297,7 @@ 
                     // That's ok
                 }
                 if (!empty($queryString)) {
-                    $dest = strtok($dest, '?') . '?' . $queryString;
+                    $dest = strtok($dest, '?').'?'.$queryString;
                 }
             }
             $redirectMatchType = $redirect['redirectMatchType'] ?? 'notfound';
@@ -412,7 +412,7 @@ 
     public function getRedirectFromCache($url, ?int $siteId = 0)
     {
         $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(
@@ -440,12 +440,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);
@@ -485,7 +485,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':
@@ -526,12 +526,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'],
@@ -559,7 +559,7 @@ 
                             }
                         } catch (\Exception $e) {
                             // That's fine
-                            Craft::error('Invalid Redirect Regex: ' . $matchRegEx, __METHOD__);
+                            Craft::error('Invalid Redirect Regex: '.$matchRegEx, __METHOD__);
                         }
 
                         break;
@@ -667,7 +667,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');
             }
         }
 
@@ -908,7 +908,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'],
@@ -969,7 +969,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__);
             }
@@ -1081,7 +1081,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
@@ -1091,7 +1091,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}}'])
@@ -1104,7 +1104,7 @@ 
             }
         }
         // Trigger a 'beforeSaveRedirect' event
-        $isNew = (int)$redirectConfig['id'] === 0;
+        $isNew = (int) $redirectConfig['id'] === 0;
         $event = new RedirectEvent([
             'isNew' => $isNew,
             'legacyUrl' => $redirectConfig['redirectSrcUrlParsed'],
@@ -1207,13 +1207,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(
@@ -1229,7 +1229,7 @@ 
                     }
                 } catch (\Exception $e) {
                     // That's fine
-                    Craft::error('Invalid exclude URI Regex: ' . $pattern, __METHOD__);
+                    Craft::error('Invalid exclude URI Regex: '.$pattern, __METHOD__);
                 }
             }
         }

src/controllers/TablesController.php

Indentation +6 added lines, -6 removed lines

@@ -93,9 +93,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');
         $data = [];
@@ -197,9 +197,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');
         $data = [];

Spacing +5 added lines, -5 removed lines

@@ -124,7 +124,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') {
@@ -145,7 +145,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 {
@@ -153,7 +153,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', [
@@ -228,7 +228,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) {
@@ -270,7 +270,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/FileController.php

Spacing +8 added lines, -8 removed lines

@@ -203,7 +203,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,
@@ -211,7 +211,7 @@ 
             ],
             [
                 'label' => 'Redirects',
-                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
@@ -221,7 +221,7 @@ 
         $file = UploadedFile::getInstanceByName('file');
         if ($file !== null) {
             $filename = uniqid($file->name, true);
-            $filePath = Craft::$app->getPath()->getTempPath() . DIRECTORY_SEPARATOR . $filename;
+            $filePath = Craft::$app->getPath()->getTempPath().DIRECTORY_SEPARATOR.$filename;
             $file->saveAs($filePath, false);
             // Also save the file to the cache as a backup way to access it
             $fileContents = @file_get_contents($filePath);
@@ -354,7 +354,7 @@ 
         }
         $csv->insertOne(array_values($columns));
         $csv->insertAll($data);
-        $csv->output($filename . '.csv');
+        $csv->output($filename.'.csv');
         exit(0);
     }
 
@@ -386,9 +386,9 @@ 
                 $index++;
             }
             $redirectDump = print_r($redirectConfig, true);
-            Craft::debug("-> ROW #$rowIndex contents: " . $redirectDump, __METHOD__);
+            Craft::debug("-> ROW #$rowIndex contents: ".$redirectDump, __METHOD__);
             if (!Retour::$plugin->redirects->saveRedirect($redirectConfig)) {
-                Craft::info("-> ROW #$rowIndex contents: " . $redirectDump, __METHOD__);
+                Craft::info("-> ROW #$rowIndex contents: ".$redirectDump, __METHOD__);
                 $hasErrors = true;
             }
             $rowIndex++;
@@ -428,9 +428,9 @@ 
                 $index++;
             }
             $redirectDump = print_r($redirectConfig, true);
-            Craft::debug("-> ROW #$rowIndex contents: " . $redirectDump, __METHOD__);
+            Craft::debug("-> ROW #$rowIndex contents: ".$redirectDump, __METHOD__);
             if (!Retour::$plugin->redirects->saveRedirect($redirectConfig)) {
-                Craft::info("-> ROW #$rowIndex contents: " . $redirectDump, __METHOD__);
+                Craft::info("-> ROW #$rowIndex contents: ".$redirectDump, __METHOD__);
                 $hasErrors = true;
             }
             $rowIndex++;