nystudio107 / craft-retour

src/models/StaticRedirects.php

Spacing +18 added lines, -18 removed lines

@@ -96,18 +96,18 @@ 
     public function rules()
     {
         return [
-            ['id', 'integer'],
-            ['siteId', 'integer'],
-            ['siteId', 'default', 'value' => null],
-            ['associatedElementId', 'default', 'value' => 0],
-            ['associatedElementId', 'integer'],
-            ['enabled', 'boolean'],
-            ['redirectSrcMatch', 'default', 'value' => 'pathonly'],
-            ['redirectSrcMatch', DbStringValidator::class, 'max' => 32],
-            ['redirectSrcMatch', 'string'],
-            ['redirectMatchType', 'default', 'value' => 'exactmatch'],
-            ['redirectMatchType', DbStringValidator::class, 'max' => 32],
-            ['redirectMatchType', 'string'],
+            [ 'id', 'integer' ],
+            [ 'siteId', 'integer' ],
+            [ 'siteId', 'default', 'value' => null ],
+            [ 'associatedElementId', 'default', 'value' => 0 ],
+            [ 'associatedElementId', 'integer' ],
+            [ 'enabled', 'boolean' ],
+            [ 'redirectSrcMatch', 'default', 'value' => 'pathonly' ],
+            [ 'redirectSrcMatch', DbStringValidator::class, 'max' => 32 ],
+            [ 'redirectSrcMatch', 'string' ],
+            [ 'redirectMatchType', 'default', 'value' => 'exactmatch' ],
+            [ 'redirectMatchType', DbStringValidator::class, 'max' => 32 ],
+            [ 'redirectMatchType', 'string' ],
             [
                 [
                     'redirectSrcUrl',
@@ -117,7 +117,7 @@ 
                 'default',
                 'value' => ''
             ],
-            ['redirectSrcUrlParsed', ParsedUriValidator::class, 'source' => 'redirectSrcUrl'],
+            [ 'redirectSrcUrlParsed', ParsedUriValidator::class, 'source' => 'redirectSrcUrl' ],
             [
                 [
                     'redirectSrcUrl',
@@ -144,11 +144,11 @@ 
                 ],
                 'string'
             ],
-            ['redirectHttpCode', 'integer'],
-            ['redirectHttpCode', 'default', 'value' => 301],
-            ['hitCount', 'default', 'value' => 0],
-            ['hitCount', 'integer'],
-            ['hitLastTime', 'safe'],
+            [ 'redirectHttpCode', 'integer' ],
+            [ 'redirectHttpCode', 'default', 'value' => 301 ],
+            [ 'hitCount', 'default', 'value' => 0 ],
+            [ 'hitCount', 'integer' ],
+            [ 'hitLastTime', 'safe' ],
         ];
     }
 

src/controllers/ChartsController.php

Spacing +14 added lines, -14 removed lines

@@ -55,7 +55,7 @@ 
     public function actionDashboard(string $range = 'day', int $siteId = 0): Response
     {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $days = 1;
         switch ($range) {
             case 'day':
@@ -81,8 +81,8 @@ 
                     'COUNT(handledByRetour = 1 or null) as handled_cnt',
                 ])
                 ->where("hitLastTime >= ( CURDATE() - INTERVAL '{$days}' DAY )");
-            if ((int)$siteId !== 0) {
-                $query->andWhere(['siteId' => $siteId]);
+            if ((int) $siteId !== 0) {
+                $query->andWhere([ 'siteId' => $siteId ]);
             }
             $query
                 ->orderBy('date_formatted ASC')
@@ -99,8 +99,8 @@ 
                     "COUNT(CASE WHEN \"handledByRetour\" = true THEN 1 END) as handled_cnt",
                 ])
                 ->where("\"hitLastTime\" >= ( CURRENT_TIMESTAMP - INTERVAL '{$days} days' )");
