jon48 / webtrees-lib

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

src/Webtrees/Contracts/GeoDispersion/MapDefinitionInterface.php

Indentation +18 added lines, -18 removed lines

@@ -18,24 +18,24 @@
  */
 interface MapDefinitionInterface
 {
-    /**
-     * Get the map ID
-     * 
-     * @return string
-     */
-    function id(): string;
+	/**
+	 * Get the map ID
+	 * 
+	 * @return string
+	 */
+	function id(): string;
     
-    /**
-     * Get the map title
-     * 
-     * @return string
-     */
-    function title(): string;
+	/**
+	 * Get the map title
+	 * 
+	 * @return string
+	 */
+	function title(): string;
     
-    /**
-     * Get the features in the map
-     * 
-     * @return \Brick\Geo\IO\GeoJSON\Feature[]
-     */
-    function features(): array;
+	/**
+	 * Get the features in the map
+	 * 
+	 * @return \Brick\Geo\IO\GeoJSON\Feature[]
+	 */
+	function features(): array;
 }
\ No newline at end of file

src/Webtrees/Contracts/GeoDispersion/MapViewConfigInterface.php

Indentation +12 added lines, -12 removed lines

@@ -18,17 +18,17 @@
  */
 interface MapViewConfigInterface
 {
-    /**
-     * Get the feature property to be used for mapping the map feature with the analysis results
-     * 
-     * @return string
-     */
-    function mapMappingProperty(): string;
+	/**
+	 * Get the feature property to be used for mapping the map feature with the analysis results
+	 * 
+	 * @return string
+	 */
+	function mapMappingProperty(): string;
 
-    /**
-     * Get the config of the mapper associated with the map view
-     * 
-     * @return PlaceMapperConfigInterface
-     */
-    function mapperConfig(): PlaceMapperConfigInterface;
+	/**
+	 * Get the config of the mapper associated with the map view
+	 * 
+	 * @return PlaceMapperConfigInterface
+	 */
+	function mapperConfig(): PlaceMapperConfigInterface;
 }
\ No newline at end of file

src/Webtrees/Http/Middleware/AuthTreePreference.php

Indentation +32 added lines, -32 removed lines

@@ -30,43 +30,43 @@
  */
 class AuthTreePreference implements MiddlewareInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\MiddlewareInterface::process()
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-        /** @var Tree $tree */
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\MiddlewareInterface::process()
+	 */
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+	{
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+		/** @var Tree $tree */
 
-        $route = $request->getAttribute('route');
-        assert($route instanceof \Aura\Router\Route);
-        /** @var \Aura\Router\Route $route */
+		$route = $request->getAttribute('route');
+		assert($route instanceof \Aura\Router\Route);
+		/** @var \Aura\Router\Route $route */
 
-        $user = $request->getAttribute('user');
+		$user = $request->getAttribute('user');
 
-        $permission_preference = $route->extras['permission_preference'] ?? '';
-        $permission_level = $permission_preference === '' ? '' : $tree->getPreference($permission_preference);
+		$permission_preference = $route->extras['permission_preference'] ?? '';
+		$permission_level = $permission_preference === '' ? '' : $tree->getPreference($permission_preference);
 
-        // Permissions are configured
-        if (is_numeric($permission_level)) {
-            // Logged in with the correct role?
-            if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
-                    return $handler->handle($request);
-            }
+		// Permissions are configured
+		if (is_numeric($permission_level)) {
+			// Logged in with the correct role?
+			if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
+					return $handler->handle($request);
+			}
 
-            // Logged in, but without the correct role?
-            if ($user instanceof User) {
-                throw new HttpAccessDeniedException();
-            }
-        }
+			// Logged in, but without the correct role?
+			if ($user instanceof User) {
+				throw new HttpAccessDeniedException();
+			}
+		}
 
-        // Permissions no configured, or not logged in
-        if ($request->getMethod() === RequestMethodInterface::METHOD_POST) {
-            throw new HttpAccessDeniedException();
-        }
+		// Permissions no configured, or not logged in
+		if ($request->getMethod() === RequestMethodInterface::METHOD_POST) {
+			throw new HttpAccessDeniedException();
+		}
 
-        return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => $request->getUri()]));
-    }
+		return redirect(route(LoginPage::class, ['tree' => $tree->name(), 'url' => $request->getUri()]));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         // Permissions are configured
         if (is_numeric($permission_level)) {
             // Logged in with the correct role?
-            if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
+            if (Auth::accessLevel($tree, $user) <= (int)$permission_level) {
                     return $handler->handle($request);
             }
 

src/Webtrees/Individual.php

Indentation +19 added lines, -19 removed lines

@@ -105,29 +105,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;
 	}
 }
 

Spacing +22 added lines, -22 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;
@@ -35,9 +35,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;
@@ -48,18 +48,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()][] = '';
 				}
 			}
 		}
@@ -73,8 +73,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;
@@ -86,12 +86,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;
 			}
 		}
@@ -104,8 +104,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;
 	    }
 	
@@ -115,11 +115,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;

Braces +2 added lines, -4 removed lines

@@ -57,8 +57,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()][]='';
 				}
 			}
@@ -90,8 +89,7 @@ 
 		if($bplace = $this->gedcomrecord->getBirthPlace()){
 			if($perc){
 				return array ($bplace, 1);
-			}
-			else{
+			} else{
 				return $bplace;
 			}
 		}