nystudio107 / craft-retour

src/helpers/UrlHelper.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         /** @noinspection CallableParameterUseCaseInTypeContextInspection */
         $url = preg_replace('/{.*}/', '', $url);
         // Remove any linebreaks that may be errantly in the URL
-        $url = (string)str_replace([
+        $url = (string) str_replace([
             PHP_EOL,
                 "\r",
                 "\n",

src/controllers/ApiController.php

Spacing +1 added lines, -1 removed lines

@@ -57,6 +57,6 @@
     {
         $redirects = Retour::$plugin->redirects->getAllStaticRedirects(null, $siteId);
 
-        return $this->asJson($redirects ?? []);
+        return $this->asJson($redirects ?? [ ]);
     }
 }

src/models/Settings.php

Spacing +17 added lines, -17 removed lines

@@ -135,8 +135,8 @@ 
     public function rules()
     {
         return [
-            ['pluginName', 'string'],
-            ['pluginName', 'default', 'value' => 'Retour'],
+            [ 'pluginName', 'string' ],
+            [ 'pluginName', 'default', 'value' => 'Retour' ],
             [
                 [
                     'createUriChangeRedirects',
@@ -147,22 +147,22 @@ 
                 ],
                 'boolean',
             ],
-            ['uriChangeRedirectSrcMatch', 'default', 'value' => 'pathonly'],
-            ['uriChangeRedirectSrcMatch', 'string'],
-            ['uriChangeRedirectSrcMatch', 'in', 'range' => [
+            [ 'uriChangeRedirectSrcMatch', 'default', 'value' => 'pathonly' ],
+            [ 'uriChangeRedirectSrcMatch', 'string' ],
+            [ 'uriChangeRedirectSrcMatch', 'in', 'range' => [
                 'pathonly',
                 'fullurl'
-            ]],
-            ['staticRedirectDisplayLimit', 'integer', 'min' => 1],
-            ['staticRedirectDisplayLimit', 'default', 'value' => 100],
-            ['dynamicRedirectDisplayLimit', 'integer', 'min' => 1],
-            ['dynamicRedirectDisplayLimit', 'default', 'value' => 100],
-            ['statsStoredLimit', 'integer', 'min' => 1],
-            ['statsStoredLimit', 'default', 'value' => 1000],
-            ['refreshIntervalSecs', 'integer', 'min' => 0],
-            ['refreshIntervalSecs', 'default', 'value' => 3],
-            ['statsDisplayLimit', 'integer', 'min' => 1],
-            ['statsDisplayLimit', 'default', 'value' => 1000],
+            ] ],
+            [ 'staticRedirectDisplayLimit', 'integer', 'min' => 1 ],
+            [ 'staticRedirectDisplayLimit', 'default', 'value' => 100 ],
+            [ 'dynamicRedirectDisplayLimit', 'integer', 'min' => 1 ],
+            [ 'dynamicRedirectDisplayLimit', 'default', 'value' => 100 ],
+            [ 'statsStoredLimit', 'integer', 'min' => 1 ],
+            [ 'statsStoredLimit', 'default', 'value' => 1000 ],
+            [ 'refreshIntervalSecs', 'integer', 'min' => 0 ],
+            [ 'refreshIntervalSecs', 'default', 'value' => 3 ],
+            [ 'statsDisplayLimit', 'integer', 'min' => 1 ],
+            [ 'statsDisplayLimit', 'default', 'value' => 1000 ],
             [
                 [
                     'excludePatterns',
@@ -178,7 +178,7 @@ 
      */
     public function behaviors()
     {
-        $craft31Behaviors = [];
+        $craft31Behaviors = [ ];
         if (Retour::$craft31) {
             $craft31Behaviors = [
                 'parser' => [

src/controllers/TablesController.php

Spacing +33 added lines, -33 removed lines

@@ -96,7 +96,7 @@ 
         $handled = 'all'
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -108,7 +108,7 @@ 
             }
         }
         $sortType = strtoupper($sortType);
-        $sortType = self::SORT_MAP[$sortType] ?? self::SORT_MAP['DESC'];
+        $sortType = self::SORT_MAP[ $sortType ] ?? self::SORT_MAP[ 'DESC' ];
         // Validate untrusted data
         if (!in_array($sortField, self::ALLOWED_STATS_SORT_FIELDS, true)) {
             throw new BadRequestHttpException(Craft::t('retour', 'Invalid sort field specified.'));
@@ -116,35 +116,35 @@ 
         // Query the db table
         $offset = ($page - 1) * $per_page;
         $query = (new Query())
-            ->from(['{{%retour_stats}}'])
+            ->from([ '{{%retour_stats}}' ])
             ->offset($offset)
             ->limit($per_page)
-            ->orderBy([$sortField => $sortType])
-            ->filterWhere(['like', 'redirectSrcUrl', $filter])
-            ->orFilterWhere(['like', 'referrerUrl', $filter])
+            ->orderBy([ $sortField => $sortType ])
+            ->filterWhere([ 'like', 'redirectSrcUrl', $filter ])
+            ->orFilterWhere([ 'like', 'referrerUrl', $filter ])
             ;
-        if ((int)$siteId !== 0) {
-            $query->andWhere(['siteId' => $siteId]);
+        if ((int) $siteId !== 0) {
+            $query->andWhere([ 'siteId' => $siteId ]);
         }
         if ($handled !== 'all') {
-            $query->andWhere(['handledByRetour' => self::HANDLED_MAP[$handled]]);
+            $query->andWhere([ 'handledByRetour' => self::HANDLED_MAP[ $handled ] ]);
         }
         $stats = $query->all();
         if ($stats) {
             // Add in the `addLink` field
             foreach ($stats as &$stat) {
-                $stat['addLink'] = '';
-                if (!$stat['handledByRetour']) {
-                    $encodedUrl = urlencode('/'.ltrim($stat['redirectSrcUrl'], '/'));
-                    $stat['addLink'] = UrlHelper::cpUrl('retour/add-redirect', [
+                $stat[ 'addLink' ] = '';
+                if (!$stat[ 'handledByRetour' ]) {
+                    $encodedUrl = urlencode('/' . ltrim($stat[ 'redirectSrcUrl' ], '/'));
+                    $stat[ 'addLink' ] = UrlHelper::cpUrl('retour/add-redirect', [
                         'defaultUrl' => $encodedUrl
                     ]);
                 }
             }
             // Format the data for the API
-            $data['data'] = $stats;
+            $data[ 'data' ] = $stats;
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,
@@ -180,7 +180,7 @@ 
         $siteId = 0
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:redirects');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -192,7 +192,7 @@ 
             }
         }
         $sortType = strtoupper($sortType);
-        $sortType = self::SORT_MAP[$sortType] ?? self::SORT_MAP['DESC'];
+        $sortType = self::SORT_MAP[ $sortType ] ?? self::SORT_MAP[ 'DESC' ];
         // Validate untrusted data
         if (!in_array($sortField, self::ALLOWED_REDIRECTS_SORT_FIELDS, true)) {
             throw new BadRequestHttpException(Craft::t('retour', 'Invalid sort field specified.'));
@@ -200,42 +200,42 @@ 
         // Query the db table
         $offset = ($page - 1) * $per_page;
         $query = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
+            ->from([ '{{%retour_static_redirects}}' ])
             ->offset($offset)
             ->limit($per_page)
-            ->orderBy([$sortField => $sortType])
-            ->filterWhere(['like', 'redirectSrcUrl', $filter])
-            ->orFilterWhere(['like', 'redirectDestUrl', $filter])
+            ->orderBy([ $sortField => $sortType ])
+            ->filterWhere([ 'like', 'redirectSrcUrl', $filter ])
+            ->orFilterWhere([ 'like', 'redirectDestUrl', $filter ])
            ;
-        if ((int)$siteId !== 0) {
-            $query->andWhere(['siteId' => $siteId]);
+        if ((int) $siteId !== 0) {
+            $query->andWhere([ 'siteId' => $siteId ]);
         }
         $redirects = $query->all();
         // Add in the `deleteLink` field and clean up the redirects
         foreach ($redirects as &$redirect) {
             // Make sure the destination URL is not a regex
-            if ($redirect['redirectMatchType'] !== 'exactmatch') {
-                if (preg_match("/\$\d+/", $redirect['redirectDestUrl'])) {
-                    $redirect['redirectDestUrl'] = '';
+            if ($redirect[ 'redirectMatchType' ] !== 'exactmatch') {
+                if (preg_match("/\$\d+/", $redirect[ 'redirectDestUrl' ])) {
+                    $redirect[ 'redirectDestUrl' ] = '';
                 }
             }
             // Handle extracting the site name
-            $redirect['siteName'] = Craft::t('retour', 'All Sites');
-            if ($redirect['siteId']) {
+            $redirect[ 'siteName' ] = Craft::t('retour', 'All Sites');
+            if ($redirect[ 'siteId' ]) {
                 $sites = Craft::$app->getSites();
-                $site = $sites->getSiteById($redirect['siteId']);
+                $site = $sites->getSiteById($redirect[ 'siteId' ]);
                 if ($site) {
-                    $redirect['siteName'] = $site->name;
+                    $redirect[ 'siteName' ] = $site->name;
                 }
             }
 
-            $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) {
-            $data['data'] = $redirects;
+            $data[ 'data' ] = $redirects;
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,

src/controllers/RedirectsController.php

Spacing +38 added lines, -38 removed lines

@@ -41,7 +41,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -57,7 +57,7 @@ 
      */
     public function actionRedirects(string $siteHandle = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
         // Get the site to edit
         $siteId = MultiSiteHelper::getSiteIdFromHandle($siteHandle);
@@ -70,32 +70,32 @@ 
         } 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'] = 'redirects';
+        $variables[ 'controllerHandle' ] = 'redirects';
 
         // Basic variables
-        $variables['fullPageForm'] = false;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = false;
+        $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' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'redirects';
+        $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'redirects';
 
         // Render the template
         return $this->renderTemplate('retour/redirects/index', $variables);
@@ -119,7 +119,7 @@ 
         int $siteId = 0,
         StaticRedirectsModel $redirect = null
     ): Response {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
 
         // Load in the redirect
@@ -133,12 +133,12 @@ 
         if ($redirect === null) {
             $redirectConfig = Retour::$plugin->redirects->getRedirectById($redirectId);
             if ($redirectConfig === null) {
-                $redirectConfig = [];
+                $redirectConfig = [ ];
                 Craft::error(
                     Craft::t(
                         'retour',
                         "Couldn't load redirect id {id}",
-                        ['id' => $redirectId]
+                        [ 'id' => $redirectId ]
                     ),
                     __METHOD__
                 );
@@ -151,13 +151,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;
@@ -169,20 +169,20 @@ 
         } 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
         );
         // Sites menu
         MultiSiteHelper::setSitesMenuVariables($variables);
-        $variables['controllerHandle'] = 'redirects';
+        $variables[ 'controllerHandle' ] = 'redirects';
 
         // Basic variables
-        $variables['fullPageForm'] = true;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = true;
+        $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL;
+        $variables[ 'pluginName' ] = $pluginName;
+        $variables[ 'title' ] = $templateTitle;
+        $variables[ 'crumbs' ] = [
             [
                 'label' => $pluginName,
                 'url' => UrlHelper::cpUrl('retour'),
@@ -193,12 +193,12 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/edit-redirect/'.$redirectId),
+                'url' => UrlHelper::cpUrl('retour/edit-redirect/' . $redirectId),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'redirects';
-        $variables['redirect'] = $redirect;
+        $variables[ 'docTitle' ] = "{$pluginName} - Redirects - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'redirects';
+        $variables[ 'redirect' ] = $redirect;
 
         // Render the template
         return $this->renderTemplate('retour/redirects/_edit', $variables);
@@ -251,17 +251,17 @@ 
         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') {
-            $destUrl = $redirectConfig['redirectDestUrl'] ?? '';
-            $redirectConfig['redirectDestUrl'] = $this->addSlashToSiteUrls($destUrl);
+        if ($generalConfig->addTrailingSlashesToUrls && $redirectConfig[ 'redirectMatchType' ] === 'exactmatch') {
+            $destUrl = $redirectConfig[ 'redirectDestUrl' ] ?? '';
+            $redirectConfig[ 'redirectDestUrl' ] = $this->addSlashToSiteUrls($destUrl);
         }
         // Handle URL encoded URLs by decoding them before saving them
-        if ($redirectConfig['redirectMatchType'] === 'exactmatch') {
-            $redirectConfig['redirectSrcUrl'] = urldecode($redirectConfig['redirectSrcUrl'] ?? '');
-            $redirectConfig['redirectSrcUrlParsed'] = urldecode($redirectConfig['redirectSrcUrlParsed'] ?? '');
+        if ($redirectConfig[ 'redirectMatchType' ] === 'exactmatch') {
+            $redirectConfig[ 'redirectSrcUrl' ] = urldecode($redirectConfig[ 'redirectSrcUrl' ] ?? '');
+            $redirectConfig[ 'redirectSrcUrlParsed' ] = urldecode($redirectConfig[ 'redirectSrcUrlParsed' ] ?? '');
         }
         $redirect = new StaticRedirectsModel($redirectConfig);
         // Make sure the redirect validates
@@ -279,8 +279,8 @@ 
         Retour::$plugin->redirects->saveRedirect($redirectConfig);
         // Handle the case where the redirect wasn't saved because it'd create a redirect loop
         $testRedirectConfig = Retour::$plugin->redirects->getRedirectByRedirectSrcUrl(
-            $redirectConfig['redirectSrcUrl'],
-            $redirectConfig['siteId']
+            $redirectConfig[ 'redirectSrcUrl' ],
+            $redirectConfig[ 'siteId' ]
         );
         if ($testRedirectConfig === null) {
             Craft::$app->getSession()->setError(Craft::t('app', "Couldn't save redirect settings because it'd create a redirect loop."));

src/migrations/m210603_221000_add_gql_schema_components.php

Spacing +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@
         $schemaVersion = $projectConfig->get('plugins.retour.schemaVersion', true);
 
         if (version_compare($schemaVersion, '3.0.10', '<')) {
-            foreach ($projectConfig->get('graphql.schemas') ?? [] as $schemaUid => $schemaComponents) {
-                if (isset($schemaComponents['scope'])) {
-                    $scope = $schemaComponents['scope'];
-                    $scope[] = 'retour.all:read';
+            foreach ($projectConfig->get('graphql.schemas') ?? [ ] as $schemaUid => $schemaComponents) {
+                if (isset($schemaComponents[ 'scope' ])) {
+                    $scope = $schemaComponents[ 'scope' ];
+                    $scope[ ] = 'retour.all:read';
 
                     $projectConfig->set("graphql.schemas.$schemaUid.scope", $scope);
                 }

src/helpers/Gql.php

Spacing +1 added lines, -1 removed lines

@@ -17,6 +17,6 @@
     {
         $allowedEntities = self::extractAllowedEntitiesFromSchema();
 
-        return isset($allowedEntities['retour']);
+        return isset($allowedEntities[ 'retour' ]);
     }
 }

src/gql/queries/RetourQuery.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public static function getQueries($checkToken = true): array
     {
         if ($checkToken && !GqlHelper::canQueryRetour()) {
-            return [];
+            return [ ];
         }
 
         return [

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' ],
             ],
         ];
     }