-            if ((int)$siteId !== 0) {
-                $query->andWhere(['siteId' => $siteId]);
+            if ((int) $siteId !== 0) {
+                $query->andWhere([ 'siteId' => $siteId ]);
             }
             $query
                 ->orderBy('date_formatted ASC')
@@ -108,15 +108,15 @@ 
             $stats = $query->all();
         }
         if ($stats) {
-            $data[] = [
+            $data[ ] = [
                 'name' => '404 hits',
-                'data' => array_merge(['0'], ArrayHelper::getColumn($stats, 'cnt')),
-                'labels' => array_merge(['-'], ArrayHelper::getColumn($stats, 'date_formatted')),
+                'data' => array_merge([ '0' ], ArrayHelper::getColumn($stats, 'cnt')),
+                'labels' => array_merge([ '-' ], ArrayHelper::getColumn($stats, 'date_formatted')),
             ];
-            $data[] = [
+            $data[ ] = [
                 'name' => 'Handled 404 hits',
-                'data' => array_merge(['0'], ArrayHelper::getColumn($stats, 'handled_cnt')),
-                'labels' => array_merge(['-'], ArrayHelper::getColumn($stats, 'date_formatted')),
+                'data' => array_merge([ '0' ], ArrayHelper::getColumn($stats, 'handled_cnt')),
+                'labels' => array_merge([ '-' ], ArrayHelper::getColumn($stats, 'date_formatted')),
             ];
         }
 
@@ -132,7 +132,7 @@ 
      */
     public function actionWidget($days = 1): Response
     {
-        $data = [];
+        $data = [ ];
         // Different dbs do it different ways
         $stats = null;
         $handledStats = null;
@@ -163,8 +163,8 @@ 
         }
         if ($stats) {
             $data = [
-                (int)$stats,
-                (int)$handledStats,
+                (int) $stats,
+                (int) $handledStats,
             ];
         }
 

src/controllers/FileController.php

Spacing +23 added lines, -23 removed lines

@@ -73,7 +73,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -98,20 +98,20 @@ 
         $headers = array_flip($csv->fetchOne(0));
         $csv->setOffset(1);
         $columns = ArrayHelper::filterEmptyStringsFromArray($columns);
-        $csv->each(function ($row) use ($headers, $columns) {
+        $csv->each(function($row) use ($headers, $columns) {
             $redirectConfig = [
                 'id' => 0,
             ];
             $index = 0;
             foreach (self::IMPORT_REDIRECTS_CSV_FIELDS as $importField) {
-                if (isset($columns[$index], $headers[$columns[$index]])) {
-                    $redirectConfig[$importField] = empty($row[$headers[$columns[$index]]])
+                if (isset($columns[ $index ], $headers[ $columns[ $index ] ])) {
+                    $redirectConfig[ $importField ] = empty($row[ $headers[ $columns[ $index ] ] ])
                         ? null
-                        : $row[$headers[$columns[$index]]];
+                        : $row[ $headers[ $columns[ $index ] ] ];
                 }
                 $index++;
             }
-            Craft::debug('Importing row: '.print_r($redirectConfig, true), __METHOD__);
+            Craft::debug('Importing row: ' . print_r($redirectConfig, true), __METHOD__);
             Retour::$plugin->redirects->saveRedirect($redirectConfig);
 
             return true;
@@ -133,7 +133,7 @@ 
      */
     public function actionImportCsv(string $siteHandle = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
         // If your CSV document was created or is read on a Macintosh computer,
         // add the following lines before using the library to help PHP detect line ending in Mac OS X
@@ -151,43 +151,43 @@ 
         } catch (InvalidConfigException $e) {
             Craft::error($e->getMessage(), __METHOD__);
         }
-        $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl(
+        $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl(
             '@nystudio107/retour/assetbundles/retour/dist',
             true
         );
         // Enabled sites
         MultiSiteHelper::setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'file';
+        $variables[ 'controllerHandle' ] = 'file';
 
         // Basic variables
-        $variables['fullPageForm'] = true;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = true;
+        $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL;
+        $variables[ 'pluginName' ] = $pluginName;
+        $variables[ 'title' ] = $templateTitle;
+        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $variables[ 'crumbs' ] = [
             [
                 'label' => $pluginName,
                 'url' => UrlHelper::cpUrl('retour'),
             ],
             [
                 'label' => 'Redirects',
-                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'redirects';
+        $variables[ 'docTitle' ] = "{$pluginName} - Redirects - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'redirects';
 
         // The CSV file
         $file = UploadedFile::getInstanceByName('file');
         if ($file !== null) {
-            $filename = Craft::$app->getPath()->getTempPath().DIRECTORY_SEPARATOR.uniqid($file->name, true);
+            $filename = Craft::$app->getPath()->getTempPath() . DIRECTORY_SEPARATOR . uniqid($file->name, true);
             $file->saveAs($filename, false);
             $csv = Reader::createFromPath($file->tempName);
             $headers = $csv->fetchOne(0);
             Craft::info(print_r($headers, true), __METHOD__);
-            $variables['headers'] = $headers;
-            $variables['filename'] = $filename;
+            $variables[ 'headers' ] = $headers;
+            $variables[ 'filename' ] = $filename;
         }
 
         // Render the template
@@ -233,7 +233,7 @@ 
         }
         // Query the db table
         $data = (new Query())
-            ->from([$table])
+            ->from([ $table ])
             ->select(array_keys($columns))
             ->orderBy('hitCount DESC')
             ->all();
@@ -241,7 +241,7 @@ 
         $csv = Writer::createFromFileObject(new \SplTempFileObject());
         $csv->insertOne(array_values($columns));
         $csv->insertAll($data);
-        $csv->output($filename.'.csv');
+        $csv->output($filename . '.csv');
         exit(0);
     }
 }

src/Retour.php

Spacing +30 added lines, -30 removed lines

@@ -99,7 +99,7 @@ 
     /**
      * @var array The URIs for the element before it was saved
      */
-    public $oldElementUris = [];
+    public $oldElementUris = [ ];
 
     // Public Methods
     // =========================================================================
@@ -130,7 +130,7 @@ 
             Craft::t(
                 'retour',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );
@@ -150,18 +150,18 @@ 
      */
     public function getCpNavItem()
     {
-        $subNavs = [];
+        $subNavs = [ ];
         $navItem = parent::getCpNavItem();
         $currentUser = Craft::$app->getUser()->getIdentity();
         // Only show sub-navs the user has permission to view
         if ($currentUser->can('retour:dashboard')) {
-            $subNavs['dashboard'] = [
+            $subNavs[ 'dashboard' ] = [
                 'label' => 'Dashboard',
                 'url' => 'retour/dashboard',
             ];
         }
         if ($currentUser->can('retour:redirects')) {
-            $subNavs['redirects'] = [
+            $subNavs[ 'redirects' ] = [
                 'label' => 'Redirects',
                 'url' => 'retour/redirects',
             ];
@@ -172,7 +172,7 @@ 
             $editableSettings = false;
         }
         if ($currentUser->can('retour:settings') && $editableSettings) {
-            $subNavs['settings'] = [
+            $subNavs[ 'settings' ] = [
                 'label' => 'Settings',
                 'url' => 'retour/settings',
             ];
@@ -231,7 +231,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -247,7 +247,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     // Invalidate our caches after we've been installed
                     $this->clearAllCaches();
@@ -274,7 +274,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('retour', RetourVariable::class);
@@ -284,7 +284,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -299,8 +299,8 @@ 
                         if ($oldElement !== null) {
                             // Stash the old URLs by element id, and do so only once,
                             // in case we are called more than once per request
-                            if (empty($this->oldElementUris[$oldElement->id])) {
-                                $this->oldElementUris[$oldElement->id] = $this->getAllElementUris($oldElement);
+                            if (empty($this->oldElementUris[ $oldElement->id ])) {
+                                $this->oldElementUris[ $oldElement->id ] = $this->getAllElementUris($oldElement);
                             }
                         }
                     }
@@ -311,7 +311,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -327,7 +327,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_LOAD_PLUGINS,
-            function () {
+            function() {
                 // Install these only after all other plugins have loaded
                 $request = Craft::$app->getRequest();
                 // Only respond to non-console site requests
@@ -351,7 +351,7 @@ 
         Event::on(
             UrlManager::class,
             UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-            function (RegisterUrlRulesEvent $event) {
+            function(RegisterUrlRulesEvent $event) {
                 Craft::debug(
                     'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
                     __METHOD__
@@ -374,15 +374,15 @@ 
         Event::on(
             Dashboard::class,
             Dashboard::EVENT_REGISTER_WIDGET_TYPES,
-            function (RegisterComponentTypesEvent $event) {
-                $event->types[] = RetourWidget::class;
+            function(RegisterComponentTypesEvent $event) {
+                $event->types[ ] = RetourWidget::class;
             }
         );
         // Handler: UrlManager::EVENT_REGISTER_CP_URL_RULES
         Event::on(
             UrlManager::class,
             UrlManager::EVENT_REGISTER_CP_URL_RULES,
-            function (RegisterUrlRulesEvent $event) {
+            function(RegisterUrlRulesEvent $event) {
                 Craft::debug(
                     'UrlManager::EVENT_REGISTER_CP_URL_RULES',
                     __METHOD__
@@ -398,13 +398,13 @@ 
         Event::on(
             UserPermissions::class,
             UserPermissions::EVENT_REGISTER_PERMISSIONS,
-            function (RegisterUserPermissionsEvent $event) {
+            function(RegisterUserPermissionsEvent $event) {
                 Craft::debug(
                     'UserPermissions::EVENT_REGISTER_PERMISSIONS',
                     __METHOD__
                 );
                 // Register our custom permissions
-                $event->permissions[Craft::t('retour', 'Retour')] = $this->customAdminCpPermissions();
+                $event->permissions[ Craft::t('retour', 'Retour') ] = $this->customAdminCpPermissions();
             }
         );
     }
@@ -420,7 +420,7 @@ 
         Event::on(
             ErrorHandler::class,
             ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION,
-            function (ExceptionEvent $event) {
+            function(ExceptionEvent $event) {
                 Craft::debug(
                     'ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION',
                     __METHOD__
@@ -463,16 +463,16 @@ 
     protected function handleElementUriChange(Element $element)
     {
         $uris = $this->getAllElementUris($element);
-        if (!empty($this->oldElementUris[$element->id])) {
-            $oldElementUris = $this->oldElementUris[$element->id];
+        if (!empty($this->oldElementUris[ $element->id ])) {
+            $oldElementUris = $this->oldElementUris[ $element->id ];
             foreach ($uris as $siteId => $newUri) {
-                if (!empty($oldElementUris[$siteId])) {
-                    $oldUri = $oldElementUris[$siteId];
+                if (!empty($oldElementUris[ $siteId ])) {
+                    $oldUri = $oldElementUris[ $siteId ];
                     Craft::debug(
                         Craft::t(
                             'retour',
                             'Comparing old: {oldUri} to new: {newUri}',
-                            ['oldUri' => print_r($oldUri, true), 'newUri' => print_r($newUri, true)]
+                            [ 'oldUri' => print_r($oldUri, true), 'newUri' => print_r($newUri, true) ]
                         ),
                         __METHOD__
                     );
@@ -507,12 +507,12 @@ 
      */
     protected function getAllElementUris(Element $element): array
     {
-        $uris = [];
+        $uris = [ ];
         $sites = Craft::$app->getSites()->getAllSites();
         foreach ($sites as $site) {
             $uri = Craft::$app->getElements()->getElementUriForSite($element->id, $site->id);
             if ($uri !== null) {
-                $uris[$site->id] = $uri;
+                $uris[ $site->id ] = $uri;
             }
         }
 
@@ -520,7 +520,7 @@ 
             Craft::t(
                 'retour',
                 'Getting Element URIs: {uris}',
-                ['uris' => print_r($uris, true)]
+                [ 'uris' => print_r($uris, true) ]
             ),
             __METHOD__
         );
@@ -584,7 +584,7 @@ 
             [
                 'key' => 'retour-redirect-caches',
                 'label' => Craft::t('retour', 'Retour redirect caches'),
-                'action' => [self::$plugin->redirects, 'invalidateCaches'],
+                'action' => [ self::$plugin->redirects, 'invalidateCaches' ],
             ],
         ];
     }

src/controllers/TablesController.php

Spacing +35 added lines, -35 removed lines

@@ -62,7 +62,7 @@ 
         $siteId = 0
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -76,42 +76,42 @@ 
         // Query the db table
         $offset = ($page - 1) * $per_page;
         $query = (new Query())
-            ->from(['{{%retour_stats}}'])
+            ->from([ '{{%retour_stats}}' ])
             ->offset($offset)
             ->limit($per_page)
             ->orderBy("{$sortField} {$sortType}");
-        if ((int)$siteId !== 0) {
-            $query->where(['siteId' => $siteId]);
+        if ((int) $siteId !== 0) {
+            $query->where([ 'siteId' => $siteId ]);
         }
         if ($filter !== '') {
-            $query->where(['like', 'redirectSrcUrl', $filter]);
-            $query->orWhere(['like', 'referrerUrl', $filter]);
+            $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+            $query->orWhere([ 'like', 'referrerUrl', $filter ]);
         }
         $stats = $query->all();
         if ($stats) {
             // Add in the `addLink` field
             foreach ($stats as &$stat) {
-                $stat['addLink'] = '';
-                if (!$stat['handledByRetour']) {
-                    $encodedUrl = urlencode('/'.ltrim($stat['redirectSrcUrl'], '/'));
-                    $stat['addLink'] = UrlHelper::cpUrl('retour/add-redirect', [
+                $stat[ 'addLink' ] = '';
+                if (!$stat[ 'handledByRetour' ]) {
+                    $encodedUrl = urlencode('/' . ltrim($stat[ 'redirectSrcUrl' ], '/'));
+                    $stat[ 'addLink' ] = UrlHelper::cpUrl('retour/add-redirect', [
                         'defaultUrl' => $encodedUrl
                     ]);
                 }
             }
             // Format the data for the API
-            $data['data'] = $stats;
+            $data[ 'data' ] = $stats;
             $query = (new Query())
-                ->from(['{{%retour_stats}}']);
-            if ((int)$siteId !== 0) {
-                $query->where(['siteId' => $siteId]);
+                ->from([ '{{%retour_stats}}' ]);
+            if ((int) $siteId !== 0) {
+                $query->where([ 'siteId' => $siteId ]);
             }
             if ($filter !== '') {
-                $query->where(['like', 'redirectSrcUrl', $filter]);
-                $query->orWhere(['like', 'referrerUrl', $filter]);
+                $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+                $query->orWhere([ 'like', 'referrerUrl', $filter ]);
             }
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,
@@ -146,7 +146,7 @@ 
         $siteId = 0
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:redirects');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -160,43 +160,43 @@ 
         // Query the db table
         $offset = ($page - 1) * $per_page;
         $query = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
+            ->from([ '{{%retour_static_redirects}}' ])
             ->offset($offset)
             ->limit($per_page)
             ->orderBy("{$sortField} {$sortType}");
-        if ((int)$siteId !== 0) {
-            $query->where(['siteId' => $siteId]);
+        if ((int) $siteId !== 0) {
+            $query->where([ 'siteId' => $siteId ]);
         }
         if ($filter !== '') {
-            $query->where(['like', 'redirectSrcUrl', $filter]);
-            $query->orWhere(['like', 'redirectDestUrl', $filter]);
+            $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+            $query->orWhere([ 'like', 'redirectDestUrl', $filter ]);
         }
         $redirects = $query->all();
         // Add in the `deleteLink` field and clean up the redirects
         foreach ($redirects as &$redirect) {
             // Make sure the destination URL is not a regex
-            if ($redirect['redirectMatchType'] !== 'exactmatch') {
-                if (preg_match("/\$\d+/", $redirect['redirectDestUrl'])) {
-                    $redirect['redirectDestUrl'] = '';
+            if ($redirect[ 'redirectMatchType' ] !== 'exactmatch') {
+                if (preg_match("/\$\d+/", $redirect[ 'redirectDestUrl' ])) {
+                    $redirect[ 'redirectDestUrl' ] = '';
                 }
             }
-            $redirect['deleteLink'] = UrlHelper::cpUrl('retour/delete-redirect/'.$redirect['id']);
-            $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-redirect/'.$redirect['id']);
+            $redirect[ 'deleteLink' ] = UrlHelper::cpUrl('retour/delete-redirect/' . $redirect[ 'id' ]);
+            $redirect[ 'editLink' ] = UrlHelper::cpUrl('retour/edit-redirect/' . $redirect[ 'id' ]);
         }
         // Format the data for the API
         if ($redirects) {
-            $data['data'] = $redirects;
+            $data[ 'data' ] = $redirects;
             $query = (new Query())
-                ->from(['{{%retour_static_redirects}}']);
-            if ((int)$siteId !== 0) {
-                $query->where(['siteId' => $siteId]);
+                ->from([ '{{%retour_static_redirects}}' ]);
+            if ((int) $siteId !== 0) {
+                $query->where([ 'siteId' => $siteId ]);
             }
             if ($filter !== '') {
-                $query->where(['like', 'redirectSrcUrl', $filter]);
-                $query->orWhere(['like', 'redirectDestUrl', $filter]);
+                $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+                $query->orWhere([ 'like', 'redirectDestUrl', $filter ]);
             }
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,

src/services/Statistics.php

Spacing +17 added lines, -17 removed lines

@@ -58,7 +58,7 @@ 
         }
         // Query the db table
         $stats = (new Query())
-            ->from(['{{%retour_stats}}'])
+            ->from([ '{{%retour_stats}}' ])
             ->orderBy('hitCount DESC')
             ->limit(Retour::$settings->statsDisplayLimit)
             ->all();
@@ -77,13 +77,13 @@ 
     public function getRecentStatistics($days = 1, $handled = false): array
     {
         // Ensure is an int
-        $handledInt = (int)$handled;
-        $stats = [];
+        $handledInt = (int) $handled;
+        $stats = [ ];
         $db = Craft::$app->getDb();
         if ($db->getIsMysql()) {
             // Query the db table
             $stats = (new Query())
-                ->from(['{{%retour_stats}}'])
+                ->from([ '{{%retour_stats}}' ])
                 ->where("hitLastTime >= ( CURDATE() - INTERVAL '{$days}' DAY )")
                 ->andWhere("handledByRetour = {$handledInt}")
                 ->orderBy('hitLastTime DESC')
@@ -92,9 +92,9 @@ 
         if ($db->getIsPgsql()) {
             // Query the db table
             $stats = (new Query())
-                ->from(['{{%retour_stats}}'])
+                ->from([ '{{%retour_stats}}' ])
                 ->where("\"hitLastTime\" >= ( CURRENT_TIMESTAMP - INTERVAL '{$days} days' )")
-                ->andWhere(['handledByRetour' => $handledInt])
+                ->andWhere([ 'handledByRetour' => $handledInt ])
                 ->orderBy('hitLastTime DESC')
                 ->all();
         }
@@ -161,16 +161,16 @@ 
         $stats->validate();
         // Find any existing retour_stats record
         $statsConfig = (new Query())
-            ->from(['{{%retour_stats}}'])
-            ->where(['redirectSrcUrl' => $stats->redirectSrcUrl])
+            ->from([ '{{%retour_stats}}' ])
+            ->where([ 'redirectSrcUrl' => $stats->redirectSrcUrl ])
             ->one();
         // If no record is found, initialize some values
         if ($statsConfig === null) {
             $stats->id = 0;
             $stats->hitCount = 0;
         } else {
-            $stats->id = $statsConfig['id'];
-            $stats->hitCount = $statsConfig['hitCount'];
+            $stats->id = $statsConfig[ 'id' ];
+            $stats->hitCount = $statsConfig[ 'hitCount' ];
         }
         // Merge in the updated info
         $stats->siteId = $siteId;
@@ -179,9 +179,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
@@ -251,7 +251,7 @@ 
                 Craft::t(
                     'retour',
                     'Trimmed {rows} from retour_stats table',
-                    ['rows' => $affectedRows]
+                    [ 'rows' => $affectedRows ]
                 ),
                 __METHOD__
             );
@@ -272,7 +272,7 @@ 
                 Craft::t(
                     'retour',
                     'Error validating statistics {id}: {errors}',
-                    ['id' => $stats->id, 'errors' => print_r($stats->getErrors(), true)]
+                    [ 'id' => $stats->id, 'errors' => print_r($stats->getErrors(), true) ]
                 ),
                 __METHOD__
             );
@@ -282,14 +282,14 @@ 
         // Get the validated model attributes and save them to the db
         $statsConfig = $stats->getAttributes();
         $db = Craft::$app->getDb();
-        if ($statsConfig['id'] !== 0) {
+        if ($statsConfig[ 'id' ] !== 0) {
             // Update the existing record
             try {
                 $result = $db->createCommand()->update(
                     '{{%retour_stats}}',
                     $statsConfig,
                     [
-                        'id' => $statsConfig['id'],
+                        'id' => $statsConfig[ 'id' ],
                     ]
                 )->execute();
             } catch (Exception $e) {
@@ -298,7 +298,7 @@ 
                 // Craft::error($e->getMessage(), __METHOD__);
             }
         } else {
-            unset($statsConfig['id']);
+            unset($statsConfig[ 'id' ]);
             // Create a new record
             try {
                 $db->createCommand()->insert(

src/helpers/MultiSite.php

Spacing +24 added lines, -24 removed lines

@@ -36,7 +36,7 @@ 
     public static function setSitesMenuVariables(array &$variables)
     {
         // Set defaults based on the section settings
-        $variables['sitesMenu'] = [
+        $variables[ 'sitesMenu' ] = [
             0 => Craft::t(
                 'retour',
                 'All Sites'
@@ -49,11 +49,11 @@ 
             /** @var Site $site */
             foreach ($sites->getAllGroups() as $group) {
                 $groupSites = $sites->getSitesByGroupId($group->id);
-                $variables['sitesMenu'][$group->name]
-                    = ['optgroup' => $group->name];
+                $variables[ 'sitesMenu' ][ $group->name ]
+                    = [ 'optgroup' => $group->name ];
                 foreach ($groupSites as $groupSite) {
                     if (in_array($groupSite->id, $editableSites, false)) {
-                        $variables['sitesMenu'][$groupSite->id] = $groupSite->name;
+                        $variables[ 'sitesMenu' ][ $groupSite->id ] = $groupSite->name;
                     }
                 }
             }
@@ -73,53 +73,53 @@ 
         $sites = Craft::$app->getSites();
         if (Craft::$app->getIsMultiSite()) {
             // Set defaults based on the section settings
-            $variables['enabledSiteIds'] = [];
-            $variables['siteIds'] = [];
+            $variables[ 'enabledSiteIds' ] = [ ];
+            $variables[ 'siteIds' ] = [ ];
 
             /** @var Site $site */
             foreach ($sites->getEditableSiteIds() as $editableSiteId) {
-                $variables['enabledSiteIds'][] = $editableSiteId;
-                $variables['siteIds'][] = $editableSiteId;
+                $variables[ 'enabledSiteIds' ][ ] = $editableSiteId;
+                $variables[ 'siteIds' ][ ] = $editableSiteId;
             }
 
             // Make sure the $siteId they are trying to edit is in our array of editable sites
-            if (!\in_array($siteId, $variables['enabledSiteIds'], false)) {
-                if (!empty($variables['enabledSiteIds'])) {
+            if (!\in_array($siteId, $variables[ 'enabledSiteIds' ], false)) {
+                if (!empty($variables[ 'enabledSiteIds' ])) {
                     if ($siteId !== 0) {
-                        $siteId = reset($variables['enabledSiteIds']);
+                        $siteId = reset($variables[ 'enabledSiteIds' ]);
                     }
                 } else {
-                    self::requirePermission('editSite:'.$siteId);
+                    self::requirePermission('editSite:' . $siteId);
                 }
             }
         }
         // Set the currentSiteId and currentSiteHandle
-        $variables['currentSiteId'] = empty($siteId) ? 0 : $siteId;
-        $variables['currentSiteHandle'] = empty($siteHandle)
+        $variables[ 'currentSiteId' ] = empty($siteId) ? 0 : $siteId;
+        $variables[ 'currentSiteHandle' ] = empty($siteHandle)
             ? Craft::$app->getSites()->currentSite->handle
             : $siteHandle;
 
         // Page title
-        $variables['showSites'] = (
+        $variables[ 'showSites' ] = (
             Craft::$app->getIsMultiSite() &&
-            \count($variables['enabledSiteIds'])
+            \count($variables[ 'enabledSiteIds' ])
         );
 
-        if ($variables['showSites']) {
-            if ($variables['currentSiteId'] === 0) {
-                $variables['sitesMenuLabel'] = Craft::t(
+        if ($variables[ 'showSites' ]) {
+            if ($variables[ 'currentSiteId' ] === 0) {
+                $variables[ 'sitesMenuLabel' ] = Craft::t(
                     'retour',
                     'All Sites'
                 );
             } else {
-                $variables['sitesMenuLabel'] = Craft::t(
+                $variables[ 'sitesMenuLabel' ] = Craft::t(
                     'site',
-                    $sites->getSiteById((int)$variables['currentSiteId'])->name
+                    $sites->getSiteById((int) $variables[ 'currentSiteId' ])->name
                 );
             }
         } else {
-            $variables['currentSiteId'] = 0;
-            $variables['sitesMenuLabel'] = '';
+            $variables[ 'currentSiteId' ] = 0;
+            $variables[ 'sitesMenuLabel' ] = '';
         }
     }
 
@@ -137,7 +137,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;
         } else {

src/config.php

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     // Whether the Statistics should be trimmed after each new statistic is recorded
     'automaticallyTrimStatistics' => true,
 
-     // [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/services/Redirects.php

Spacing +61 added lines, -61 removed lines

@@ -128,7 +128,7 @@ 
                 Craft::t(
                     'retour',
                     '404 full URL: {fullUrl}, 404 path only: {pathOnly}',
-                    ['fullUrl' => $fullUrl, 'pathOnly' => $pathOnly]
+                    [ 'fullUrl' => $fullUrl, 'pathOnly' => $pathOnly ]
                 ),
                 __METHOD__
             );
@@ -162,7 +162,7 @@ 
         $response = Craft::$app->getResponse();
         if ($redirect !== null) {
             // Figure out what type of source matching was done
-            $redirectSrcMatch = $redirect['redirectSrcMatch'] ?? 'pathonly';
+            $redirectSrcMatch = $redirect[ 'redirectSrcMatch' ] ?? 'pathonly';
             switch ($redirectSrcMatch) {
                 case 'pathonly':
                     $url = $pathOnly;
@@ -174,11 +174,11 @@ 
                     $url = $pathOnly;
                     break;
             }
-            $dest = $redirect['redirectDestUrl'];
+            $dest = $redirect[ 'redirectDestUrl' ];
             // If this isn't a full URL, make it one based on the appropriate site
             if (!UrlHelper::isFullUrl($dest)) {
                 try {
-                    $dest = UrlHelper::siteUrl($dest, null, null, $redirect['siteId'] ?? null);
+                    $dest = UrlHelper::siteUrl($dest, null, null, $redirect[ 'siteId' ] ?? null);
                 } catch (\yii\base\Exception $e) {
                 }
             }
@@ -188,12 +188,12 @@ 
                     $dest .= '?' . $request->getQueryStringWithoutPath();
                 }
             }
-            $status = $redirect['redirectHttpCode'];
+            $status = $redirect[ 'redirectHttpCode' ];
             Craft::info(
                 Craft::t(
                     'retour',
                     'Redirecting {url} to {dest} with status {status}',
-                    ['url' => $url, 'dest' => $dest, 'status' => $status]
+                    [ 'url' => $url, 'dest' => $dest, 'status' => $status ]
                 ),
                 __METHOD__
             );
@@ -273,13 +273,13 @@ 
     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(
                 'retour',
                 'Cached redirect hit for {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -301,12 +301,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);
@@ -314,7 +314,7 @@ 
             Craft::t(
                 'retour',
                 'Cached redirect saved for {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -332,8 +332,8 @@ 
         $result = null;
         foreach ($redirects as $redirect) {
             // Figure out what type of source matching to do
-            $redirectSrcMatch = $redirect['redirectSrcMatch'] ?? 'pathonly';
-            $redirectEnabled = (bool)$redirect['enabled'];
+            $redirectSrcMatch = $redirect[ 'redirectSrcMatch' ] ?? 'pathonly';
+            $redirectEnabled = (bool) $redirect[ 'enabled' ];
             if ($redirectEnabled === true) {
                 switch ($redirectSrcMatch) {
                     case 'pathonly':
@@ -346,11 +346,11 @@ 
                         $url = $pathOnly;
                         break;
                 }
-                $redirectMatchType = $redirect['redirectMatchType'] ?? 'notfound';
+                $redirectMatchType = $redirect[ 'redirectMatchType' ] ?? 'notfound';
                 switch ($redirectMatchType) {
                     // Do a straight up match
                     case 'exactmatch':
-                        if (strcasecmp($redirect['redirectSrcUrlParsed'], $url) === 0) {
+                        if (strcasecmp($redirect[ 'redirectSrcUrlParsed' ], $url) === 0) {
                             $this->incrementRedirectHitCount($redirect);
                             $this->saveRedirectToCache($url, $redirect);
 
@@ -360,14 +360,14 @@ 
 
                     // Do a regex match
                     case 'regexmatch':
-                        $matchRegEx = '`'.$redirect['redirectSrcUrlParsed'].'`i';
+                        $matchRegEx = '`' . $redirect[ 'redirectSrcUrlParsed' ] . '`i';
                         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) {
-                                $redirect['redirectDestUrl'] = preg_replace(
+                            if ((int) $redirect[ 'associatedElementId' ] === 0) {
+                                $redirect[ 'redirectDestUrl' ] = preg_replace(
                                     $matchRegEx,
-                                    $redirect['redirectDestUrl'],
+                                    $redirect[ 'redirectDestUrl' ],
                                     $url
                                 );
                             }
@@ -386,7 +386,7 @@ 
                                     'redirect' => &$redirect,
                                 ],
                             ];
-                            $result = \call_user_func_array([$plugin, 'retourMatch'], $args);
+                            $result = \call_user_func_array([ $plugin, 'retourMatch' ], $args);
                             if ($result) {
                                 $this->incrementRedirectHitCount($redirect);
                                 $this->saveRedirectToCache($url, $redirect);
@@ -402,7 +402,7 @@ 
             Craft::t(
                 'retour',
                 'Not handled-> full URL: {fullUrl}, path only: {pathOnly}',
-                ['fullUrl' => $fullUrl, 'pathOnly' => $pathOnly]
+                [ 'fullUrl' => $fullUrl, 'pathOnly' => $pathOnly ]
             ),
             __METHOD__
         );
@@ -426,7 +426,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');
             }
         }
 
@@ -447,12 +447,12 @@ 
         }
         // Query the db table
         $query = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
+            ->from([ '{{%retour_static_redirects}}' ])
             ->orderBy('redirectMatchType ASC, redirectSrcMatch ASC, hitCount DESC');
         if ($siteId) {
             $query
-                ->where(['siteId' => $siteId])
-                ->orWhere(['siteId' => null]);
+                ->where([ 'siteId' => $siteId ])
+                ->orWhere([ 'siteId' => null ]);
         }
         if ($limit) {
             $query->limit($limit);
@@ -475,8 +475,8 @@ 
     {
         // Query the db table
         $redirect = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
-            ->where(['id' => $id])
+            ->from([ '{{%retour_static_redirects}}' ])
+            ->where([ 'id' => $id ])
             ->one();
 
         return $redirect;
@@ -494,13 +494,13 @@ 
     {
         // Query the db table
         $query = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
-            ->where(['redirectSrcUrl' => $redirectSrcUrl])
+            ->from([ '{{%retour_static_redirects}}' ])
+            ->where([ 'redirectSrcUrl' => $redirectSrcUrl ])
             ;
         if ($siteId) {
             $query
-                ->andWhere(['siteId' => $siteId])
-                ->orWhere(['siteId' => null]);
+                ->andWhere([ 'siteId' => $siteId ])
+                ->orWhere([ 'siteId' => null ]);
         }
         $redirect = $query->one();
 
@@ -542,13 +542,13 @@ 
     {
         if ($redirectConfig !== null) {
             $db = Craft::$app->getDb();
-            $redirectConfig['hitCount']++;
-            $redirectConfig['hitLastTime'] = Db::prepareDateForDb(new \DateTime());
+            $redirectConfig[ 'hitCount' ]++;
+            $redirectConfig[ 'hitLastTime' ] = Db::prepareDateForDb(new \DateTime());
             Craft::debug(
                 Craft::t(
                     'retour',
                     'Incrementing statistics for: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -557,14 +557,14 @@ 
                 $rowsAffected = $db->createCommand()->update(
                     '{{%retour_static_redirects}}',
                     [
-                        'hitCount' => $redirectConfig['hitCount'],
-                        'hitLastTime' => $redirectConfig['hitLastTime'],
+                        'hitCount' => $redirectConfig[ 'hitCount' ],
+                        'hitLastTime' => $redirectConfig[ 'hitLastTime' ],
                     ],
                     [
-                        'id' => $redirectConfig['id'],
+                        'id' => $redirectConfig[ 'id' ],
                     ]
                 )->execute();
-                Craft::debug('Rows affected: '.$rowsAffected, __METHOD__);
+                Craft::debug('Rows affected: ' . $rowsAffected, __METHOD__);
             } catch (Exception $e) {
                 Craft::error($e->getMessage(), __METHOD__);
             }
@@ -583,7 +583,7 @@ 
                 Craft::t(
                     'retour',
                     'Error validating redirect {id}: {errors}',
-                    ['id' => $redirect->id, 'errors' => print_r($redirect->getErrors(), true)]
+                    [ 'id' => $redirect->id, 'errors' => print_r($redirect->getErrors(), true) ]
                 ),
                 __METHOD__
             );
@@ -593,32 +593,32 @@ 
         // 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) {
-            $redirectConfig['siteId'] = null;
+        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}}'])
-                ->where(['redirectSrcUrlParsed' => $redirectConfig['redirectSrcUrlParsed']])
-                ->andWhere(['siteId' => $redirectConfig['siteId']])
+                ->from([ '{{%retour_static_redirects}}' ])
+                ->where([ 'redirectSrcUrlParsed' => $redirectConfig[ 'redirectSrcUrlParsed' ] ])
+                ->andWhere([ 'siteId' => $redirectConfig[ 'siteId' ] ])
                 ->one();
             // If it exists, update it rather than having duplicates
             if (!empty($redirect)) {
-                $redirectConfig['id'] = $redirect['id'];
+                $redirectConfig[ 'id' ] = $redirect[ 'id' ];
             }
         }
         // Trigger a 'beforeSaveRedirect' event
-        $isNew = (int)$redirectConfig['id'] === 0;
+        $isNew = (int) $redirectConfig[ 'id' ] === 0;
         $event = new RedirectEvent([
             'isNew' => $isNew,
-            'legacyUrl' => $redirectConfig['redirectSrcUrlParsed'],
-            'destinationUrl' => $redirectConfig['redirectDestUrl'],
-            'matchType' => $redirectConfig['redirectSrcMatch'],
-            'redirectType' => $redirectConfig['redirectHttpCode'],
+            'legacyUrl' => $redirectConfig[ 'redirectSrcUrlParsed' ],
+            'destinationUrl' => $redirectConfig[ 'redirectDestUrl' ],
+            'matchType' => $redirectConfig[ 'redirectSrcMatch' ],
+            'redirectType' => $redirectConfig[ 'redirectHttpCode' ],
         ]);
         $this->trigger(self::EVENT_BEFORE_SAVE_REDIRECT, $event);
         if (!$event->isValid) {
@@ -630,7 +630,7 @@ 
                 Craft::t(
                     'retour',
                     'Updating existing redirect: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -640,7 +640,7 @@ 
                     '{{%retour_static_redirects}}',
                     $redirectConfig,
                     [
-                        'id' => $redirectConfig['id'],
+                        'id' => $redirectConfig[ 'id' ],
                     ]
                 )->execute();
             } catch (Exception $e) {
@@ -651,11 +651,11 @@ 
                 Craft::t(
                     'retour',
                     'Creating new redirect: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
-            unset($redirectConfig['id']);
+            unset($redirectConfig[ 'id' ]);
             // Create a new record
             try {
                 $db->createCommand()->insert(
@@ -668,15 +668,15 @@ 
         }
         // To prevent redirect loops, see if any static redirects have our redirectDestUrl as their redirectSrcUrl
         $testRedirectConfig = $this->getRedirectByRedirectSrcUrl(
-            $redirectConfig['redirectDestUrl'],
-            $redirectConfig['siteId']
+            $redirectConfig[ 'redirectDestUrl' ],
+            $redirectConfig[ 'siteId' ]
         );
         if ($testRedirectConfig !== null) {
             Craft::debug(
                 Craft::t(
                     'retour',
                     'Deleting redirect to prevent a loop: {redirect}',
-                    ['redirect' => print_r($testRedirectConfig, true)]
+                    [ 'redirect' => print_r($testRedirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -684,7 +684,7 @@ 
             try {
                 $db->createCommand()->delete(
                     '{{%retour_static_redirects}}',
-                    ['id' => $testRedirectConfig['id']]
+                    [ 'id' => $testRedirectConfig[ 'id' ] ]
                 )->execute();
             } catch (Exception $e) {
                 Craft::error($e->getMessage(), __METHOD__);
@@ -717,10 +717,10 @@ 
      */
     public function excludeUri($uri): bool
     {
-        $uri = '/'.ltrim($uri, '/');
+        $uri = '/' . ltrim($uri, '/');
         if (!empty(Retour::$settings->excludePatterns)) {
             foreach (Retour::$settings->excludePatterns as $excludePattern) {
-                $pattern = '`'.$excludePattern['pattern'].'`i';
+                $pattern = '`' . $excludePattern[ 'pattern' ] . '`i';
                 if (preg_match($pattern, $uri) === 1) {
                     return true;
                 }