nystudio107 / craft-retour

src/controllers/FileController.php

Spacing +25 added lines, -25 removed lines

@@ -79,7 +79,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -154,7 +154,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
@@ -172,38 +172,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();
@@ -219,8 +219,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
@@ -266,7 +266,7 @@ 
         }
         // Query the db table
         $data = (new Query())
-            ->from([$table])
+            ->from([ $table ])
             ->select(array_keys($columns))
             ->orderBy('hitCount DESC')
             ->all();
@@ -279,7 +279,7 @@ 
         }
         $csv->insertOne(array_values($columns));
         $csv->insertAll($data);
-        $csv->output($filename.'.csv');
+        $csv->output($filename . '.csv');
         exit(0);
     }
 
@@ -292,16 +292,16 @@ 
     {
         $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++;
             }
@@ -331,10 +331,10 @@ 
             ];
             $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++;
             }

src/Retour.php

Spacing +41 added lines, -41 removed lines

@@ -125,9 +125,9 @@ 
     /**
      * @inheritdoc
      */
-    public function __construct($id, $parent = null, array $config = [])
+    public function __construct($id, $parent = null, array $config = [ ])
     {
-        $config['components'] = [
+        $config[ 'components' ] = [
             'redirects' => Redirects::class,
             'statistics' => Statistics::class,
             // Register the manifest service
@@ -163,7 +163,7 @@ 
     /**
      * @var array The URIs for the element before it was saved
      */
-    public $oldElementUris = [];
+    public $oldElementUris = [ ];
 
     // Public Methods
     // =========================================================================
@@ -197,7 +197,7 @@ 
             Craft::t(
                 'retour',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );
@@ -217,18 +217,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',
             ];
@@ -239,7 +239,7 @@ 
             $editableSettings = false;
         }
         if ($currentUser->can('retour:settings') && $editableSettings) {
-            $subNavs['settings'] = [
+            $subNavs[ 'settings' ] = [
                 'label' => 'Settings',
                 'url' => 'retour/settings',
             ];
@@ -250,7 +250,7 @@ 
         }
         // A single sub nav item is redundant
         if (count($subNavs) === 1) {
-            $subNavs = [];
+            $subNavs = [ ];
         }
         $navItem = array_merge($navItem, [
             'subnav' => $subNavs,
@@ -306,7 +306,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -322,7 +322,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();
@@ -349,7 +349,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('retour', [
@@ -362,7 +362,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -385,8 +385,8 @@ 
                         if (strpos($element->uri, '__temp_') === false && !$element->propagating) {
                             // 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[$element->id])) {
-                                $this->oldElementUris[$element->id] = $this->getAllElementUris($element);
+                            if (empty($this->oldElementUris[ $element->id ])) {
+                                $this->oldElementUris[ $element->id ] = $this->getAllElementUris($element);
                             }
                         }
                     }
@@ -397,7 +397,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -419,7 +419,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
@@ -437,26 +437,26 @@ 
             Event::on(
                 Gql::class,
                 Gql::EVENT_REGISTER_GQL_TYPES,
-                function (RegisterGqlTypesEvent $event) {
+                function(RegisterGqlTypesEvent $event) {
                     Craft::debug(
                         'Gql::EVENT_REGISTER_GQL_TYPES',
                         __METHOD__
                     );
-                    $event->types[] = RetourInterface::class;
+                    $event->types[ ] = RetourInterface::class;
                 }
             );
             // Handler: Gql::EVENT_REGISTER_GQL_QUERIES
             Event::on(
                 Gql::class,
                 Gql::EVENT_REGISTER_GQL_QUERIES,
-                function (RegisterGqlQueriesEvent $event) {
+                function(RegisterGqlQueriesEvent $event) {
                     Craft::debug(
                         'Gql::EVENT_REGISTER_GQL_QUERIES',
                         __METHOD__
                     );
                     $queries = RetourQuery::getQueries();
                     foreach ($queries as $key => $value) {
-                        $event->queries[$key] = $value;
+                        $event->queries[ $key ] = $value;
                     }
                 }
             );
@@ -465,13 +465,13 @@ 
                 Event::on(
                     Gql::class,
                     Gql::EVENT_REGISTER_GQL_SCHEMA_COMPONENTS,
-                    function (RegisterGqlSchemaComponentsEvent $event) {
+                    function(RegisterGqlSchemaComponentsEvent $event) {
                         Craft::debug(
                             'Gql::EVENT_REGISTER_GQL_SCHEMA_COMPONENTS',
                             __METHOD__
                         );
                         $label = Craft::t('retour', 'Retour');
-                        $event->queries[$label]['retour.all:read'] = ['label' => Craft::t('retour', 'Query Retour data')];
+                        $event->queries[ $label ][ 'retour.all:read' ] = [ 'label' => Craft::t('retour', 'Query Retour data') ];
                     }
                 );
             }
@@ -481,7 +481,7 @@ 
             Event::on(
                 Schema::class,
                 AlterSchemaFields::EVENT,
-                [GetCraftQLSchema::class, 'handle']
+                [ GetCraftQLSchema::class, 'handle' ]
             );
         }
     }
@@ -495,7 +495,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__
@@ -518,15 +518,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__
@@ -542,13 +542,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();
             }
         );
     }
@@ -564,7 +564,7 @@ 
         Event::on(
             ErrorHandler::class,
             ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION,
-            function (ExceptionEvent $event) {
+            function(ExceptionEvent $event) {
                 Craft::debug(
                     'ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION',
                     __METHOD__
@@ -607,16 +607,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__
                     );
@@ -636,7 +636,7 @@ 
                         if (self::$settings->uriChangeRedirectSrcMatch === 'fullurl') {
                             try {
                                 if ($redirectSiteId !== null) {
-                                    $redirectSiteId = (int)$redirectSiteId;
+                                    $redirectSiteId = (int) $redirectSiteId;
                                 }
                                 $oldUri = UrlHelper::siteUrl($oldUri, null, null, $redirectSiteId);
                                 $newUri = UrlHelper::siteUrl($newUri, null, null, $redirectSiteId);
@@ -669,13 +669,13 @@ 
      */
     protected function getAllElementUris(Element $element): array
     {
-        $uris = [];
+        $uris = [ ];
         if (!self::$craft32 || !ElementHelper::isDraftOrRevision($element)) {
             $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;
                 }
             }
         }
@@ -684,7 +684,7 @@ 
             Craft::t(
                 'retour',
                 'Getting Element URIs: {uris}',
-                ['uris' => print_r($uris, true)]
+                [ 'uris' => print_r($uris, true) ]
             ),
             __METHOD__
         );
@@ -739,7 +739,7 @@ 
             [
                 'key' => 'retour-redirect-caches',
                 'label' => Craft::t('retour', 'Retour redirect caches'),
-                'action' => [self::$plugin->redirects, 'invalidateCaches'],
+                'action' => [ self::$plugin->redirects, 'invalidateCaches' ],
             ],
         ];
     }