nystudio107 / craft-retour

src/Retour.php

Spacing +19 added lines, -19 removed lines

@@ -242,7 +242,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -258,7 +258,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();
@@ -297,7 +297,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('retour', [
@@ -307,7 +307,7 @@ 
             }
         );
 
-        $prepareRedirectOnElementChange = function (ElementEvent $event) {
+        $prepareRedirectOnElementChange = function(ElementEvent $event) {
             /** @var Element $element */
             $element = $event->element;
             if (!$event->isNew && $element->getUrl() !== null && !$element->propagating) {
@@ -328,7 +328,7 @@ 
             }
         };
 
-        $insertRedirectOnElementChange = function (ElementEvent $event) {
+        $insertRedirectOnElementChange = function(ElementEvent $event) {
             /** @var Element $element */
             $element = $event->element;
             if ($element !== null && !$event->isNew && $element->getUrl() !== null) {
@@ -346,7 +346,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            static function (ElementEvent $event) use ($prepareRedirectOnElementChange) {
+            static function(ElementEvent $event) use ($prepareRedirectOnElementChange) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -358,7 +358,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            static function (ElementEvent $event) use ($insertRedirectOnElementChange) {
+            static function(ElementEvent $event) use ($insertRedirectOnElementChange) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -370,7 +370,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_UPDATE_SLUG_AND_URI,
-            static function (ElementEvent $event) use ($prepareRedirectOnElementChange) {
+            static function(ElementEvent $event) use ($prepareRedirectOnElementChange) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_UPDATE_SLUG_AND_URI',
                     __METHOD__
@@ -382,7 +382,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_UPDATE_SLUG_AND_URI,
-            static function (ElementEvent $event) use ($insertRedirectOnElementChange) {
+            static function(ElementEvent $event) use ($insertRedirectOnElementChange) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_UPDATE_SLUG_AND_URI',
                     __METHOD__
@@ -394,7 +394,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
@@ -411,7 +411,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 $event->types[] = ShortLinkField::class;
             }
         );
@@ -419,7 +419,7 @@ 
         Event::on(
             Gql::class,
             Gql::EVENT_REGISTER_GQL_TYPES,
-            static function (RegisterGqlTypesEvent $event) {
+            static function(RegisterGqlTypesEvent $event) {
                 Craft::debug(
                     'Gql::EVENT_REGISTER_GQL_TYPES',
                     __METHOD__
@@ -431,7 +431,7 @@ 
         Event::on(
             Gql::class,
             Gql::EVENT_REGISTER_GQL_QUERIES,
-            static function (RegisterGqlQueriesEvent $event) {
+            static function(RegisterGqlQueriesEvent $event) {
                 Craft::debug(
                     'Gql::EVENT_REGISTER_GQL_QUERIES',
                     __METHOD__
@@ -446,7 +446,7 @@ 
         Event::on(
             Gql::class,
             Gql::EVENT_REGISTER_GQL_SCHEMA_COMPONENTS,
-            static function (RegisterGqlSchemaComponentsEvent $event) {
+            static function(RegisterGqlSchemaComponentsEvent $event) {
                 Craft::debug(
                     'Gql::EVENT_REGISTER_GQL_SCHEMA_COMPONENTS',
                     __METHOD__
@@ -468,7 +468,7 @@ 
         Event::on(
             ErrorHandler::class,
             ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION,
-            static function (ExceptionEvent $event) {
+            static function(ExceptionEvent $event) {
                 Craft::debug(
                     'ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION',
                     __METHOD__
@@ -506,7 +506,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__
@@ -540,7 +540,7 @@ 
         Event::on(
             Dashboard::class,
             Dashboard::EVENT_REGISTER_WIDGET_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 $currentUser = Craft::$app->getUser()->getIdentity();
                 if ($currentUser->can('accessPlugin-retour')) {
                     $event->types[] = RetourWidget::class;
@@ -551,7 +551,7 @@ 
         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__
@@ -567,7 +567,7 @@ 
         Event::on(
             UserPermissions::class,
             UserPermissions::EVENT_REGISTER_PERMISSIONS,
-            function (RegisterUserPermissionsEvent $event) {
+            function(RegisterUserPermissionsEvent $event) {
                 Craft::debug(
                     'UserPermissions::EVENT_REGISTER_PERMISSIONS',
                     __METHOD__

src/services/ServicesTrait.php

Spacing +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
         // so we can't extract it from the passed in $config
         $majorVersion = '5';
         // Dev server container name & port are based on the major version of this plugin
-        $devPort = 3000 + (int)$majorVersion;
-        $versionName = 'v' . $majorVersion;
+        $devPort = 3000 + (int) $majorVersion;
+        $versionName = 'v'.$majorVersion;
         return [
             'components' => [
                 'events' => Events::class,
@@ -51,8 +51,8 @@ 
                     'assetClass' => RetourAsset::class,
                     'checkDevServer' => true,
                     'class' => VitePluginService::class,
-                    'devServerInternal' => 'http://craft-retour-' . $versionName . '-buildchain-dev:' . $devPort,
-                    'devServerPublic' => 'http://localhost:' . $devPort,
+                    'devServerInternal' => 'http://craft-retour-'.$versionName.'-buildchain-dev:'.$devPort,
+                    'devServerPublic' => 'http://localhost:'.$devPort,
                     'errorEntry' => 'src/js/Retour.js',
                     'useDevServer' => true,
                 ],

src/controllers/FileController.php

Spacing +10 added lines, -10 removed lines

@@ -89,7 +89,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected array|bool|int $allowAnonymous = [];
+    protected array | bool | int $allowAnonymous = [];
 
     // Public Methods
     // =========================================================================
@@ -206,7 +206,7 @@ 
         $variables['docsUrl'] = self::DOCUMENTATION_URL;
         $variables['pluginName'] = $pluginName;
         $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -214,7 +214,7 @@ 
             ],
             [
                 'label' => 'Redirects',
-                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
@@ -224,7 +224,7 @@ 
         $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
             $fileContents = @file_get_contents($filePath);
@@ -345,7 +345,7 @@ 
         $columns = ArrayHelper::filterEmptyStringsFromArray($columns);
         $rowIndex = 1;
         /** @phpstan-ignore-next-line */
-        $csv->each(function ($row) use ($headers, $columns, &$rowIndex, &$hasErrors) {
+        $csv->each(function($row) use ($headers, $columns, &$rowIndex, &$hasErrors) {
             $redirectConfig = [
                 'id' => 0,
             ];
@@ -359,9 +359,9 @@ 
                 $index++;
             }
             $redirectDump = print_r($redirectConfig, true);
-            Craft::debug("-> ROW #$rowIndex contents: " . $redirectDump, __METHOD__);
+            Craft::debug("-> ROW #$rowIndex contents: ".$redirectDump, __METHOD__);
             if (!Retour::$plugin->redirects->saveRedirect($redirectConfig)) {
-                Craft::info("-> ROW #$rowIndex contents: " . $redirectDump, __METHOD__);
+                Craft::info("-> ROW #$rowIndex contents: ".$redirectDump, __METHOD__);
                 $hasErrors = true;
             }
             $rowIndex++;
@@ -401,9 +401,9 @@ 
                 $index++;
             }
             $redirectDump = print_r($redirectConfig, true);
-            Craft::debug("-> ROW #$rowIndex contents: " . $redirectDump, __METHOD__);
+            Craft::debug("-> ROW #$rowIndex contents: ".$redirectDump, __METHOD__);
             if (!Retour::$plugin->redirects->saveRedirect($redirectConfig)) {
-                Craft::info("-> ROW #$rowIndex contents: " . $redirectDump, __METHOD__);
+                Craft::info("-> ROW #$rowIndex contents: ".$redirectDump, __METHOD__);
                 $hasErrors = true;
             }
             $rowIndex++;
@@ -439,7 +439,7 @@ 
         }
         $csv->insertOne(array_values($columns));
         $csv->insertAll($data);
-        $csv->output($filename . '.csv');
+        $csv->output($filename.'.csv');
         exit(0);
     }
 }

src/controllers/ChartsController.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
     ];
 
     // Public Methods
@@ -79,7 +79,7 @@ 
                     'COUNT(handledByRetour = 1 or null) as handled_cnt',
                 ])
                 ->where("hitLastTime >= ( CURDATE() - INTERVAL '{$days}' DAY )");
-            if ((int)$siteId !== 0) {
+            if ((int) $siteId !== 0) {
                 $query->andWhere(['siteId' => $siteId]);
             }
             $query
@@ -97,7 +97,7 @@ 
                     "COUNT(CASE WHEN \"handledByRetour\" = true THEN 1 END) as handled_cnt",
                 ])
                 ->where("\"hitLastTime\" >= ( CURRENT_TIMESTAMP - INTERVAL '{$days} days' )");
-            if ((int)$siteId !== 0) {
+            if ((int) $siteId !== 0) {
                 $query->andWhere(['siteId' => $siteId]);
             }
             $query
@@ -161,8 +161,8 @@ 
         }
         if ($stats) {
             $data = [
-                (int)$stats,
-                (int)$handledStats,
+                (int) $stats,
+                (int) $handledStats,
             ];
         }
 

src/controllers/TablesController.php

Spacing +6 added lines, -6 removed lines

@@ -69,7 +69,7 @@ 
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
     ];
 
     // Public Methods
@@ -124,7 +124,7 @@ 
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'referrerUrl', $filter]);
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($handled !== 'all') {
@@ -145,7 +145,7 @@ 
                 }
                 $stat['addLink'] = '';
                 if (!$stat['handledByRetour']) {
-                    $encodedUrl = urlencode('/' . ltrim($stat['redirectSrcUrl'], '/'));
+                    $encodedUrl = urlencode('/'.ltrim($stat['redirectSrcUrl'], '/'));
                     // Add the siteId to the URL, but keep the current behavior of passing in siteId=0 for "all"
                     $statSiteId = $stat['siteId'] ?? 0;
                     try {
@@ -153,7 +153,7 @@ 
                     } catch (SiteNotFoundException $e) {
                         $primarySite = null;
                     }
-                    if ($primarySite !== null && $statSiteId == (int)$primarySite->id) {
+                    if ($primarySite !== null && $statSiteId == (int) $primarySite->id) {
                         $statSiteId = 0;
                     }
                     $stat['addLink'] = UrlHelper::cpUrl('retour/add-redirect', [
@@ -228,7 +228,7 @@ 
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'redirectDestUrl', $filter]);
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($shortLinks) {
@@ -270,7 +270,7 @@ 
                 }
             }
 
-            $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-redirect/' . $redirect['id']);
+            $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-redirect/'.$redirect['id']);
         }
         // Format the data for the API
         if ($redirects) {