nystudio107 / craft-retour

src/models/DbModel.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     {
         foreach ($config as $propName => $propValue) {
             if (!property_exists($class, $propName)) {
-                unset($config[$propName]);
+                unset($config[ $propName ]);
             }
         }
     }
@@ -47,7 +47,7 @@ 
     /**
      * @inheritdoc
      */
-    public function __construct(array $config = [])
+    public function __construct(array $config = [ ])
     {
         // Unset any deprecated properties
         self::cleanProperties(static::class, $config);

src/models/Settings.php

Spacing +10 added lines, -10 removed lines

@@ -75,8 +75,8 @@ 
     public function rules()
     {
         return [
-            ['pluginName', 'string'],
-            ['pluginName', 'default', 'value' => 'Retour'],
+            [ 'pluginName', 'string' ],
+            [ 'pluginName', 'default', 'value' => 'Retour' ],
             [
                 [
                     'createUriChangeRedirects',
@@ -85,14 +85,14 @@ 
                 ],
                 'boolean'
             ],
-            ['staticRedirectDisplayLimit', 'integer', 'min' => 1],
-            ['staticRedirectDisplayLimit', 'default', 'value' => 100],
-            ['dynamicRedirectDisplayLimit', 'integer', 'min' => 1],
-            ['dynamicRedirectDisplayLimit', 'default', 'value' => 100],
-            ['statsStoredLimit', 'integer', 'min' => 1],
-            ['statsStoredLimit', 'default', 'value' => 1000],
-            ['statsDisplayLimit', 'integer', 'min' => 1],
-            ['statsDisplayLimit', 'default', 'value' => 1000],
+            [ 'staticRedirectDisplayLimit', 'integer', 'min' => 1 ],
+            [ 'staticRedirectDisplayLimit', 'default', 'value' => 100 ],
+            [ 'dynamicRedirectDisplayLimit', 'integer', 'min' => 1 ],
+            [ 'dynamicRedirectDisplayLimit', 'default', 'value' => 100 ],
+            [ 'statsStoredLimit', 'integer', 'min' => 1 ],
+            [ 'statsStoredLimit', 'default', 'value' => 1000 ],
+            [ 'statsDisplayLimit', 'integer', 'min' => 1 ],
+            [ 'statsDisplayLimit', 'default', 'value' => 1000 ],
         ];
     }
 }

src/models/Stats.php

Spacing +12 added lines, -12 removed lines

@@ -62,18 +62,18 @@
     public function rules()
     {
         return [
-            ['id', 'integer'],
-            ['redirectSrcUrl', DbStringValidator::class, 'max' => 255],
-            ['redirectSrcUrl', 'string'],
-            ['redirectSrcUrl', 'default', 'value' => ''],
-            ['referrerUrl', DbStringValidator::class, 'max' => 2000],
-            ['referrerUrl', 'string'],
-            ['referrerUrl', 'default', 'value' => ''],
-            ['hitCount', 'integer'],
-            ['hitCount', 'default', 'value' => 0],
-            ['hitLastTime', 'safe'],
-            ['handledByRetour', 'integer', 'min' => 0, 'max' => 1],
-            ['handledByRetour', 'default', 'value' => 0],
+            [ 'id', 'integer' ],
+            [ 'redirectSrcUrl', DbStringValidator::class, 'max' => 255 ],
+            [ 'redirectSrcUrl', 'string' ],
+            [ 'redirectSrcUrl', 'default', 'value' => '' ],
+            [ 'referrerUrl', DbStringValidator::class, 'max' => 2000 ],
+            [ 'referrerUrl', 'string' ],
+            [ 'referrerUrl', 'default', 'value' => '' ],
+            [ 'hitCount', 'integer' ],
+            [ 'hitCount', 'default', 'value' => 0 ],
+            [ 'hitLastTime', 'safe' ],
+            [ 'handledByRetour', 'integer', 'min' => 0, 'max' => 1 ],
+            [ 'handledByRetour', 'default', 'value' => 0 ],
         ];
     }
 }

src/helpers/Text.php

Spacing +2 added lines, -2 removed lines

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

src/helpers/MultiSite.php

Spacing +17 added lines, -17 removed lines

@@ -42,43 +42,43 @@ 
         $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'])) {
-                    $siteId = reset($variables['enabledSiteIds']);
+            if (!\in_array($siteId, $variables[ 'enabledSiteIds' ], false)) {
+                if (!empty($variables[ 'enabledSiteIds' ])) {
+                    $siteId = reset($variables[ 'enabledSiteIds' ]);
                 } else {
-                    self::requirePermission('editSite:'.$siteId);
+                    self::requirePermission('editSite:' . $siteId);
                 }
             }
         }
         // Set the currentSiteId and currentSiteHandle
-        $variables['currentSiteId'] = empty($siteId) ? Craft::$app->getSites()->currentSite->id : $siteId;
-        $variables['currentSiteHandle'] = empty($siteHandle)
+        $variables[ 'currentSiteId' ] = empty($siteId) ? Craft::$app->getSites()->currentSite->id : $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']) {
-            $variables['sitesMenuLabel'] = Craft::t(
+        if ($variables[ 'showSites' ]) {
+            $variables[ 'sitesMenuLabel' ] = Craft::t(
                 'site',
-                $sites->getSiteById((int)$variables['currentSiteId'])->name
+                $sites->getSiteById((int) $variables[ 'currentSiteId' ])->name
             );
         } else {
-            $variables['sitesMenuLabel'] = '';
+            $variables[ 'sitesMenuLabel' ] = '';
         }
     }
 
@@ -96,7 +96,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/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;

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/retour/assetbundles/retour/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/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
@@ -192,7 +192,7 @@ 
                 Craft::t(
                     'retour',
                     'Trimmed {rows} from retour_stats table',
-                    ['rows' => $affectedRows]
+                    [ 'rows' => $affectedRows ]
                 ),
                 __METHOD__
             );
@@ -211,7 +211,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__
             );
@@ -221,14 +221,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/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
             ];
         }