Passed
Push — master ( c5754d...1955b9 )
by Darío
07:59 queued 02:30
created
module/Auth/lang/en.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -3,12 +3,12 @@
 block discarded – undo
3 3
 return [
4 4
     "Register form" => "Register form",
5 5
     "User registering" => "User registering",
6
-	"Username" => "Username",
7
-	"username" => "username",
8
-	"Email" => "Email",
9
-	"email" => "email",
10
-	"Password" => "Password",
11
-	"password" => "password",
6
+    "Username" => "Username",
7
+    "username" => "username",
8
+    "Email" => "Email",
9
+    "email" => "email",
10
+    "Password" => "Password",
11
+    "password" => "password",
12 12
     "Repeat your password" => "Repeat your password",
13 13
     "Register now" => "Register now",
14 14
     "Log in" => "Log in",
Please login to merge, or discard this patch.
module/Utils/source/Model/Entity.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
 
7 7
 class Entity extends DbEntity
8 8
 {
9
-	// general table gateway
9
+    // general table gateway
10 10
 }
11 11
\ No newline at end of file
Please login to merge, or discard this patch.
module/Utils/config/module.config.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,11 +3,11 @@
 block discarded – undo
3 3
 return [
4 4
     'router' => [
5 5
         'routes' => [
6
-        	'Utils' => [
7
-        		'module' => 'Utils',
8
-        		'controller' => '',
9
-        		'view' => ''
10
-        	]
6
+            'Utils' => [
7
+                'module' => 'Utils',
8
+                'controller' => '',
9
+                'view' => ''
10
+            ]
11 11
         ],
12 12
     ],
13 13
     'view_manager' => [
Please login to merge, or discard this patch.
module/Connections/source/Controller/Tools.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
                     $sql_text = strstr($sql_text, ';', true);
482 482
             }
483 483
 
484
-             # clean comments and other characters
484
+                # clean comments and other characters
485 485
 
486 486
             // (/**/)
487 487
             $clean_code = preg_replace('/(\s)*\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\//', '', $sql_text);
@@ -923,7 +923,7 @@  discard block
 block discarded – undo
923 923
                     $sql_text = strstr($sql_text, ';', true);
924 924
             }
925 925
 
926
-             # clean comments and other characters
926
+                # clean comments and other characters
927 927
 
928 928
             // (/**/)
929 929
             $clean_code = preg_replace('/(\s)*\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\//', '', $sql_text);
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -183,8 +183,8 @@  discard block
 block discarded – undo
183 183
         $data = [];
184 184
 
185 185
         # environment settings
186
-        $post = $this->getPost();           # catch $_POST
187
-        $this->setTerminal(true);           # set terminal
186
+        $post = $this->getPost(); # catch $_POST
187
+        $this->setTerminal(true); # set terminal
188 188
 
189 189
         # TRY-CATCH-BLOCK
190 190
         try {
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
                 $http = new Http();
196 196
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
197 197
 
198
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
198
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
199 199
             }
200 200
 
201 201
             $idenfiers = $this->getIdentifiersEntity()->select([]);
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
                         $http = new Http();
213 213
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
214 214
 
215
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
215
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
216 216
                     }
217 217
                 });
218 218
 
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
                         $http = new Http();
243 243
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
244 244
 
245
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
245
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
246 246
                     }
247 247
                 });
248 248
 
@@ -361,14 +361,14 @@  discard block
 block discarded – undo
361 361
             $http = new Http();
362 362
             $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
363 363
 
364
-            die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
364
+            die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
365 365
         }
366 366
 
367 367
         # data to send
368 368
         $data = [];
369 369
 
370
-        $this->setTerminal(true);           # set terminal
371
-        $post = $this->getPost();           # catch $_POST
370
+        $this->setTerminal(true); # set terminal
371
+        $post = $this->getPost(); # catch $_POST
372 372
 
373 373
         $data["id"]   = $post["id"];
374 374
         $data["conn"] = $post["conn"];
@@ -390,8 +390,8 @@  discard block
 block discarded – undo
390 390
         $data = [];
391 391
 
392 392
         # environment settings
393
-        $post = $this->getPost();           # catch $_POST
394
-        $this->setTerminal(true);           # set terminal
393
+        $post = $this->getPost(); # catch $_POST
394
+        $this->setTerminal(true); # set terminal
395 395
 
