Inspection of "Version 3.1.30" - nystudio107/craft-retour - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — develop ( b4111b...cbcc38 )

by Andrew

created 2019-12-06 20:34 UTC

Status

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -75,7 +75,7 @@  discard block
 block discarded – undo
         $handled = 'all'
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -87,52 +87,52 @@  discard block
 block discarded – undo
             }
         }
         $sortType = strtoupper($sortType);
-        $sortType = self::SORT_MAP[$sortType] ?? self::SORT_MAP['DESC'];
+        $sortType = self::SORT_MAP[ $sortType ] ?? self::SORT_MAP[ 'DESC' ];
         // 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]);
-        if ((int)$siteId !== 0) {
-            $query->where(['siteId' => $siteId]);
+            ->orderBy([ $sortField => $sortType ]);
+        if ((int) $siteId !== 0) {
+            $query->where([ 'siteId' => $siteId ]);
         }
         if ($handled !== 'all') {
-            $query->where(['handledByRetour' => self::HANDLED_MAP[$handled]]);
+            $query->where([ 'handledByRetour' => self::HANDLED_MAP[ $handled ] ]);
         }
         if ($filter !== '') {
-            $query->where(['like', 'redirectSrcUrl', $filter]);
-            $query->orWhere(['like', 'referrerUrl', $filter]);
+            $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+            $query->orWhere([ 'like', 'referrerUrl', $filter ]);
         }
         $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;
             $query = (new Query())
-                ->from(['{{%retour_stats}}']);
-            if ((int)$siteId !== 0) {
-                $query->where(['siteId' => $siteId]);
+                ->from([ '{{%retour_stats}}' ]);
+            if ((int) $siteId !== 0) {
+                $query->where([ 'siteId' => $siteId ]);
             }
             if ($handled !== 'all') {
-                $query->where(['handledByRetour' => self::HANDLED_MAP[$handled]]);
+                $query->where([ 'handledByRetour' => self::HANDLED_MAP[ $handled ] ]);
             }
             if ($filter !== '') {
-                $query->where(['like', 'redirectSrcUrl', $filter]);
-                $query->orWhere(['like', 'referrerUrl', $filter]);
+                $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+                $query->orWhere([ 'like', 'referrerUrl', $filter ]);
             }
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
         $siteId = 0
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:redirects');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -179,56 +179,56 @@  discard block
 block discarded – undo
             }
         }
         $sortType = strtoupper($sortType);
-        $sortType = self::SORT_MAP[$sortType] ?? self::SORT_MAP['DESC'];
+        $sortType = self::SORT_MAP[ $sortType ] ?? self::SORT_MAP[ 'DESC' ];
         // 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]);
-        if ((int)$siteId !== 0) {
-            $query->where(['siteId' => $siteId]);
+            ->orderBy([ $sortField => $sortType ]);
+        if ((int) $siteId !== 0) {
+            $query->where([ 'siteId' => $siteId ]);
         }
         if ($filter !== '') {
-            $query->where(['like', 'redirectSrcUrl', $filter]);
-            $query->orWhere(['like', 'redirectDestUrl', $filter]);
+            $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+            $query->orWhere([ 'like', 'redirectDestUrl', $filter ]);
         }
         $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;
             $query = (new Query())
-                ->from(['{{%retour_static_redirects}}']);
-            if ((int)$siteId !== 0) {
-                $query->where(['siteId' => $siteId]);
+                ->from([ '{{%retour_static_redirects}}' ]);
+            if ((int) $siteId !== 0) {
+                $query->where([ 'siteId' => $siteId ]);
             }
             if ($filter !== '') {
-                $query->where(['like', 'redirectSrcUrl', $filter]);
-                $query->orWhere(['like', 'redirectDestUrl', $filter]);
+                $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+                $query->orWhere([ 'like', 'redirectDestUrl', $filter ]);
             }
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,

Please login to merge, or discard this patch.

		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	$handled = 'all'
76	76	): Response {
77	77	PermissionHelper::controllerPermissionCheck('retour:dashboard');
78		- $data = [];
	78	+ $data = [ ];
79	79	$sortField = 'hitCount';
80	80	$sortType = 'DESC';
81	81	// Figure out the sorting type
		@@ -87,52 +87,52 @@ discard block
		block discarded – undo
87	87	}
88	88	}
89	89	$sortType = strtoupper($sortType);
90		- $sortType = self::SORT_MAP[$sortType] ?? self::SORT_MAP['DESC'];
	90	+ $sortType = self::SORT_MAP[ $sortType ] ?? self::SORT_MAP[ 'DESC' ];
