nystudio107 / craft-retour

src/services/Redirects.php

Spacing +45 added lines, -45 removed lines

@@ -90,7 +90,7 @@ 
                 Craft::t(
                     'retour',
                     '404 full URL: {fullUrl}, 404 path only: {pathOnly}',
-                    ['fullUrl' => $fullUrl, 'pathOnly' => $pathOnly]
+                    [ 'fullUrl' => $fullUrl, 'pathOnly' => $pathOnly ]
                 ),
                 __METHOD__
             );
@@ -122,7 +122,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;
@@ -134,13 +134,13 @@ 
                     $url = $pathOnly;
                     break;
             }
-            $dest = $redirect['redirectDestUrl'];
-            $status = $redirect['redirectHttpCode'];
+            $dest = $redirect[ 'redirectDestUrl' ];
+            $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__
             );
@@ -202,13 +202,13 @@ 
     public function getRedirectFromCache($url)
     {
         $cache = Craft::$app->getCache();
-        $cacheKey = $this::CACHE_KEY.md5($url);
+        $cacheKey = $this::CACHE_KEY . md5($url);
         $redirect = $cache->get($cacheKey);
         Craft::info(
             Craft::t(
                 'retour',
                 'Cached redirect hit for {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -222,7 +222,7 @@ 
      */
     public function saveRedirectToCache($url, $redirect)
     {
-        $cacheKey = $this::CACHE_KEY.md5($url);
+        $cacheKey = $this::CACHE_KEY . md5($url);
         $cache = Craft::$app->getCache();
         // Get the current site id
         $sites = Craft::$app->getSites();
@@ -235,7 +235,7 @@ 
         $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);
@@ -243,7 +243,7 @@ 
             Craft::t(
                 'retour',
                 'Cached redirect saved for {url}',
-                ['url' => $url]
+                [ 'url' => $url ]
             ),
             __METHOD__
         );
@@ -261,7 +261,7 @@ 
         $result = null;
         foreach ($redirects as $redirect) {
             // Figure out what type of source matching to do
-            $redirectSrcMatch = $redirect['redirectSrcMatch'] ?? 'pathonly';
+            $redirectSrcMatch = $redirect[ 'redirectSrcMatch' ] ?? 'pathonly';
             switch ($redirectSrcMatch) {
                 case 'pathonly':
                     $url = $pathOnly;
@@ -273,11 +273,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);
 
@@ -287,14 +287,14 @@ 
 
                 // Do a regex match
                 case 'regexmatch':
-                    $matchRegEx = '`'.$redirect['redirectSrcUrlParsed'].'`i';
+                    $matchRegEx = '`' . $redirect[ 'redirectSrcUrlParsed' ] . '`i';
                     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
                             );
                         }
@@ -313,7 +313,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);
@@ -328,7 +328,7 @@ 
             Craft::t(
                 'retour',
                 'Not handled-> full URL: {fullUrl}, path only: {pathOnly}',
-                ['fullUrl' => $fullUrl, 'pathOnly' => $pathOnly]
+                [ 'fullUrl' => $fullUrl, 'pathOnly' => $pathOnly ]
             ),
             __METHOD__
         );
@@ -352,7 +352,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');
             }
         }
 
@@ -372,7 +372,7 @@ 
         }
         // Query the db table
         $query = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
+            ->from([ '{{%retour_static_redirects}}' ])
             ->orderBy('redirectMatchType ASC, redirectSrcMatch ASC, hitCount DESC');
         if ($limit) {
             $query->limit($limit);
@@ -395,8 +395,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;
@@ -413,8 +413,8 @@ 
     {
         // Query the db table
         $redirect = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
-            ->where(['redirectSrcUrl' => $redirectSrcUrl])
+            ->from([ '{{%retour_static_redirects}}' ])
+            ->where([ 'redirectSrcUrl' => $redirectSrcUrl ])
             ->one();
 
         return $redirect;
@@ -455,13 +455,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__
             );
@@ -470,14 +470,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__);
             }
@@ -496,7 +496,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__
             );
@@ -507,23 +507,23 @@ 
         $redirectConfig = $redirect->getAttributes();
         $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']])
+                ->from([ '{{%retour_static_redirects}}' ])
+                ->where([ 'redirectSrcUrlParsed' => $redirectConfig[ 'redirectSrcUrlParsed' ] ])
                 ->one();
             // If it exists, update it rather than having duplicates
             if (!empty($redirect)) {
-                $redirectConfig['id'] = $redirect['id'];
+                $redirectConfig[ 'id' ] = $redirect[ 'id' ];
             }
         }
-        if ((int)$redirectConfig['id'] !== 0) {
+        if ((int) $redirectConfig[ 'id' ] !== 0) {
             Craft::debug(
                 Craft::t(
                     'retour',
                     'Updating existing redirect: {redirect}',
-                    ['redirect' => print_r($redirectConfig, true)]
+                    [ 'redirect' => print_r($redirectConfig, true) ]
                 ),
                 __METHOD__
             );
@@ -533,7 +533,7 @@ 
                     '{{%retour_static_redirects}}',
                     $redirectConfig,
                     [
-                        'id' => $redirectConfig['id'],
+                        'id' => $redirectConfig[ 'id' ],
                     ]
                 )->execute();
             } catch (Exception $e) {
@@ -544,11 +544,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(
@@ -560,13 +560,13 @@ 
             }
         }
         // To prevent redirect loops, see if any static redirects have our redirectDestUrl as their redirectSrcUrl
-        $testRedirectConfig = $this->getRedirectByRedirectSrcUrl($redirectConfig['redirectDestUrl']);
+        $testRedirectConfig = $this->getRedirectByRedirectSrcUrl($redirectConfig[ 'redirectDestUrl' ]);
         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__
             );
@@ -574,7 +574,7 @@ 
             try {
                 $db->createCommand()->delete(
                     '{{%retour_static_redirects}}',
-                    ['id' => $testRedirectConfig['id']]
+                    [ 'id' => $testRedirectConfig[ 'id' ] ]
                 )->execute();
             } catch (Exception $e) {
                 Craft::error($e->getMessage(), __METHOD__);