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/config.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     // Determines whether the Retour API endpoint should be enabled for anonymous frontend access
     'enableApiEndpoint' => false,
 
-     // [Regular expressions](https://regexr.com/) to match URLs to exclude from tracking
+        // [Regular expressions](https://regexr.com/) to match URLs to exclude from tracking
     'excludePatterns' => [
     ],
 

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 +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/FileController.php

Spacing +25 added lines, -25 removed lines

@@ -78,7 +78,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -148,7 +148,7 @@ 
      */
     public function actionImportCsv(string $siteHandle = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
         // If your CSV document was created or is read on a Macintosh computer,
         // add the following lines before using the library to help PHP detect line ending in Mac OS X
@@ -166,38 +166,38 @@ 
         } 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'] = 'file';
+        $variables[ 'controllerHandle' ] = 'file';
 
         // Basic variables
-        $variables['fullPageForm'] = true;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = true;
+        $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' => 'Redirects',
-                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'redirects';
+        $variables[ 'docTitle' ] = "{$pluginName} - Redirects - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'redirects';
 
         // The CSV file
         $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();
@@ -213,8 +213,8 @@ 
             $csv = Reader::createFromPath($file->tempName);
             $headers = $csv->fetchOne(0);
             Craft::info(print_r($headers, true), __METHOD__);
-            $variables['headers'] = $headers;
-            $variables['filename'] = $filePath;
+            $variables[ 'headers' ] = $headers;
+            $variables[ 'filename' ] = $filePath;
         }
 
         // Render the template
@@ -260,7 +260,7 @@ 
         }
         // Query the db table
         $data = (new Query())
-            ->from([$table])
+            ->from([ $table ])
             ->select(array_keys($columns))
             ->orderBy('hitCount DESC')
             ->all();
@@ -268,7 +268,7 @@ 
         $csv = Writer::createFromFileObject(new \SplTempFileObject());
         $csv->insertOne(array_values($columns));
         $csv->insertAll($data);
-        $csv->output($filename.'.csv');
+        $csv->output($filename . '.csv');
         exit(0);
     }
 
@@ -281,16 +281,16 @@ 
     {
         $csv->setOffset(1);
         $columns = ArrayHelper::filterEmptyStringsFromArray($columns);
-        $csv->each(function ($row) use ($headers, $columns) {
+        $csv->each(function($row) use ($headers, $columns) {
             $redirectConfig = [
                 'id' => 0,
             ];
             $index = 0;
             foreach (self::IMPORT_REDIRECTS_CSV_FIELDS as $importField) {
-                if (isset($columns[$index], $headers[$columns[$index]])) {
-                    $redirectConfig[$importField] = empty($row[$headers[$columns[$index]]])
+                if (isset($columns[ $index ], $headers[ $columns[ $index ] ])) {
+                    $redirectConfig[ $importField ] = empty($row[ $headers[ $columns[ $index ] ] ])
                         ? null
-                        : $row[$headers[$columns[$index]]];
+                        : $row[ $headers[ $columns[ $index ] ] ];
                 }
                 $index++;
             }
@@ -320,10 +320,10 @@ 
             ];
             $index = 0;
             foreach (self::IMPORT_REDIRECTS_CSV_FIELDS as $importField) {
-                if (isset($columns[$index], $headers[$columns[$index]])) {
-                    $redirectConfig[$importField] = empty($row[$headers[$columns[$index]]])
+                if (isset($columns[ $index ], $headers[ $columns[ $index ] ])) {
+                    $redirectConfig[ $importField ] = empty($row[ $headers[ $columns[ $index ] ] ])
                         ? null
-                        : $row[$headers[$columns[$index]]];
+                        : $row[ $headers[ $columns[ $index ] ] ];
                 }
                 $index++;
             }

src/services/Redirects.php

Spacing +72 added lines, -72 removed lines

@@ -190,7 +190,7 @@ 
                 Craft::t(
                     'retour',
                     '404 full URL: {fullUrl}, 404 path only: {pathOnly}',
-                    ['fullUrl' => $fullUrl, 'pathOnly' => $pathOnly]
+                    [ 'fullUrl' => $fullUrl, 'pathOnly' => $pathOnly ]
                 ),
                 __METHOD__
             );
@@ -224,7 +224,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;
@@ -236,13 +236,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) {
@@ -254,17 +254,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__
             );
@@ -288,7 +288,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;
@@ -359,13 +359,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__
         );
@@ -387,12 +387,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);
@@ -400,7 +400,7 @@ 
             Craft::t(
                 'retour',
                 'Cached redirect saved for {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -430,8 +430,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':
@@ -444,11 +444,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);
 
@@ -471,15 +471,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
                                     );
                                 }
@@ -503,7 +503,7 @@ 
                             }
                         } catch (\Exception $e) {
                             // That's fine
-                            Craft::error('Invalid Redirect Regex: '.$matchRegEx, __METHOD__);
+                            Craft::error('Invalid Redirect Regex: ' . $matchRegEx, __METHOD__);
                         }
 
                         break;
@@ -517,7 +517,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);
@@ -557,7 +557,7 @@ 
             Craft::t(
                 'retour',
                 'Not handled-> full URL: {fullUrl}, path only: {pathOnly}',
-                ['fullUrl' => $fullUrl, 'pathOnly' => $pathOnly]
+                [ 'fullUrl' => $fullUrl, 'pathOnly' => $pathOnly ]
             ),
             __METHOD__
         );
@@ -584,8 +584,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);
             }
         }
@@ -609,7 +609,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');
             }
         }
 
@@ -630,12 +630,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);
@@ -658,8 +658,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;
@@ -677,16 +677,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();
 
@@ -728,13 +728,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__
             );
@@ -743,14 +743,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__);
             }
@@ -763,9 +763,9 @@ 
     public function saveRedirect(array $redirectConfig)
     {
         // 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' ] ?? '');
         }
         // Validate the model before saving it to the db
         $redirect = new StaticRedirectsModel($redirectConfig);
@@ -774,7 +774,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__
             );
@@ -784,32 +784,32 @@ 
         // 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'],
+            'legacyUrl' => $redirectConfig[ 'redirectSrcUrlParsed' ],
+            'destinationUrl' => $redirectConfig[ 'redirectDestUrl' ],
+            'matchType' => $redirectConfig[ 'redirectSrcMatch' ],
+            'redirectType' => $redirectConfig[ 'redirectHttpCode' ],
         ]);
         $this->trigger(self::EVENT_BEFORE_SAVE_REDIRECT, $event);
         if (!$event->isValid) {
@@ -821,7 +821,7 @@ 
                 Craft::t(
                     'retour',
                     'Updating existing redirect: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -831,7 +831,7 @@ 
                     '{{%retour_static_redirects}}',
                     $redirectConfig,
                     [
-                        'id' => $redirectConfig['id'],
+                        'id' => $redirectConfig[ 'id' ],
                     ]
                 )->execute();
             } catch (Exception $e) {
@@ -842,11 +842,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(
@@ -859,15 +859,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__
             );
@@ -875,7 +875,7 @@ 
             try {
                 $db->createCommand()->delete(
                     '{{%retour_static_redirects}}',
-                    ['id' => $testRedirectConfig['id']]
+                    [ 'id' => $testRedirectConfig[ 'id' ] ]
                 )->execute();
             } catch (Exception $e) {
                 Craft::error($e->getMessage(), __METHOD__);
@@ -918,17 +918,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/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);
                 }