nystudio107 / craft-retour

src/gql/interfaces/RetourInterface.php

Spacing +2 added lines, -2 removed lines

@@ -48,9 +48,9 @@
 
         $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) {
+            'resolveType' => function(array $value) {
                 return GqlEntityRegistry::getEntity(RetourGenerator::getName());
             },
         ]));

src/controllers/ApiController.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     /**
      * @inheritdoc
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
         'get-redirects',
     ];
 

src/controllers/RedirectsController.php

Spacing +11 added lines, -11 removed lines

@@ -42,7 +42,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected array|bool|int $allowAnonymous = [];
+    protected array | bool | int $allowAnonymous = [];
 
     // Public Methods
     // =========================================================================
@@ -84,7 +84,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,
@@ -92,7 +92,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
@@ -153,13 +153,13 @@ 
         if ($redirect->siteId) {
             $site = $sites->getSiteById($redirect->siteId);
             if ($site) {
-                MultiSiteHelper::requirePermission('editSite:' . $site->uid);
+                MultiSiteHelper::requirePermission('editSite:'.$site->uid);
             }
         }
         if ($siteId) {
             $site = $sites->getSiteById($siteId);
             if ($site) {
-                MultiSiteHelper::requirePermission('editSite:' . $site->uid);
+                MultiSiteHelper::requirePermission('editSite:'.$site->uid);
             }
         }
         $pluginName = Retour::$settings->pluginName;
@@ -195,7 +195,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/edit-redirect/' . $redirectId),
+                'url' => UrlHelper::cpUrl('retour/edit-redirect/'.$redirectId),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
@@ -253,7 +253,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') {
@@ -337,7 +337,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,
@@ -345,7 +345,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/shortlinks' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/shortlinks'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
@@ -400,13 +400,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/StatisticsController.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected array|bool|int $allowAnonymous = [];
+    protected array | bool | int $allowAnonymous = [];
 
     // Public Methods
     // =========================================================================
@@ -84,7 +84,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,
@@ -92,7 +92,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/dashboard' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/dashboard'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";

src/controllers/FileController.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected array|bool|int $allowAnonymous = [];
+    protected array | bool | int $allowAnonymous = [];
 
     // Public Methods
     // =========================================================================
@@ -174,7 +174,7 @@ 
         $csv->setOffset(1);
         $columns = ArrayHelper::filterEmptyStringsFromArray($columns);
         $rowIndex = 1;
-        $csv->each(function ($row) use ($headers, $columns, &$rowIndex, &$hasErrors) {
+        $csv->each(function($row) use ($headers, $columns, &$rowIndex, &$hasErrors) {
             $redirectConfig = [
                 'id' => 0,
             ];
@@ -188,9 +188,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++;
@@ -230,9 +230,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++;
@@ -281,7 +281,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,
@@ -289,7 +289,7 @@ 
             ],
             [
                 'label' => 'Redirects',
-                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
@@ -299,7 +299,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
             $cache = Craft::$app->getCache();
@@ -422,7 +422,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 @@ 
     /**
      * @var    bool|array
      */
-    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/SettingsController.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected array|bool|int $allowAnonymous = [];
+    protected array | bool | int $allowAnonymous = [];
 
     // Public Methods
     // =========================================================================
@@ -53,7 +53,7 @@ 
      * @return Response The rendered result
      * @throws ForbiddenHttpException
      */
-    public function actionPluginSettings(Settings|bool|null $settings = null): Response
+    public function actionPluginSettings(Settings | bool | null $settings = null): Response
     {
         $variables = [];
         PermissionHelper::controllerPermissionCheck('retour:settings');

src/Retour.php

Spacing +19 added lines, -19 removed lines

@@ -241,7 +241,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -257,7 +257,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();
@@ -296,7 +296,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('retour', [
@@ -306,7 +306,7 @@ 
             }
         );
 
-        $prepareRedirectOnElementChange = function (ElementEvent $event) {
+        $prepareRedirectOnElementChange = function(ElementEvent $event) {
             /** @var Element $element */
             $element = $event->element;
             if ($element !== null && !$event->isNew && $element->getUrl() !== null && !$element->propagating) {
@@ -327,7 +327,7 @@ 
             }
         };
 
-        $insertRedirectOnElementChange = function (ElementEvent $event) {
+        $insertRedirectOnElementChange = function(ElementEvent $event) {
             /** @var Element $element */
             $element = $event->element;
             if ($element !== null && !$event->isNew && $element->getUrl() !== null) {
@@ -345,7 +345,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__
@@ -357,7 +357,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__
@@ -369,7 +369,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__
@@ -381,7 +381,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__
@@ -393,7 +393,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
@@ -410,7 +410,7 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
+            function(RegisterComponentTypesEvent $event) {
                 $event->types[] = ShortLinkField::class;
             }
         );
@@ -418,7 +418,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__
@@ -430,7 +430,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__
@@ -445,7 +445,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__
@@ -467,7 +467,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__
@@ -505,7 +505,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__
@@ -539,7 +539,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;
@@ -550,7 +550,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__
@@ -566,7 +566,7 @@ 
         Event::on(
             UserPermissions::class,
             UserPermissions::EVENT_REGISTER_PERMISSIONS,
-            function (RegisterUserPermissionsEvent $event) {
+            function(RegisterUserPermissionsEvent $event) {
                 Craft::debug(
                     'UserPermissions::EVENT_REGISTER_PERMISSIONS',
                     __METHOD__

src/events/RedirectResolvedEvent.php

Spacing +1 added lines, -1 removed lines

@@ -26,5 +26,5 @@
     /**
      * @var StaticRedirects|array|null The redirect that was resolved
      */
-    public StaticRedirects|array|null $redirect = null;
+    public StaticRedirects | array | null $redirect = null;
 }