jon48 / webtrees-lib

src/Webtrees/Functions/Functions.php

Indentation +11 added lines, -11 removed lines

@@ -184,7 +184,7 @@ 
 	 */
 	public static function encodeFileSystemToUtf8($string){
 		if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-		    return iconv('cp1252', 'utf-8//IGNORE',$string);
+			return iconv('cp1252', 'utf-8//IGNORE',$string);
 		}
 		return $string;
 	}
@@ -249,20 +249,20 @@ 
 	 * @return boolean|string Is supported?
 	 */
 	public static function isImageTypeSupported($reqtype) {
-	    $supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png');
-	    $reqtype = strtolower($reqtype);
+		$supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png');
+		$reqtype = strtolower($reqtype);
 	
-	    if (empty($supportByGD[$reqtype])) {
-	        return false;
-	    }
+		if (empty($supportByGD[$reqtype])) {
+			return false;
+		}
 	
-	    $type = $supportByGD[$reqtype];
+		$type = $supportByGD[$reqtype];
 	
-	    if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) {
-	        return $type;
-	    }
+		if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) {
+			return $type;
+		}
 	
-	    return false;
+		return false;
 	}
 		
 }

Spacing +16 added lines, -16 removed lines

@@ -32,9 +32,9 @@ 
 	 *
 	 * @param string $text Text to display
 	 */
