nystudio107 / craft-retour

src/config.php

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     // The number of milliseconds required between trimming of statistics
     'statisticsRateLimitMs' => 3600000,
 
-     // [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/Statistics.php

Spacing +18 added lines, -18 removed lines

@@ -60,7 +60,7 @@ 
         }
         // Query the db table
         $stats = (new Query())
-            ->from(['{{%retour_stats}}'])
+            ->from([ '{{%retour_stats}}' ])
             ->orderBy('hitCount DESC')
             ->limit(Retour::$settings->statsDisplayLimit)
             ->all();
@@ -79,13 +79,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')
@@ -94,9 +94,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();
         }
@@ -163,16 +163,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;
@@ -181,9 +181,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
@@ -253,7 +253,7 @@ 
                 Craft::t(
                     'retour',
                     'Trimmed {rows} from retour_stats table',
-                    ['rows' => $affectedRows]
+                    [ 'rows' => $affectedRows ]
                 ),
                 __METHOD__
             );
@@ -274,7 +274,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__
             );
@@ -284,14 +284,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) {
@@ -300,7 +300,7 @@ 
                 // Craft::error($e->getMessage(), __METHOD__);
             }
         } else {
-            unset($statsConfig['id']);
+            unset($statsConfig[ 'id' ]);
             // Create a new record
             try {
                 $db->createCommand()->insert(
@@ -327,7 +327,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/listeners/GetCraftQLSchema.php

Spacing +13 added lines, -13 removed lines

@@ -62,36 +62,36 @@ 
                 // Boolean field
                 $retourField
                     ->addBooleanField($field)
-                    ->resolve(function ($redirect) use ($field) {
-                        $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (bool)$result;
+                    ->resolve(function($redirect) use ($field) {
+                        $result = $redirect[ $field ] ?? null;
+                        return $result === null ? $result : (bool) $result;
                     });
             } elseif (in_array($field, self::INT_FIELDS, true)) {
                 // Integer field
                 $retourField
                     ->addIntField($field)
-                    ->resolve(function ($redirect) use ($field) {
-                        $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (int)$result;
+                    ->resolve(function($redirect) use ($field) {
+                        $result = $redirect[ $field ] ?? null;
+                        return $result === null ? $result : (int) $result;
                     });
             } else {
                 // String field
                 $retourField
                     ->addStringField($field)
-                    ->resolve(function ($redirect) use ($field) {
-                        $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (string)$result;
+                    ->resolve(function($redirect) use ($field) {
+                        $result = $redirect[ $field ] ?? null;
+                        return $result === null ? $result : (string) $result;
                     });
             }
         }
         // Add the root
         $event->schema->addField('retour')
-            ->arguments(function (FieldBuilder $field) {
+            ->arguments(function(FieldBuilder $field) {
                 $field->addStringArgument('uri');
                 $field->addIntArgument('siteId');
             })
             ->type($retourField)
-            ->resolve(function ($root, $args, $context, $info) {
+            ->resolve(function($root, $args, $context, $info) {
                 // If our root is an Element, extract the URI and siteId from it
                 if ($root instanceof Element) {
                     /** Element $root */
@@ -99,8 +99,8 @@ 
                     $siteId = $root->siteId;
                 } else {
                     // Otherwise use the passed in arguments, or defaults
-                    $uri = $args['uri'] ?? '/';
-                    $siteId = $args['siteId'] ?? null;
+                    $uri = $args[ 'uri' ] ?? '/';
+                    $siteId = $args[ 'siteId' ] ?? null;
                 }
                 $uri = trim($uri === '/' ? '__home__' : $uri);
 

src/Retour.php

Spacing +31 added lines, -31 removed lines

@@ -104,7 +104,7 @@ 
     /**
      * @var array The URIs for the element before it was saved
      */
-    public $oldElementUris = [];
+    public $oldElementUris = [ ];
 
     // Public Methods
     // =========================================================================
@@ -135,7 +135,7 @@ 
             Craft::t(
                 'retour',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );
@@ -155,18 +155,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',
             ];
@@ -177,7 +177,7 @@ 
             $editableSettings = false;
         }
         if ($currentUser->can('retour:settings') && $editableSettings) {
-            $subNavs['settings'] = [
+            $subNavs[ 'settings' ] = [
                 'label' => 'Settings',
                 'url' => 'retour/settings',
             ];
@@ -236,7 +236,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -252,7 +252,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();
@@ -279,7 +279,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);
@@ -289,7 +289,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -304,8 +304,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);
                             }
                         }
                     }
@@ -316,7 +316,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -332,7 +332,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
@@ -350,7 +350,7 @@ 
             Event::on(
                 Schema::class,
                 AlterSchemaFields::EVENT,
-                [GetCraftQLSchema::class, 'handle']
+                [ GetCraftQLSchema::class, 'handle' ]
             );
         }
     }
@@ -364,7 +364,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__
@@ -387,15 +387,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__
@@ -411,13 +411,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();
             }
         );
     }
@@ -433,7 +433,7 @@ 
         Event::on(
             ErrorHandler::class,
             ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION,
-            function (ExceptionEvent $event) {
+            function(ExceptionEvent $event) {
                 Craft::debug(
                     'ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION',
                     __METHOD__
@@ -476,16 +476,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__
                     );
@@ -520,12 +520,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;
             }
         }
 
@@ -533,7 +533,7 @@ 
             Craft::t(
                 'retour',
                 'Getting Element URIs: {uris}',
-                ['uris' => print_r($uris, true)]
+                [ 'uris' => print_r($uris, true) ]
             ),
             __METHOD__
         );
@@ -597,7 +597,7 @@ 
             [
                 'key' => 'retour-redirect-caches',
                 'label' => Craft::t('retour', 'Retour redirect caches'),
-                'action' => [self::$plugin->redirects, 'invalidateCaches'],
+                'action' => [ self::$plugin->redirects, 'invalidateCaches' ],
             ],
         ];
     }

src/controllers/FileController.php

Spacing +23 added lines, -23 removed lines

@@ -73,7 +73,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -115,20 +115,20 @@ 
         if ($headers !== null) {
             $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;
@@ -152,7 +152,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
@@ -170,38 +170,38 @@ 
         } 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 = 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
             $cache = Craft::$app->getCache();
@@ -217,8 +217,8 @@ 
             $csv = Reader::createFromPath($file->tempName);
             $headers = $csv->fetchOne(0);
             Craft::info(print_r($headers, true), __METHOD__);
-            $variables['headers'] = $headers;
-            $variables['filename'] = $filePath;
+            $variables[ 'headers' ] = $headers;
+            $variables[ 'filename' ] = $filePath;
         }
 
         // Render the template
@@ -264,7 +264,7 @@ 
         }
         // Query the db table
         $data = (new Query())
-            ->from([$table])
+            ->from([ $table ])
             ->select(array_keys($columns))
             ->orderBy('hitCount DESC')
             ->all();
@@ -272,7 +272,7 @@ 
         $csv = Writer::createFromFileObject(new \SplTempFileObject());
         $csv->insertOne(array_values($columns));
         $csv->insertAll($data);
-        $csv->output($filename.'.csv');
+        $csv->output($filename . '.csv');
         exit(0);
     }
 }