nystudio107 / craft-retour

src/controllers/TablesController.php

Indentation +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'redirectDestUrl', $filter])
-           ;
+            ;
         if ((int)$siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }

Spacing +35 added lines, -35 removed lines

@@ -97,7 +97,7 @@ 
         $handled = 'all'
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -109,7 +109,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.'));
@@ -117,46 +117,46 @@ 
         // 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' ] = '';
+                if (!$stat[ 'handledByRetour' ]) {
+                    $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;
+                    $statSiteId = $stat[ 'siteId' ] ?? 0;
                     try {
                         $primarySite = Craft::$app->getSites()->getPrimarySite();
                     } 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', [
+                    $stat[ 'addLink' ] = UrlHelper::cpUrl('retour/add-redirect', [
                         'defaultUrl' => $encodedUrl,
                         'siteId' => $statSiteId
                     ]);
                 }
             }
             // 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,
@@ -192,7 +192,7 @@ 
         $siteId = 0
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:redirects');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -204,7 +204,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.'));
@@ -212,42 +212,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/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/services/Redirects.php

Spacing +73 added lines, -73 removed lines

@@ -192,7 +192,7 @@ 
                 Craft::t(
                     'retour',
                     '404 full URL: {fullUrl}, 404 path only: {pathOnly}',
-                    ['fullUrl' => $fullUrl, 'pathOnly' => $pathOnly]
+                    [ 'fullUrl' => $fullUrl, 'pathOnly' => $pathOnly ]
                 ),
                 __METHOD__
             );
