jon48 / webtrees-lib

src/Webtrees/Family.php

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	/**
 	 * Find the spouse of a person, using the Xref comparison.
 	 *
-	 * @param Individual $person
+	 * @param fw\Individual $person
 	 *
 	 * @return Individual|null
 	 */

Indentation +4 added lines, -4 removed lines

@@ -39,10 +39,10 @@
 	}
 	
 	/**
-	* Check if this family's marriages are sourced
-	*
-	* @return int Level of sources
-	* */
+	 * Check if this family's marriages are sourced
+	 *
+	 * @return int Level of sources
+	 * */
 	function isMarriageSourced(){
 		if($this->_ismarriagesourced != null) return $this->_ismarriagesourced;
 		$this->_ismarriagesourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC');

Spacing +4 added lines, -4 removed lines

@@ -30,10 +30,10 @@ 
 	 * @param string $gedcom
 	 * @return NULL|\MyArtJaub\Webtrees\Family
 	 */
-	public static function getIntance($xref, Tree $tree, $gedcom = null){
+	public static function getIntance($xref, Tree $tree, $gedcom = null) {
 		$dfam = null;
 		$fam = fw\Family::getInstance($xref, $tree, $gedcom);
-		if($fam){
+		if ($fam) {
 			$dfam = new Family($fam);
 		}
 		return $dfam;
@@ -44,8 +44,8 @@ 
 	*
 	* @return int Level of sources
 	* */
-	function isMarriageSourced(){
-		if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced;
+	function isMarriageSourced() {
+		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;
 	}

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/Functions/FunctionsPrint.php

Doc Comments +1 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 	 * 
 	 * @param \Fisharebest\Webtrees\Place $place
 	 * @param string $icon_path
-	 * @param number $size
+	 * @param integer $size
 	 * @return string HTML code of the inserted flag
 	 */
 	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path , $size = 50) {
@@ -184,7 +184,6 @@ 
 	/**
 	 * Format date to display short (just years)
 	 *
-	 * @param \Fisharebest\Webtrees\Fact $eventObj Fact to display date
 	 * @param boolean $anchor option to print a link to calendar
 	 * @return string HTML code for short date
 	 */
@@ -212,7 +211,6 @@ 
 	/**
 	 * Format fact place to display short
 	 *
-	 * @param \Fisharebest\Webtrees\Fact $eventObj Fact to display date
 	 * @param string $format Format of the place
 	 * @param boolean $anchor option to print a link to placelist
 	 * @return string HTML code for short place

Braces +11 added lines, -7 removed lines

@@ -160,7 +160,9 @@ 
 	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true){
 		$html = '';
 		$tag = 'em';
-		if($isStrong) $tag = 'strong';
+		if($isStrong) {
+			$tag = 'strong';
+		}
 		if($individual && $individual->canShow()){
 			$dindi = new Individual($individual);
 			$html = $individual->getSexImage();
@@ -174,8 +176,7 @@ 
 			$html .= '&nbsp;<span><small><em>'.$dindi->format_first_major_fact(WT_EVENTS_BIRT, 10).'</em></small></span>';
 			$html .= '&nbsp;<span><small><em>'.$dindi->format_first_major_fact(WT_EVENTS_DEAT, 10).'</em></small></span>';
 			$html .= '</a>';
-		}
-		else {
+		} else {
 			$html .= '<span class=\"list_item\"><'.$tag.'>' . I18N::translate('Private') . '</'.$tag.'></span>';
 		}
 		return $html;
@@ -195,8 +196,7 @@ 
 		$date = $fact->getDate();
 		if($date->isOK()){
 			$html.=' '.$date->Display($anchor && !$SEARCH_SPIDER, '%Y');
-		}
-		else{
+		} else{
 			// 1 DEAT Y with no DATE => print YES
 			// 1 BIRT 2 SOUR @S1@ => print YES
 			// 1 DEAT N is not allowed
@@ -220,7 +220,9 @@ 
 	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor=false){
 		$html='';
 		
-		if ($fact === null) return $html;
+		if ($fact === null) {
+			return $html;
+		}
 		$place = $fact->getPlace();
 		if($place){
 			$dplace = new Place($place);
@@ -339,7 +341,9 @@ 
 					default:
 						break;
 				}
-				if($image && $title) $html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
+				if($image && $title) {
+					$html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
+				}
 				break;
 			default:
 				break;

Indentation +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 	 * @return string HTML code of the inserted flag
 	 */
 	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path , $size = 50) {
-	    return '<img class="flag_gm_h'. $size . '" src="' . $icon_path . '" title="' . $place->getGedcomName() . '" alt="' . $place->getGedcomName() . '" />';
+		return '<img class="flag_gm_h'. $size . '" src="' . $icon_path . '" title="' . $place->getGedcomName() . '" alt="' . $place->getGedcomName() . '" />';
 	}
 	
 	/**
@@ -355,7 +355,7 @@ 
 	 * @return boolean
 	 */
 	public static function isDateWithinChartsRange(Date $date) {
-	    return $date->gregorianYear() >= 1550 && $date->gregorianYear() < 2030;
+		return $date->gregorianYear() >= 1550 && $date->gregorianYear() < 2030;
 	}
 
 }

Spacing +42 added lines, -42 removed lines

@@ -31,7 +31,7 @@ 
 	 * @return string List of elements
 	 */
 	public static function getListFromArray(array $array) {
-		$n=count($array);
+		$n = count($array);
 		switch ($n) {
 			case 0:
 				return '';
@@ -40,10 +40,10 @@ 
 			default:
 				return implode(
 						/* I18N: list separator */ I18N::translate(', '), 
-						array_slice($array, 0, $n-1)
-					) .
-					/* I18N: last list separator, " and " in English, " et " in French  */ I18N::translate(' and ') . 
-					$array[$n-1];
+						array_slice($array, 0, $n - 1)
+					).
+					/* I18N: last list separator, " and " in English, " et " in French  */ I18N::translate(' and '). 
+					$array[$n - 1];
 		}
 	}
 
@@ -59,10 +59,10 @@ 
 			\MyArtJaub\Webtrees\Map\MapProviderInterface $mapProvider
 	) {
 		$place = $fact->getPlace();
-		if(!$place->isEmpty()) {
-			$iconPlace= $mapProvider->getPlaceIcon($place);	
-			if($iconPlace && strlen($iconPlace) > 0){
-				return	'<div class="fact_flag">'. self::htmlPlaceIcon($place, $iconPlace, 50). '</div>';
+		if (!$place->isEmpty()) {
+			$iconPlace = $mapProvider->getPlaceIcon($place);	
+			if ($iconPlace && strlen($iconPlace) > 0) {
+				return	'<div class="fact_flag">'.self::htmlPlaceIcon($place, $iconPlace, 50).'</div>';
 			}
 		}
 		return '';
@@ -76,8 +76,8 @@ 
 	 * @param number $size
 	 * @return string HTML code of the inserted flag
 	 */
-	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path , $size = 50) {
-	    return '<img class="flag_gm_h'. $size . '" src="' . $icon_path . '" title="' . $place->getGedcomName() . '" alt="' . $place->getGedcomName() . '" />';
+	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path, $size = 50) {
+	    return '<img class="flag_gm_h'.$size.'" src="'.$icon_path.'" title="'.$place->getGedcomName().'" alt="'.$place->getGedcomName().'" />';
 	}
 	
 	/**
@@ -95,7 +95,7 @@ 
 		$minimum = PHP_INT_MAX;
 		$maximum = 1;
 		foreach ($list as $params) {
-			if(array_key_exists('count', $params)) {
+			if (array_key_exists('count', $params)) {
 				$maximum = max($maximum, $params['count']);
 				$minimum = min($minimum, $params['count']);
 			}
@@ -113,15 +113,15 @@ 
 				$size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum);
 			}
 			
-			$html .= '<a style="font-size:' . $size . '%" href="' . $url . '">';
+			$html .= '<a style="font-size:'.$size.'%" href="'.$url.'">';
 			if ($totals) {
-				$html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $text . '</span>', I18N::number($count));
+				$html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">'.$text.'</span>', I18N::number($count));
 			} else {
 				$html .= $text;
 			}
 			$html .= '</a>';
 		}
-		return '<div class="tag_cloud">' . $html . '</div>';
+		return '<div class="tag_cloud">'.$html.'</div>';
 	}
 	
 
@@ -156,11 +156,11 @@ 
 	 * @param bool $isStrong Bolden the name ?
 	 * @return string HTML Code for individual item
 	 */
-	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true){
+	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true) {
 		$html = '';
 		$tag = 'em';
-		if($isStrong) $tag = 'strong';
-		if($individual && $individual->canShow()){
+		if ($isStrong) $tag = 'strong';
+		if ($individual && $individual->canShow()) {
 			$dindi = new Individual($individual);
 			$html = $individual->getSexImage();
 			$html .= '<a class="list_item" href="'.
@@ -175,7 +175,7 @@ 
 			$html .= '</a>';
 		}
 		else {
-			$html .= '<span class=\"list_item\"><'.$tag.'>' . I18N::translate('Private') . '</'.$tag.'></span>';
+			$html .= '<span class=\"list_item\"><'.$tag.'>'.I18N::translate('Private').'</'.$tag.'></span>';
 		}
 		return $html;
 	}
@@ -187,22 +187,22 @@ 
 	 * @param boolean $anchor option to print a link to calendar
 	 * @return string HTML code for short date
 	 */
-	public static function formatFactDateShort(\Fisharebest\Webtrees\Fact $fact, $anchor=false) {
+	public static function formatFactDateShort(\Fisharebest\Webtrees\Fact $fact, $anchor = false) {
 		global $SEARCH_SPIDER;
 
-		$html='';
+		$html = '';
 		$date = $fact->getDate();
-		if($date->isOK()){
-			$html.=' '.$date->Display($anchor && !$SEARCH_SPIDER, '%Y');
+		if ($date->isOK()) {
+			$html .= ' '.$date->Display($anchor && !$SEARCH_SPIDER, '%Y');
 		}
-		else{
+		else {
 			// 1 DEAT Y with no DATE => print YES
 			// 1 BIRT 2 SOUR @S1@ => print YES
 			// 1 DEAT N is not allowed
 			// It is not proper GEDCOM form to use a N(o) value with an event tag to infer that it did not happen.
 			$factdetail = explode(' ', trim($fact->getGedcom()));
 			if (isset($factdetail) && (count($factdetail) == 3 && strtoupper($factdetail[2]) == 'Y') || (count($factdetail) == 4 && $factdetail[2] == 'SOUR')) {
-				$html.=I18N::translate('yes');
+				$html .= I18N::translate('yes');
 			}
 		}
 		return $html;
@@ -216,12 +216,12 @@ 
 	 * @param boolean $anchor option to print a link to placelist
 	 * @return string HTML code for short place
 	 */
-	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor=false){
-		$html='';
+	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor = false) {
+		$html = '';
 		
 		if ($fact === null) return $html;
 		$place = $fact->getPlace();
-		if($place){
+		if ($place) {
 			$dplace = new Place($place);
 			$html .= $dplace->htmlFormattedName($format, $anchor);
 		}
@@ -239,21 +239,21 @@ 
 	 * @param string $size CSS size for the icon. A CSS style css_$size is required
 	 * @return string HTML code for the formatted Sosa numbers
 	 */
-	public static function formatSosaNumbers(array $sosatab, $format = 1, $size = 'small'){
+	public static function formatSosaNumbers(array $sosatab, $format = 1, $size = 'small') {
 		$html = '';
-		switch($format){
+		switch ($format) {
 			case 1:
-				if(count($sosatab)>0){
+				if (count($sosatab) > 0) {
 					$html = '<i class="icon-maj-sosa_'.$size.'" title="'.I18N::translate('Sosa').'"></i>';
 				}
 				break;
 			case 2:
-				if(count($sosatab)>0){
+				if (count($sosatab) > 0) {
 					ksort($sosatab);
 					$tmp_html = array();
 					foreach ($sosatab as $sosa => $gen) {
 						$tmp_html[] = sprintf(
-								'<i class="icon-maj-sosa_%1$s" title="'.I18N::translate('Sosa').'"></i>&nbsp;<strong>%2$d&nbsp;'.I18N::translate('(G%s)', $gen) .'</strong>',
+								'<i class="icon-maj-sosa_%1$s" title="'.I18N::translate('Sosa').'"></i>&nbsp;<strong>%2$d&nbsp;'.I18N::translate('(G%s)', $gen).'</strong>',
 								$size,
 								$sosa
 							);
@@ -279,15 +279,15 @@ 
 	 * @param string $size CSS size for the icon. A CSS style css_$size is required
 	 * @return string HTML code for IsSourced icon
 	 */
-	public static function formatIsSourcedIcon($sourceType, $isSourced, $tag='EVEN', $format = 1, $size='normal'){
-		$html='';
-		$image=null;
-		$title=null;
-		switch($format){
+	public static function formatIsSourcedIcon($sourceType, $isSourced, $tag = 'EVEN', $format = 1, $size = 'normal') {
+		$html = '';
+		$image = null;
+		$title = null;
+		switch ($format) {
 			case 1:
-				switch($sourceType){
+				switch ($sourceType) {
 					case 'E':
-						switch($isSourced){
+						switch ($isSourced) {
 							case 0:
 								$image = 'event_unknown';
 								$title = I18N::translate('%s not found', GedcomTag::getLabel($tag));
@@ -317,7 +317,7 @@ 
 						}
 						break;
 					case 'R':
-						switch($isSourced){
+						switch ($isSourced) {
 							case -1:
 								$image = 'record_notsourced';
 								$title = I18N::translate('%s not sourced', GedcomTag::getLabel($tag));
@@ -337,7 +337,7 @@ 
 					default:
 						break;
 				}
-				if($image && $title) $html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
+				if ($image && $title) $html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
 				break;
 			default:
 				break;

src/Webtrees/Individual.php

Doc Comments +1 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
 	 * Returns an estimated birth place based on statistics on the base
 	 *
 	 * @param boolean $perc Should the coefficient of reliability be returned
-	 * @return string|array Estimated birth place if found, null otherwise
+	 * @return string Estimated birth place if found, null otherwise
 	 */
 	public function getEstimatedBirthPlace($perc=false){
 		if($bplace = $this->gedcomrecord->getBirthPlace()){
@@ -110,7 +110,6 @@ 
 	/**
 	 * Returns a significant place for the individual
 	 *
-	 * @param boolean $perc Should the coefficient of reliability be returned
 	 * @return string|array Estimated birth place if found, null otherwise
 	 */
 	public function getSignificantPlace(){

Indentation +29 added lines, -29 removed lines

@@ -113,29 +113,29 @@ 
 	 * @return string|array Estimated birth place if found, null otherwise
 	 */
 	public function getSignificantPlace(){
-	    if($bplace = $this->gedcomrecord->getBirthPlace()){
-	        return $bplace;
-	    }
+		if($bplace = $this->gedcomrecord->getBirthPlace()){
+			return $bplace;
+		}
 	
-	    foreach ($this->gedcomrecord->getAllEventPlaces('RESI') as $rplace) {
-	        if ($rplace) {
-	            return $rplace;
-	        }
-	    }
+		foreach ($this->gedcomrecord->getAllEventPlaces('RESI') as $rplace) {
+			if ($rplace) {
+				return $rplace;
+			}
+		}
 	
-	    if($dplace = $this->gedcomrecord->getDeathPlace()){
-	        return $dplace;
-	    }
+		if($dplace = $this->gedcomrecord->getDeathPlace()){
+			return $dplace;
+		}
 	
-	    foreach($this->gedcomrecord->getSpouseFamilies() as $fams) {
-	        foreach ($fams->getAllEventPlaces('RESI') as $rplace) {
-	            if ($rplace) {
-	                return $rplace;
-	            }
-	        }
-	    }
+		foreach($this->gedcomrecord->getSpouseFamilies() as $fams) {
+			foreach ($fams->getAllEventPlaces('RESI') as $rplace) {
+				if ($rplace) {
+					return $rplace;
+				}
+			}
+		}
 	
-	    return null;
+		return null;
 	}
 	
 	/**
@@ -144,7 +144,7 @@ 
 	 * @return boolean Is the individual a Sosa ancestor
 	 */
 	public function isSosa(){
-	    return count($this->getSosaNumbers()) > 0;
+		return count($this->getSosaNumbers()) > 0;
 	}
 	
 	/**
@@ -155,11 +155,11 @@ 
 	 * @return array List of Sosa numbers
 	 */
 	public function getSosaNumbers(){
-	    if($this->sosa === null) {
-	        $provider = new SosaProvider($this->gedcomrecord->getTree());
-	        $this->sosa = $provider->getSosaNumbers($this->gedcomrecord);	        
-	    }
-	    return $this->sosa;
+		if($this->sosa === null) {
+			$provider = new SosaProvider($this->gedcomrecord->getTree());
+			$this->sosa = $provider->getSosaNumbers($this->gedcomrecord);	        
+		}
+		return $this->sosa;
 	}
 		
 	/** 
@@ -174,10 +174,10 @@ 
 	}
 	
 	/**
-	* Check if this individual's death is sourced
-	*
-	* @return int Level of sources
-	* */
+	 * Check if this individual's death is sourced
+	 *
+	 * @return int Level of sources
+	 * */
 	public function isDeathSourced(){
 		if($this->is_death_sourced !== null) return $this->is_death_sourced;
 		$this->is_death_sourced = $this->isFactSourced(WT_EVENTS_DEAT);

Spacing +29 added lines, -29 removed lines

@@ -21,7 +21,7 @@ 
 class Individual extends GedcomRecord {
 
 	/** @var array|null List of titles the individal holds */	
-	protected $titles=null;
+	protected $titles = null;
 	
 	/** @var string|null Individual's primary surname, without any privacy applied to it */
 	protected $unprotected_prim_surname = null;
@@ -43,9 +43,9 @@ 
 	 * @param null|string $gedcom
 	 * @return null|Individual
 	 */
-	public static function getIntance($xref, Tree $tree, $gedcom = null){
+	public static function getIntance($xref, Tree $tree, $gedcom = null) {
 		$indi = \Fisharebest\Webtrees\Individual::getInstance($xref, $tree, $gedcom);
-		if($indi){
+		if ($indi) {
 			return new Individual($indi);
 		}
 		return null;
@@ -56,18 +56,18 @@ 
 	 * 
 	 * @return array Array of titles
 	 */
-	public function getTitles(){
-		if(is_null($this->titles) && $module = Module::getModuleByName(Constants::MODULE_MAJ_MISC_NAME)){
+	public function getTitles() {
+		if (is_null($this->titles) && $module = Module::getModuleByName(Constants::MODULE_MAJ_MISC_NAME)) {
 			$pattern = '/(.*) (('.$module->getSetting('MAJ_TITLE_PREFIX', '').')(.*))/';
-			$this->titles=array();
+			$this->titles = array();
 			$titlefacts = $this->gedcomrecord->getFacts('TITL');
-			foreach($titlefacts as $titlefact){
+			foreach ($titlefacts as $titlefact) {
 				$ct2 = preg_match_all($pattern, $titlefact->getValue(), $match2);
-				if($ct2>0){
-					$this->titles[$match2[1][0]][]= trim($match2[2][0]);
+				if ($ct2 > 0) {
+					$this->titles[$match2[1][0]][] = trim($match2[2][0]);
 				}
-				else{
-					$this->titles[$titlefact->getValue()][]='';
+				else {
+					$this->titles[$titlefact->getValue()][] = '';
 				}
 			}
 		}
@@ -81,8 +81,8 @@ 
 	 * @return string Primary surname
 	 */
 	public function getUnprotectedPrimarySurname() {
-		if(!$this->unprotected_prim_surname){
-			$tmp=$this->gedcomrecord->getAllNames();
+		if (!$this->unprotected_prim_surname) {
+			$tmp = $this->gedcomrecord->getAllNames();
 			$this->unprotected_prim_surname = $tmp[$this->gedcomrecord->getPrimaryName()]['surname'];
 		}
 		return $this->unprotected_prim_surname;
@@ -94,12 +94,12 @@ 
 	 * @param boolean $perc Should the coefficient of reliability be returned
 	 * @return string|array Estimated birth place if found, null otherwise
 	 */
-	public function getEstimatedBirthPlace($perc=false){
-		if($bplace = $this->gedcomrecord->getBirthPlace()){
-			if($perc){
-				return array ($bplace, 1);
+	public function getEstimatedBirthPlace($perc = false) {
+		if ($bplace = $this->gedcomrecord->getBirthPlace()) {
+			if ($perc) {
+				return array($bplace, 1);
 			}
-			else{
+			else {
 				return $bplace;
 			}
 		}
@@ -112,8 +112,8 @@ 
 	 * @param boolean $perc Should the coefficient of reliability be returned
 	 * @return string|array Estimated birth place if found, null otherwise
 	 */
-	public function getSignificantPlace(){
-	    if($bplace = $this->gedcomrecord->getBirthPlace()){
+	public function getSignificantPlace() {
+	    if ($bplace = $this->gedcomrecord->getBirthPlace()) {
 	        return $bplace;
 	    }
 	
@@ -123,11 +123,11 @@ 
 	        }
 	    }
 	
-	    if($dplace = $this->gedcomrecord->getDeathPlace()){
+	    if ($dplace = $this->gedcomrecord->getDeathPlace()) {
 	        return $dplace;
 	    }
 	
-	    foreach($this->gedcomrecord->getSpouseFamilies() as $fams) {
+	    foreach ($this->gedcomrecord->getSpouseFamilies() as $fams) {
 	        foreach ($fams->getAllEventPlaces('RESI') as $rplace) {
 	            if ($rplace) {
 	                return $rplace;
@@ -143,7 +143,7 @@ 
 	 *
 	 * @return boolean Is the individual a Sosa ancestor
 	 */
-	public function isSosa(){
+	public function isSosa() {
 	    return count($this->getSosaNumbers()) > 0;
 	}
 	
@@ -154,8 +154,8 @@ 
 	 * @uses \MyArtJaub\Webtrees\Functions\ModuleManager
 	 * @return array List of Sosa numbers
 	 */
-	public function getSosaNumbers(){
-	    if($this->sosa === null) {
+	public function getSosaNumbers() {
+	    if ($this->sosa === null) {
 	        $provider = new SosaProvider($this->gedcomrecord->getTree());
 	        $this->sosa = $provider->getSosaNumbers($this->gedcomrecord);	        
 	    }
@@ -167,8 +167,8 @@ 
 	 *
 	 * @return int Level of sources
 	 * */
-	public function isBirthSourced(){
-		if($this->is_birth_sourced !== null) return $this->is_birth_sourced;
+	public function isBirthSourced() {
+		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;
 	}
@@ -178,8 +178,8 @@ 
 	*
 	* @return int Level of sources
 	* */
-	public function isDeathSourced(){
-		if($this->is_death_sourced !== null) return $this->is_death_sourced;
+	public function isDeathSourced() {
+		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;
 	}

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/Module/AdminTasks/Model/AbstractTask.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
      * Set parameters of the Task
      *
      * @param bool $is_enabled Status of the task
-     * @param \DateTime $lastupdated Time of the last task run
+     * @param \DateTime $last_updated Time of the last task run
      * @param bool $last_result Result of the last run, true for success, false for failure
      * @param int $frequency Frequency of execution in minutes
      * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited

Braces +9 added lines, -4 removed lines

@@ -236,7 +236,9 @@ 
 	 * @return bool
 	 */
 	public function save() {
-	    if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
+	    if(!$this->provider) {
+	    	throw new \Exception('The task has not been initialised with a provider.');
+	    }
 		return $this->provider->updateTask($this);
 	}
 	
@@ -246,8 +248,9 @@ 
      */
     public function execute(){
     
-        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
-            $this->is_running = false;
+        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime()) {
+                    $this->is_running = false;
+        }
     
         if(!$this->is_running){  //TODO put in place a time_out for running...
             //TODO Log the executions in the logs
@@ -261,7 +264,9 @@ 
                 $this->last_updated = new \DateTime();
                 if($this->nb_occurrences > 0){
                     $this->nb_occurrences--;
-                    if($this->nb_occurrences == 0) $this->is_enabled = false;
+                    if($this->nb_occurrences == 0) {
+                    	$this->is_enabled = false;
+                    }
                 }
             }
             $this->is_running = false;

Indentation +194 added lines, -194 removed lines

@@ -20,253 +20,253 @@
  */
 abstract class AbstractTask {
     
-    /**
-     * Time out for runnign tasks, in seconds. Default 5 min
-     * @var int TASK_TIME_OUT
-     */
-    const TASK_TIME_OUT = 300;
+	/**
+	 * Time out for runnign tasks, in seconds. Default 5 min
+	 * @var int TASK_TIME_OUT
+	 */
+	const TASK_TIME_OUT = 300;
               
-    /**
-     * Task provider
-     * @var TaskProviderInterface $provider
-     */
+	/**
+	 * Task provider
+	 * @var TaskProviderInterface $provider
+	 */
 	protected $provider;
 			
 	/**
 	 * Task name
 	 * @var string $name
 	 */
-    protected $name;
+	protected $name;
     
-    /**
-     * Status of the task
-     * @var bool $is_enabled
-     */
-    protected $is_enabled;
+	/**
+	 * Status of the task
+	 * @var bool $is_enabled
+	 */
+	protected $is_enabled;
     
-    /**
-     * Last updated date
-     * @var \DateTime $last_updated
-     */
-    protected $last_updated;
+	/**
+	 * Last updated date
+	 * @var \DateTime $last_updated
+	 */
+	protected $last_updated;
     
-    /**
-     * Last run result
-     * @var bool $last_result
-     */
-    protected $last_result;
+	/**
+	 * Last run result
+	 * @var bool $last_result
+	 */
+	protected $last_result;
     
-    /**
-     * Task run frequency
-     * @var int $frequency
-     */
-    protected $frequency;
+	/**
+	 * Task run frequency
+	 * @var int $frequency
+	 */
+	protected $frequency;
     
-    /**
-     * Task remaining runs
-     * @var int $nb_occurrences
-     */
-    protected $nb_occurrences;
+	/**
+	 * Task remaining runs
+	 * @var int $nb_occurrences
+	 */
+	protected $nb_occurrences;
     
-    /**
-     * Current running status of the task
-     * @var bool $is_running
-     */
-    protected $is_running;
+	/**
+	 * Current running status of the task
+	 * @var bool $is_running
+	 */
+	protected $is_running;
     
-    /**
-     * Constructor for the Admin task class
+	/**
+	 * Constructor for the Admin task class
 	 *
 	 * @param string $file Filename containing the task object
 	 * @param TaskProviderInterface $provider Provider for tasks
-     */
-    public function __construct($file, TaskProviderInterface $provider = null){
-        $this->name = trim(basename($file, '.php'));
+	 */
+	public function __construct($file, TaskProviderInterface $provider = null){
+		$this->name = trim(basename($file, '.php'));
 		$this->provider = $provider;
-    }
+	}
     
-    /**
-     * Get the provider.
-     *
-     * @return TaskProviderInterface 
-     */
-    public function getProvider(){
-        return $this->provider;
-    }
+	/**
+	 * Get the provider.
+	 *
+	 * @return TaskProviderInterface 
+	 */
+	public function getProvider(){
+		return $this->provider;
+	}
     
-    /**
-     * Set the provider.
-     *
-     * @param TaskProviderInterface $provider
-     * @return self Enable method-chaining
-     */
-    public function setProvider(TaskProviderInterface $provider){
-        $this->provider = $provider;
-        return $this;
-    }
+	/**
+	 * Set the provider.
+	 *
+	 * @param TaskProviderInterface $provider
+	 * @return self Enable method-chaining
+	 */
+	public function setProvider(TaskProviderInterface $provider){
+		$this->provider = $provider;
+		return $this;
+	}
     
-    /**
-     * Set parameters of the Task
-     *
-     * @param bool $is_enabled Status of the task
-     * @param \DateTime $lastupdated Time of the last task run
-     * @param bool $last_result Result of the last run, true for success, false for failure
-     * @param int $frequency Frequency of execution in minutes
-     * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited
-     * @param bool $is_running Indicates if the task is currently running
-     */
-    public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){
-        $this->is_enabled = $is_enabled;
-        $this->last_updated = $last_updated;
-        $this->last_result = $last_result;
-        $this->frequency = $frequency;
-        $this->nb_occurrences = $nb_occur;
-        $this->is_running = $is_running;
-    }
+	/**
+	 * Set parameters of the Task
+	 *
+	 * @param bool $is_enabled Status of the task
+	 * @param \DateTime $lastupdated Time of the last task run
+	 * @param bool $last_result Result of the last run, true for success, false for failure
+	 * @param int $frequency Frequency of execution in minutes
+	 * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited
+	 * @param bool $is_running Indicates if the task is currently running
+	 */
+	public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){
+		$this->is_enabled = $is_enabled;
+		$this->last_updated = $last_updated;
+		$this->last_result = $last_result;
+		$this->frequency = $frequency;
+		$this->nb_occurrences = $nb_occur;
+		$this->is_running = $is_running;
+	}
     
-    /**
-     * Get the name of the task
-     *
-     * @return string
-     */
-    public function getName(){
-        return $this->name;
-    }
+	/**
+	 * Get the name of the task
+	 *
+	 * @return string
+	 */
+	public function getName(){
+		return $this->name;
+	}
     
     
-    /**
-     * Return the status of the task in a boolean way
-     *
-     * @return boolean True if enabled
-     */
-    public function isEnabled(){
-        return $this->is_enabled;
-    }
+	/**
+	 * Return the status of the task in a boolean way
+	 *
+	 * @return boolean True if enabled
+	 */
+	public function isEnabled(){
+		return $this->is_enabled;
+	}
     
-    /**
-     * Get the last updated time.
-     *
-     * @return \DateTime
-     */
-    public function getLastUpdated(){
-        return $this->last_updated;
-    }
+	/**
+	 * Get the last updated time.
+	 *
+	 * @return \DateTime
+	 */
+	public function getLastUpdated(){
+		return $this->last_updated;
+	}
     
-    /**
-     * Check if the last result has been successful.
-     *
-     * @return bool
-     */
-    public function isLastRunSuccess(){
-        return $this->last_result;
-    }
+	/**
+	 * Check if the last result has been successful.
+	 *
+	 * @return bool
+	 */
+	public function isLastRunSuccess(){
+		return $this->last_result;
+	}
     
-    /**
-     * Get the task frequency.
-     *
-     * @return int
-     */
-    public function getFrequency(){
-        return $this->frequency;
-    }
+	/**
+	 * Get the task frequency.
+	 *
+	 * @return int
+	 */
+	public function getFrequency(){
+		return $this->frequency;
+	}
 	
 	/**
-     * Set the task frequency.
-     *
+	 * Set the task frequency.
+	 *
 	 * @param int $frequency
-     * @return self Enable method-chaining
-     */
-    public function setFrequency($frequency){
-        $this->frequency = $frequency;
+	 * @return self Enable method-chaining
+	 */
+	public function setFrequency($frequency){
+		$this->frequency = $frequency;
 		return $this;
-    }
+	}
     
-    /**
-     * Get the number of remaining occurrences.
-     *
-     * @return int
-     */
-    public function getRemainingOccurrences(){
-        return $this->nb_occurrences;
-    }
+	/**
+	 * Get the number of remaining occurrences.
+	 *
+	 * @return int
+	 */
+	public function getRemainingOccurrences(){
+		return $this->nb_occurrences;
+	}
 	
 	/**
-     * Set the number of remaining occurrences.
-     *
+	 * Set the number of remaining occurrences.
+	 *
 	 * @param int $nb_occur
-     * @return self Enable method-chaining
-     */
-    public function setRemainingOccurrences($nb_occur){
-        $this->nb_occurrences = $nb_occur;
+	 * @return self Enable method-chaining
+	 */
+	public function setRemainingOccurrences($nb_occur){
+		$this->nb_occurrences = $nb_occur;
 		return $this;
-    }
+	}
     
-    /**
-     * Check if the task if running.
-     *
-     * @return bool
-     */
-    public function isRunning(){
-        return $this->is_running;
-    }
+	/**
+	 * Check if the task if running.
+	 *
+	 * @return bool
+	 */
+	public function isRunning(){
+		return $this->is_running;
+	}
     
     
-    /**
-     * Return the name to display for the task
-     *
-     * @return string Title for the task
-     */
-    abstract public function getTitle();
+	/**
+	 * Return the name to display for the task
+	 *
+	 * @return string Title for the task
+	 */
+	abstract public function getTitle();
     
-    /**
-     * Return the default frequency for the execution of the task
-     *
-     * @return int Frequency for the execution of the task
-     */
-    abstract public function getDefaultFrequency();
+	/**
+	 * Return the default frequency for the execution of the task
+	 *
+	 * @return int Frequency for the execution of the task
+	 */
+	abstract public function getDefaultFrequency();
     
-    /**
-     * Execute the task's actions
-     */
-    abstract protected function executeSteps();
+	/**
+	 * Execute the task's actions
+	 */
+	abstract protected function executeSteps();
     
 	/**
 	 * Persist task state into database.
 	 * @return bool
 	 */
 	public function save() {
-	    if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
+		if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
 		return $this->provider->updateTask($this);
 	}
 	
-    /**
-     * Execute the task, default skeleton
-     *
-     */
-    public function execute(){
+	/**
+	 * Execute the task, default skeleton
+	 *
+	 */
+	public function execute(){
     
-        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
-            $this->is_running = false;
+		if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
+			$this->is_running = false;
     
-        if(!$this->is_running){
-            $this->last_result = false;
-            $this->is_running = true;
-            $this->save();
+		if(!$this->is_running){
+			$this->last_result = false;
+			$this->is_running = true;
+			$this->save();
     
-            Log::addDebugLog('Start execution of Admin task: '.$this->getTitle());
-            $this->last_result = $this->executeSteps();
-            if($this->last_result){
-                $this->last_updated = new \DateTime();
-                if($this->nb_occurrences > 0){
-                    $this->nb_occurrences--;
-                    if($this->nb_occurrences == 0) $this->is_enabled = false;
-                }
-            }
-            $this->is_running = false;
-            $this->save();
-            Log::addDebugLog('Execution completed for Admin task: '.$this->getTitle().' - '.($this->last_result ? 'Success' : 'Failure'));
-        }
-    }
+			Log::addDebugLog('Start execution of Admin task: '.$this->getTitle());
+			$this->last_result = $this->executeSteps();
+			if($this->last_result){
+				$this->last_updated = new \DateTime();
+				if($this->nb_occurrences > 0){
+					$this->nb_occurrences--;
+					if($this->nb_occurrences == 0) $this->is_enabled = false;
+				}
+			}
+			$this->is_running = false;
+			$this->save();
+			Log::addDebugLog('Execution completed for Admin task: '.$this->getTitle().' - '.($this->last_result ? 'Success' : 'Failure'));
+		}
+	}
     
     
 }

Spacing +20 added lines, -20 removed lines

@@ -80,7 +80,7 @@ 
 	 * @param string $file Filename containing the task object
 	 * @param TaskProviderInterface $provider Provider for tasks
      */
-    public function __construct($file, TaskProviderInterface $provider = null){
+    public function __construct($file, TaskProviderInterface $provider = null) {
         $this->name = trim(basename($file, '.php'));
 		$this->provider = $provider;
     }
@@ -90,7 +90,7 @@ 
      *
      * @return TaskProviderInterface 
      */
-    public function getProvider(){
+    public function getProvider() {
         return $this->provider;
     }
     
@@ -100,7 +100,7 @@ 
      * @param TaskProviderInterface $provider
      * @return self Enable method-chaining
      */
-    public function setProvider(TaskProviderInterface $provider){
+    public function setProvider(TaskProviderInterface $provider) {
         $this->provider = $provider;
         return $this;
     }
@@ -115,7 +115,7 @@ 
      * @param int $nb_occur Number of remaining occurrences, 0 for tasks not limited
      * @param bool $is_running Indicates if the task is currently running
      */
-    public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running){
+    public function setParameters($is_enabled, \DateTime $last_updated, $last_result, $frequency, $nb_occur, $is_running) {
         $this->is_enabled = $is_enabled;
         $this->last_updated = $last_updated;
         $this->last_result = $last_result;
@@ -129,7 +129,7 @@ 
      *
      * @return string
      */
-    public function getName(){
+    public function getName() {
         return $this->name;
     }
     
@@ -139,7 +139,7 @@ 
      *
      * @return boolean True if enabled
      */
-    public function isEnabled(){
+    public function isEnabled() {
         return $this->is_enabled;
     }
     
@@ -148,7 +148,7 @@ 
      *
      * @return \DateTime
      */
-    public function getLastUpdated(){
+    public function getLastUpdated() {
         return $this->last_updated;
     }
     
@@ -157,7 +157,7 @@ 
      *
      * @return bool
      */
-    public function isLastRunSuccess(){
+    public function isLastRunSuccess() {
         return $this->last_result;
     }
     
@@ -166,7 +166,7 @@ 
      *
      * @return int
      */
-    public function getFrequency(){
+    public function getFrequency() {
         return $this->frequency;
     }
 	
@@ -176,7 +176,7 @@ 
 	 * @param int $frequency
      * @return self Enable method-chaining
      */
-    public function setFrequency($frequency){
+    public function setFrequency($frequency) {
         $this->frequency = $frequency;
 		return $this;
     }
@@ -186,7 +186,7 @@ 
      *
      * @return int
      */
-    public function getRemainingOccurrences(){
+    public function getRemainingOccurrences() {
         return $this->nb_occurrences;
     }
 	
@@ -196,7 +196,7 @@ 
 	 * @param int $nb_occur
      * @return self Enable method-chaining
      */
-    public function setRemainingOccurrences($nb_occur){
+    public function setRemainingOccurrences($nb_occur) {
         $this->nb_occurrences = $nb_occur;
 		return $this;
     }
@@ -206,7 +206,7 @@ 
      *
      * @return bool
      */
-    public function isRunning(){
+    public function isRunning() {
         return $this->is_running;
     }
     
@@ -235,7 +235,7 @@ 
 	 * @return bool
 	 */
 	public function save() {
-	    if(!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
+	    if (!$this->provider) throw new \Exception('The task has not been initialised with a provider.');
 		return $this->provider->updateTask($this);
 	}
 	
@@ -243,23 +243,23 @@ 
      * Execute the task, default skeleton
      *
      */
-    public function execute(){
+    public function execute() {
     
-        if($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
+        if ($this->last_updated->add(new \DateInterval('PT'.self::TASK_TIME_OUT.'S')) < new \DateTime())
             $this->is_running = false;
     
-        if(!$this->is_running){
+        if (!$this->is_running) {
             $this->last_result = false;
             $this->is_running = true;
             $this->save();
     
             Log::addDebugLog('Start execution of Admin task: '.$this->getTitle());
             $this->last_result = $this->executeSteps();
-            if($this->last_result){
+            if ($this->last_result) {
                 $this->last_updated = new \DateTime();
-                if($this->nb_occurrences > 0){
+                if ($this->nb_occurrences > 0) {
                     $this->nb_occurrences--;
-                    if($this->nb_occurrences == 0) $this->is_enabled = false;
+                    if ($this->nb_occurrences == 0) $this->is_enabled = false;
                 }
             }
             $this->is_running = false;

src/Webtrees/Module/AdminTasks/Model/TaskProviderInterface.php

Doc Comments +3 added lines, -2 removed lines

@@ -32,8 +32,8 @@ 
 	 * Set the status of a specific admin task.
 	 * The status can be enabled (true), or disabled (false).
 	 *
-	 * @param AbstractTask $ga
 	 * @param bool $status
+	 * @return void
 	 */
 	public function setTaskStatus(AbstractTask $task, $status);
 		
@@ -49,6 +49,7 @@ 
      * Delete the task from the database, in a transactional manner.
      *
      * @param string $task_name Task to delete
+     * @return boolean
      */
     public function deleteTask($task_name);
     
@@ -75,7 +76,7 @@ 
      * Returns the list of tasks that are currently meant to run.
      * Tasks to run can be forced, or can be limited to only one.
      * 
-     * @param string|null $force Force the enabled tasks to run.
+     * @param boolean $force Force the enabled tasks to run.
      * @param string|null $task_name Name of the specific task to run
      */
 	function getTasksToRun($force = false, $task_name = null);

Indentation +36 added lines, -36 removed lines

@@ -37,47 +37,47 @@
 	 */
 	public function setTaskStatus(AbstractTask $task, $status);
 		
-    /**
-     * Update an Admin Task in the database.
-     * 
-     * @param AbstractTask $task Task to update
-     * @return bool
-     */
-    function updateTask(AbstractTask $task);    
+	/**
+	 * Update an Admin Task in the database.
+	 * 
+	 * @param AbstractTask $task Task to update
+	 * @return bool
+	 */
+	function updateTask(AbstractTask $task);    
     
-    /**
-     * Delete the task from the database, in a transactional manner.
-     *
-     * @param string $task_name Task to delete
-     */
-    public function deleteTask($task_name);
+	/**
+	 * Delete the task from the database, in a transactional manner.
+	 *
+	 * @param string $task_name Task to delete
+	 */
+	public function deleteTask($task_name);
     
 
-    /**
-     * Returns the number of Admin Tasks (active and inactive).
-     *
-     * @return int
-     */
-    public function getTasksCount();
+	/**
+	 * Returns the number of Admin Tasks (active and inactive).
+	 *
+	 * @return int
+	 */
+	public function getTasksCount();
     
-    /**
-     * Return the list of Admin Tasks matching specified criterias.
-     *
-     * @param string $search Search criteria in analysis description
-     * @param array $order_by Columns to order by
-     * @param int $start Offset to start with (for pagination)
-     * @param int|null $limit Max number of items to return (for pagination)
-     * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
-     */
-    function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null);
+	/**
+	 * Return the list of Admin Tasks matching specified criterias.
+	 *
+	 * @param string $search Search criteria in analysis description
+	 * @param array $order_by Columns to order by
+	 * @param int $start Offset to start with (for pagination)
+	 * @param int|null $limit Max number of items to return (for pagination)
+	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
+	 */
+	function getFilteredTasksList($search = null, $order_by = null, $start = 0, $limit = null);
     
-    /**
-     * Returns the list of tasks that are currently meant to run.
-     * Tasks to run can be forced, or can be limited to only one.
-     * 
-     * @param string|null $force Force the enabled tasks to run.
-     * @param string|null $task_name Name of the specific task to run
-     */
+	/**
+	 * Returns the list of tasks that are currently meant to run.
+	 * Tasks to run can be forced, or can be limited to only one.
+	 * 
+	 * @param string|null $force Force the enabled tasks to run.
+	 * @param string|null $task_name Name of the specific task to run
+	 */
 	function getTasksToRun($force = false, $task_name = null);
 		
 	/**

src/Webtrees/Module/Certificates/Model/Certificate.php

Doc Comments +2 added lines, -1 removed lines

@@ -109,6 +109,7 @@ 
 	/**
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\GedcomRecord::getInstance()
+	 * @param string $xref
 	 */	
 	static public function getInstance($xref, Tree $tree, $gedcom = null, CertificateProviderInterface $provider = null) {
 		try{
@@ -150,7 +151,7 @@ 
 	/**
 	 * Define a source associated with the certificate
 	 *
-	 * @param string|Source $xref
+	 * @param string|null $xref
 	 */
 	public function setSource($xref){
 		if($xref instanceof Source){

Indentation +41 added lines, -41 removed lines

@@ -35,12 +35,12 @@ 
  */
 class Certificate extends Media {
     
-    const URL_PREFIX  = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
+	const URL_PREFIX  = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
 		
-    /** @var string The "TITL" value from the GEDCOM 
-     * This is a tweak to overcome the private level from the parent object...
-     */
-    protected $title = '';
+	/** @var string The "TITL" value from the GEDCOM 
+	 * This is a tweak to overcome the private level from the parent object...
+	 */
+	protected $title = '';
     
 	/**
 	 * Certificate provider
@@ -80,7 +80,7 @@ 
 	 * @param CertificateProviderInterface $provider
 	 */
 	public function __construct($data, Tree $tree, CertificateProviderInterface $provider) {
-	    $this->provider = $provider;
+		$this->provider = $provider;
 		// Data is only the file name
 		$data = str_replace("\\", '/', $data);
 		$xref = Functions::encryptToSafeBase64($data);
@@ -165,7 +165,7 @@ 
 	 * @see \Fisharebest\Webtrees\Media::getTitle()
 	 */
 	public function getTitle() {
-	    return $this->title;
+		return $this->title;
 	}
 	
 	/**
@@ -241,26 +241,26 @@ 
 	 	$module = Module::getModuleByName(Constants::MODULE_MAJ_CERTIF_NAME);
 	 	
 	 	if($module) {
-    		$wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.'));
-    		$sid= Filter::get('sid', WT_REGEX_XREF);	
+			$wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.'));
+			$sid= Filter::get('sid', WT_REGEX_XREF);	
     	
-    		if($sid){
-    			$this->source = Source::getInstance($sid, $this->tree);
-    		}
-    		else{
-    			$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
-    		}
+			if($sid){
+				$this->source = Source::getInstance($sid, $this->tree);
+			}
+			else{
+				$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
+			}
     		
-    		if($this->source) {
-    			$wmtext = '©';
-    			$repofact = $this->source->getFirstFact('REPO');
-    			if($repofact) {
-    				$repo = $repofact->getTarget();
-    				if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
-    			}
-    			$wmtext .= $this->source->getFullName();			
-    		}	
-    		return $wmtext;
+			if($this->source) {
+				$wmtext = '©';
+				$repofact = $this->source->getFirstFact('REPO');
+				if($repofact) {
+					$repo = $repofact->getTarget();
+					if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
+				}
+				$wmtext .= $this->source->getFullName();			
+			}	
+			return $wmtext;
 	 	}
 	 	return '';
 	}
@@ -323,8 +323,8 @@ 
 				' FROM `##individuals`'.
 				' WHERE i_file= :gedcom_id AND i_gedcom LIKE :gedcom')
 		->execute(array(
-		    'gedcom_id' => $this->tree->getTreeId(),
-		    'gedcom' => '%_ACT '.$this->getFilename().'%'		    
+			'gedcom_id' => $this->tree->getTreeId(),
+			'gedcom' => '%_ACT '.$this->getFilename().'%'		    
 		))->fetchAll();
 		
 		$list = array();
@@ -347,8 +347,8 @@ 
 				' FROM `##families`'.
 				' WHERE f_file= :gedcom_id AND f_gedcom LIKE :gedcom')
 		->execute(array(
-		    'gedcom_id' => $this->tree->getTreeId(),
-		    'gedcom' => '%_ACT '.$this->getFilename().'%'		    
+			'gedcom_id' => $this->tree->getTreeId(),
+			'gedcom' => '%_ACT '.$this->getFilename().'%'		    
 		))->fetchAll();
 		
 		$list = array();
@@ -375,25 +375,25 @@ 
 				'SELECT i_gedcom AS gedrec FROM `##individuals`'.
 				' WHERE i_file=:gedcom_id AND i_gedcom LIKE :gedcom')
 		  ->execute(array(
-		      'gedcom_id' => $this->tree->getTreeId(), 
-		      'gedcom' => '%_ACT '.$this->getFilename().'%'		      
+			  'gedcom_id' => $this->tree->getTreeId(), 
+			  'gedcom' => '%_ACT '.$this->getFilename().'%'		      
 		  ))->fetchOne();
 		if(!$ged){
 			$ged = Database::prepare(
 					'SELECT f_gedcom AS gedrec FROM `##families`'.
 					' WHERE f_file=:gedcom_id AND f_gedcom LIKE :gedcom')
-			     ->execute(array(
-			         'gedcom_id' => $this->tree->getTreeId(), 
-			         'gedcom' => '%_ACT '.$this->getFilename().'%'			         
-			     ))->fetchOne();
+				 ->execute(array(
+					 'gedcom_id' => $this->tree->getTreeId(), 
+					 'gedcom' => '%_ACT '.$this->getFilename().'%'			         
+				 ))->fetchOne();
 			if(!$ged){
 				$ged = Database::prepare(
-				    'SELECT o_gedcom AS gedrec FROM `##other`'.
-				    ' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom')
-				    ->execute(array(
-				        'gedcom_id' => $this->tree->getTreeId(),
-				        'gedcom' => '%_ACT '.$this->getFilename().'%'				        
-				    ))->fetchOne();
+					'SELECT o_gedcom AS gedrec FROM `##other`'.
+					' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom')
+					->execute(array(
+						'gedcom_id' => $this->tree->getTreeId(),
+						'gedcom' => '%_ACT '.$this->getFilename().'%'				        
+					))->fetchOne();
 			}
 		}
 		//If a record has been found, parse it to find the source reference.

Spacing +58 added lines, -58 removed lines

@@ -35,7 +35,7 @@ 
  */
 class Certificate extends Media {
     
-    const URL_PREFIX  = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
+    const URL_PREFIX = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
 		
     /** @var string The "TITL" value from the GEDCOM 
      * This is a tweak to overcome the private level from the parent object...
@@ -94,8 +94,8 @@ 
 		$this->title = basename($this->getFilename(), '.'.$this->extension());
 		
 		$ct = preg_match("/(?<year>\d{1,4})(\.(?<month>\d{1,2}))?(\.(?<day>\d{1,2}))?( (?<type>[A-Z]{1,2}) )?(?<details>.*)/", $this->title, $match);
-		if($ct > 0){
-			$monthId = (int) $match['month'];
+		if ($ct > 0) {
+			$monthId = (int)$match['month'];
 			$calendarShortMonths = Functions::getCalendarShortMonths();
 			$monthShortName = array_key_exists($monthId, $calendarShortMonths) ? $calendarShortMonths[$monthId] : $monthId;
 			$this->certDate = new Date($match['day'].' '.strtoupper($monthShortName).' '.$match['year']);
@@ -111,11 +111,11 @@ 
 	 * @see \Fisharebest\Webtrees\GedcomRecord::getInstance()
 	 */	
 	static public function getInstance($xref, Tree $tree, $gedcom = null, CertificateProviderInterface $provider = null) {
-		try{
+		try {
 			$certfile = Functions::decryptFromSafeBase64($xref);
 			
 			//NEED TO CHECK THAT !!!
-			if(Functions::isValidPath($certfile, true)) {
+			if (Functions::isValidPath($certfile, true)) {
 				return new Certificate($certfile, $tree, $provider);
 			}
 		}
@@ -152,8 +152,8 @@ 
 	 *
 	 * @param string|Source $xref
 	 */
-	public function setSource($xref){
-		if($xref instanceof Source){
+	public function setSource($xref) {
+		if ($xref instanceof Source) {
 			$this->source = $data;
 		} else {
 			$this->source = Source::getInstance($xref, $this->tree);
@@ -173,7 +173,7 @@ 
 	 *
 	 * @return Date Certificate date
 	 */
-	public function getCertificateDate(){
+	public function getCertificateDate() {
 		return $this->certDate;
 	}
 	
@@ -182,7 +182,7 @@ 
 	 *
 	 * @return string Certificate date
 	 */
-	public function getCertificateType(){
+	public function getCertificateType() {
 		return $this->certType;
 	}
 	
@@ -191,7 +191,7 @@ 
 	 *
 	 * @return string Certificate details
 	 */
-	public function getCertificateDetails(){
+	public function getCertificateDetails() {
 		return $this->certDetails;
 	}
 	
@@ -200,9 +200,9 @@ 
 	 *
 	 * @return string|NULL Certificate city
 	 */
-	public function getCity(){
+	public function getCity() {
 		$chunks = explode('/', $this->getFilename(), 2);
-		if(count($chunks) > 1) return $chunks[0];
+		if (count($chunks) > 1) return $chunks[0];
 		return null;
 	}
 	
@@ -210,8 +210,8 @@ 
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\Media::getServerFilename()
 	 */
-	public function getServerFilename($which='main') {
-		$filename =  $this->provider->getRealCertificatesDirectory() . $this->getFilename();
+	public function getServerFilename($which = 'main') {
+		$filename = $this->provider->getRealCertificatesDirectory().$this->getFilename();
 		return Functions::encodeUtf8ToFileSystem($filename);
 	}
 	
@@ -222,11 +222,11 @@ 
 	public function getHtmlUrlDirect($which = 'main', $download = false) {
 		$sidstr = ($this->source) ? '&sid='.$this->source->getXref() : '';
 		return
-			'module.php?mod='. \MyArtJaub\Webtrees\Constants::MODULE_MAJ_CERTIF_NAME . 
-			'&mod_action=Certificate@image' . 
-			'&ged='. $this->tree->getNameUrl() .
-			'&cid=' . $this->getXref() . $sidstr .
-			'&cb=' . $this->getEtag($which);
+			'module.php?mod='.\MyArtJaub\Webtrees\Constants::MODULE_MAJ_CERTIF_NAME. 
+			'&mod_action=Certificate@image'. 
+			'&ged='.$this->tree->getNameUrl().
+			'&cid='.$this->getXref().$sidstr.
+			'&cb='.$this->getEtag($which);
 	}
 	
 	/**
@@ -237,26 +237,26 @@ 
 	 *
 	 * @return string Watermark text
 	 */
-	 public function getWatermarkText(){	
+	 public function getWatermarkText() {	
 	 	$module = Module::getModuleByName(Constants::MODULE_MAJ_CERTIF_NAME);
 	 	
-	 	if($module) {
+	 	if ($module) {
     		$wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.'));
-    		$sid= Filter::get('sid', WT_REGEX_XREF);	
+    		$sid = Filter::get('sid', WT_REGEX_XREF);	
     	
-    		if($sid){
+    		if ($sid) {
     			$this->source = Source::getInstance($sid, $this->tree);
     		}
-    		else{
-    			$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
+    		else {
+    			$this->fetchALinkedSource(); // the method already attach the source to the Certificate object;
     		}
     		
-    		if($this->source) {
+    		if ($this->source) {
     			$wmtext = '&copy;';
     			$repofact = $this->source->getFirstFact('REPO');
-    			if($repofact) {
+    			if ($repofact) {
     				$repo = $repofact->getTarget();
-    				if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
+    				if ($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
     			}
     			$wmtext .= $this->source->getFullName();			
     		}	
@@ -279,45 +279,45 @@ 
 		';
 		
 		$script = '';
-		if($controller && !($controller instanceof IndividualController)){
+		if ($controller && !($controller instanceof IndividualController)) {
 			$controller->addInlineJavascript('$(document).ready(function() { '.$js.' });');
 		} else {
-			$script = '<script>' . $js . '</script>';
+			$script = '<script>'.$js.'</script>';
 		}
 		
 		if ($which == 'icon' || !file_exists($this->getServerFilename())) {
 			// Use an icon
 			$image =
-			'<i dir="auto" class="icon-maj-certificate margin-h-2"' .
-			' title="' . strip_tags($this->getFullName()) . '"' .
+			'<i dir="auto" class="icon-maj-certificate margin-h-2"'.
+			' title="'.strip_tags($this->getFullName()).'"'.
 			'></i>';
 		} else {
 			$imgsize = getimagesize($this->getServerFilename());
 			$image =
-			'<img' .
-			' class ="'. 'certif_image'					 	. '"' .
-			' dir="'   . 'auto'                           	. '"' . // For the tool-tip
-			' src="'   . $this->getHtmlUrlDirect() 			. '"' .
-			' alt="'   . strip_tags($this->getFullName()) 	. '"' .
-			' title="' . strip_tags($this->getFullName()) 	. '"' .
-			$imgsize[3] . // height="yyy" width="xxx"
+			'<img'.
+			' class ="'.'certif_image'.'"'.
+			' dir="'.'auto'.'"'.// For the tool-tip
+			' src="'.$this->getHtmlUrlDirect().'"'.
+			' alt="'.strip_tags($this->getFullName()).'"'.
+			' title="'.strip_tags($this->getFullName()).'"'.
+			$imgsize[3].// height="yyy" width="xxx"
 			'>';
 		}	
 		return
-		'<a' .
-		' class="'          . 'certgallery'                          . '"' .
-		' href="'           . $this->getHtmlUrlDirect()    		 . '"' .
-		' type="'           . $this->mimeType()                  . '"' .
-		' data-obje-url="'  . $this->getHtmlUrl()                . '"' .
-		' data-title="'     . strip_tags($this->getFullName())   . '"' .
-		'>' . $image . '</a>'.$script;
+		'<a'.
+		' class="'.'certgallery'.'"'.
+		' href="'.$this->getHtmlUrlDirect().'"'.
+		' type="'.$this->mimeType().'"'.
+		' data-obje-url="'.$this->getHtmlUrl().'"'.
+		' data-title="'.strip_tags($this->getFullName()).'"'.
+		'>'.$image.'</a>'.$script;
 	}
 	
 	/**
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\GedcomRecord::linkedIndividuals()
 	 */
-	public function linkedIndividuals($link = '_ACT'){
+	public function linkedIndividuals($link = '_ACT') {
 		$rows = Database::prepare(
 				'SELECT i_id AS xref, i_gedcom AS gedcom'.
 				' FROM `##individuals`'.
@@ -341,7 +341,7 @@ 
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\GedcomRecord::linkedFamilies()
 	 */
-	public function linkedFamilies($link = '_ACT'){
+	public function linkedFamilies($link = '_ACT') {
 		$rows = Database::prepare(
 				'SELECT f_id AS xref, f_gedcom AS gedcom'.
 				' FROM `##families`'.
@@ -366,7 +366,7 @@ 
 	 *
 	 * @return Source|NULL Linked source
 	 */
-	public function fetchALinkedSource(){		
+	public function fetchALinkedSource() {		
 		$sid = null;
 		
 		// Try to find in individual, then families, then other types of records. We are interested in the first available value.
@@ -378,7 +378,7 @@ 
 		      'gedcom_id' => $this->tree->getTreeId(), 
 		      'gedcom' => '%_ACT '.$this->getFilename().'%'		      
 		  ))->fetchOne();
-		if(!$ged){
+		if (!$ged) {
 			$ged = Database::prepare(
 					'SELECT f_gedcom AS gedrec FROM `##families`'.
 					' WHERE f_file=:gedcom_id AND f_gedcom LIKE :gedcom')
@@ -386,7 +386,7 @@ 
 			         'gedcom_id' => $this->tree->getTreeId(), 
 			         'gedcom' => '%_ACT '.$this->getFilename().'%'			         
 			     ))->fetchOne();
-			if(!$ged){
+			if (!$ged) {
 				$ged = Database::prepare(
 				    'SELECT o_gedcom AS gedrec FROM `##other`'.
 				    ' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom')
@@ -397,28 +397,28 @@ 
 			}
 		}
 		//If a record has been found, parse it to find the source reference.
-		if($ged){
+		if ($ged) {
 			$gedlines = explode("\n", $ged);
 			$level = 0;
 			$levelsource = -1;
-			$sid_tmp=null;
+			$sid_tmp = null;
 			$sourcefound = false;
-			foreach($gedlines as $gedline){
+			foreach ($gedlines as $gedline) {
 				// Get the level
 				if (!$sourcefound && preg_match('~^('.WT_REGEX_INTEGER.') ~', $gedline, $match)) {
 					$level = $match[1];
 					//If we are not any more within the context of a source, reset
-					if($level <= $levelsource){
+					if ($level <= $levelsource) {
 						$levelsource = -1;
 						$sid_tmp = null;
 					}
 					// If a source, get the level and the reference
 					if (preg_match('~^'.$level.' SOUR @('.WT_REGEX_XREF.')@$~', $gedline, $match2)) {
 						$levelsource = $level;
-						$sid_tmp=$match2[1];
+						$sid_tmp = $match2[1];
 					}
 					// If the image has be found, get the source reference and exit.
-					if($levelsource>=0 && $sid_tmp && preg_match('~^'.$level.' _ACT '.preg_quote($this->getFilename()).'~', $gedline, $match3)){
+					if ($levelsource >= 0 && $sid_tmp && preg_match('~^'.$level.' _ACT '.preg_quote($this->getFilename()).'~', $gedline, $match3)) {
 						$sid = $sid_tmp;
 						$sourcefound = true;
 					}
@@ -426,7 +426,7 @@ 
 			}
 		}
 		
-		if($sid) $this->source = Source::getInstance($sid, $this->tree);
+		if ($sid) $this->source = Source::getInstance($sid, $this->tree);
 		
 		return $this->source;	
 	}

Braces +11 added lines, -7 removed lines

@@ -118,8 +118,7 @@ 
 			if(Functions::isValidPath($certfile, true)) {
 				return new Certificate($certfile, $tree, $provider);
 			}
-		}
-		catch (\Exception $ex) { 
+		} catch (\Exception $ex) { 
 			Log::addErrorLog('Certificate module error : > '.$ex->getMessage().' < with data > '.$xref.' <');
 		}	
 
@@ -202,7 +201,9 @@ 
 	 */
 	public function getCity(){
 		$chunks = explode('/', $this->getFilename(), 2);
-		if(count($chunks) > 1) return $chunks[0];
+		if(count($chunks) > 1) {
+			return $chunks[0];
+		}
 		return null;
 	}
 	
@@ -246,8 +247,7 @@ 
     	
     		if($sid){
     			$this->source = Source::getInstance($sid, $this->tree);
-    		}
-    		else{
+    		} else{
     			$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
     		}
     		
@@ -256,7 +256,9 @@ 
     			$repofact = $this->source->getFirstFact('REPO');
     			if($repofact) {
     				$repo = $repofact->getTarget();
-    				if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
+    				if($repo && $repo instanceof Repository) {
+    					$wmtext .= ' '.$repo->getFullName().' - ';
+    				}
     			}
     			$wmtext .= $this->source->getFullName();			
     		}	
@@ -426,7 +428,9 @@ 
 			}
 		}
 		
-		if($sid) $this->source = Source::getInstance($sid, $this->tree);
+		if($sid) {
+			$this->source = Source::getInstance($sid, $this->tree);
+		}
 		
 		return $this->source;	
 	}

src/Webtrees/Module/CertificatesModule.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
     /**
      * Return the HTML code for custom simple tag _ACT
      *
-     * @param Certificate $certificatePath Certificate (as per the GEDCOM)
+     * @param Certificate $certificate Certificate (as per the GEDCOM)
      * @param string|null $sid Linked Source ID, if it exists
      */
     protected function getDisplay_ACT(Certificate $certificate, $sid = null){    

Braces +15 added lines, -6 removed lines

@@ -105,7 +105,9 @@ 
         $sid=null;
         
         if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
-            if (!$srec || strlen($srec) == 0) return $html;
+            if (!$srec || strlen($srec) == 0) {
+            	return $html;
+            }
             	
             $certificate = null;
             $subrecords = explode("\n", $srec);
@@ -118,11 +120,14 @@ 
                 $level = substr($subrecords[$i], 0, 1);
                 $tag = substr($subrecords[$i], 2, 4);
                 $text = substr($subrecords[$i], 7);
-                if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
+                if($tag == '_ACT') {
+                	$certificate= new Certificate($text, $WT_TREE, $this->getProvider());
+                }
             }
             	
-            if($certificate && $certificate->canShow())
-                $html = $this->getDisplay_ACT($certificate, $sid);
+            if($certificate && $certificate->canShow()) {
+                            $html = $this->getDisplay_ACT($certificate, $sid);
+            }
                 	
         }
         return $html;
@@ -150,7 +155,9 @@ 
         $html = '';
         switch($tag){
             case '_ACT':
-                if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
+                if($context == 'SOUR') {
+                	$html = $this->getDisplay_ACT($value, $contextid);
+                }
                 break;
         }
         return $html;
@@ -180,7 +187,9 @@ 
 				$html .= '<select id="certifCity'.$element_id.'" class="_CITY">';
 				foreach ($tabCities as $cities){
 					$selectedCity='';
-					if($certificate && $cities== $certificate->getCity()) $selectedCity='selected="true"';
+					if($certificate && $cities== $certificate->getCity()) {
+						$selectedCity='selected="true"';
+					}
 					$html .= '<option value="'.$cities.'" '.$selectedCity.' />'.$cities.'</option>';
 				}
 				$html .= '</select>';

Spacing +22 added lines, -22 removed lines

@@ -67,7 +67,7 @@ 
      * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
      */
     public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -92,7 +92,7 @@ 
      */
     public function getMenu(Tree $tree, $reference = null) {
         $tree_url = $tree ? $tree->getNameUrl() : '';
-        return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
+        return new Menu($this->getTitle(), 'module.php?mod='.$this->getName().'&mod_action=Certificate@listAll&ged='.$tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
     }
     
     /**
@@ -102,27 +102,27 @@ 
     public function hFactSourcePrepend($srec) {
         global $WT_TREE;
         
-        $html='';
-        $sid=null;
+        $html = '';
+        $sid = null;
         
-        if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
+        if ($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)) {
             if (!$srec || strlen($srec) == 0) return $html;
             	
             $certificate = null;
             $subrecords = explode("\n", $srec);
             $levelSOUR = substr($subrecords[0], 0, 1);
             if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
-                $sid=$match[1];
+                $sid = $match[1];
             };
             $nb_subrecords = count($subrecords);
-            for ($i=0; $i < $nb_subrecords; $i++) {
+            for ($i = 0; $i < $nb_subrecords; $i++) {
                 $subrecords[$i] = trim($subrecords[$i]);
                 $tag = substr($subrecords[$i], 2, 4);
                 $text = substr($subrecords[$i], 7);
-                if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
+                if ($tag == '_ACT') $certificate = new Certificate($text, $WT_TREE, $this->getProvider());
             }
             	
-            if($certificate && $certificate->canShow())
+            if ($certificate && $certificate->canShow())
                 $html = $this->getDisplay_ACT($certificate, $sid);
                 	
         }
@@ -149,9 +149,9 @@ 
      */
     public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
         $html = '';
-        switch($tag){
+        switch ($tag) {
             case '_ACT':
-                if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
+                if ($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
                 break;
         }
         return $html;
@@ -166,7 +166,7 @@ 
         
         $html = '';
 		
-		switch($tag){
+		switch ($tag) {
 			case '_ACT':
 				$element_id = Uuid::uuid4();
 				$controller
@@ -174,14 +174,14 @@ 
 					->addExternalJavascript(WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/js/autocomplete.js')
 					->addExternalJavascript(WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/js/updatecertificatevalues.js');
 				$certificate = null;
-				if($value){
+				if ($value) {
 					$certificate = new Certificate($value, $WT_TREE, $this->getProvider());
 				}
 				$tabCities = $this->getProvider()->getCitiesList();
 				$html .= '<select id="certifCity'.$element_id.'" class="_CITY">';
-				foreach ($tabCities as $cities){
-					$selectedCity='';
-					if($certificate && $cities== $certificate->getCity()) $selectedCity='selected="true"';
+				foreach ($tabCities as $cities) {
+					$selectedCity = '';
+					if ($certificate && $cities == $certificate->getCity()) $selectedCity = 'selected="true"';
 					$html .= '<option value="'.$cities.'" '.$selectedCity.' />'.$cities.'</option>';
 				}
 				$html .= '</select>';
@@ -199,7 +199,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
      */
     public function hAddSimpleTag($context, $level) {
-        switch($context){
+        switch ($context) {
             case 'SOUR':
                 FunctionsEdit::addSimpleTag($level.' _ACT');
                 break;
@@ -211,7 +211,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
      */
     public function hHasHelpTextTag($tag) {
-        switch($tag){
+        switch ($tag) {
 			case '_ACT':
 				return true;
 				break;
@@ -224,7 +224,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
      */
     public function hGetHelpTextTag($tag) {
-        switch($tag){
+        switch ($tag) {
             case '_ACT':
                 return array(
                 I18N::translate('Certificate'),
@@ -242,7 +242,7 @@ 
     public function getProvider() {
         global $WT_TREE;
     
-        if(!$this->provider) {
+        if (!$this->provider) {
             $root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
             $this->provider = new CertificateFileProvider($root_path, $WT_TREE);
         }
@@ -256,9 +256,9 @@ 
      * @param Certificate $certificatePath Certificate (as per the GEDCOM)
      * @param string|null $sid Linked Source ID, if it exists
      */
-    protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
+    protected function getDisplay_ACT(Certificate $certificate, $sid = null) {    
         $html = '';
-        if($certificate){
+        if ($certificate) {
             $certificate->setSource($sid);
             $html = $certificate->displayImage('icon');
         }

Indentation +185 added lines, -185 removed lines

@@ -30,151 +30,151 @@ 
  * Certificates Module.
  */
 class CertificatesModule 
-    extends AbstractModule 
-    implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface, DependentInterface
+	extends AbstractModule 
+	implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface, DependentInterface
 {
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
         
-    /**
-     * Provider for Certificates
-     * @var CertificateProviderInterface $provider
-     */
-    protected $provider;
+	/**
+	 * Provider for Certificates
+	 * @var CertificateProviderInterface $provider
+	 */
+	protected $provider;
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
-     */
-    public function validatePrerequisites() {
-        return Functions::isEncryptionCompatible();    
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
+	 */
+	public function validatePrerequisites() {
+		return Functions::isEncryptionCompatible();    
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
-    public function getSubscribedHooks() {
-        return array(
-            'hFactSourcePrepend' => 50,
-            'hGetExpectedTags' => 50,
-            'hHtmlSimpleTagDisplay#_ACT' => 50,
-            'hHtmlSimpleTagEditor#_ACT'	=> 50,
-            'hAddSimpleTag#SOUR'	=> 50,
-            'hHasHelpTextTag#_ACT'	=> 50,
-            'hGetHelpTextTag#_ACT'	=> 50
-        );
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
+	public function getSubscribedHooks() {
+		return array(
+			'hFactSourcePrepend' => 50,
+			'hGetExpectedTags' => 50,
+			'hHtmlSimpleTagDisplay#_ACT' => 50,
+			'hHtmlSimpleTagEditor#_ACT'	=> 50,
+			'hAddSimpleTag#SOUR'	=> 50,
+			'hHasHelpTextTag#_ACT'	=> 50,
+			'hGetHelpTextTag#_ACT'	=> 50
+		);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
-     */
-    public function getMenu(Tree $tree, $reference = null) {
-        $tree_url = $tree ? $tree->getNameUrl() : '';
-        return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
+	 */
+	public function getMenu(Tree $tree, $reference = null) {
+		$tree_url = $tree ? $tree->getNameUrl() : '';
+		return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
-     */
-    public function hFactSourcePrepend($srec) {
-        global $WT_TREE;
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
+	 */
+	public function hFactSourcePrepend($srec) {
+		global $WT_TREE;
         
-        $html='';
-        $sid=null;
+		$html='';
+		$sid=null;
         
-        if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
-            if (!$srec || strlen($srec) == 0) return $html;
+		if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
+			if (!$srec || strlen($srec) == 0) return $html;
             	
-            $certificate = null;
-            $subrecords = explode("\n", $srec);
-            $levelSOUR = substr($subrecords[0], 0, 1);
-            $match = null;
-            if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
-                $sid=$match[1];
-            };
-            $nb_subrecords = count($subrecords);
-            for ($i=0; $i < $nb_subrecords; $i++) {
-                $subrecords[$i] = trim($subrecords[$i]);
-                $tag = substr($subrecords[$i], 2, 4);
-                $text = substr($subrecords[$i], 7);
-                if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
-            }
+			$certificate = null;
+			$subrecords = explode("\n", $srec);
+			$levelSOUR = substr($subrecords[0], 0, 1);
+			$match = null;
+			if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
+				$sid=$match[1];
+			};
+			$nb_subrecords = count($subrecords);
+			for ($i=0; $i < $nb_subrecords; $i++) {
+				$subrecords[$i] = trim($subrecords[$i]);
+				$tag = substr($subrecords[$i], 2, 4);
+				$text = substr($subrecords[$i], 7);
+				if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
+			}
             	
-            if($certificate && $certificate->canShow())
-                $html = $this->getDisplay_ACT($certificate, $sid);
+			if($certificate && $certificate->canShow())
+				$html = $this->getDisplay_ACT($certificate, $sid);
                 	
-        }
-        return $html;
-    }
+		}
+		return $html;
+	}
    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
-     */
-    public function hFactSourceAppend($srec) { }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
+	 */
+	public function hFactSourceAppend($srec) { }
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
-     */
-    public function hGetExpectedTags() {
-        return array('SOUR' => '_ACT');
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
+	 */
+	public function hGetExpectedTags() {
+		return array('SOUR' => '_ACT');
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
-     */
-    public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
-        $html = '';
-        switch($tag){
-            case '_ACT':
-                if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
-                break;
-        }
-        return $html;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
+	 */
+	public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
+		$html = '';
+		switch($tag){
+			case '_ACT':
+				if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
+				break;
+		}
+		return $html;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
-     */
-    public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {
-        global $controller, $WT_TREE;
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
+	 */
+	public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {
+		global $controller, $WT_TREE;
         
-        $html = '';
+		$html = '';
 		
 		switch($tag){
 			case '_ACT':
@@ -202,77 +202,77 @@ 
 		}
 		
 		return $html;
-    }
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
-     */
-    public function hAddSimpleTag($context, $level) {
-        switch($context){
-            case 'SOUR':
-                FunctionsEdit::addSimpleTag($level.' _ACT');
-                break;
-        }
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
+	 */
+	public function hAddSimpleTag($context, $level) {
+		switch($context){
+			case 'SOUR':
+				FunctionsEdit::addSimpleTag($level.' _ACT');
+				break;
+		}
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
-     */
-    public function hHasHelpTextTag($tag) {
-        switch($tag){
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
+	 */
+	public function hHasHelpTextTag($tag) {
+		switch($tag){
 			case '_ACT':
 				return true;
 		}
 		return false;
-    }
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
-     */
-    public function hGetHelpTextTag($tag) {
-        switch($tag){
-            case '_ACT':
-                return array(
-                I18N::translate('Certificate'),
-                '<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
-            default:
-                return null;
-        }
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
+	 */
+	public function hGetHelpTextTag($tag) {
+		switch($tag){
+			case '_ACT':
+				return array(
+				I18N::translate('Certificate'),
+				'<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
+			default:
+				return null;
+		}
+	}
 
-    /**
-     * Returns the default Certificate File Provider, as configured in the module
-     *
-     * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
-     */
-    public function getProvider() {
-        global $WT_TREE;
+	/**
+	 * Returns the default Certificate File Provider, as configured in the module
+	 *
+	 * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
+	 */
+	public function getProvider() {
+		global $WT_TREE;
     
-        if(!$this->provider) {
-            $root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
-            $this->provider = new CertificateFileProvider($root_path, $WT_TREE);
-        }
-        return $this->provider;
-    }
+		if(!$this->provider) {
+			$root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
+			$this->provider = new CertificateFileProvider($root_path, $WT_TREE);
+		}
+		return $this->provider;
+	}
     
     
-    /**
-     * Return the HTML code for custom simple tag _ACT
-     *
-     * @param Certificate $certificatePath Certificate (as per the GEDCOM)
-     * @param string|null $sid Linked Source ID, if it exists
-     */
-    protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
-        $html = '';
-        if($certificate){
-            $certificate->setSource($sid);
-            $html = $certificate->displayImage('icon');
-        }
-        return $html;
-    }
+	/**
+	 * Return the HTML code for custom simple tag _ACT
+	 *
+	 * @param Certificate $certificatePath Certificate (as per the GEDCOM)
+	 * @param string|null $sid Linked Source ID, if it exists
+	 */
+	protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
+		$html = '';
+		if($certificate){
+			$certificate->setSource($sid);
+			$html = $certificate->displayImage('icon');
+		}
+		return $html;
+	}
 
 
 }

src/Webtrees/Module/PatronymicLineage/Model/LineageNode.php

Doc Comments +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * Constructor for Lineage node
 	 * 
-	 * @param Fisharebest\Webtrees\Individual $node_indi Main individual
+	 * @param Individual $node_indi Main individual
 	 * @param LineageRootNode $root_node Node of the lineage root
 	 * @param unknown $alt_surname Follow-up surname
 	 */
@@ -54,7 +54,7 @@ 
 	/**
 	 * Add a spouse family to the node
 	 * 
-	 * @param Fisharebest\Webtrees\Family $fams
+	 * @param Family $fams
 	 */
 	public function addFamily(Family $fams) {
 		if($fams && !isset($this->linked_fams[$fams])) {
@@ -65,7 +65,7 @@ 
 	/**
 	 * Add a child LineageNode to the node
 	 * 
-	 * @param Fisharebest\Webtrees\Family $fams
+	 * @param Family $fams
 	 * @param LineageNode $child
 	 */
 	public function addChild(Family $fams, LineageNode $child = null) {
@@ -80,7 +80,7 @@ 
 	/**
 	 * Returns the node individual
 	 * 
-	 * @return Fisharebest\Webtrees\Individual
+	 * @return \Fisharebest\Webtrees\GedcomRecord
 	 */
 	public function getIndividual() {
 		return $this->node_indi;

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
 	 * @param Fisharebest\Webtrees\Family $fams
 	 */
 	public function addFamily(Family $fams) {
-		if($fams && !isset($this->linked_fams[$fams])) {
+		if ($fams && !isset($this->linked_fams[$fams])) {
 			$this->linked_fams[$fams] = array();
 		}
 	}
@@ -69,7 +69,7 @@ 
 	 * @param LineageNode $child
 	 */
 	public function addChild(Family $fams, LineageNode $child = null) {
-		if($fams) {
+		if ($fams) {
 			$this->addFamily($fams);
 			$tmp = $this->linked_fams[$fams];
 			$tmp[] = $child;
@@ -119,7 +119,7 @@ 
 	 * @return boolean
 	 */
 	public function hasFollowUpSurname() {
-		return !is_null($this->alt_surname) && strlen($this->alt_surname) > 0 ;
+		return !is_null($this->alt_surname) && strlen($this->alt_surname) > 0;
 	}
 	
 }

src/Webtrees/Mvc/View/ViewBag.php

Doc Comments -1 removed lines

@@ -42,7 +42,6 @@
      * Get all the data from the bag for a given key.
      *
      * @param  string  $key
-     * @param  string  $format
      * @return unknown
      */
     public function get($key, $default = null)

Spacing +3 added lines, -3 removed lines

@@ -73,8 +73,8 @@ 
      * @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;        
     }
     
@@ -107,7 +107,7 @@ 
      * @param string $key
      */
     public function __unset($key) {
-        unset($this->data[$key]);;
+        unset($this->data[$key]); ;
     }
     
 }

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;        
     }
     

Indentation +83 added lines, -83 removed lines

@@ -18,97 +18,97 @@
 	/**
 	 * @var array $data Container for data
 	 */
-    protected $data = array();
+	protected $data = array();
     
-    /**
-     * Constructor for ViewBag
-     * @param array $data_in
-     */
-    public function __construct(array $data_in = array()) {
-        $this->data = $data_in;
-    }
+	/**
+	 * Constructor for ViewBag
+	 * @param array $data_in
+	 */
+	public function __construct(array $data_in = array()) {
+		$this->data = $data_in;
+	}
     
-    /**
-     * Get the keys present in the view bag.
-     *
-     * @return array
-     */
-    public function keys()
-    {
-        return array_keys($this->data);
-    }
+	/**
+	 * Get the keys present in the view bag.
+	 *
+	 * @return array
+	 */
+	public function keys()
+	{
+		return array_keys($this->data);
+	}
     
-    /**
-     * Get all the data from the bag for a given key.
-     *
-     * @param  string  $key
-     * @param  string  $format
-     * @return unknown
-     */
-    public function get($key, $default = null)
-    {
-        if (array_key_exists($key, $this->data)) {
-            return $this->data[$key];
-        }
-        return $default;
-    }
+	/**
+	 * Get all the data from the bag for a given key.
+	 *
+	 * @param  string  $key
+	 * @param  string  $format
+	 * @return unknown
+	 */
+	public function get($key, $default = null)
+	{
+		if (array_key_exists($key, $this->data)) {
+			return $this->data[$key];
+		}
+		return $default;
+	}
     
-    /**
-     * Magic getter.
-     * Returns the value associated with the key.
-     * 
-     * @param string $key
-     * @return unknown
-     */
-    public function __get($key) {
-        return $this->get($key, null);
-    }
+	/**
+	 * Magic getter.
+	 * Returns the value associated with the key.
+	 * 
+	 * @param string $key
+	 * @return unknown
+	 */
+	public function __get($key) {
+		return $this->get($key, null);
+	}
     
-    /**
-     * Set the value for the specified key.
-     * Can define whether to override an existing value;
-     * 
-     * @param string $key
-     * @param mixed $value
-     * @param bool $override
-     */
-    public function set($key, $value, $override = true) {
-        if(is_null($key)) return;
-        if(!$override && array_key_exists($key, $this->data)) return;
-        $this->data[$key] = $value;        
-    }
+	/**
+	 * Set the value for the specified key.
+	 * Can define whether to override an existing value;
+	 * 
+	 * @param string $key
+	 * @param mixed $value
+	 * @param bool $override
+	 */
+	public function set($key, $value, $override = true) {
+		if(is_null($key)) return;
+		if(!$override && array_key_exists($key, $this->data)) return;
+		$this->data[$key] = $value;        
+	}
     
-    /**
-     * Magic setter.
-     * Set the value for the specified key.
-     * 
-     * @param string $key
-     * @param mixed $value
-     */
-    public function __set($key, $value) {
-        $this->set($key, $value);
-    }
+	/**
+	 * Magic setter.
+	 * Set the value for the specified key.
+	 * 
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function __set($key, $value) {
+		$this->set($key, $value);
+	}
     
-    /**
-     * Magic isset
-     * Checks whether the ViewBag contains the specified key
-     * 
-     * @param string $key
-     * @return bool
-     */
-    public function __isset($key) {
-        return isset($this->data[$key]);
-    }
+	/**
+	 * Magic isset
+	 * Checks whether the ViewBag contains the specified key
+	 * 
+	 * @param string $key
+	 * @return bool
+	 */
+	public function __isset($key) {
+		return isset($this->data[$key]);
+	}
     
-    /**
-     * Magic unset
-     * Unset the specified key from the ViewBag
-     * 
-     * @param string $key
-     */
-    public function __unset($key) {
-        unset($this->data[$key]);;
-    }
+	/**
+	 * Magic unset
+	 * Unset the specified key from the ViewBag
+	 * 
+	 * @param string $key
+	 */
+	public function __unset($key) {
+		unset($this->data[$key]);;
+	}
     
 }
  
\ No newline at end of file