jon48 / webtrees-lib

src/Webtrees/Place.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 			$index = str_replace('%', '', $match2);
 			if(is_numeric($index) && $index >0 && $index <= $nbLevels){
 				$displayPlace = str_replace($match2, $levels[$index-1] , $displayPlace);
-			}
-			else{
+			} else{
 				$displayPlace = str_replace($match2, '' , $displayPlace);
 			}
 		}

src/Webtrees/Mvc/View/ViewFactory.php

Braces +12 added lines, -4 removed lines

@@ -53,13 +53,21 @@
      */
     public function makeView($view_name, MvcController $mvc_ctrl, BaseController $ctrl, ViewBag $data) 
     {
-        if(!$mvc_ctrl) throw new \Exception('Mvc Controller not defined');
-        if(!$ctrl) throw new \Exception('Base Controller not defined');
-        if(!$view_name) throw new \Exception('View not defined');
+        if(!$mvc_ctrl) {
+        	throw new \Exception('Mvc Controller not defined');
+        }
+        if(!$ctrl) {
+        	throw new \Exception('Base Controller not defined');
+        }
+        if(!$view_name) {
+        	throw new \Exception('View not defined');
+        }
         
         $mvc_ctrl_refl = new \ReflectionObject($mvc_ctrl);
         $view_class = $mvc_ctrl_refl->getNamespaceName() . '\\Views\\' . $view_name . 'View';       
-        if(!class_exists($view_class)) throw new \Exception('View does not exist');
+        if(!class_exists($view_class)) {
+        	throw new \Exception('View does not exist');
+        }
         
         return new $view_class($ctrl, $data);
     }

src/Webtrees/Mvc/View/ViewBag.php

Braces +6 added lines, -2 removed lines

@@ -73,8 +73,12 @@
      * @param bool $override
      */
     public function set($key, $value, $override = true) {
-        if(is_null($key)) return;
-        if(!$override && array_key_exists($key, $this->data)) return;
+        if(is_null($key)) {
+        	return;
+        }
+        if(!$override && array_key_exists($key, $this->data)) {
+        	return;
+        }
         $this->data[$key] = $value;        
     }
     

src/Webtrees/Family.php

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
 	* @return int Level of sources
 	* */
 	function isMarriageSourced(){
-		if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced;
+		if($this->is_marriage_sourced !== null) {
+			return $this->is_marriage_sourced;
+		}
 		$this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC');
 		return $this->is_marriage_sourced;
 	}

src/Webtrees/Individual.php

Braces +8 added lines, -6 removed lines

@@ -65,8 +65,7 @@ 
 				$ct2 = preg_match_all($pattern, $titlefact->getValue(), $match2);
 				if($ct2>0){
 					$this->titles[$match2[1][0]][]= trim($match2[2][0]);
-				}
-				else{
+				} else{
 					$this->titles[$titlefact->getValue()][]='';
 				}
 			}
@@ -98,8 +97,7 @@ 
 		if($bplace = $this->gedcomrecord->getBirthPlace()){
 			if($perc){
 				return array ($bplace, 1);
-			}
-			else{
+			} else{
 				return $bplace;
 			}
 		}
@@ -168,7 +166,9 @@ 
 	 * @return int Level of sources
 	 * */
 	public function isBirthSourced(){
-		if($this->is_birth_sourced !== null) return $this->is_birth_sourced;
+		if($this->is_birth_sourced !== null) {
+			return $this->is_birth_sourced;
+		}
 		$this->is_birth_sourced = $this->isFactSourced(WT_EVENTS_BIRT);
 		return $this->is_birth_sourced;
 	}
@@ -179,7 +179,9 @@ 
 	* @return int Level of sources
 	* */
 	public function isDeathSourced(){
-		if($this->is_death_sourced !== null) return $this->is_death_sourced;
+		if($this->is_death_sourced !== null) {
+			return $this->is_death_sourced;
+		}
 		$this->is_death_sourced = $this->isFactSourced(WT_EVENTS_DEAT);
 		return $this->is_death_sourced;
 	}

src/Webtrees/Mvc/Dispatcher.php

Braces +3 added lines, -6 removed lines

@@ -71,19 +71,16 @@
 			if(method_exists($ctrl, $method)) {
 			    try {
 			        call_user_func_array(array($ctrl, $method), array());
-			    }
-			    catch (MvcException $ex) {
+			    } catch (MvcException $ex) {
 			        if(!headers_sent()) {
 			            http_response_code($ex->getHttpCode());
 			        }
 			        echo $ex->getMessage();			        
 			    }
-			}
-			 else {
+			} else {
 				 throw new \Exception('The page requested does not exist');
 			 }
-		 }
-		 else {
+		 } else {
 			 throw new \Exception('The page requested does not exist');
 		 }
     }

src/Webtrees/Mvc/MvcException.php

Braces +3 added lines, -2 removed lines

@@ -58,8 +58,9 @@
      * @throws InvalidArgumentException Thrown if not valid Http code
      */
     public function setHttpCode($http_code) {
-        if(!in_array($http_code, self::$VALID_HTTP))
-            throw new \InvalidArgumentException('Invalid HTTP code');
+        if(!in_array($http_code, self::$VALID_HTTP)) {
+                    throw new \InvalidArgumentException('Invalid HTTP code');
+        }
         $this->http_code= $http_code;
     }   
 

src/Webtrees/Module/HooksModule.php

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
         try {
             Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
             return true;
-        }
-        catch (\Exception $ex) { }
+        } catch (\Exception $ex) { }
         return false;
     }
     

src/Webtrees/Module/GeoDispersionModule.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
             Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
             
             return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
-        }
-        catch (\Exception $ex) {  }
+        } catch (\Exception $ex) {  }
         return false;
     }