91	91	// Query the db table
92	92	$offset = ($page - 1) * $per_page;
93	93	$query = (new Query())
94		- ->from(['{{%retour_stats}}'])
	94	+ ->from([ '{{%retour_stats}}' ])
95	95	->offset($offset)
96	96	->limit($per_page)
97		- ->orderBy([$sortField => $sortType]);
98		- if ((int)$siteId !== 0) {
99		- $query->where(['siteId' => $siteId]);
	97	+ ->orderBy([ $sortField => $sortType ]);
	98	+ if ((int) $siteId !== 0) {
	99	+ $query->where([ 'siteId' => $siteId ]);
100	100	}
101	101	if ($handled !== 'all') {
102		- $query->where(['handledByRetour' => self::HANDLED_MAP[$handled]]);
	102	+ $query->where([ 'handledByRetour' => self::HANDLED_MAP[ $handled ] ]);
103	103	}
104	104	if ($filter !== '') {
105		- $query->where(['like', 'redirectSrcUrl', $filter]);
106		- $query->orWhere(['like', 'referrerUrl', $filter]);
	105	+ $query->where([ 'like', 'redirectSrcUrl', $filter ]);
	106	+ $query->orWhere([ 'like', 'referrerUrl', $filter ]);
107	107	}
108	108	$stats = $query->all();
109	109	if ($stats) {
110	110	// Add in the `addLink` field
111	111	foreach ($stats as &$stat) {
112		- $stat['addLink'] = '';
113		- if (!$stat['handledByRetour']) {
114		- $encodedUrl = urlencode('/'.ltrim($stat['redirectSrcUrl'], '/'));
115		- $stat['addLink'] = UrlHelper::cpUrl('retour/add-redirect', [
	112	+ $stat[ 'addLink' ] = '';
	113	+ if (!$stat[ 'handledByRetour' ]) {
	114	+ $encodedUrl = urlencode('/' . ltrim($stat[ 'redirectSrcUrl' ], '/'));
	115	+ $stat[ 'addLink' ] = UrlHelper::cpUrl('retour/add-redirect', [
116	116	'defaultUrl' => $encodedUrl
117	117	]);
118	118	}
119	119	}
120	120	// Format the data for the API
121		- $data['data'] = $stats;
	121	+ $data[ 'data' ] = $stats;
122	122	$query = (new Query())
123		- ->from(['{{%retour_stats}}']);
124		- if ((int)$siteId !== 0) {
125		- $query->where(['siteId' => $siteId]);
	123	+ ->from([ '{{%retour_stats}}' ]);
	124	+ if ((int) $siteId !== 0) {
	125	+ $query->where([ 'siteId' => $siteId ]);
126	126	}
127	127	if ($handled !== 'all') {
128		- $query->where(['handledByRetour' => self::HANDLED_MAP[$handled]]);
	128	+ $query->where([ 'handledByRetour' => self::HANDLED_MAP[ $handled ] ]);
129	129	}
130	130	if ($filter !== '') {
131		- $query->where(['like', 'redirectSrcUrl', $filter]);
132		- $query->orWhere(['like', 'referrerUrl', $filter]);
	131	+ $query->where([ 'like', 'redirectSrcUrl', $filter ]);
	132	+ $query->orWhere([ 'like', 'referrerUrl', $filter ]);
133	133	}
134	134	$count = $query->count();
135		- $data['links']['pagination'] = [
	135	+ $data[ 'links' ][ 'pagination' ] = [
136	136	'total' => $count,
137	137	'per_page' => $per_page,
138	138	'current_page' => $page,
		@@ -167,7 +167,7 @@ discard block
		block discarded – undo
167	167	$siteId = 0
168	168	): Response {
169	169	PermissionHelper::controllerPermissionCheck('retour:redirects');
170		- $data = [];
	170	+ $data = [ ];
171	171	$sortField = 'hitCount';
172	172	$sortType = 'DESC';
173	173	// Figure out the sorting type
		@@ -179,56 +179,56 @@ discard block
		block discarded – undo
179	179	}
180	180	}
181	181	$sortType = strtoupper($sortType);
182		- $sortType = self::SORT_MAP[$sortType] ?? self::SORT_MAP['DESC'];
	182	+ $sortType = self::SORT_MAP[ $sortType ] ?? self::SORT_MAP[ 'DESC' ];
183	183	// Query the db table
184	184	$offset = ($page - 1) * $per_page;
185	185	$query = (new Query())
186		- ->from(['{{%retour_static_redirects}}'])
	186	+ ->from([ '{{%retour_static_redirects}}' ])
187	187	->offset($offset)
188	188	->limit($per_page)
189		- ->orderBy([$sortField => $sortType]);
190		- if ((int)$siteId !== 0) {
191		- $query->where(['siteId' => $siteId]);
	189	+ ->orderBy([ $sortField => $sortType ]);
	190	+ if ((int) $siteId !== 0) {
	191	+ $query->where([ 'siteId' => $siteId ]);
192	192	}
193	193	if ($filter !== '') {
194		- $query->where(['like', 'redirectSrcUrl', $filter]);
195		- $query->orWhere(['like', 'redirectDestUrl', $filter]);
	194	+ $query->where([ 'like', 'redirectSrcUrl', $filter ]);
	195	+ $query->orWhere([ 'like', 'redirectDestUrl', $filter ]);
196	196	}
197	197	$redirects = $query->all();
198	198	// Add in the `deleteLink` field and clean up the redirects
199	199	foreach ($redirects as &$redirect) {
200	200	// Make sure the destination URL is not a regex
201		- if ($redirect['redirectMatchType'] !== 'exactmatch') {
202		- if (preg_match("/\$\d+/", $redirect['redirectDestUrl'])) {
203		- $redirect['redirectDestUrl'] = '';
	201	+ if ($redirect[ 'redirectMatchType' ] !== 'exactmatch') {
	202	+ if (preg_match("/\$\d+/", $redirect[ 'redirectDestUrl' ])) {
	203	+ $redirect[ 'redirectDestUrl' ] = '';
204	204	}
205	205	}
206	206	// Handle extracting the site name
207		- $redirect['siteName'] = Craft::t('retour', 'All Sites');
208		- if ($redirect['siteId']) {
	207	+ $redirect[ 'siteName' ] = Craft::t('retour', 'All Sites');
	208	+ if ($redirect[ 'siteId' ]) {
209	209	$sites = Craft::$app->getSites();
210		- $site = $sites->getSiteById($redirect['siteId']);
	210	+ $site = $sites->getSiteById($redirect[ 'siteId' ]);
211	211	if ($site) {
212		- $redirect['siteName'] = $site->name;
	212	+ $redirect[ 'siteName' ] = $site->name;
213	213	}
214	214	}
215	215
216		- $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-redirect/'.$redirect['id']);
	216	+ $redirect[ 'editLink' ] = UrlHelper::cpUrl('retour/edit-redirect/' . $redirect[ 'id' ]);
217	217	}
218	218	// Format the data for the API
219	219	if ($redirects) {
220		- $data['data'] = $redirects;
	220	+ $data[ 'data' ] = $redirects;
221	221	$query = (new Query())
222		- ->from(['{{%retour_static_redirects}}']);
223		- if ((int)$siteId !== 0) {
224		- $query->where(['siteId' => $siteId]);
	222	+ ->from([ '{{%retour_static_redirects}}' ]);
	223	+ if ((int) $siteId !== 0) {
	224	+ $query->where([ 'siteId' => $siteId ]);
225	225	}
226	226	if ($filter !== '') {
227		- $query->where(['like', 'redirectSrcUrl', $filter]);
228		- $query->orWhere(['like', 'redirectDestUrl', $filter]);
	227	+ $query->where([ 'like', 'redirectSrcUrl', $filter ]);
	228	+ $query->orWhere([ 'like', 'redirectDestUrl', $filter ]);
229	229	}
230	230	$count = $query->count();
231		- $data['links']['pagination'] = [
	231	+ $data[ 'links' ][ 'pagination' ] = [
232	232	'total' => $count,
233	233	'per_page' => $per_page,
234	234	'current_page' => $page,

nystudio107 / craft-retour

Push — develop ( b4111b...cbcc38 )

Status

Category

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch