Passed
Branch feature/2.0 (9789a8)
by Jonathan
14:17
created
src/Webtrees/Mvc/View/ViewBag.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,8 +73,12 @@
 block discarded – undo
73 73
      * @param bool $override
74 74
      */
75 75
     public function set($key, $value, $override = true) {
76
-        if(is_null($key)) return;
77
-        if(!$override && array_key_exists($key, $this->data)) return;
76
+        if(is_null($key)) {
77
+        	return;
78
+        }
79
+        if(!$override && array_key_exists($key, $this->data)) {
80
+        	return;
81
+        }
78 82
         $this->data[$key] = $value;        
79 83
     }
80 84
     
Please login to merge, or discard this patch.
src/Webtrees/Family.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,9 @@
 block discarded – undo
45 45
 	* @return int Level of sources
46 46
 	* */
47 47
 	function isMarriageSourced(){
48
-		if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced;
48
+		if($this->is_marriage_sourced !== null) {
49
+			return $this->is_marriage_sourced;
50
+		}
49 51
 		$this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC');
50 52
 		return $this->is_marriage_sourced;
51 53
 	}
Please login to merge, or discard this patch.
src/Webtrees/Individual.php 1 patch
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -65,8 +65,7 @@  discard block
 block discarded – undo
65 65
 				$ct2 = preg_match_all($pattern, $titlefact->getValue(), $match2);
66 66
 				if($ct2>0){
67 67
 					$this->titles[$match2[1][0]][]= trim($match2[2][0]);
68
-				}
69
-				else{
68
+				} else{
70 69
 					$this->titles[$titlefact->getValue()][]='';
71 70
 				}
72 71
 			}
@@ -98,8 +97,7 @@  discard block
 block discarded – undo
98 97
 		if($bplace = $this->gedcomrecord->getBirthPlace()){
99 98
 			if($perc){
100 99
 				return array ($bplace, 1);
101
-			}
102
-			else{
100
+			} else{
103 101
 				return $bplace;
104 102
 			}
105 103
 		}
@@ -168,7 +166,9 @@  discard block
 block discarded – undo
168 166
 	 * @return int Level of sources
169 167
 	 * */
170 168
 	public function isBirthSourced(){
171
-		if($this->is_birth_sourced !== null) return $this->is_birth_sourced;
169
+		if($this->is_birth_sourced !== null) {
170
+			return $this->is_birth_sourced;
171
+		}
172 172
 		$this->is_birth_sourced = $this->isFactSourced(WT_EVENTS_BIRT);
173 173
 		return $this->is_birth_sourced;
174 174
 	}
@@ -179,7 +179,9 @@  discard block
 block discarded – undo
179 179
 	* @return int Level of sources
180 180
 	* */
181 181
 	public function isDeathSourced(){
182
-		if($this->is_death_sourced !== null) return $this->is_death_sourced;
182
+		if($this->is_death_sourced !== null) {
183
+			return $this->is_death_sourced;
184
+		}
183 185
 		$this->is_death_sourced = $this->isFactSourced(WT_EVENTS_DEAT);
184 186
 		return $this->is_death_sourced;
185 187
 	}
Please login to merge, or discard this patch.
src/Webtrees/Mvc/Dispatcher.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -71,19 +71,16 @@
 block discarded – undo
71 71
 			if(method_exists($ctrl, $method)) {
72 72
 			    try {
73 73
 			        call_user_func_array(array($ctrl, $method), array());
74
-			    }
75
-			    catch (MvcException $ex) {
74
+			    } catch (MvcException $ex) {
76 75
 			        if(!headers_sent()) {
77 76
 			            http_response_code($ex->getHttpCode());
78 77
 			        }
79 78
 			        echo $ex->getMessage();			        
80 79
 			    }
81
-			}
82
-			 else {
80
+			} else {
83 81
 				 throw new \Exception('The page requested does not exist');
84 82
 			 }
85
-		 }
86
-		 else {
83
+		 } else {
87 84
 			 throw new \Exception('The page requested does not exist');
88 85
 		 }
89 86
     }
Please login to merge, or discard this patch.
src/Webtrees/Mvc/MvcException.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,9 @@
 block discarded – undo
58 58
      * @throws InvalidArgumentException Thrown if not valid Http code
59 59
      */
60 60
     public function setHttpCode($http_code) {
61
-        if(!in_array($http_code, self::$VALID_HTTP))
62
-            throw new \InvalidArgumentException('Invalid HTTP code');
61
+        if(!in_array($http_code, self::$VALID_HTTP)) {
62
+                    throw new \InvalidArgumentException('Invalid HTTP code');
63
+        }
63 64
         $this->http_code= $http_code;
64 65
     }   
65 66
 
Please login to merge, or discard this patch.
src/Webtrees/Module/HooksModule.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,8 +68,7 @@
 block discarded – undo
68 68
         try {
69 69
             Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
70 70
             return true;
71
-        }
72
-        catch (\Exception $ex) { }
71
+        } catch (\Exception $ex) { }
73 72
         return false;
74 73
     }
75 74
     
Please login to merge, or discard this patch.
src/Webtrees/Module/GeoDispersionModule.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,8 +79,7 @@
 block discarded – undo
79 79
             Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
80 80
             
81 81
             return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
82
-        }
83
-        catch (\Exception $ex) {  }
82
+        } catch (\Exception $ex) {  }
84 83
         return false;
85 84
     }
86 85
     
Please login to merge, or discard this patch.
src/Webtrees/Hook/HookProvider.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -93,16 +93,14 @@
 block discarded – undo
93 93
 							if(is_int($key)) {
94 94
 								$hook_item = $value;
95 95
 								$priority = self::DEFAULT_PRIORITY;
96
-							}
97
-							else{
96
+							} else{
98 97
 								$hook_item = explode('#', $key, 2);
99 98
 								$priority = $value;
100 99
 							}
101 100
 							if($hook_item && count($hook_item) == 2){
102 101
 								$hook_func = $hook_item[0];
103 102
 								$hook_cont = $hook_item[1];
104
-							}
105
-							else{
103
+							} else{
106 104
 								$hook_func = $hook_item[0];
107 105
 								$hook_cont = 'all';
108 106
 							}
Please login to merge, or discard this patch.
src/Webtrees/Module/Certificates/Views/CertificatesListView.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,8 @@  discard block
 block discarded – undo
39 39
     			<input type="hidden" name="ged" value="<?= $this->data->get('url_ged') ?>">
40 40
     			<select name="city">
41 41
     			<?php foreach ($cities as $city) { ?>
42
-    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if(trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?= $city ?></option>
42
+    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if(trim($city) == trim($selected_city)) {
43
+	echo 'selected="selected"'?> ><?= $city ?></option>
43 44
     			<?php } ?>
44 45
     			</select>
45 46
     			<input type="submit" value="<?= I18N::translate('Show') ?>" />
@@ -72,9 +73,12 @@  discard block
 block discarded – undo
72 73
     						<!--  Certificate Name -->
73 74
     						<?php 
74 75
     						$name = $certificate->getCertificateDetails() ?: '';
76
+}
75 77
     						$sortname = "";
76 78
     						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
77
-    						if($ct_names > 0) $sortname = $match[1].'_';
79
+    						if($ct_names > 0) {
80
+    							$sortname = $match[1].'_';
81
+    						}
78 82
     						$sortname .= $name;
79 83
     						?>
80 84
     						<td data-sort="<?= Filter::escapeHtml($sortname) ?>">
Please login to merge, or discard this patch.