nystudio107 / craft-retour

src/Retour.php

Spacing +19 added lines, -19 removed lines

@@ -285,7 +285,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -301,7 +301,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();
@@ -328,7 +328,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('retour', [
@@ -338,7 +338,7 @@ 
             }
         );
 
-        $prepareRedirectOnElementChange = function (ElementEvent $event) {
+        $prepareRedirectOnElementChange = function(ElementEvent $event) {
             /** @var Element $element */
             $element = $event->element;
             if ($element !== null && !$element->propagating && !$event->isNew && $element->getUrl() !== null) {
@@ -361,7 +361,7 @@ 
             }
         };
 
-        $insertRedirectOnElementChange = function (ElementEvent $event) {
+        $insertRedirectOnElementChange = function(ElementEvent $event) {
             /** @var Element $element */
             $element = $event->element;
             if ($element !== null && !$event->isNew && $element->getUrl() !== null) {
@@ -379,7 +379,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) use ($prepareRedirectOnElementChange) {
+            function(ElementEvent $event) use ($prepareRedirectOnElementChange) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -391,7 +391,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            function (ElementEvent $event) use ($insertRedirectOnElementChange) {
+            function(ElementEvent $event) use ($insertRedirectOnElementChange) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -403,7 +403,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_UPDATE_SLUG_AND_URI,
-            function (ElementEvent $event) use ($prepareRedirectOnElementChange) {
+            function(ElementEvent $event) use ($prepareRedirectOnElementChange) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_UPDATE_SLUG_AND_URI',
                     __METHOD__
@@ -415,7 +415,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_UPDATE_SLUG_AND_URI,
-            function (ElementEvent $event) use ($insertRedirectOnElementChange) {
+            function(ElementEvent $event) use ($insertRedirectOnElementChange) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_UPDATE_SLUG_AND_URI',
                     __METHOD__
@@ -428,7 +428,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
@@ -445,7 +445,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 $event->types[] = ShortLinkField::class;
             }
         );
@@ -454,7 +454,7 @@ 
             Event::on(
                 Gql::class,
                 Gql::EVENT_REGISTER_GQL_TYPES,
-                function (RegisterGqlTypesEvent $event) {
+                function(RegisterGqlTypesEvent $event) {
                     Craft::debug(
                         'Gql::EVENT_REGISTER_GQL_TYPES',
                         __METHOD__
@@ -466,7 +466,7 @@ 
             Event::on(
                 Gql::class,
                 Gql::EVENT_REGISTER_GQL_QUERIES,
-                function (RegisterGqlQueriesEvent $event) {
+                function(RegisterGqlQueriesEvent $event) {
                     Craft::debug(
                         'Gql::EVENT_REGISTER_GQL_QUERIES',
                         __METHOD__
@@ -482,7 +482,7 @@ 
                 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__
@@ -512,7 +512,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__
@@ -535,7 +535,7 @@ 
         Event::on(
             Dashboard::class,
             Dashboard::EVENT_REGISTER_WIDGET_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 /** @var User $user */
                 $user = Craft::$app->getUser();
                 if ($currentUser = $user->getIdentity()) {
@@ -549,7 +549,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__
@@ -565,7 +565,7 @@ 
         Event::on(
             UserPermissions::class,
             UserPermissions::EVENT_REGISTER_PERMISSIONS,
-            function (RegisterUserPermissionsEvent $event) {
+            function(RegisterUserPermissionsEvent $event) {
                 Craft::debug(
                     'UserPermissions::EVENT_REGISTER_PERMISSIONS',
                     __METHOD__
@@ -587,7 +587,7 @@ 
         Event::on(
             ErrorHandler::class,
             ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION,
-            function (ExceptionEvent $event) {
+            function(ExceptionEvent $event) {
                 Craft::debug(
                     'ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION',
                     __METHOD__

src/services/ServicesTrait.php

Spacing +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
         // Constants aren't allowed in traits until PHP >= 8.2
         $majorVersion = '3';
         // 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;
         // Merge in the passed config, so it our config can be overridden by Plugins::pluginConfigs['retour']
         // ref: https://github.com/craftcms/cms/issues/1989
         $config = ArrayHelper::merge([
@@ -53,8 +53,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/listeners/GetCraftQLSchema.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
                     ->addBooleanField($field)
                     ->resolve(function($redirect) use ($field) {
                         $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (bool)$result;
+                        return $result === null ? $result : (bool) $result;
                     });
             } elseif (in_array($field, self::INT_FIELDS, true)) {
                 // Integer field
@@ -72,7 +72,7 @@ 
                     ->addIntField($field)
                     ->resolve(function($redirect) use ($field) {
                         $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (int)$result;
+                        return $result === null ? $result : (int) $result;
                     });
             } else {
                 // String field
@@ -80,7 +80,7 @@ 
                     ->addStringField($field)
                     ->resolve(function($redirect) use ($field) {
                         $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (string)$result;
+                        return $result === null ? $result : (string) $result;
                     });
             }
         }

src/gql/interfaces/RetourInterface.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
         $type = GqlEntityRegistry::createEntity(self::class, new InterfaceType([
             'name' => static::getName(),
-            'fields' => self::class . '::getFieldDefinitions',
+            'fields' => self::class.'::getFieldDefinitions',
             'description' => 'This is the interface implemented by Retour.',
             'resolveType' => function(array $value) {
                 return GqlEntityRegistry::getEntity(RetourGenerator::getName());

src/gql/queries/RetourQuery.php

Spacing +3 added lines, -3 removed lines

@@ -41,14 +41,14 @@ 
             'retour' => [
                 'type' => RetourInterface::getType(),
                 'args' => RetourArguments::getArguments(),
-                'resolve' => RetourResolver::class . '::resolve',
+                'resolve' => RetourResolver::class.'::resolve',
                 'description' => 'This query is used to query for Retour redirects.',
                 'deprecationReason' => 'This query is deprecated and will be removed in the future. You should use `retourResolveRedirect` instead.',
             ],
             'retourResolveRedirect' => [
                 'type' => RetourInterface::getType(),
                 'args' => RetourArguments::getArguments(),
-                'resolve' => RetourResolver::class . '::resolve',
+                'resolve' => RetourResolver::class.'::resolve',
                 'description' => 'This query is used to query for Retour redirects.',
             ],
             'retourRedirects' => [
@@ -65,7 +65,7 @@ 
                         'description' => 'The siteId to list all redirects for.',
                     ],
                 ],
-                'resolve' => RetourResolver::class . '::resolveAll',
+                'resolve' => RetourResolver::class.'::resolveAll',
                 'description' => 'This query is used to query for all Retour redirects for a site.',
             ],
         ];

src/gql/resolvers/RetourResolver.php

Spacing +2 added lines, -2 removed lines

@@ -65,8 +65,8 @@
                 // Set the `site` virtual field
                 $redirect['site'] = null;
                 $redirect['siteId'] = $siteId;
-                if (isset($redirect['siteId']) && (int)$redirect['siteId'] !== 0) {
-                    $site = Craft::$app->getSites()->getSiteById((int)$redirect['siteId']);
+                if (isset($redirect['siteId']) && (int) $redirect['siteId'] !== 0) {
+                    $site = Craft::$app->getSites()->getSiteById((int) $redirect['siteId']);
                     if ($site !== null) {
                         $redirect['site'] = $site->handle;
                     }

src/controllers/FileController.php

Spacing +9 added lines, -9 removed lines

@@ -202,7 +202,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,
@@ -210,7 +210,7 @@ 
             ],
             [
                 'label' => 'Redirects',
-                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
@@ -220,7 +220,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);
@@ -353,7 +353,7 @@ 
         }
         $csv->insertOne(array_values($columns));
         $csv->insertAll($data);
-        $csv->output($filename . '.csv');
+        $csv->output($filename.'.csv');
         exit(0);
     }
 
@@ -371,7 +371,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,
             ];
@@ -385,9 +385,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++;
@@ -427,9 +427,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++;

src/helpers/MultiSite.php

Spacing +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
                         $siteId = reset($variables['enabledSiteIds']);
                     }
                 } else {
-                    self::requirePermission('editSite:' . $siteId);
+                    self::requirePermission('editSite:'.$siteId);
                 }
             }
         }
@@ -112,7 +112,7 @@ 
             } else {
                 $variables['sitesMenuLabel'] = Craft::t(
                     'site',
-                    $sites->getSiteById((int)$variables['currentSiteId'])->name
+                    $sites->getSiteById((int) $variables['currentSiteId'])->name
                 );
             }
         } else {
@@ -136,7 +136,7 @@ 
         if ($siteHandle !== null) {
             $site = Craft::$app->getSites()->getSiteByHandle($siteHandle);
             if (!$site) {
-                throw new NotFoundHttpException('Invalid site handle: ' . $siteHandle);
+                throw new NotFoundHttpException('Invalid site handle: '.$siteHandle);
             }
             $siteId = $site->id;
         }

ecs.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 return static function(ECSConfig $ecsConfig): void {
     $ecsConfig->paths([
-        __DIR__ . '/src',
+        __DIR__.'/src',
         __FILE__,
     ]);
     $ecsConfig->parallel();