nystudio107 / craft-retour

src/controllers/TablesController.php

Spacing +15 added lines, -15 removed lines

@@ -60,7 +60,7 @@ 
         $filter = ''
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -74,7 +74,7 @@ 
         // 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}");
@@ -85,22 +85,22 @@ 
         $stats = $query->all();
         // Add in the `addLink` field
         foreach ($stats as &$stat) {
-            $stat['addLink'] = '';
-            if (!$stat['handledByRetour']) {
-                $stat['addLink'] = urlencode($stat['redirectSrcUrl']);
+            $stat[ 'addLink' ] = '';
+            if (!$stat[ 'handledByRetour' ]) {
+                $stat[ 'addLink' ] = urlencode($stat[ 'redirectSrcUrl' ]);
             }
         }
         // Format the data for the API
         if ($stats) {
-            $data['data'] = $stats;
+            $data[ 'data' ] = $stats;
             $query = (new Query())
-                ->from(['{{%retour_stats}}']);
+                ->from([ '{{%retour_stats}}' ]);
             if ($filter !== '') {
                 $query->where("`redirectSrcUrl` LIKE '%{$filter}%'");
                 $query->orWhere("`referrerUrl` LIKE '%{$filter}%'");
             }
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,
@@ -133,7 +133,7 @@ 
         $filter = ''
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:redirects');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -147,7 +147,7 @@ 
         // 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}");
@@ -158,20 +158,20 @@ 
         $redirects = $query->all();
         // Add in the `deleteLink` field
         foreach ($redirects as &$redirect) {
-            $redirect['deleteLink'] = $redirect['id'];
-            $redirect['redirectSrcUrl'].="|{$redirect['id']}";
+            $redirect[ 'deleteLink' ] = $redirect[ 'id' ];
+            $redirect[ 'redirectSrcUrl' ] .= "|{$redirect[ 'id' ]}";
         }
         // Format the data for the API
         if ($redirects) {
-            $data['data'] = $redirects;
+            $data[ 'data' ] = $redirects;
             $query = (new Query())
-                ->from(['{{%retour_static_redirects}}']);
+                ->from([ '{{%retour_static_redirects}}' ]);
             if ($filter !== '') {
                 $query->where("`redirectSrcUrl` LIKE '%{$filter}%'");
                 $query->orWhere("`redirectDestUrl` LIKE '%{$filter}%'");
             }
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,

src/controllers/ChartsController.php

Spacing +6 added lines, -6 removed lines

@@ -54,7 +54,7 @@ 
     public function actionDashboard(string $range = 'day'): Response
     {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $days = 1;
         switch ($range) {
             case 'day':
@@ -80,12 +80,12 @@ 
             ->groupBy('DAY(hitLastTime)')
             ->all();
         if ($stats) {
-            $data[] = [
+            $data[ ] = [
                 'name' => '404 hits',
                 'data' => ArrayHelper::getColumn($stats, 'cnt'),
                 'labels' => ArrayHelper::getColumn($stats, 'hitLastTime'),
             ];
-            $data[] = [
+            $data[ ] = [
                 'name' => 'Handled 404 hits',
                 'data' => ArrayHelper::getColumn($stats, 'handled_cnt'),
                 'labels' => ArrayHelper::getColumn($stats, 'hitLastTime'),
@@ -104,7 +104,7 @@ 
      */
     public function actionWidget($days = 1): Response
     {
-        $data = [];
+        $data = [ ];
         // Query the db
         $stats = (new Query())
             ->from('{{%retour_stats}}')
@@ -117,8 +117,8 @@ 
             ->count();
         if ($stats) {
             $data = [
-                (int)$stats,
-                (int)$handledStats
+                (int) $stats,
+                (int) $handledStats
             ];
         }
         Craft::error($data);

src/controllers/SettingsController.php

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -54,7 +54,7 @@ 
      */
     public function actionPluginSettings($settings = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:settings');
         if ($settings === null) {
             $settings = Retour::$settings;
@@ -69,16 +69,16 @@ 
         } catch (InvalidConfigException $e) {
             Craft::error($e->getMessage(), __METHOD__);
         }
-        $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl(
+        $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl(
             '@nystudio107/seomatic/assetbundles/seomatic/dist',
             true
         );
         // Basic variables
-        $variables['fullPageForm'] = true;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = true;
+        $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL;
+        $variables[ 'pluginName' ] = $pluginName;
+        $variables[ 'title' ] = $templateTitle;
+        $variables[ 'crumbs' ] = [
             [
                 'label' => $pluginName,
                 'url' => UrlHelper::cpUrl('retour'),
@@ -88,9 +88,9 @@ 
                 'url' => UrlHelper::cpUrl('retour/settings'),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'settings';
-        $variables['settings'] = $settings;
+        $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'settings';
+        $variables[ 'settings' ] = $settings;
 
         // Render the template
         return $this->renderTemplate('retour/settings', $variables);
@@ -110,7 +110,7 @@ 
         PermissionHelper::controllerPermissionCheck('retour:settings');
         $this->requirePostRequest();
         $pluginHandle = Craft::$app->getRequest()->getRequiredBodyParam('pluginHandle');
-        $settings = Craft::$app->getRequest()->getBodyParam('settings', []);
+        $settings = Craft::$app->getRequest()->getBodyParam('settings', [ ]);
         $plugin = Craft::$app->getPlugins()->getPlugin($pluginHandle);
 
         if ($plugin === null) {

src/controllers/StatisticsController.php

Spacing +13 added lines, -13 removed lines

@@ -40,7 +40,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -56,7 +56,7 @@ 
      */
     public function actionDashboard(string $siteHandle = null, bool $showWelcome = false): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
         // Get the site to edit
         $siteId = MultiSiteHelper::getSiteIdFromHandle($siteHandle);
@@ -69,20 +69,20 @@ 
         } 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'] = 'dashboard';
+        $variables[ 'controllerHandle' ] = 'dashboard';
 
         // Basic variables
-        $variables['fullPageForm'] = false;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = false;
+        $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL;
+        $variables[ 'pluginName' ] = $pluginName;
+        $variables[ 'title' ] = $templateTitle;
+        $variables[ 'crumbs' ] = [
             [
                 'label' => $pluginName,
                 'url' => UrlHelper::cpUrl('retour'),
@@ -92,9 +92,9 @@ 
                 'url' => UrlHelper::cpUrl('retour/dashboard'),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'dashboard';
-        $variables['showWelcome'] = $showWelcome;
+        $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'dashboard';
+        $variables[ 'showWelcome' ] = $showWelcome;
 
         // Render the template
         return $this->renderTemplate('retour/dashboard/index', $variables);
@@ -112,7 +112,7 @@ 
             Craft::t(
                 'retour',
                 'Retour statistics cleared: {error}',
-                ['error' => $error]
+                [ 'error' => $error ]
             ),
             __METHOD__
         );

src/services/Redirects.php

Spacing +26 added lines, -26 removed lines

@@ -85,7 +85,7 @@ 
                 Craft::t(
                     'retour',
                     '404 URL: {url}',
-                    ['url' => $url]
+                    [ 'url' => $url ]
                 ),
                 __METHOD__
             );
@@ -114,13 +114,13 @@ 
     {
         $response = Craft::$app->getResponse();
         if ($redirect !== null) {
-            $dest = $redirect['redirectDestUrl'];
-            $status = $redirect['redirectHttpCode'];
+            $dest = $redirect[ 'redirectDestUrl' ];
+            $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__
             );
@@ -172,13 +172,13 @@ 
     public function getRedirectFromCache($url)
     {
         $cache = Craft::$app->getCache();
-        $cacheKey = $this::CACHE_KEY.md5($url);
+        $cacheKey = $this::CACHE_KEY . md5($url);
         $redirect = $cache->get($cacheKey);
         Craft::info(
             Craft::t(
                 'retour',
                 'Cached redirect hit for {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -192,7 +192,7 @@ 
      */
     public function saveRedirectToCache($url, $redirect)
     {
-        $cacheKey = $this::CACHE_KEY.md5($url);
+        $cacheKey = $this::CACHE_KEY . md5($url);
         $cache = Craft::$app->getCache();
         // Get the current site id
         $sites = Craft::$app->getSites();
@@ -205,7 +205,7 @@ 
         $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);
@@ -213,7 +213,7 @@ 
             Craft::t(
                 'retour',
                 'Cached redirect saved for {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -229,11 +229,11 @@ 
     {
         $result = null;
         foreach ($redirects as $redirect) {
-            $redirectMatchType = $redirect['redirectMatchType'] ?? null;
+            $redirectMatchType = $redirect[ 'redirectMatchType' ] ?? null;
             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);
 
@@ -243,14 +243,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 ($redirect['associatedElementId'] === 0) {
-                            $redirect['redirectDestUrl'] = preg_replace(
+                        if ($redirect[ 'associatedElementId' ] === 0) {
+                            $redirect[ 'redirectDestUrl' ] = preg_replace(
                                 $matchRegEx,
-                                $redirect['redirectDestUrl'],
+                                $redirect[ 'redirectDestUrl' ],
                                 $url
                             );
                         }
@@ -269,7 +269,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);
@@ -284,7 +284,7 @@ 
             Craft::t(
                 'retour',
                 'Not handled: {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -308,7 +308,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');
             }
         }
 
@@ -328,7 +328,7 @@ 
         }
         // Query the db table
         $query = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
+            ->from([ '{{%retour_static_redirects}}' ])
             ->orderBy('redirectMatchType ASC, hitCount DESC');
         if ($limit) {
             $query->limit($limit);
@@ -351,8 +351,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;
@@ -392,8 +392,8 @@ 
     public function incrementRedirectHitCount($redirectConfig)
     {
         if ($redirectConfig !== null) {
-            $redirectConfig['hitCount']++;
-            $redirectConfig['hitLastTime'] = Db::prepareDateForDb(new \DateTime());
+            $redirectConfig[ 'hitCount' ]++;
+            $redirectConfig[ 'hitLastTime' ] = Db::prepareDateForDb(new \DateTime());
             $this->saveRedirect($redirectConfig);
         }
     }
@@ -410,7 +410,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__
             );
@@ -420,14 +420,14 @@ 
         // Get the validated model attributes and save them to the db
         $redirectConfig = $redirect->getAttributes();
         $db = Craft::$app->getDb();
-        if ((int)$redirectConfig['id'] !== 0) {
+        if ((int) $redirectConfig[ 'id' ] !== 0) {
             // Update the existing record
             try {
                 $db->createCommand()->update(
                     '{{%retour_static_redirects}}',
                     $redirectConfig,
                     [
-                        'id' => $redirectConfig['id'],
+                        'id' => $redirectConfig[ 'id' ],
                     ]
                 )->execute();
             } catch (Exception $e) {

src/services/Statistics.php

Spacing +12 added lines, -12 removed lines

@@ -57,7 +57,7 @@ 
         }
         // Query the db table
         $stats = (new Query())
-            ->from(['{{%retour_stats}}'])
+            ->from([ '{{%retour_stats}}' ])
             ->orderBy('hitCount DESC')
             ->limit(Retour::$settings->statsDisplayLimit)
             ->all();
@@ -76,10 +76,10 @@ 
     public function getRecentStatistics($days = 1, $handled = false): array
     {
         // Ensure is an int
-        $handledInt = (int)$handled;
+        $handledInt = (int) $handled;
         // 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')
@@ -131,21 +131,21 @@ 
         $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->referrerUrl = $referrer;
         $stats->hitLastTime = Db::prepareDateForDb(new \DateTime());
-        $stats->handledByRetour = (int)$handled;
+        $stats->handledByRetour = (int) $handled;
         $stats->hitCount++;
         $statsConfig = $stats->getAttributes();
         // Record the updated statistics
@@ -193,7 +193,7 @@ 
                     Craft::t(
                         'retour',
                         'Trimmed {rows} from retour_stats table',
-                        ['rows' => $affectedRows]
+                        [ 'rows' => $affectedRows ]
                     ),
                     __METHOD__
                 );
@@ -213,7 +213,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__
             );
@@ -223,14 +223,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) {

src/widgets/RetourWidget.php

Spacing +2 added lines, -2 removed lines

@@ -78,8 +78,8 @@
         $rules = array_merge(
             $rules,
             [
-                ['numberOfDays', 'integer', 'min' => 1],
-                ['numberOfDays', 'default', 'value' => 30],
+                [ 'numberOfDays', 'integer', 'min' => 1 ],
+                [ 'numberOfDays', 'default', 'value' => 30 ],
             ]
         );
         return $rules;