-	static public function promptAlert($text){
+	static public function promptAlert($text) {
 		echo '<script>';
-		echo 'alert("',fw\Filter::escapeHtml($text),'")';
+		echo 'alert("', fw\Filter::escapeHtml($text), '")';
 		echo '</script>';
 	}
 	
@@ -47,7 +47,7 @@ 
 	 * @return float Result of the safe division
 	 */
 	public static function safeDivision($num, $denom, $default = 0) {
-		if($denom && $denom!=0){
+		if ($denom && $denom != 0) {
 			return $num / $denom;
 		}
 		return $default;
@@ -61,7 +61,7 @@ 
 	 * @param float $default Default value if denominator null or 0
 	 * @return float Percentage
 	 */
-	public static function getPercentage($num, $denom, $default = 0){
+	public static function getPercentage($num, $denom, $default = 0) {
 		return 100 * self::safeDivision($num, $denom, $default);
 	}
 	
@@ -72,8 +72,8 @@ 
 	 * @param int $target	The final max width/height
 	 * @return array array of ($width, $height). One of them must be $target
 	 */
-	static public function getResizedImageSize($file, $target=25){
-		list($width, $height, , ) = getimagesize($file);
+	static public function getResizedImageSize($file, $target = 25) {
+		list($width, $height,,) = getimagesize($file);
 		$max = max($width, $height);
 		$rapp = $target / $max;
 		$width = intval($rapp * $width);
@@ -103,21 +103,21 @@ 
 	 * @param int $length Length of the token, default to 32
 	 * @return string Random token
 	 */
-	public static function generateRandomToken($length=32) {
+	public static function generateRandomToken($length = 32) {
 		$chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
 		$len_chars = count($chars);
 		$token = '';
 		
 		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+			$token .= $chars[mt_rand(0, $len_chars - 1)];
 		
 		# Number of 32 char chunks
-		$chunks = ceil( strlen($token) / 32 );
+		$chunks = ceil(strlen($token) / 32);
 		$md5token = '';
 		
 		# Run each chunk through md5
-		for ( $i=1; $i<=$chunks; $i++ )
-			$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		for ($i = 1; $i <= $chunks; $i++)
+			$md5token .= md5(substr($token, $i * 32 - 32, 32));
 		
 			# Trim the token
 		return substr($md5token, 0, $length);		
@@ -129,9 +129,9 @@ 
 	 * @param string $string Filesystem encoded string to encode
 	 * @return string UTF-8 encoded string
 	 */
-	public static function encodeFileSystemToUtf8($string){
+	public static function encodeFileSystemToUtf8($string) {
 		if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-		    return iconv('cp1252', 'utf-8//IGNORE',$string);
+		    return iconv('cp1252', 'utf-8//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -142,9 +142,9 @@ 
 	 * @param string $string UTF-8 encoded string to encode
 	 * @return string Filesystem encoded string
 	 */
-	public static function encodeUtf8ToFileSystem($string){
+	public static function encodeUtf8ToFileSystem($string) {
 		if (preg_match('//u', $string) && strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-			return iconv('utf-8', 'cp1252//IGNORE' ,  $string);
+			return iconv('utf-8', 'cp1252//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -157,7 +157,7 @@ 
 	 * @return boolean True if path valid
 	 */
 	public static function isValidPath($filename, $acceptfolder = FALSE) {		
-		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
+		if (strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
 		return false;
 	}
 

Braces +9 added lines, -5 removed lines

@@ -108,16 +108,18 @@ 
 		$len_chars = count($chars);
 		$token = '';
 		
-		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		for ($i = 0; $i < $length; $i++) {
+					$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		}
 		
 		# Number of 32 char chunks
 		$chunks = ceil( strlen($token) / 32 );
 		$md5token = '';
 		
 		# Run each chunk through md5
-		for ( $i=1; $i<=$chunks; $i++ )
-			$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		for ( $i=1; $i<=$chunks; $i++ ) {
+					$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		}
 		
 			# Trim the token
 		return substr($md5token, 0, $length);		
@@ -157,7 +159,9 @@ 
 	 * @return boolean True if path valid
 	 */
 	public static function isValidPath($filename, $acceptfolder = FALSE) {		
-		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
+		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) {
+			return true;
+		}
 		return false;
 	}
 

src/Webtrees/Family.php

Spacing +2 added lines, -2 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;

src/Webtrees/GedcomRecord.php

Indentation +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-					    return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+						return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
 				}

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 	 *
 	 * @param \Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in The GedcomRecord to extend
 	 */
-	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in){
+	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in) {
 		$this->gedcomrecord = $gedcomrecord_in;
 	}
 
@@ -36,7 +36,7 @@ 
 	 *
 	 * @return \Fisharebest\Webtrees\GedcomRecord Embedded gedcom record
 	 */
-	public function getDerivedRecord(){
+	public function getDerivedRecord() {
 		return $this->gedcomrecord;
 	}
 	
@@ -67,7 +67,7 @@ 
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-					    return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+					    return '<i>'.$fact->getLabel().' '.\MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact).'&nbsp;'.\MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1').'</i>';
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
 				}

src/Webtrees/Contracts/GeoDispersion/ModulePlaceMapperProviderInterface.php

Indentation +6 added lines, -6 removed lines

@@ -19,10 +19,10 @@
  */
 interface ModulePlaceMapperProviderInterface
 {
-    /**
-     * List place mappers provided by the module as an array.
-     *
-     * @return string[] List of tasks
-     */
-    public function listPlaceMappers(): array;
+	/**
+	 * List place mappers provided by the module as an array.
+	 *
+	 * @return string[] List of tasks
+	 */
+	public function listPlaceMappers(): array;
 }

src/Webtrees/Contracts/GeoDispersion/PlaceMapperInterface.php

Indentation +38 added lines, -38 removed lines

@@ -21,47 +21,47 @@
  */
 interface PlaceMapperInterface
 {   
-    /**
-     * Boot the Place mapper
-     */
-    function boot(): void;
+	/**
+	 * Boot the Place mapper
+	 */
+	function boot(): void;
     
-    /**
-     * Get the configuration associated to the mapper
-     * 
-     * @return PlaceMapperConfigInterface
-     */
-    function config(): PlaceMapperConfigInterface;
+	/**
+	 * Get the configuration associated to the mapper
+	 * 
+	 * @return PlaceMapperConfigInterface
+	 */
+	function config(): PlaceMapperConfigInterface;
     
-    /**
-     * Set the configured associated to the mapper
-     * 
-     * @param PlaceMapperConfigInterface $config
-     */
-    function setConfig(PlaceMapperConfigInterface $config): void;
+	/**
+	 * Set the configured associated to the mapper
+	 * 
+	 * @param PlaceMapperConfigInterface $config
+	 */
+	function setConfig(PlaceMapperConfigInterface $config): void;
     
-    /**
-     * Get the data associated to the mapper, for a specific key
-     * 
-     * @param string $key
-     * @return null|mixed
-     */
-    function data(string $key);
+	/**
+	 * Get the data associated to the mapper, for a specific key
+	 * 
+	 * @param string $key
+	 * @return null|mixed
+	 */
+	function data(string $key);
     
-    /**
-     * Set the data associated to the mapper, for a specific key
-     * 
-     * @param string $key
-     * @param mixed $data
-     */
-    function setData(string $key, $data): void;
+	/**
+	 * Set the data associated to the mapper, for a specific key
+	 * 
+	 * @param string $key
+	 * @param mixed $data
+	 */
+	function setData(string $key, $data): void;
     
-    /**
-     * Return the property value of the feature identifying a place in a GeoJson map.
-     * 
-     * @param Place $place
-     * @param string $feature_property
-     * @return string|NULL
-     */
-    function map(Place $place, string $feature_property) : ?string;
+	/**
+	 * Return the property value of the feature identifying a place in a GeoJson map.
+	 * 
+	 * @param Place $place
+	 * @param string $feature_property
+	 * @return string|NULL
+	 */
+	function map(Place $place, string $feature_property) : ?string;
 }
\ No newline at end of file

src/Webtrees/Contracts/GeoDispersion/ModuleMapDefinitionProviderInterface.php

Indentation +6 added lines, -6 removed lines

@@ -19,10 +19,10 @@
  */
 interface ModuleMapDefinitionProviderInterface
 {
-    /**
-     * List map definitions provided by the module as an array.
-     *
-     * @return MapDefinitionInterface[] List of map definitions
-     */
-    public function listMapDefinition(): array;
+	/**
+	 * List map definitions provided by the module as an array.
+	 *
+	 * @return MapDefinitionInterface[] List of map definitions
+	 */
+	public function listMapDefinition(): array;
 }

src/Webtrees/Contracts/GeoDispersion/PlaceMapperConfigInterface.php

Indentation +22 added lines, -22 removed lines

@@ -20,28 +20,28 @@
  */
 interface PlaceMapperConfigInterface extends JsonSerializable
 {
-    /**
-     * Deserialise the mapper configuration from a string or an array
-     * 
-     * @param mixed $config
-     * @return self
-     */
-    function jsonDeserialize($config): self;
+	/**
+	 * Deserialise the mapper configuration from a string or an array
+	 * 
+	 * @param mixed $config
+	 * @return self
+	 */
+	function jsonDeserialize($config): self;
     
-    /**
-     * Check if the configuration contains a specific key
-     * 
-     * @param string $key
-     * @return bool
-     */
-    function has(string $key): bool;
+	/**
+	 * Check if the configuration contains a specific key
+	 * 
+	 * @param string $key
+	 * @return bool
+	 */
+	function has(string $key): bool;
     
-    /**
-     * Return the configuration associated with a key, or a default value if none found.
-     * 
-     * @param string $key
-     * @param mixed|null $default
-     * @return mixed|null
-     */
-    function get(string $key, $default = null);
+	/**
+	 * Return the configuration associated with a key, or a default value if none found.
+	 * 
+	 * @param string $key
+	 * @param mixed|null $default
+	 * @return mixed|null
+	 */
+	function get(string $key, $default = null);
 }
\ No newline at end of file

src/Webtrees/Contracts/GeoDispersion/ModuleGeoAnalysisProviderInterface.php

Indentation +6 added lines, -6 removed lines

@@ -20,10 +20,10 @@
 interface ModuleGeoAnalysisProviderInterface
 {
 
-    /**
-     * List geographical analyses provided by the module as an array.
-     *
-     * @return string[] List of tasks
-     */
-    public function listGeoAnalyses(): array;
+	/**
+	 * List geographical analyses provided by the module as an array.
+	 *
+	 * @return string[] List of tasks
+	 */
+	public function listGeoAnalyses(): array;
 }

src/Webtrees/Contracts/GeoDispersion/GeoAnalysisInterface.php

Indentation +20 added lines, -20 removed lines

@@ -21,26 +21,26 @@
  */
 interface GeoAnalysisInterface
 {
-    /**
-     * Get the geographical dispersion analysis title
-     * 
-     * @return string
-     */
-    function title(): string;
+	/**
+	 * Get the geographical dispersion analysis title
+	 * 
+	 * @return string
+	 */
+	function title(): string;
     
-    /**
-     * Gets the function to translate 
-     * 
-     * @return callable(int $count): string
-     */
-    function itemsDescription(): callable;
+	/**
+	 * Gets the function to translate 
+	 * 
+	 * @return callable(int $count): string
+	 */
+	function itemsDescription(): callable;
     
-    /**
-     * Get the results of the geographical dispersion analysis
-     * 
-     * @param Tree $tree
-     * @param int $depth
-     * @return GeoAnalysisResults
-     */
-    function results(Tree $tree, int $depth): GeoAnalysisResults;
+	/**
+	 * Get the results of the geographical dispersion analysis
+	 * 
+	 * @param Tree $tree
+	 * @param int $depth
+	 * @return GeoAnalysisResults
+	 */
+	function results(Tree $tree, int $depth): GeoAnalysisResults;
 }
\ No newline at end of file