Inspection of "Refactor field notes" - OpencachingDeutschland/oc-server3 - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — development (#682)

by Nick

created 2017-10-20 19:55 UTC

Status

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

@@ -151,17 +151,17 @@
 block discarded – undo
     public static function getConflictingAttribIds($attribId)
     {
         static $conflicts = [
-            [1, 38],    // only at night - 24/7
-            [1, 40],    // only at night - only by day
-            [24, 25],   // near the parking area - long walk
-            [24, 27],   // near the parking area - hilly area
-            [24, 29],   // near the parking area - swimming required
-            [24, 50],   // near the parking area - cave equipment
-            [24, 51],   // near the parking area - diving equipment
-            [24, 52],   // near the parking area - watercraft
-            [38, 39],   // 24/7 - only at specified times
-            [38, 40],   // 24/7 - only by day
-            [42, 43],   // all seasons - breeding season
+            [1, 38], // only at night - 24/7
+            [1, 40], // only at night - only by day
+            [24, 25], // near the parking area - long walk
+            [24, 27], // near the parking area - hilly area
+            [24, 29], // near the parking area - swimming required
+            [24, 50], // near the parking area - cave equipment
+            [24, 51], // near the parking area - diving equipment
+            [24, 52], // near the parking area - watercraft
+            [38, 39], // 24/7 - only at specified times
+            [38, 40], // 24/7 - only by day
+            [42, 43], // all seasons - breeding season
             [42, 60]    // all seassons - only during specified seasons
         ];
 

Please login to merge, or discard this patch.

htdocs/lib2/OcHTMLPurifier.class.php 1 patch

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

@@ -63,7 +63,7 @@  discard block
 block discarded – undo
         $config->set(
             'HTML.ForbiddenElements',
             [
-                'basefont',   // workaround for HTMLPurifier bug, which allows this in the <body>
+                'basefont', // workaround for HTMLPurifier bug, which allows this in the <body>
             ]
         );
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
         // add attributes
         $def->addAttribute('a', 'rel', 'CDATA');
         $def->addAttribute('img', 'usemap', 'CDATA');
-        $def->addAttribute('map', 'name', 'CDATA');   // workaround for HTMLPurifer bug
+        $def->addAttribute('map', 'name', 'CDATA'); // workaround for HTMLPurifer bug
 
         // create parent object with config
         parent::__construct($config);

Please login to merge, or discard this patch.

htdocs/src/Oc/Command/CodeSnifferCommand.php 1 patch

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

@@ -43,7 +43,7 @@
 block discarded – undo
         }
 
         $process = new Process($cmd, $this->rootPath, null, null, 9600);
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             echo $buffer;
         });
 

Please login to merge, or discard this patch.

htdocs/src/Oc/Command/OkapiCronjobsCommand.php 1 patch

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

@@ -46,7 +46,7 @@
 block discarded – undo
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        require_once __DIR__.'/../../../okapi/autoload.php';
+        require_once __DIR__ . '/../../../okapi/autoload.php';
         Okapi::execute_prerequest_cronjobs();
         Okapi::execute_cron5_cronjobs();
     }

Please login to merge, or discard this patch.

htdocs/app/AppKernel.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -106,6 +106,6 @@
 block discarded – undo
      */
     public static function Container()
     {
-       return self::getInstance()->getContainer();
+        return self::getInstance()->getContainer();
     }
 }

Please login to merge, or discard this patch.

