nystudio107 / craft-retour

src/controllers/RedirectsController.php

Spacing +26 added lines, -26 removed lines

@@ -41,7 +41,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -57,7 +57,7 @@ 
      */
     public function actionRedirects(string $siteHandle = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
         // Get the site to edit
         $siteId = MultiSiteHelper::getSiteIdFromHandle($siteHandle);
@@ -70,20 +70,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'] = 'redirects';
+        $variables[ 'controllerHandle' ] = 'redirects';
 
         // 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'),
@@ -93,8 +93,8 @@ 
                 'url' => UrlHelper::cpUrl('retour/redirects'),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'redirects';
+        $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'redirects';
 
         // Render the template
         return $this->renderTemplate('retour/redirects/index', $variables);
@@ -118,7 +118,7 @@ 
         string $siteHandle = null,
         StaticRedirectsModel $redirect = null
     ): Response {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
         // Load in the redirect
         if ($redirectId === 0) {
@@ -130,12 +130,12 @@ 
         if ($redirect === null) {
             $redirectConfig = Retour::$plugin->redirects->getRedirectById($redirectId);
             if ($redirectConfig === null) {
-                $redirectConfig = [];
+                $redirectConfig = [ ];
                 Craft::error(
                     Craft::t(
                         'retour',
                         "Couldn't load redirect id {id}",
-                        ['id' => $redirectId]
+                        [ 'id' => $redirectId ]
                     ),
                     __METHOD__
                 );
@@ -153,20 +153,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'] = 'redirects';
+        $variables[ 'controllerHandle' ] = 'redirects';
 
         // 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'),
@@ -177,12 +177,12 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/edit-redirect/'.$redirectId),
+                'url' => UrlHelper::cpUrl('retour/edit-redirect/' . $redirectId),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'redirects';
-        $variables['redirect'] = $redirect;
+        $variables[ 'docTitle' ] = "{$pluginName} - Redirects - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'redirects';
+        $variables[ 'redirect' ] = $redirect;
 
         // Render the template
         return $this->renderTemplate('retour/redirects/_edit', $variables);
@@ -228,7 +228,7 @@ 
         if ($redirectConfig === null) {
             throw new NotFoundHttpException('Redirect not found');
         }
-        $redirectConfig['id'] = (int)$redirectConfig['id'];
+        $redirectConfig[ 'id' ] = (int) $redirectConfig[ 'id' ];
         $redirect = new StaticRedirectsModel($redirectConfig);
         // Make sure the redirect validates
         if (!$redirect->validate()) {

src/models/StaticRedirects.php

Spacing +13 added lines, -13 removed lines

@@ -84,12 +84,12 @@ 
     public function rules()
     {
         return [
-            ['id', 'integer'],
-            ['locale', DbStringValidator::class, 'max' => 12],
-            ['locale', 'string'],
-            ['locale', 'default', 'value' => ''],
-            ['associatedElementId', 'default', 'value' => 0],
-            ['associatedElementId', 'integer'],
+            [ 'id', 'integer' ],
+            [ 'locale', DbStringValidator::class, 'max' => 12 ],
+            [ 'locale', 'string' ],
+            [ 'locale', 'default', 'value' => '' ],
+            [ 'associatedElementId', 'default', 'value' => 0 ],
+            [ 'associatedElementId', 'integer' ],
             [
                 [
                     'redirectSrcUrl',
@@ -99,8 +99,8 @@ 
                 'default',
                 'value' => ''
             ],
-            ['redirectMatchType', 'default', 'value' => 'exactmatch'],
-            ['redirectSrcUrlParsed', ParsedUriValidator::class, 'source' => 'redirectSrcUrl'],
+            [ 'redirectMatchType', 'default', 'value' => 'exactmatch' ],
+            [ 'redirectSrcUrlParsed', ParsedUriValidator::class, 'source' => 'redirectSrcUrl' ],
             [
                 [
                     'redirectSrcUrl',
@@ -128,11 +128,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/models/Redirects.php

Spacing +13 added lines, -13 removed lines

@@ -84,12 +84,12 @@ 
     public function rules()
     {
         return [
-            ['id', 'integer'],
-            ['locale', DbStringValidator::class, 'max' => 12],
-            ['locale', 'string'],
-            ['locale', 'default', 'value' => ''],
-            ['associatedElementId', 'default', 'value' => 0],
-            ['associatedElementId', 'integer'],
+            [ 'id', 'integer' ],
+            [ 'locale', DbStringValidator::class, 'max' => 12 ],
+            [ 'locale', 'string' ],
+            [ 'locale', 'default', 'value' => '' ],
+            [ 'associatedElementId', 'default', 'value' => 0 ],
+            [ 'associatedElementId', 'integer' ],
             [
                 [
                     'redirectSrcUrl',
@@ -99,8 +99,8 @@ 
                 'default',
                 'value' => ''
             ],
-            ['redirectMatchType', 'default', 'value' => 'exactmatch'],
-            ['redirectSrcUrlParsed', ParsedUriValidator::class, 'source' => 'redirectSrcUrl'],
+            [ 'redirectMatchType', 'default', 'value' => 'exactmatch' ],
+            [ 'redirectSrcUrlParsed', ParsedUriValidator::class, 'source' => 'redirectSrcUrl' ],
             [
                 [
                     'redirectSrcUrl',
@@ -128,11 +128,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/FileController.php

Spacing +25 added lines, -25 removed lines

@@ -61,7 +61,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -81,21 +81,21 @@ 
         $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,
             ];
-            if (isset($columns[0], $headers[$columns[0]])) {
-                $redirectConfig['redirectSrcUrl'] = $row[$headers[$columns[0]]] ?? null;
+            if (isset($columns[ 0 ], $headers[ $columns[ 0 ] ])) {
+                $redirectConfig[ 'redirectSrcUrl' ] = $row[ $headers[ $columns[ 0 ] ] ] ?? null;
             }
-            if (isset($columns[1], $headers[$columns[1]])) {
-                $redirectConfig['redirectDestUrl'] = $row[$headers[$columns[1]]] ?? null;
+            if (isset($columns[ 1 ], $headers[ $columns[ 1 ] ])) {
+                $redirectConfig[ 'redirectDestUrl' ] = $row[ $headers[ $columns[ 1 ] ] ] ?? null;
             }
-            if (isset($columns[2], $headers[$columns[2]])) {
-                $redirectConfig['redirectMatchType'] = $row[$headers[$columns[2]]] ?? null;
+            if (isset($columns[ 2 ], $headers[ $columns[ 2 ] ])) {
+                $redirectConfig[ 'redirectMatchType' ] = $row[ $headers[ $columns[ 2 ] ] ] ?? null;
             }
-            if (isset($columns[3], $headers[$columns[3]])) {
-                $redirectConfig['redirectHttpCode'] = $row[$headers[$columns[3]]] ?? null;
+            if (isset($columns[ 3 ], $headers[ $columns[ 3 ] ])) {
+                $redirectConfig[ 'redirectHttpCode' ] = $row[ $headers[ $columns[ 3 ] ] ] ?? null;
             }
             Retour::$plugin->redirects->saveRedirect($redirectConfig);
         });
@@ -116,7 +116,7 @@ 
      */
     public function actionImportCsv(string $siteHandle = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
         // Get the site to edit
         $siteId = MultiSiteHelper::getSiteIdFromHandle($siteHandle);
@@ -129,20 +129,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'] = 'file';
+        $variables[ 'controllerHandle' ] = 'file';
 
         // 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'),
@@ -152,19 +152,19 @@ 
                 'url' => UrlHelper::cpUrl('retour/redirects'),
             ],
         ];
-        $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
@@ -205,7 +205,7 @@ 
     {
         // Query the db table
         $data = (new Query())
-            ->from([$table])
+            ->from([ $table ])
             ->select(array_keys($columns))
             ->orderBy('hitCount DESC')
             ->all();
@@ -213,7 +213,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/controllers/TablesController.php

Spacing +15 added lines, -15 removed lines

@@ -59,7 +59,7 @@ 
         $filter = ''
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -73,7 +73,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}");
@@ -84,22 +84,22 @@ 
         $stats = $query->all();
         // Add in the `addLink` field
         foreach ($stats as &$stat) {
-            $stat['addLink'] = '';
-            if (!$stat['handledByRetour']) {
-                $stat['addLink'] = urlencode('/'.ltrim($stat['redirectSrcUrl'], '/'));
+            $stat[ 'addLink' ] = '';
+            if (!$stat[ 'handledByRetour' ]) {
+                $stat[ 'addLink' ] = urlencode('/' . ltrim($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,
@@ -132,7 +132,7 @@ 
         $filter = ''
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:redirects');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -146,7 +146,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}");
@@ -157,20 +157,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/validators/UriValidator.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             return;
         }
         // Make sure there is a leading /
-        $value = '/'.ltrim($value, '/');
+        $value = '/' . ltrim($value, '/');
         $model->$attribute = $value;
     }
 }

src/Retour.php

Spacing +29 added lines, -29 removed lines

@@ -89,7 +89,7 @@ 
     /**
      * @var array The URIs for the element before it was saved
      */
-    public $oldElementUris = [];
+    public $oldElementUris = [ ];
 
     // Public Methods
     // =========================================================================
@@ -114,7 +114,7 @@ 
             Craft::t(
                 'retour',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );
@@ -134,24 +134,24 @@ 
      */
     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',
             ];
         }
         if ($currentUser->can('retour:settings')) {
-            $subNavs['settings'] = [
+            $subNavs[ 'settings' ] = [
                 'label' => 'Settings',
                 'url' => 'retour/settings',
             ];
@@ -210,7 +210,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();
@@ -237,7 +237,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);
@@ -247,7 +247,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -262,8 +262,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);
                             }
                         }
                     }
@@ -274,7 +274,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -290,7 +290,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
@@ -314,7 +314,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__
@@ -337,15 +337,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__
@@ -361,20 +361,20 @@ 
         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();
             }
         );
         // Handler: ClearCaches::EVENT_REGISTER_CACHE_OPTIONS
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -399,7 +399,7 @@ 
         Event::on(
             ErrorHandler::class,
             ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION,
-            function (ExceptionEvent $event) {
+            function(ExceptionEvent $event) {
                 Craft::debug(
                     'ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION',
                     __METHOD__
@@ -441,15 +441,15 @@ 
     protected function handleElementUriChange(Element $element)
     {
         $uris = $this->getAllElementUris($element);
-        $oldElementUris = $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__
                 );
@@ -476,12 +476,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;
             }
         }
 
@@ -489,7 +489,7 @@ 
             Craft::t(
                 'retour',
                 'Getting Element URIs: {uris}',
-                ['uris' => print_r($uris, true)]
+                [ 'uris' => print_r($uris, true) ]
             ),
             __METHOD__
         );
@@ -555,7 +555,7 @@ 
             [
                 'key' => 'retour-redirect-caches',
                 'label' => Craft::t('retour', 'Retour redirect caches'),
-                'action' => [self::$plugin->redirects, 'invalidateCaches'],
+                'action' => [ self::$plugin->redirects, 'invalidateCaches' ],
             ],
         ];
     }

src/services/Redirects.php

Spacing +37 added lines, -37 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 ((int)$redirect['associatedElementId'] === 0) {
-                            $redirect['redirectDestUrl'] = preg_replace(
+                        if ((int) $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;
@@ -369,8 +369,8 @@ 
     {
         // Query the db table
         $redirect = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
-            ->where(['redirectSrcUrl' => $redirectSrcUrl])
+            ->from([ '{{%retour_static_redirects}}' ])
+            ->where([ 'redirectSrcUrl' => $redirectSrcUrl ])
             ->one();
 
         return $redirect;
@@ -410,8 +410,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);
         }
     }
@@ -428,7 +428,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__
             );
@@ -439,23 +439,23 @@ 
         $redirectConfig = $redirect->getAttributes();
         $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']])
+                ->from([ '{{%retour_static_redirects}}' ])
+                ->where([ 'redirectSrcUrlParsed' => $redirectConfig[ 'redirectSrcUrlParsed' ] ])
                 ->one();
             // If it exists, update it rather than having duplicates
             if (!empty($redirect)) {
-                $redirectConfig['id'] = $redirect['id'];
+                $redirectConfig[ 'id' ] = $redirect[ 'id' ];
             }
         }
-        if ((int)$redirectConfig['id'] !== 0) {
+        if ((int) $redirectConfig[ 'id' ] !== 0) {
             Craft::debug(
                 Craft::t(
                     'retour',
                     'Updating existing redirect: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -465,7 +465,7 @@ 
                     '{{%retour_static_redirects}}',
                     $redirectConfig,
                     [
-                        'id' => $redirectConfig['id'],
+                        'id' => $redirectConfig[ 'id' ],
                     ]
                 )->execute();
             } catch (Exception $e) {
@@ -476,7 +476,7 @@ 
                 Craft::t(
                     'retour',
                     'Creating new redirect: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -491,13 +491,13 @@ 
             }
         }
         // To prevent redirect loops, see if any static redirects have our redirectDestUrl as their redirectSrcUrl
-        $testRedirectConfig = $this->getRedirectByRedirectSrcUrl($redirectConfig['redirectDestUrl']);
+        $testRedirectConfig = $this->getRedirectByRedirectSrcUrl($redirectConfig[ 'redirectDestUrl' ]);
         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__
             );
@@ -505,7 +505,7 @@ 
             try {
                 $db->createCommand()->delete(
                     '{{%retour_static_redirects}}',
-                    ['id' => $testRedirectConfig['id']]
+                    [ 'id' => $testRedirectConfig[ 'id' ] ]
                 )->execute();
             } catch (Exception $e) {
                 Craft::error($e->getMessage(), __METHOD__);