nystudio107 / craft-retour

src/controllers/RedirectsController.php

Spacing +3 added lines, -3 removed lines

@@ -251,7 +251,7 @@ 
         if ($redirectConfig === null) {
             throw new NotFoundHttpException('Redirect not found');
         }
-        $redirectConfig['id'] = (int)$redirectConfig['id'];
+        $redirectConfig['id'] = (int) $redirectConfig['id'];
         // Handle enforcing trailing slashes
         $generalConfig = Craft::$app->getConfig()->getGeneral();
         if ($generalConfig->addTrailingSlashesToUrls && $redirectConfig['redirectMatchType'] === 'exactmatch') {
@@ -314,13 +314,13 @@ 
         if (!preg_match('/\.[^\/]+$/', $url) && strpos($url, '?') === false) {
             // If it's a root relative URL, assume it's a site URL
             if (UrlHelper::isRootRelativeUrl($url)) {
-                return rtrim($url, '/') . '/';
+                return rtrim($url, '/').'/';
             }
             // If the URL matches any of the site's base URLs, assume it's a site URL
             $sites = Craft::$app->getSites()->getAllSites();
             foreach ($sites as $site) {
                 if (strpos($url, $site->getBaseUrl()) === 0) {
-                    return rtrim($url, '/') . '/';
+                    return rtrim($url, '/').'/';
                 }
             }
         }

src/controllers/FileController.php

Spacing +3 added lines, -3 removed lines

@@ -299,7 +299,7 @@ 
     {
         $csv->setOffset(1);
         $columns = ArrayHelper::filterEmptyStringsFromArray($columns);
-        $csv->each(function ($row) use ($headers, $columns) {
+        $csv->each(function($row) use ($headers, $columns) {
             $redirectConfig = [
                 'id' => 0,
             ];
@@ -312,7 +312,7 @@ 
                 }
                 $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;
@@ -345,7 +345,7 @@ 
                 }
                 $index++;
             }
-            Craft::debug('Importing row: ' . print_r($redirectConfig, true), __METHOD__);
+            Craft::debug('Importing row: '.print_r($redirectConfig, true), __METHOD__);
             Retour::$plugin->redirects->saveRedirect($redirectConfig);
         }
     }

src/gql/types/generators/RetourGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -41,17 +41,17 @@
         $retourType = GqlEntityRegistry::getEntity($typeName)
             ?: GqlEntityRegistry::createEntity($typeName, new RetourType([
                 'name' => $typeName,
-                'args' => function () use ($retourArgs) {
+                'args' => function() use ($retourArgs) {
                     return $retourArgs;
                 },
-                'fields' => function () use ($retourFields) {
+                'fields' => function() use ($retourFields) {
                     return $retourFields;
                 },
                 'description' => 'This entity has all the Retour fields',
             ]));
 
         $gqlTypes[$typeName] = $retourType;
-        TypeLoader::registerType($typeName, function () use ($retourType) {
+        TypeLoader::registerType($typeName, function() use ($retourType) {
             return $retourType;
         });
 

src/gql/interfaces/RetourInterface.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
             'name' => static::getName(),
             'fields' => self::class.'::getFieldDefinitions',
             'description' => 'This is the interface implemented by Retour.',
-            'resolveType' => function (array $value) {
+            '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

@@ -64,8 +64,8 @@
             if ($redirect === null && Craft::$app->getElements()->getElementByUri(trim($uri, '/'), $siteId) === null) {
                 // Set the `site` virtual field
                 $redirect['site'] = null;
-                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/listeners/GetCraftQLSchema.php

Spacing +8 added lines, -8 removed lines

@@ -62,36 +62,36 @@
                 // Boolean field
                 $retourField
                     ->addBooleanField($field)
-                    ->resolve(function ($redirect) use ($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
                 $retourField
                     ->addIntField($field)
-                    ->resolve(function ($redirect) use ($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
                 $retourField
                     ->addStringField($field)
-                    ->resolve(function ($redirect) use ($field) {
+                    ->resolve(function($redirect) use ($field) {
                         $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (string)$result;
+                        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 */

src/Retour.php

Spacing +15 added lines, -15 removed lines

@@ -309,7 +309,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -325,7 +325,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();
@@ -352,7 +352,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('retour', [
@@ -365,7 +365,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -396,7 +396,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -418,7 +418,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
@@ -435,7 +435,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 $event->types[] = ShortLinkField::class;
             }
         );
@@ -444,7 +444,7 @@ 
             Event::on(
                 Gql::class,
                 Gql::EVENT_REGISTER_GQL_TYPES,
-                function (RegisterGqlTypesEvent $event) {
+                function(RegisterGqlTypesEvent $event) {
                     Craft::debug(
                         'Gql::EVENT_REGISTER_GQL_TYPES',
                         __METHOD__
@@ -456,7 +456,7 @@ 
             Event::on(
                 Gql::class,
                 Gql::EVENT_REGISTER_GQL_QUERIES,
-                function (RegisterGqlQueriesEvent $event) {
+                function(RegisterGqlQueriesEvent $event) {
                     Craft::debug(
                         'Gql::EVENT_REGISTER_GQL_QUERIES',
                         __METHOD__
@@ -472,7 +472,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__
@@ -502,7 +502,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__
@@ -525,7 +525,7 @@ 
         Event::on(
             Dashboard::class,
             Dashboard::EVENT_REGISTER_WIDGET_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 $event->types[] = RetourWidget::class;
             }
         );
@@ -533,7 +533,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__
@@ -549,7 +549,7 @@ 
         Event::on(
             UserPermissions::class,
             UserPermissions::EVENT_REGISTER_PERMISSIONS,
-            function (RegisterUserPermissionsEvent $event) {
+            function(RegisterUserPermissionsEvent $event) {
                 Craft::debug(
                     'UserPermissions::EVENT_REGISTER_PERMISSIONS',
                     __METHOD__
@@ -571,7 +571,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/fields/ShortLink.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
             }
         } else if (!StringHelper::startsWith($value, 'http')) {
             $siteUrl = $element->getSite()->getBaseUrl();
-            $value = rtrim($siteUrl, '/') . '/' . ltrim($value, '/');
+            $value = rtrim($siteUrl, '/').'/'.ltrim($value, '/');
         }
 
         if (!empty($value)) {