htdocs/thumbs.php 1 patch

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 );
 if ($r) {
     if ($r['object_type'] == 1) {
-        $check = (int) $connection
+        $check = (int)$connection
             ->fetchColumn('SELECT COUNT(*)
                            FROM `cache_logs`
                            INNER JOIN `caches`
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 
         }
     } elseif ($r['object_type'] == 2) {
-        $check = (int) $connection
+        $check = (int)$connection
             ->fetchColumn('SELECT COUNT(*)
                            FROM `caches`
                            INNER JOIN `cache_status`

Please login to merge, or discard this patch.

htdocs/usertops.php 1 patch

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

@@ -13,10 +13,10 @@
 block discarded – undo
 $tpl->name = 'usertops';
 $tpl->menuitem = MNU_CACHES_USERTOPS;
 
-$userId = (int) isset($_REQUEST['userid']) ? $_REQUEST['userid']: 0;
+$userId = (int)isset($_REQUEST['userid']) ? $_REQUEST['userid'] : 0;
 $ocOnly = isset($_REQUEST['oconly']) && $_REQUEST['oconly'];
 
-$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId',['userId' => $userId]);
+$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId', ['userId' => $userId]);
 if ($sUsername == null) {
     $tpl->error(ERROR_USER_NOT_EXISTS);
 }

Please login to merge, or discard this patch.

htdocs/ocstats.php 1 patch

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

@@ -11,7 +11,7 @@  discard block
 block discarded – undo
 $jpegQuality = 80;
 $fontFile = __DIR__ . '/resource2/' . $opt['template']['style'] . '/fonts/dejavu/ttf/DejaVuSans.ttf';
 
-$userId = isset($_REQUEST['userid']) ? (int) $_REQUEST['userid'] : 0;
+$userId = isset($_REQUEST['userid']) ? (int)$_REQUEST['userid'] : 0;
 $lang = isset($_REQUEST['lang']) ? mb_strtoupper($_REQUEST['lang']) : $opt['template']['locale'];
 
 if (!isset($opt['locale'][$lang])) {
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 $connection = AppKernel::Container()->get(Connection::class);
 
 $fileName = __DIR__ . '/images/statpics/statpic' . $userId . $lang . '.jpg';
-$userStatisticPicture = (int) $connection->createQueryBuilder()
+$userStatisticPicture = (int)$connection->createQueryBuilder()
     ->select('COUNT(*)')
     ->from('user_statpic')
     ->where('user_id = :userId')
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
 
     if (is_array($userData)) {
         $username = $userData['username'];
-        $found = (int) $userData['found'];
-        $hidden = (int) $userData['hidden'];
-        $logo = (int) $userData['statpic_logo'];
+        $found = (int)$userData['found'];
+        $hidden = (int)$userData['hidden'];
+        $logo = (int)$userData['statpic_logo'];
         $logoText = $userData['statpic_text'];
 
         $textCounterStatistic = $translate->t('Finds: %1  Hidden: %2', '', '', 0, '', 0, $lang);

Please login to merge, or discard this patch.

htdocs/lib/clicompatbase.inc.php 1 patch

Doc Comments +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -422,7 +422,7 @@  discard block
 block discarded – undo
 /**
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
  * @param $value
- * @return false|string
+ * @return string
  */
 function sql_escape($value)
 {
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
 /**
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
  * @param $value
- * @return false|mixed|string
+ * @return string
  */
 function sql_escape_backtick($value)
 {
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
 
 /**
  * @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
- * @param $rs
+ * @param resource $rs
  * @return array
  */
 function sql_fetch_row($rs)

Please login to merge, or discard this patch.

		@@ -151,17 +151,17 @@
		block discarded – undo
151	151	public static function getConflictingAttribIds($attribId)
152	152	{
153	153	static $conflicts = [
154		- [1, 38], // only at night - 24/7
155		- [1, 40], // only at night - only by day
156		- [24, 25], // near the parking area - long walk
157		- [24, 27], // near the parking area - hilly area
158		- [24, 29], // near the parking area - swimming required
159		- [24, 50], // near the parking area - cave equipment
160		- [24, 51], // near the parking area - diving equipment
161		- [24, 52], // near the parking area - watercraft
162		- [38, 39], // 24/7 - only at specified times
163		- [38, 40], // 24/7 - only by day
164		- [42, 43], // all seasons - breeding season
	154	+ [1, 38], // only at night - 24/7
	155	+ [1, 40], // only at night - only by day
	156	+ [24, 25], // near the parking area - long walk
	157	+ [24, 27], // near the parking area - hilly area
	158	+ [24, 29], // near the parking area - swimming required
	159	+ [24, 50], // near the parking area - cave equipment
	160	+ [24, 51], // near the parking area - diving equipment
	161	+ [24, 52], // near the parking area - watercraft
	162	+ [38, 39], // 24/7 - only at specified times
	163	+ [38, 40], // 24/7 - only by day
	164	+ [42, 43], // all seasons - breeding season
165	165	[42, 60] // all seassons - only during specified seasons
166	166	];
167	167

		@@ -106,6 +106,6 @@
		block discarded – undo
106	106	*/
107	107	public static function Container()
108	108	{
109		- return self::getInstance()->getContainer();
	109	+ return self::getInstance()->getContainer();
110	110	}
111	111	}

		@@ -422,7 +422,7 @@ discard block
		block discarded – undo
422	422	/**
423	423	* @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
424	424	* @param $value
425		- * @return false\|string
	425	+ * @return string
426	426	*/
427	427	function sql_escape($value)
428	428	{
		@@ -436,7 +436,7 @@ discard block
		block discarded – undo
436	436	/**
437	437	* @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
438	438	* @param $value
439		- * @return false\|mixed\|string
	439	+ * @return string
440	440	*/
441	441	function sql_escape_backtick($value)
442	442	{
		@@ -547,7 +547,7 @@ discard block
		block discarded – undo
547	547
548	548	/**
549	549	* @deprecated use DBAL Conenction instead. See adminreports.php for an example implementation
550		- * @param $rs
	550	+ * @param resource $rs
551	551	* @return array
552	552	*/
553	553	function sql_fetch_row($rs)

		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	$config->set(
64	64	'HTML.ForbiddenElements',
65	65	[
66		- 'basefont', // workaround for HTMLPurifier bug, which allows this in the <body>
	66	+ 'basefont', // workaround for HTMLPurifier bug, which allows this in the <body>
67	67	]
68	68	);
69	69
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	// add attributes
99	99	$def->addAttribute('a', 'rel', 'CDATA');
100	100	$def->addAttribute('img', 'usemap', 'CDATA');
101		- $def->addAttribute('map', 'name', 'CDATA'); // workaround for HTMLPurifer bug
	101	+ $def->addAttribute('map', 'name', 'CDATA'); // workaround for HTMLPurifer bug
102	102
103	103	// create parent object with config
104	104	parent::__construct($config);

		@@ -43,7 +43,7 @@
		block discarded – undo
43	43	}
44	44
45	45	$process = new Process($cmd, $this->rootPath, null, null, 9600);
46		- $process->run(function ($type, $buffer) {
	46	+ $process->run(function($type, $buffer) {
47	47	echo $buffer;
48	48	});
49	49

		@@ -46,7 +46,7 @@
		block discarded – undo
46	46	*/
47	47	protected function execute(InputInterface $input, OutputInterface $output)
48	48	{
49		- require_once __DIR__.'/../../../okapi/autoload.php';
	49	+ require_once __DIR__ . '/../../../okapi/autoload.php';
50	50	Okapi::execute_prerequest_cronjobs();
51	51	Okapi::execute_cron5_cronjobs();
52	52	}

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	);
38	38	if ($r) {
39	39	if ($r['object_type'] == 1) {
40		- $check = (int) $connection
	40	+ $check = (int)$connection
41	41	->fetchColumn('SELECT COUNT(*)
42	42	FROM `cache_logs`
43	43	INNER JOIN `caches`
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61
62	62	}
63	63	} elseif ($r['object_type'] == 2) {
64		- $check = (int) $connection
	64	+ $check = (int)$connection
65	65	->fetchColumn('SELECT COUNT(*)
66	66	FROM `caches`
67	67	INNER JOIN `cache_status`

		@@ -13,10 +13,10 @@
		block discarded – undo
13	13	$tpl->name = 'usertops';
14	14	$tpl->menuitem = MNU_CACHES_USERTOPS;
15	15
16		-$userId = (int) isset($_REQUEST['userid']) ? $_REQUEST['userid']: 0;
	16	+$userId = (int)isset($_REQUEST['userid']) ? $_REQUEST['userid'] : 0;
17	17	$ocOnly = isset($_REQUEST['oconly']) && $_REQUEST['oconly'];
18	18
19		-$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId',['userId' => $userId]);
	19	+$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId', ['userId' => $userId]);
20	20	if ($sUsername == null) {
21	21	$tpl->error(ERROR_USER_NOT_EXISTS);
22	22	}

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	$jpegQuality = 80;
12	12	$fontFile = __DIR__ . '/resource2/' . $opt['template']['style'] . '/fonts/dejavu/ttf/DejaVuSans.ttf';
13	13
14		-$userId = isset($_REQUEST['userid']) ? (int) $_REQUEST['userid'] : 0;
	14	+$userId = isset($_REQUEST['userid']) ? (int)$_REQUEST['userid'] : 0;
15	15	$lang = isset($_REQUEST['lang']) ? mb_strtoupper($_REQUEST['lang']) : $opt['template']['locale'];
16	16
17	17	if (!isset($opt['locale'][$lang])) {
		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	$connection = AppKernel::Container()->get(Connection::class);
23	23
24	24	$fileName = __DIR__ . '/images/statpics/statpic' . $userId . $lang . '.jpg';
25		-$userStatisticPicture = (int) $connection->createQueryBuilder()
	25	+$userStatisticPicture = (int)$connection->createQueryBuilder()
26	26	->select('COUNT(*)')
27	27	->from('user_statpic')
28	28	->where('user_id = :userId')
		@@ -48,9 +48,9 @@ discard block
		block discarded – undo
48	48
49	49	if (is_array($userData)) {
50	50	$username = $userData['username'];
51		- $found = (int) $userData['found'];
52		- $hidden = (int) $userData['hidden'];
53		- $logo = (int) $userData['statpic_logo'];
	51	+ $found = (int)$userData['found'];
	52	+ $hidden = (int)$userData['hidden'];
	53	+ $logo = (int)$userData['statpic_logo'];
54	54	$logoText = $userData['statpic_text'];
55	55
56	56	$textCounterStatistic = $translate->t('Finds: %1 Hidden: %2', '', '', 0, '', 0, $lang);

OpencachingDeutschland / oc-server3

Pull Request — development (#682)

Status

Category

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

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

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

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

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

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

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

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

Doc Comments +3 added lines, -3 removed lines patch added patch discarded remove patch