Completed
Pull Request — developer (#4001)
by Thom
542:26 queued 508:45
created
config/parent_tabdata.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,10 +3,10 @@
 block discarded – undo
3 3
 
4 4
 //This file contains the commonly used variables 
5 5
 
6
-$parent_tab_info_array=array(1=>'My Home Page',2=>'Marketing',3=>'Sales',4=>'Support',5=>'Analytics',6=>'Inventory',7=>'Tools',8=>'Settings');
6
+$parent_tab_info_array = array(1=>'My Home Page', 2=>'Marketing', 3=>'Sales', 4=>'Support', 5=>'Analytics', 6=>'Inventory', 7=>'Tools', 8=>'Settings');
7 7
 
8 8
 
9
-$parent_child_tab_rel_array=array(1=>array(3,9,28,),2=>array(26,6,4,28,7,9,8,),3=>array(7,6,4,2,20,22,23,19,8,9,70,70,71,71,),4=>array(13,15,6,4,8,28,9,34,41,42,43,59,),5=>array(25,1,),6=>array(14,18,19,21,22,20,23,35,37,),7=>array(24,27,8,33,40,44,45,47,48,49,51,54,57,58,60,61,62,62,63,63,64,64,65,65,66,66,67,67,68,68,69,69,),8=>array(),);
9
+$parent_child_tab_rel_array = array(1=>array(3, 9, 28,), 2=>array(26, 6, 4, 28, 7, 9, 8,), 3=>array(7, 6, 4, 2, 20, 22, 23, 19, 8, 9, 70, 70, 71, 71,), 4=>array(13, 15, 6, 4, 8, 28, 9, 34, 41, 42, 43, 59,), 5=>array(25, 1,), 6=>array(14, 18, 19, 21, 22, 20, 23, 35, 37,), 7=>array(24, 27, 8, 33, 40, 44, 45, 47, 48, 49, 51, 54, 57, 58, 60, 61, 62, 62, 63, 63, 64, 64, 65, 65, 66, 66, 67, 67, 68, 68, 69, 69,), 8=>array(),);
10 10
 
11 11
 
12 12
 
Please login to merge, or discard this patch.
include/events/VTEventConditionParserLexer.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -59,6 +59,9 @@  discard block
 block discarded – undo
59 59
 class VTEventConditionParserLexer_DFA9 extends DFA
60 60
 {
61 61
 
62
+	/**
63
+	 * @param VTEventConditionParserLexer $recognizer
64
+	 */
62 65
 	public function __construct($recognizer)
63 66
 	{
64 67
 		global $VTEventConditionParserLexer_DFA9;
@@ -108,6 +111,9 @@  discard block
 block discarded – undo
108 111
 	// delegates
109 112
 	// delegators
110 113
 
114
+	/**
115
+	 * @param ANTLRStringStream $input
116
+	 */
111 117
 	public function __construct($input, $state = null)
112 118
 	{
113 119
 		parent::__construct($input, $state);
Please login to merge, or discard this patch.
Braces   +24 added lines, -12 removed lines patch added patch discarded remove patch
@@ -250,8 +250,10 @@  discard block
 block discarded – undo
250 250
 							break;
251 251
 
252 252
 						default :
253
-							if ($cnt1 >= 1)
254
-								break 2; //loop1;
253
+							if ($cnt1 >= 1) {
254
+															break 2;
255
+							}
256
+							//loop1;
255 257
 							$eee = new EarlyExitException(1, $this->input);
256 258
 							throw $eee;
257 259
 					}
@@ -309,8 +311,10 @@  discard block
 block discarded – undo
309 311
 							break;
310 312
 
311 313
 						default :
312
-							if ($cnt2 >= 1)
313
-								break 2; //loop2;
314
+							if ($cnt2 >= 1) {
315
+															break 2;
316
+							}
317
+							//loop2;
314 318
 							$eee = new EarlyExitException(2, $this->input);
315 319
 							throw $eee;
316 320
 					}
@@ -405,8 +409,10 @@  discard block
 block discarded – undo
405 409
 									break;
406 410
 
407 411
 								default :
408
-									if ($cnt4 >= 1)
409
-										break 2; //loop4;
412
+									if ($cnt4 >= 1) {
413
+																			break 2;
414
+									}
415
+									//loop4;
410 416
 									$eee = new EarlyExitException(4, $this->input);
411 417
 									throw $eee;
412 418
 							}
@@ -468,8 +474,10 @@  discard block
 block discarded – undo
468 474
 							break;
469 475
 
470 476
 						default :
471
-							if ($cnt6 >= 1)
472
-								break 2; //loop6;
477
+							if ($cnt6 >= 1) {
478
+															break 2;
479
+							}
480
+							//loop6;
473 481
 							$eee = new EarlyExitException(6, $this->input);
474 482
 							throw $eee;
475 483
 					}
@@ -495,8 +503,10 @@  discard block
 block discarded – undo
495 503
 							break;
496 504
 
497 505
 						default :
498
-							if ($cnt7 >= 1)
499
-								break 2; //loop7;
506
+							if ($cnt7 >= 1) {
507
+															break 2;
508
+							}
509
+							//loop7;
500 510
 							$eee = new EarlyExitException(7, $this->input);
501 511
 							throw $eee;
502 512
 					}
@@ -573,8 +583,10 @@  discard block
 block discarded – undo
