nystudio107 / craft-retour

src/controllers/TablesController.php

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,