396 396
         # TRY-CATCH-BLOCK
397 397
         try {
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
                 $http = new Http();
403 403
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
404 404
 
405
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
405
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
406 406
             }
407 407
 
408 408
             # STANDARD VALIDATIONS [check needed arguments]
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
                     $http = new Http();
415 415
                     $http->writeStatus($http::HTTP_BAD_REQUEST);
416 416
 
417
-                    die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
417
+                    die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
418 418
                 }
419 419
             });
420 420
 
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
                         $http = new Http();
545 545
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
546 546
 
547
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
547
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
548 548
                     }
549 549
 
550 550
                     $row_start = $post["row_start"] + $step;
@@ -697,11 +697,11 @@  discard block
 block discarded – undo
697 697
 
698 698
                             if (gettype($value) == 'object')
699 699
                             {
700
-                                if  (get_class($value) == 'OCI-Lob')
700
+                                if (get_class($value) == 'OCI-Lob')
701 701
                                 {
702 702
                                     if (($val = @$value->load()) === false)
703 703
                                     {
704
-                                        $val = null;   # only for default, this value is not used
704
+                                        $val = null; # only for default, this value is not used
705 705
                                         $column_errors[] = $column;
706 706
                                     }
707 707
 
@@ -778,8 +778,8 @@  discard block
 block discarded – undo
778 778
         $data = [];
779 779
 
780 780
         # environment settings
781
-        $post = $this->getPost();           # catch $_POST
782
-        $this->setTerminal(true);           # set terminal
781
+        $post = $this->getPost(); # catch $_POST
782
+        $this->setTerminal(true); # set terminal
783 783
 
784 784
         # TRY-CATCH-BLOCK
785 785
         try {
@@ -790,7 +790,7 @@  discard block
 block discarded – undo
790 790
                 $http = new Http();
791 791
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
792 792
 
793
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
793
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
794 794
             }
795 795
 
796 796
             # STANDARD VALIDATIONS [check needed arguments]
@@ -802,7 +802,7 @@  discard block
 block discarded – undo
802 802
                     $http = new Http();
803 803
                     $http->writeStatus($http::HTTP_BAD_REQUEST);
804 804
 
805
-                    die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
805
+                    die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
806 806
                 }
807 807
             });
808 808
 
@@ -1085,11 +1085,11 @@  discard block
 block discarded – undo
1085 1085
 
1086 1086
                                 if (gettype($value) == 'object')