573 583
 							break;
574 584
 
575 585
 						default :
576
-							if ($cnt8 >= 1)
577
-								break 2; //loop8;
586
+							if ($cnt8 >= 1) {
587
+															break 2;
588
+							}
589
+							//loop8;
578 590
 							$eee = new EarlyExitException(8, $this->input);
579 591
 							throw $eee;
580 592
 					}
Please login to merge, or discard this patch.
include/fields/DateTimeRange.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	 * Function to get start and end date of present calendar quarter
267 267
 	 * @param int $month
268 268
 	 * @param DateTime $dateObject
269
-	 * @return date range of present quarter
269
+	 * @return string[] range of present quarter
270 270
 	 */
271 271
 	public static function getPresentQuarterRange($month = null, &$dateObject = null)
272 272
 	{
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 	 * Function to get start and end date of previous calendar quarter
300 300
 	 * @param int $month
301 301
 	 * @param DateTime $dateObject
302
-	 * @return date range of present quarter
302
+	 * @return string[] range of present quarter
303 303
 	 */
304 304
 	public static function getPreviousQuarterRange($month = null, &$dateObject = null)
305 305
 	{
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 	 * Function to get start and end date of next calendar quarter
334 334
 	 * @param int $month
335 335
 	 * @param DateTime $dateObject
336
-	 * @return date range of present quarter
336
+	 * @return string[] range of present quarter
337 337
 	 */
338 338
 	public static function getNextQuarterRange($month = null, $dateObject = null)
339 339
 	{
Please login to merge, or discard this patch.
include/runtime/cache/Connector.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -29,6 +29,9 @@
 block discarded – undo
29 29
 		return $ns . '-' . $key;
30 30
 	}
31 31
 
32
+	/**
33
+	 * @param string $namespace
34
+	 */
32 35
 	public function set($namespace, $key, $value)
33 36
 	{
34 37
 		$this->connection->set($this->cacheKey($namespace, $key), $value);
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,9 @@
 block discarded – undo
24 24
 
25 25
 	protected function cacheKey($ns, $key)
26 26
 	{
27
-		if (is_array($key))
28
-			$key = implode('-', $key);
27
+		if (is_array($key)) {
28
+					$key = implode('-', $key);
29
+		}
29 30
 		return $ns . '-' . $key;
30 31
 	}
31 32
 
Please login to merge, or discard this patch.
include/runtime/cache/Connectors.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -11,11 +11,17 @@
 block discarded – undo
11 11
 class Vtiger_Cache_Connector_Memory
12 12
 {
13 13
 
14
+	/**
15
+	 * @param string $key
16
+	 */
14 17
 	public function set($key, $value)
15 18
 	{
16 19
 		$this->$key = $value;
17 20
 	}
18 21
 
22
+	/**
23
+	 * @param string $key
24
+	 */
19 25
 	public function get($key)
20 26
 	{
21 27
 		return isset($this->$key) ? $this->$key : false;
Please login to merge, or discard this patch.
include/runtime/Globals.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
 /**
12 12
  * Function to get or set a global variable
13
- * @param type $key
13
+ * @param string $key
14 14
  * @param type $value
15 15
  * @return value of the given key
16 16
  */
Please login to merge, or discard this patch.
include/Webservices/Custom/ChangePassword.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 
16 16
 /**
17 17
  *
18
- * @param WebserviceId $id
18
+ * @param string $id
19 19
  * @param String $oldPassword
20 20
  * @param String $newPassword
21 21
  * @param String $confirmPassword
Please login to merge, or discard this patch.
include/Webservices/Custom/DeleteUser.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -12,6 +12,8 @@
 block discarded – undo
12 12
 
13 13
 /**
14 14
  * @author MAK
15
+ * @param string $id
16
+ * @param string $newOwnerId
15 17
  */
16 18
 function vtws_deleteUser($id, $newOwnerId, $user)
17 19
 {
Please login to merge, or discard this patch.
install/models/InitSchema.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -38,6 +38,9 @@  discard block
 block discarded – undo
38 38
 		RecalculateSharingRules();
39 39
 	}
40 40
 
41
+	/**
42
+	 * @param string $location
43
+	 */
41 44
 	public function initializeDatabase($location, $filesName = array())
42 45
 	{
43 46
 		$this->db->query('SET FOREIGN_KEY_CHECKS = 0;');
@@ -101,6 +104,9 @@  discard block
 block discarded – undo
101 104
 		createUserPrivilegesfile(1);
102 105
 	}
103 106
 
107
+	/**
108
+	 * @param string $query
109
+	 */
104 110
 	public function _splitQueries($query)
105 111
 	{
106 112
 		$buffer = array();
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -267,8 +267,9 @@
 block discarded – undo
267 267
 		if ($rootDirectory && strpos($src, $rootDirectory) === false) {
268 268
 			$src = $rootDirectory . $src;
269 269
 		}
270
-		if (!file_exists($src) || !$rootDirectory)
271
-			return;
270
+		if (!file_exists($src) || !$rootDirectory) {
271
+					return;
272
+		}
272 273
 		@chmod($src, 0777);
273 274
 		\App\Log::trace("Exiting VT620_to_YT::testest(" . $src . ") method ...");
274 275
 		if (is_dir($src)) {
Please login to merge, or discard this patch.