@@ -226,7 +226,7 @@ 
         $response = Craft::$app->getResponse();
         if ($redirect !== null) {
             // Figure out what type of source matching was done
-            $redirectSrcMatch = $redirect['redirectSrcMatch'] ?? 'pathonly';
+            $redirectSrcMatch = $redirect[ 'redirectSrcMatch' ] ?? 'pathonly';
             switch ($redirectSrcMatch) {
                 case 'pathonly':
                     $url = $pathOnly;
@@ -238,13 +238,13 @@ 
                     $url = $pathOnly;
                     break;
             }
-            $dest = $redirect['redirectDestUrl'];
+            $dest = $redirect[ 'redirectDestUrl' ];
             // If this isn't a full URL, make it one based on the appropriate site
             if (!UrlHelper::isFullUrl($dest)) {
                 try {
-                    $siteId = $redirect['siteId'] ?? null;
+                    $siteId = $redirect[ 'siteId' ] ?? null;
                     if ($siteId !== null) {
-                        $siteId = (int)$siteId;
+                        $siteId = (int) $siteId;
                     }
                     $dest = UrlHelper::siteUrl($dest, null, null, $siteId);
                 } catch (\yii\base\Exception $e) {
@@ -256,17 +256,17 @@ 
                     $dest .= '?' . $request->getQueryStringWithoutPath();
                 }
             }
-            $redirectMatchType = $redirect['redirectMatchType'] ?? 'notfound';
+            $redirectMatchType = $redirect[ 'redirectMatchType' ] ?? 'notfound';
             // Parse reference tags for exact matches
             if ($redirectMatchType === 'exactmatch') {
-                $dest = Craft::$app->elements->parseRefs($dest, $redirect['siteId'] ?? null);
+                $dest = Craft::$app->elements->parseRefs($dest, $redirect[ 'siteId' ] ?? null);
             }
-            $status = $redirect['redirectHttpCode'];
+            $status = $redirect[ 'redirectHttpCode' ];
             Craft::info(
                 Craft::t(
                     'retour',
                     'Redirecting {url} to {dest} with status {status}',
-                    ['url' => $url, 'dest' => $dest, 'status' => $status]
+                    [ 'url' => $url, 'dest' => $dest, 'status' => $status ]
                 ),
                 __METHOD__
             );
@@ -290,7 +290,7 @@ 
             // Add any additional headers (existing ones will be replaced)
             if (!empty(Retour::$settings->additionalHeaders)) {
                 foreach (Retour::$settings->additionalHeaders as $additionalHeader) {
-                    $response->headers->set($additionalHeader['name'], $additionalHeader['value']);
+                    $response->headers->set($additionalHeader[ 'name' ], $additionalHeader[ 'value' ]);
                 }
             }
             // Redirect the request away;
@@ -361,13 +361,13 @@ 
     public function getRedirectFromCache($url, int $siteId = 0)
     {
         $cache = Craft::$app->getCache();
-        $cacheKey = $this::CACHE_KEY.md5($url).$siteId;
+        $cacheKey = $this::CACHE_KEY . md5($url) . $siteId;
         $redirect = $cache->get($cacheKey);
         Craft::info(
             Craft::t(
                 'retour',
                 'Cached redirect hit for {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -389,12 +389,12 @@ 
         } catch (SiteNotFoundException $e) {
             $siteId = 1;
         }
-        $cacheKey = $this::CACHE_KEY.md5($url).$siteId;
+        $cacheKey = $this::CACHE_KEY . md5($url) . $siteId;
         // Create the dependency tags
         $dependency = new TagDependency([
             'tags' => [
                 $this::GLOBAL_REDIRECTS_CACHE_TAG,
-                $this::GLOBAL_REDIRECTS_CACHE_TAG.$siteId,
+                $this::GLOBAL_REDIRECTS_CACHE_TAG . $siteId,
             ],
         ]);
         $cache->set($cacheKey, $redirect, Retour::$cacheDuration, $dependency);
@@ -402,7 +402,7 @@ 
             Craft::t(
                 'retour',
                 'Cached redirect saved for {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -433,8 +433,8 @@ 
         // Iterate through the redirects
         foreach ($redirects as $redirect) {
             // Figure out what type of source matching to do
-            $redirectSrcMatch = $redirect['redirectSrcMatch'] ?? 'pathonly';
-            $redirectEnabled = (bool)$redirect['enabled'];
+            $redirectSrcMatch = $redirect[ 'redirectSrcMatch' ] ?? 'pathonly';
+            $redirectEnabled = (bool) $redirect[ 'enabled' ];
             if ($redirectEnabled === true) {
                 switch ($redirectSrcMatch) {
                     case 'pathonly':
@@ -447,11 +447,11 @@ 
                         $url = $pathOnly;
                         break;
                 }
-                $redirectMatchType = $redirect['redirectMatchType'] ?? 'notfound';
+                $redirectMatchType = $redirect[ 'redirectMatchType' ] ?? 'notfound';
                 switch ($redirectMatchType) {
                     // Do a straight up match
                     case 'exactmatch':
-                        if (strcasecmp($redirect['redirectSrcUrlParsed'], $url) === 0) {
+                        if (strcasecmp($redirect[ 'redirectSrcUrlParsed' ], $url) === 0) {
                             $this->incrementRedirectHitCount($redirect);
                             $this->saveRedirectToCache($url, $redirect);
 
@@ -475,15 +475,15 @@ 
 
                     // Do a regex match
                     case 'regexmatch':
-                        $matchRegEx = '`'.$redirect['redirectSrcUrlParsed'].'`i';
+                        $matchRegEx = '`' . $redirect[ 'redirectSrcUrlParsed' ] . '`i';
                         try {
                             if (preg_match($matchRegEx, $url) === 1) {
                                 $this->incrementRedirectHitCount($redirect);
                                 // If we're not associated with an EntryID, handle capture group replacement
-                                if ((int)$redirect['associatedElementId'] === 0) {
-                                    $redirect['redirectDestUrl'] = preg_replace(
+                                if ((int) $redirect[ 'associatedElementId' ] === 0) {
+                                    $redirect[ 'redirectDestUrl' ] = preg_replace(
                                         $matchRegEx,
-                                        $redirect['redirectDestUrl'],
+                                        $redirect[ 'redirectDestUrl' ],
                                         $url
                                     );
                                 }
@@ -508,7 +508,7 @@ 
                             }
                         } catch (\Exception $e) {
                             // That's fine
-                            Craft::error('Invalid Redirect Regex: '.$matchRegEx, __METHOD__);
+                            Craft::error('Invalid Redirect Regex: ' . $matchRegEx, __METHOD__);
                         }
 
                         break;
@@ -522,7 +522,7 @@ 
                                     'redirect' => &$redirect,
                                 ],
                             ];
-                            $result = \call_user_func_array([$plugin, 'retourMatch'], $args);
+                            $result = \call_user_func_array([ $plugin, 'retourMatch' ], $args);
                             if ($result) {
                                 $this->incrementRedirectHitCount($redirect);
                                 $this->saveRedirectToCache($url, $redirect);
@@ -564,7 +564,7 @@ 
             Craft::t(
                 'retour',
                 'Not handled-> full URL: {fullUrl}, path only: {pathOnly}',
-                ['fullUrl' => $fullUrl, 'pathOnly' => $pathOnly]
+                [ 'fullUrl' => $fullUrl, 'pathOnly' => $pathOnly ]
             ),
             __METHOD__
         );
@@ -591,8 +591,8 @@ 
 
             if ($url !== null && $redirect !== null) {
                 // Save the modified redirect to the cache
-                $redirect['redirectDestUrl'] = $event->redirectDestUrl;
-                $redirect['redirectHttpCode'] = $event->redirectHttpCode;
+                $redirect[ 'redirectDestUrl' ] = $event->redirectDestUrl;
+                $redirect[ 'redirectHttpCode' ] = $event->redirectHttpCode;
                 $this->saveRedirectToCache($url, $redirect);
             }
         }
@@ -616,7 +616,7 @@ 
         foreach (Craft::$app->getPlugins()->getAllPlugins() as $plugin) {
             /** @var Plugin $plugin */
             if (method_exists($plugin, 'retourMatch')) {
-                $result[$plugin->getHandle()] = $plugin->name.Craft::t('retour', ' Match');
+                $result[ $plugin->getHandle() ] = $plugin->name . Craft::t('retour', ' Match');
             }
         }
 
@@ -637,12 +637,12 @@ 
         }
         // Query the db table
         $query = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
+            ->from([ '{{%retour_static_redirects}}' ])
             ->orderBy('redirectMatchType ASC, redirectSrcMatch ASC, hitCount DESC');
         if ($siteId) {
             $query
-                ->where(['siteId' => $siteId])
-                ->orWhere(['siteId' => null]);
+                ->where([ 'siteId' => $siteId ])
+                ->orWhere([ 'siteId' => null ]);
         }
         if ($limit) {
             $query->limit($limit);
@@ -665,8 +665,8 @@ 
     {
         // Query the db table
         $redirect = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
-            ->where(['id' => $id])
+            ->from([ '{{%retour_static_redirects}}' ])
+            ->where([ 'id' => $id ])
             ->one();
 
         return $redirect;
@@ -684,16 +684,16 @@ 
     {
         // Query the db table
         $query = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
-            ->where(['redirectSrcUrl' => $redirectSrcUrl])
+            ->from([ '{{%retour_static_redirects}}' ])
+            ->where([ 'redirectSrcUrl' => $redirectSrcUrl ])
             ;
         if ($siteId) {
             $query
-                ->andWhere(['or', [
+                ->andWhere([ 'or', [
                     'siteId' => $siteId,
                 ], [
                     'siteId' => null,
-                ]]);
+                ] ]);
         }
         $redirect = $query->one();
 
@@ -735,13 +735,13 @@ 
     {
         if ($redirectConfig !== null) {
             $db = Craft::$app->getDb();
-            $redirectConfig['hitCount']++;
-            $redirectConfig['hitLastTime'] = Db::prepareDateForDb(new \DateTime());
+            $redirectConfig[ 'hitCount' ]++;
+            $redirectConfig[ 'hitLastTime' ] = Db::prepareDateForDb(new \DateTime());
             Craft::debug(
                 Craft::t(
                     'retour',
                     'Incrementing statistics for: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -750,14 +750,14 @@ 
                 $rowsAffected = $db->createCommand()->update(
                     '{{%retour_static_redirects}}',
                     [
-                        'hitCount' => $redirectConfig['hitCount'],
-                        'hitLastTime' => $redirectConfig['hitLastTime'],
+                        'hitCount' => $redirectConfig[ 'hitCount' ],
+                        'hitLastTime' => $redirectConfig[ 'hitLastTime' ],
                     ],
                     [
-                        'id' => $redirectConfig['id'],
+                        'id' => $redirectConfig[ 'id' ],
                     ]
                 )->execute();
-                Craft::debug('Rows affected: '.$rowsAffected, __METHOD__);
+                Craft::debug('Rows affected: ' . $rowsAffected, __METHOD__);
             } catch (\Exception $e) {
                 Craft::error($e->getMessage(), __METHOD__);
             }
@@ -770,9 +770,9 @@ 
     public function saveRedirect(array $redirectConfig)
     {
         // Handle URL encoded URLs by decoding them before saving them
-        if (isset($redirectConfig['redirectMatchType']) && $redirectConfig['redirectMatchType'] === 'exactmatch') {
-            $redirectConfig['redirectSrcUrl'] = urldecode($redirectConfig['redirectSrcUrl'] ?? '');
-            $redirectConfig['redirectSrcUrlParsed'] = urldecode($redirectConfig['redirectSrcUrlParsed'] ?? '');
+        if (isset($redirectConfig[ 'redirectMatchType' ]) && $redirectConfig[ 'redirectMatchType' ] === 'exactmatch') {
+            $redirectConfig[ 'redirectSrcUrl' ] = urldecode($redirectConfig[ 'redirectSrcUrl' ] ?? '');
+            $redirectConfig[ 'redirectSrcUrlParsed' ] = urldecode($redirectConfig[ 'redirectSrcUrlParsed' ] ?? '');
         }
         // Validate the model before saving it to the db
         $redirect = new StaticRedirectsModel($redirectConfig);
@@ -781,7 +781,7 @@ 
                 Craft::t(
                     'retour',
                     'Error validating redirect {id}: {errors}',
-                    ['id' => $redirect->id, 'errors' => print_r($redirect->getErrors(), true)]
+                    [ 'id' => $redirect->id, 'errors' => print_r($redirect->getErrors(), true) ]
                 ),
                 __METHOD__
             );
@@ -791,33 +791,33 @@ 
         // Get the validated model attributes and save them to the db
         $redirectConfig = $redirect->getAttributes();
         // 0 for a siteId needs to be converted to null
-        if (empty($redirectConfig['siteId']) || (int)$redirectConfig['siteId'] === 0) {
-            $redirectConfig['siteId'] = null;
+        if (empty($redirectConfig[ 'siteId' ]) || (int) $redirectConfig[ 'siteId' ] === 0) {
+            $redirectConfig[ 'siteId' ] = null;
         }
         // Throw an event to before saving the redirect
         $db = Craft::$app->getDb();
         // See if a redirect exists with this source URL already
-        if ((int)$redirectConfig['id'] === 0) {
+        if ((int) $redirectConfig[ 'id' ] === 0) {
             // Query the db table
             $redirect = (new Query())
-                ->from(['{{%retour_static_redirects}}'])
-                ->where(['redirectSrcUrlParsed' => $redirectConfig['redirectSrcUrlParsed']])
-                ->andWhere(['siteId' => $redirectConfig['siteId']])
+                ->from([ '{{%retour_static_redirects}}' ])
+                ->where([ 'redirectSrcUrlParsed' => $redirectConfig[ 'redirectSrcUrlParsed' ] ])
+                ->andWhere([ 'siteId' => $redirectConfig[ 'siteId' ] ])
                 ->one();
             // If it exists, update it rather than having duplicates
             if (!empty($redirect)) {
-                $redirectConfig['id'] = $redirect['id'];
+                $redirectConfig[ 'id' ] = $redirect[ 'id' ];
             }
         }
         // Trigger a 'beforeSaveRedirect' event
-        $isNew = (int)$redirectConfig['id'] === 0;
+        $isNew = (int) $redirectConfig[ 'id' ] === 0;
         $event = new RedirectEvent([
             'isNew' => $isNew,
-            'legacyUrl' => $redirectConfig['redirectSrcUrlParsed'],
-            'destinationUrl' => $redirectConfig['redirectDestUrl'],
-            'matchType' => $redirectConfig['redirectSrcMatch'],
-            'redirectType' => $redirectConfig['redirectHttpCode'],
-            'siteId' => $redirectConfig['siteId'],
+            'legacyUrl' => $redirectConfig[ 'redirectSrcUrlParsed' ],
+            'destinationUrl' => $redirectConfig[ 'redirectDestUrl' ],
+            'matchType' => $redirectConfig[ 'redirectSrcMatch' ],
+            'redirectType' => $redirectConfig[ 'redirectHttpCode' ],
+            'siteId' => $redirectConfig[ 'siteId' ],
         ]);
         $this->trigger(self::EVENT_BEFORE_SAVE_REDIRECT, $event);
         if (!$event->isValid) {
@@ -829,7 +829,7 @@ 
                 Craft::t(
                     'retour',
                     'Updating existing redirect: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -839,7 +839,7 @@ 
                     '{{%retour_static_redirects}}',
                     $redirectConfig,
                     [
-                        'id' => $redirectConfig['id'],
+                        'id' => $redirectConfig[ 'id' ],
                     ]
                 )->execute();
             } catch (Exception $e) {
@@ -850,11 +850,11 @@ 
                 Craft::t(
                     'retour',
                     'Creating new redirect: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
-            unset($redirectConfig['id']);
+            unset($redirectConfig[ 'id' ]);
             // Create a new record
             try {
                 $db->createCommand()->insert(
@@ -867,15 +867,15 @@ 
         }
         // To prevent redirect loops, see if any static redirects have our redirectDestUrl as their redirectSrcUrl
         $testRedirectConfig = $this->getRedirectByRedirectSrcUrl(
-            $redirectConfig['redirectDestUrl'],
-            $redirectConfig['siteId']
+            $redirectConfig[ 'redirectDestUrl' ],
+            $redirectConfig[ 'siteId' ]
         );
         if ($testRedirectConfig !== null) {
             Craft::debug(
                 Craft::t(
                     'retour',
                     'Deleting redirect to prevent a loop: {redirect}',
-                    ['redirect' => print_r($testRedirectConfig, true)]
+                    [ 'redirect' => print_r($testRedirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -883,7 +883,7 @@ 
             try {
                 $db->createCommand()->delete(
                     '{{%retour_static_redirects}}',
-                    ['id' => $testRedirectConfig['id']]
+                    [ 'id' => $testRedirectConfig[ 'id' ] ]
                 )->execute();
             } catch (Exception $e) {
                 Craft::error($e->getMessage(), __METHOD__);
@@ -926,17 +926,17 @@ 
      */
     public function excludeUri($uri): bool
     {
-        $uri = '/'.ltrim($uri, '/');
+        $uri = '/' . ltrim($uri, '/');
         if (!empty(Retour::$settings->excludePatterns)) {
             foreach (Retour::$settings->excludePatterns as $excludePattern) {
-                $pattern = '`'.$excludePattern['pattern'].'`i';
+                $pattern = '`' . $excludePattern[ 'pattern' ] . '`i';
                 try {
                     if (preg_match($pattern, $uri) === 1) {
                         return true;
                     }
                 } catch (\Exception $e) {
                     // That's fine
-                    Craft::error('Invalid exclude URI Regex: '.$pattern, __METHOD__);
+                    Craft::error('Invalid exclude URI Regex: ' . $pattern, __METHOD__);
                 }
             }
         }

src/Retour.php

Spacing +29 added lines, -29 removed lines

@@ -126,9 +126,9 @@ 
     /**
      * @inheritdoc
      */
-    public function __construct($id, $parent = null, array $config = [])
+    public function __construct($id, $parent = null, array $config = [ ])
     {
-        $config['components'] = [
+        $config[ 'components' ] = [
             'events' => Events::class,
             'redirects' => Redirects::class,
             'statistics' => Statistics::class,
@@ -194,7 +194,7 @@ 
             Craft::t(
                 'retour',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );
@@ -214,18 +214,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',
             ];
@@ -236,7 +236,7 @@ 
             $editableSettings = false;
         }
         if ($currentUser->can('retour:settings') && $editableSettings) {
-            $subNavs['settings'] = [
+            $subNavs[ 'settings' ] = [
                 'label' => 'Settings',
                 'url' => 'retour/settings',
             ];
@@ -247,7 +247,7 @@ 
         }
         // A single sub nav item is redundant
         if (count($subNavs) === 1) {
-            $subNavs = [];
+            $subNavs = [ ];
         }
         $navItem = array_merge($navItem, [
             'subnav' => $subNavs,
@@ -303,7 +303,7 @@ 
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -319,7 +319,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();
@@ -346,7 +346,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('retour', [
@@ -359,7 +359,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -390,7 +390,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -412,7 +412,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
@@ -430,26 +430,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;
                     }
                 }
             );
@@ -458,13 +458,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') ];
                     }
                 );
             }
@@ -474,7 +474,7 @@ 
             Event::on(
                 Schema::class,
                 AlterSchemaFields::EVENT,
-                [GetCraftQLSchema::class, 'handle']
+                [ GetCraftQLSchema::class, 'handle' ]
             );
         }
     }
@@ -488,7 +488,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__
@@ -511,15 +511,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__
@@ -535,13 +535,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();
             }
         );
     }
@@ -557,7 +557,7 @@ 
         Event::on(
             ErrorHandler::class,
             ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION,
-            function (ExceptionEvent $event) {
+            function(ExceptionEvent $event) {
                 Craft::debug(
                     'ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION',
                     __METHOD__
@@ -641,7 +641,7 @@ 
             [
                 'key' => 'retour-redirect-caches',
                 'label' => Craft::t('retour', 'Retour redirect caches'),
-                'action' => [self::$plugin->redirects, 'invalidateCaches'],
+                'action' => [ self::$plugin->redirects, 'invalidateCaches' ],
             ],
         ];
     }

src/services/Events.php

Spacing +18 added lines, -18 removed lines

@@ -57,7 +57,7 @@ 
     /**
      * @var array The URIs for the element before it was saved
      */
-    public $oldElementUris = [];
+    public $oldElementUris = [ ];
 
     // Public Methods
     // =========================================================================
@@ -69,8 +69,8 @@ 
     {
         // 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);
         }
     }
 
@@ -80,16 +80,16 @@ 
     public 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__
                     );
@@ -109,7 +109,7 @@ 
                         if (Retour::$settings->uriChangeRedirectSrcMatch === 'fullurl') {
                             try {
                                 if ($redirectSiteId !== null) {
-                                    $redirectSiteId = (int)$redirectSiteId;
+                                    $redirectSiteId = (int) $redirectSiteId;
                                 }
                                 $oldUri = \craft\helpers\UrlHelper::siteUrl($oldUri, null, null, $redirectSiteId);
                                 $newUri = UrlHelper::siteUrl($newUri, null, null, $redirectSiteId);
@@ -127,14 +127,14 @@ 
                             'siteId' => $redirectSiteId,
                         ];
                         // Trigger a 'beforeSaveEntryRedirect' event
-                        $isNew = (int)$redirectConfig['id'] === 0;
+                        $isNew = (int) $redirectConfig[ 'id' ] === 0;
                         $event = new RedirectEvent([
                             'isNew' => $isNew,
-                            'legacyUrl' => $redirectConfig['redirectSrcUrl'],
-                            'destinationUrl' => $redirectConfig['redirectDestUrl'],
-                            'matchType' => $redirectConfig['redirectSrcMatch'],
-                            'redirectType' => $redirectConfig['redirectHttpCode'],
-                            'siteId' => $redirectConfig['siteId'],
+                            'legacyUrl' => $redirectConfig[ 'redirectSrcUrl' ],
+                            'destinationUrl' => $redirectConfig[ 'redirectDestUrl' ],
+                            'matchType' => $redirectConfig[ 'redirectSrcMatch' ],
+                            'redirectType' => $redirectConfig[ 'redirectHttpCode' ],
+                            'siteId' => $redirectConfig[ 'siteId' ],
                         ]);
                         $this->trigger(self::EVENT_BEFORE_SAVE_ENTRY_REDIRECT, $event);
                         if (!$event->isValid) {
@@ -156,13 +156,13 @@ 
      */
     protected function getAllElementUris(Element $element): array
     {
-        $uris = [];
+        $uris = [ ];
         if (!Retour::$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;
                 }
             }
         }
@@ -171,7 +171,7 @@ 
             Craft::t(
                 'retour',
                 'Getting Element URIs: {uris}',
-                ['uris' => print_r($uris, true)]
+                [ 'uris' => print_r($uris, true) ]
             ),
             __METHOD__
         );

src/controllers/StatisticsController.php

Spacing +17 added lines, -17 removed lines

@@ -40,7 +40,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -56,7 +56,7 @@ 
      */
     public function actionDashboard(string $siteHandle = null, bool $showWelcome = false): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
         // Trim the statistics
         Retour::$plugin->statistics->trimStatistics();
@@ -71,34 +71,34 @@ 
         } catch (InvalidConfigException $e) {
             Craft::error($e->getMessage(), __METHOD__);
         }
-        $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl(
+        $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl(
             '@nystudio107/retour/web/assets/dist',
             true
         );
         // Enabled sites
         MultiSiteHelper::setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'dashboard';
+        $variables[ 'controllerHandle' ] = 'dashboard';
 
         // 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/dashboard'.$siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/dashboard' . $siteHandleUri),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'dashboard';
-        $variables['showWelcome'] = $showWelcome;
-        $variables['settings'] = Retour::$settings;
+        $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'dashboard';
+        $variables[ 'showWelcome' ] = $showWelcome;
+        $variables[ 'settings' ] = Retour::$settings;
 
         // Render the template
         return $this->renderTemplate('retour/dashboard/index', $variables);
@@ -116,7 +116,7 @@ 
             Craft::t(
                 'retour',
                 'Retour statistics cleared: {error}',
-                ['error' => $error]
+                [ 'error' => $error ]
             ),
             __METHOD__
         );
@@ -151,7 +151,7 @@ 
             Craft::t(
                 'retour',
                 'Retour statistics deleted: {error}',
-                ['error' => $stickyError]
+                [ 'error' => $stickyError ]
             ),
             __METHOD__
         );

src/controllers/SettingsController.php

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -54,7 +54,7 @@ 
      */
     public function actionPluginSettings($settings = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:settings');
         if ($settings === null) {
             $settings = Retour::$settings;
@@ -69,16 +69,16 @@ 
         } catch (InvalidConfigException $e) {
             Craft::error($e->getMessage(), __METHOD__);
         }
-        $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl(
+        $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl(
             '@nystudio107/retour/web/assets/dist',
             true
         );
         // 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'),
@@ -88,9 +88,9 @@ 
                 'url' => UrlHelper::cpUrl('retour/settings'),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'settings';
-        $variables['settings'] = $settings;
+        $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'settings';
+        $variables[ 'settings' ] = $settings;
 
         // Render the template
         return $this->renderTemplate('retour/settings', $variables);
@@ -110,7 +110,7 @@ 
         PermissionHelper::controllerPermissionCheck('retour:settings');
         $this->requirePostRequest();
         $pluginHandle = Craft::$app->getRequest()->getRequiredBodyParam('pluginHandle');
-        $settings = Craft::$app->getRequest()->getBodyParam('settings', []);
+        $settings = Craft::$app->getRequest()->getBodyParam('settings', [ ]);
         $plugin = Craft::$app->getPlugins()->getPlugin($pluginHandle);
 
         if ($plugin === null) {