1087 1087
                                 {
1088
-                                    if  (get_class($value) == 'OCI-Lob')
1088
+                                    if (get_class($value) == 'OCI-Lob')
1089 1089
                                     {
1090 1090
                                         if (($val = @$value->load()) === false)
1091 1091
                                         {
1092
-                                            $val = null;   # only for default, this value is not used
1092
+                                            $val = null; # only for default, this value is not used
1093 1093
                                             $column_errors[] = $column;
1094 1094
                                         }
1095 1095
 
@@ -1111,7 +1111,7 @@  discard block
 block discarded – undo
1111 1111
 
1112 1112
                             foreach ($column_names as $column_name)
1113 1113
                             {
1114
-                                $table .= "\t\t\t<td>". $row[$column_name] ."</td>\r\n";
1114
+                                $table .= "\t\t\t<td>" . $row[$column_name] . "</td>\r\n";
1115 1115
                             }
1116 1116
 
1117 1117
                             $table .= "\t\t</tr>\r\n";
@@ -1153,11 +1153,11 @@  discard block
 block discarded – undo
1153 1153
 
1154 1154
                                 if (gettype($value) == 'object')
1155 1155
                                 {
1156
-                                    if  (get_class($value) == 'OCI-Lob')
1156
+                                    if (get_class($value) == 'OCI-Lob')
1157 1157
                                     {
1158 1158
                                         if (($val = @$value->load()) === false)
1159 1159
                                         {
1160
-                                            $val = null;   # only for default, this value is not used
1160
+                                            $val = null; # only for default, this value is not used
1161 1161
                                             $column_errors[] = $column;
1162 1162
                                         }
1163 1163
 
@@ -1258,7 +1258,7 @@  discard block
 block discarded – undo
1258 1258
             foreach ($errors as $errno => $error)
1259 1259
             {
1260 1260
                 $errorInformation .=
1261
-                    "<strong style='color: #a94442'>".
1261
+                    "<strong style='color: #a94442'>" .
1262 1262
                         $method
1263 1263
                             . "</strong>: <span style='color: #e24f4c'>{$error}</span> \n<br />";
1264 1264
             }
Please login to merge, or discard this patch.
module/Connections/source/Model/Authentication.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -12,24 +12,24 @@
 block discarded – undo
12 12
 
13 13
         foreach ($dbconfig as $key => $value)
14 14
         {
15
-        	switch ($key)
16
-        	{
17
-        		case 'dbhost':
18
-        			$db->setDbhost($value);
19
-        			break;
20
-        		case 'dbuser':
21
-        			$db->setDbuser($value);
22
-        			break;
23
-        		case 'dbpass':
24
-        			$db->setDbpass($value);
25
-        			break;
26
-        		case 'dbname':
27
-        			$db->setDbname($value);
28
-        			break;
29
-        		case 'dbchar':
30
-        			$db->setDbChar($value);
31
-        			break;
32
-        	}
15
+            switch ($key)
16
+            {
17
+                case 'dbhost':
18
+                    $db->setDbhost($value);
19
+                    break;
20
+                case 'dbuser':
21
+                    $db->setDbuser($value);
22
+                    break;
23
+                case 'dbpass':
24
+                    $db->setDbpass($value);
25
+                    break;
26
+                case 'dbname':
27
+                    $db->setDbname($value);
28
+                    break;
29
+                case 'dbchar':
30
+                    $db->setDbChar($value);
31
+                    break;
32
+            }
33 33
         }
34 34
 
35 35
         return $db->reconnect();
Please login to merge, or discard this patch.
module/Connections/config/module.config.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,11 +3,11 @@
 block discarded – undo
3 3
 return [
4 4
     'router' => [
5 5
         'routes' => [
6
-        	'Connections' => [
7
-        		'module' => '',
8
-        		'controller' => '',
9
-        		'view' => 'index'
10
-        	]
6
+            'Connections' => [
7
+                'module' => '',
8
+                'controller' => '',
9
+                'view' => 'index'
10
+            ]
11 11
         ],
12 12
     ],
13 13
     'view_manager' => [
Please login to merge, or discard this patch.
module/Workarea/source/Controller/Connections.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
         $data = array();
157 157
 
158 158
         # environment settings
159
-        $this->setTerminal(true);           # set terminal
159
+        $this->setTerminal(true); # set terminal
160 160
 
161 161
         # TRY-CATCH-BLOCK
162 162
         try {
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
                 $http = new Http();
168 168
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
169 169
 
170
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
170
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
171 171
             }
172 172
 
173 173
             $data["connections"] = $this->getUserConnectionEntity()->select([
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
227 227
         $data = array();
228 228
 
229 229
         # environment settings
230
-        $post = $this->getPost();           # catch $_POST
231
-        $this->setTerminal(true);           # set terminal
230
+        $post = $this->getPost(); # catch $_POST
231
+        $this->setTerminal(true); # set terminal
232 232
 
233 233
         # TRY-CATCH-BLOCK
234 234
         try {
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
                 $http = new Http();
240 240
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
241 241
 
242
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
242
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
243 243
             }
244 244
 
245 245
             # STANDARD VALIDATIONS [check needed arguments]
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
                     $http = new Http();
252 252
                     $http->writeStatus($http::HTTP_BAD_REQUEST);
253 253
 
254
-                    die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
254
+                    die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
255 255
                 }
256 256
             });
257 257
 
@@ -359,8 +359,8 @@  discard block
 block discarded – undo
359 359
         $data = array();
360 360
 
361 361
         # environment settings
362
-        $post = $this->getPost();           # catch $_POST
363
-        $this->setTerminal(true);           # set terminal
362
+        $post = $this->getPost(); # catch $_POST
363
+        $this->setTerminal(true); # set terminal
364 364
 
365 365
         # TRY-CATCH-BLOCK
366 366
         try {
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
                         $http = new Http();
400 400
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
401 401
 
402
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
402
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
403 403
                     }
404 404
                 });
405 405
 
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
                 $http = new Http();
493 493
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
494 494
 
495
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
495
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
496 496
             }
497 497
         }
498 498
         catch (\Drone\Exception\Exception $e)
@@ -544,9 +544,9 @@  discard block
 block discarded – undo
544 544
         $data = array();
545 545
 
546 546
         # environment settings
547
-        $post = $this->getPost();           # catch $_POST
548
-        $get = $_GET;                       # catch $_GET
549
-        $this->setTerminal(true);           # set terminal
547
+        $post = $this->getPost(); # catch $_POST
548
+        $get = $_GET; # catch $_GET
549
+        $this->setTerminal(true); # set terminal
550 550
 
551 551
         # TRY-CATCH-BLOCK
552 552
         try {
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
                         $http = new Http();
563 563
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
564 564
 
565
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
565
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
566 566
                     }
567 567
                 });
568 568
 
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
                         $http = new Http();
625 625
                         $http->writeStatus($http::HTTP_BAD_REQUEST);
626 626
 
627
-                        die('Error ' . $http::HTTP_BAD_REQUEST .' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
627
+                        die('Error ' . $http::HTTP_BAD_REQUEST . ' (' . $http->getStatusText($http::HTTP_BAD_REQUEST) . ')!!');
628 628
                     }
629 629
                 });
630 630
 
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
                 $http = new Http();
730 730
                 $http->writeStatus($http::HTTP_METHOD_NOT_ALLOWED);
731 731
 
732
-                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED .' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
732
+                die('Error ' . $http::HTTP_METHOD_NOT_ALLOWED . ' (' . $http->getStatusText($http::HTTP_METHOD_NOT_ALLOWED) . ')!!');
733 733
             }
734 734
         }
735 735
         catch (\Drone\Exception\Exception $e)
@@ -776,7 +776,7 @@  discard block
 block discarded – undo
776 776
             foreach ($errors as $errno => $error)
777 777
             {
778 778
                 $errorInformation .=
779
-                    "<strong style='color: #a94442'>".
779
+                    "<strong style='color: #a94442'>" .
780 780
                         $method
781 781
                             . "</strong>: <span style='color: #e24f4c'>{$error}</span> \n<br />";
782 782
             }
Please login to merge, or discard this patch.
module/Workarea/source/Model/Identifiers.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -6,19 +6,19 @@
 block discarded – undo
6 6
 
7 7
 class Identifiers extends Entity
8 8
 {
9
-	/**
10
-	* @var integer
11
-	*/
12
-	public $CONN_IDENTI_ID;
9
+    /**
10
+     * @var integer
11
+     */
12
+    public $CONN_IDENTI_ID;
13 13
 
14
-	/**
15
-	* @var string
16
-	*/
17
-	public $CONN_IDENTI_NAME;
14
+    /**
15
+     * @var string
16
+     */
17
+    public $CONN_IDENTI_NAME;
18 18
 
19 19
     public function __construct($data = [])
20 20
     {
21
-    	parent::__construct($data);
21
+        parent::__construct($data);
22 22
         $this->setTableName("SWM_CONN_IDENTIFIERS");
23 23
     }
24 24
 }
25 25
\ No newline at end of file
Please login to merge, or discard this patch.
module/Workarea/source/Model/ConnectionType.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -6,19 +6,19 @@
 block discarded – undo
6 6
 
7 7
 class ConnectionType extends Entity
8 8
 {
9
-	/**
10
-	* @var integer
11
-	*/
12
-	public $CONN_TYPE_ID;
9
+    /**
10
+     * @var integer
11
+     */
12
+    public $CONN_TYPE_ID;
13 13
 
14
-	/**
15
-	* @var string
16
-	*/
17
-	public $CONN_TYPE_NAME;
14
+    /**
15
+     * @var string
16
+     */
17
+    public $CONN_TYPE_NAME;
18 18
 
19 19
     public function __construct($data = [])
20 20
     {
21
-    	parent::__construct($data);
21
+        parent::__construct($data);
22 22
         $this->setTableName("SWM_CONNECTION_TYPES");
23 23
     }
24 24
 }
25 25
\ No newline at end of file
Please login to merge, or discard this patch.