jon48 / webtrees-lib

app/Module/Certificates/Services/UrlObfuscatorService.php

Indentation +116 added lines, -116 removed lines

@@ -23,120 +23,120 @@
  */
 class UrlObfuscatorService
 {
-    /**
-     * @var string|null $encryption_key
-     */
-    private $encryption_key;
-
-
-    /**
-     * Return (and generate) the key to be used for the encryption step
-     *
-     * @return string Encryption key
-     */
-    protected function encryptionKey(): string
-    {
-        if ($this->encryption_key === null) {
-            /** @var ServerRequestInterface $request **/
-            $request = app(ServerRequestInterface::class);
-            $server_name = $request->getServerParams()['SERVER_NAME'] ?? '';
-            $server_software = $request->getServerParams()['SERVER_SOFTWARE'] ?? '';
-            $this->encryption_key = str_pad(md5(
-                $server_name !== '' && $server_software !== '' ?
-                $server_name . $server_software :
-                'STANDARDKEYIFNOSERVER'
-            ), SODIUM_CRYPTO_SECRETBOX_KEYBYTES, "1234567890ABCDEF");
-        }
-        return $this->encryption_key;
-    }
-
-    /**
-     * Obfuscate a clear text, with a combination of encryption and base64 encoding.
-     * The return string is URL-safe.
-     *
-     * @param string $cleartext Text to obfuscate
-     * @param string $key
-     * @param string $nonce
-     * @return string
-     */
-    public function obfuscate(string $cleartext, string $key = '', string $nonce = ''): string
-    {
-        if ($nonce === '') {
-            $nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
-        }
-        if ($key === '') {
-            $key = $this->encryptionKey();
-        }
-
-        if (strlen($nonce) !== SODIUM_CRYPTO_SECRETBOX_NONCEBYTES) {
-            throw new InvalidArgumentException('The nonce needs to be SODIUM_CRYPTO_SECRETBOX_NONCEBYTES long');
-        }
-
-        if (strlen($key) !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new InvalidArgumentException('The key needs to be SODIUM_CRYPTO_SECRETBOX_KEYBYTES long');
-        }
-
-        $encryted = sodium_crypto_secretbox($cleartext, $nonce, $key);
-        return strtr(base64_encode($nonce . $encryted), '+/=', '._-');
-    }
-
-    /**
-     * Deobfuscate a string from an URL to a clear text.
-     *
-     * @param string $obfuscated Text to deobfuscate
-     * @param string $key
-     * @throws InvalidArgumentException
-     * @return string
-     */
-    public function deobfuscate(string $obfuscated, string $key = ''): string
-    {
-        $obfuscated = strtr($obfuscated, '._-', '+/=');
-        if ($key === '') {
-            $key = $this->encryptionKey();
-        }
-
-        if (strlen($key) !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new InvalidArgumentException('The key needs to be SODIUM_CRYPTO_SECRETBOX_KEYBYTES long');
-        }
-
-        $encrypted = base64_decode($obfuscated, true);
-        if ($encrypted === false) {
-            throw new InvalidArgumentException('The encrypted value is not in correct base64 format.');
-        }
-
-        if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES)) {
-            throw new InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
-        }
-
-        $nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
-        $ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
-
-        $decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, $key);
-
-        if ($decrypted === false) {
-            throw new InvalidArgumentException('The message has been tampered with in transit.');
-        }
-
-        //sodium_memzero($ciphertext);    // sodium_compat cannot handle it, only through libsodium
-
-        /** @var string $decrypted - Psalm detect as string|true otherwise */
-        return $decrypted;
-    }
-
-    /**
-     * Try to deobfuscate a string from an URL to a clear text, returning whether the operation is a success.
-     *
-     * @param string $obfuscated Text to deobfuscate
-     * @param string $key
-     * @return bool
-     */
-    public function tryDeobfuscate(string &$obfuscated, string $key = ''): bool
-    {
-        try {
-            $obfuscated = $this->deobfuscate($obfuscated, $key);
-            return true;
-        } catch (InvalidArgumentException $ex) {
-        }
-        return false;
-    }
+	/**
+	 * @var string|null $encryption_key
+	 */
+	private $encryption_key;
+
+
+	/**
+	 * Return (and generate) the key to be used for the encryption step
+	 *
+	 * @return string Encryption key
+	 */
+	protected function encryptionKey(): string
+	{
+		if ($this->encryption_key === null) {
+			/** @var ServerRequestInterface $request **/
+			$request = app(ServerRequestInterface::class);
+			$server_name = $request->getServerParams()['SERVER_NAME'] ?? '';
+			$server_software = $request->getServerParams()['SERVER_SOFTWARE'] ?? '';
+			$this->encryption_key = str_pad(md5(
+				$server_name !== '' && $server_software !== '' ?
+				$server_name . $server_software :
+				'STANDARDKEYIFNOSERVER'
+			), SODIUM_CRYPTO_SECRETBOX_KEYBYTES, "1234567890ABCDEF");
+		}
+		return $this->encryption_key;
+	}
+
+	/**
+	 * Obfuscate a clear text, with a combination of encryption and base64 encoding.
+	 * The return string is URL-safe.
+	 *
+	 * @param string $cleartext Text to obfuscate
+	 * @param string $key
+	 * @param string $nonce
+	 * @return string
+	 */
+	public function obfuscate(string $cleartext, string $key = '', string $nonce = ''): string
+	{
+		if ($nonce === '') {
+			$nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+		}
+		if ($key === '') {
+			$key = $this->encryptionKey();
+		}
+
+		if (strlen($nonce) !== SODIUM_CRYPTO_SECRETBOX_NONCEBYTES) {
+			throw new InvalidArgumentException('The nonce needs to be SODIUM_CRYPTO_SECRETBOX_NONCEBYTES long');
+		}
+
+		if (strlen($key) !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
+			throw new InvalidArgumentException('The key needs to be SODIUM_CRYPTO_SECRETBOX_KEYBYTES long');
+		}
+
+		$encryted = sodium_crypto_secretbox($cleartext, $nonce, $key);
+		return strtr(base64_encode($nonce . $encryted), '+/=', '._-');
+	}
+
+	/**
+	 * Deobfuscate a string from an URL to a clear text.
+	 *
+	 * @param string $obfuscated Text to deobfuscate
+	 * @param string $key
+	 * @throws InvalidArgumentException
+	 * @return string
+	 */
+	public function deobfuscate(string $obfuscated, string $key = ''): string
+	{
+		$obfuscated = strtr($obfuscated, '._-', '+/=');
+		if ($key === '') {
+			$key = $this->encryptionKey();
+		}
+
+		if (strlen($key) !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
+			throw new InvalidArgumentException('The key needs to be SODIUM_CRYPTO_SECRETBOX_KEYBYTES long');
+		}
+
+		$encrypted = base64_decode($obfuscated, true);
+		if ($encrypted === false) {
+			throw new InvalidArgumentException('The encrypted value is not in correct base64 format.');
+		}
+
+		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES)) {
+			throw new InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+		}
+
+		$nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
+		$ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
+
+		$decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, $key);
+
+		if ($decrypted === false) {
+			throw new InvalidArgumentException('The message has been tampered with in transit.');
+		}
+
+		//sodium_memzero($ciphertext);    // sodium_compat cannot handle it, only through libsodium
+
+		/** @var string $decrypted - Psalm detect as string|true otherwise */
+		return $decrypted;
+	}
+
+	/**
+	 * Try to deobfuscate a string from an URL to a clear text, returning whether the operation is a success.
+	 *
+	 * @param string $obfuscated Text to deobfuscate
+	 * @param string $key
+	 * @return bool
+	 */
+	public function tryDeobfuscate(string &$obfuscated, string $key = ''): bool
+	{
+		try {
+			$obfuscated = $this->deobfuscate($obfuscated, $key);
+			return true;
+		} catch (InvalidArgumentException $ex) {
+		}
+		return false;
+	}
 }

app/Module/Certificates/Model/Certificate.php

Indentation +189 added lines, -189 removed lines

@@ -25,193 +25,193 @@
  */
 class Certificate
 {
-    /**
-     * Pattern to extract information from a file name.
-     * Specific to the author's workflow.
-     * @var string
-     */
-    private const FILENAME_PATTERN = '/^(?<year>\d{1,4})(\.(?<month>\d{1,2}))?(\.(?<day>\d{1,2}))?( (?<type>[A-Z]{1,2}))?\s(?<descr>.*)/'; //phpcs:ignore Generic.Files.LineLength.TooLong
-
-    private Tree $tree;
-    private string $path;
-    private ?string $city = null;
-    private ?string $basename = null;
-    private ?string $filename = null;
-    private ?string $extension = null;
-    private ?string $type = null;
-    private ?string $description = null;
-    private ?Date $date = null;
-
-    /**
-     * Contructor for Certificate
-     *
-     * @param Tree $tree
-     * @param string $path
-     */
-    public function __construct(Tree $tree, string $path)
-    {
-        $this->tree = $tree;
-        $this->path = $path;
-        $this->extractDataFromPath($path);
-    }
-
-    /**
-     * Populate fields from the filename, based on a predeterminate pattern.
-     * Logic specific to the author.
-     *
-     * @param string $path
-     */
-    protected function extractDataFromPath(string $path): void
-    {
-        $path_parts = pathinfo($this->gedcomPath());
-        $this->city = $path_parts['dirname'];
-        $this->basename = $path_parts['basename'];
-        $this->filename = $path_parts['filename'];
-        $this->extension = strtoupper($path_parts['extension'] ?? '');
-
-        if (preg_match(self::FILENAME_PATTERN, $this->filename, $match) === 1) {
-            $this->type = $match['type'];
-            $this->description = $match['descr'];
-
-            $day = $match['day'] ?? '';
-            $month_date = DateTime::createFromFormat('m', $match['month'] ?? '');
-            $month = $month_date !== false ? strtoupper($month_date->format('M')) : '';
-            $year = $match['year'] ?? '';
-
-            $this->date = new Date(sprintf('%s %s %s', $day, $month, $year));
-        } else {
-            $this->description = $this->filename;
-        }
-    }
-
-    /**
-     * Get the family tree of the certificate
-     *
-     * @return Tree
-     */
-    public function tree(): Tree
-    {
-        return $this->tree;
-    }
-
-    /**
-     * Get the path of the certificate in the file system.
-     *
-     * @return string
-     */
-    public function path(): string
-    {
-        return $this->path;
-    }
-
-    /**
-     * The the path of the certificate, in a Gedcom canonical form.
-     *
-     * @return string
-     */
-    public function gedcomPath(): string
-    {
-        return str_replace('\\', '/', $this->path);
-    }
-
-    /**
-     * Get the certificate name.
-     *
-     * @return string
-     */
-    public function name(): string
-    {
-        return $this->filename ?? '';
-    }
-
-    /**
-     * Get the certificate file name.
-     *
-     * @return string
-     */
-    public function filename(): string
-    {
-        return $this->basename ?? '';
-    }
-
-    /**
-     * Get the certificate's city (the first level folder).
-     *
-     * @return string
-     */
-    public function city(): string
-    {
-        return $this->city ?? '';
-    }
-
-    /**
-     * Get the certificate's date. Extracted from the file name.
-     *
-     * @return Date
-     */
-    public function date(): Date
-    {
-        return $this->date ?? new Date('');
-    }
-
-    /**
-     * Get the certificate's type. Extracted from the file name.
-     *
-     * @return string
-     */
-    public function type(): string
-    {
-        return $this->type ?? '';
-    }
-
-    /**
-     * Get the certificate's description.  Extracted from the file name.
-     * @return string
-     */
-    public function description(): string
-    {
-        return $this->description ?? '';
-    }
-
-    /**
-     * Get the certificate's description to be used for sorting.
-     * This is based on surnames (at least 3 letters) found in the file name.
-     *
-     * @return string
-     */
-    public function sortDescription(): string
-    {
-        $sort_prefix = '';
-        if (preg_match_all('/\b([A-Z]{3,})\b/', $this->description(), $matches, PREG_SET_ORDER) >= 1) {
-            $sort_prefix = implode('_', array_map(function ($match) {
-                return $match[1];
-            }, $matches)) . '_';
-        }
-        return $sort_prefix . $this->description();
-    }
-
-    /**
-     * Get the certificate's MIME type.
-     *
-     * @return string
-     */
-    public function mimeType(): string
-    {
-        return Mime::TYPES[$this->extension] ?? Mime::DEFAULT_TYPE;
-    }
-
-    /**
-     * Get the base parameters to be used in url referencing the certificate.
-     *
-     * @param UrlObfuscatorService $url_obfuscator_service
-     * @return array{tree: string, cid: mixed}
-     */
-    public function urlParameters(UrlObfuscatorService $url_obfuscator_service = null): array
-    {
-        $url_obfuscator_service = $url_obfuscator_service ?? app(UrlObfuscatorService::class);
-        return [
-            'tree' => $this->tree->name(),
-            'cid' => $url_obfuscator_service->obfuscate($this->path)
-        ];
-    }
+	/**
+	 * Pattern to extract information from a file name.
+	 * Specific to the author's workflow.
+	 * @var string
+	 */
+	private const FILENAME_PATTERN = '/^(?<year>\d{1,4})(\.(?<month>\d{1,2}))?(\.(?<day>\d{1,2}))?( (?<type>[A-Z]{1,2}))?\s(?<descr>.*)/'; //phpcs:ignore Generic.Files.LineLength.TooLong
+
+	private Tree $tree;
+	private string $path;
+	private ?string $city = null;
+	private ?string $basename = null;
+	private ?string $filename = null;
+	private ?string $extension = null;
+	private ?string $type = null;
+	private ?string $description = null;
+	private ?Date $date = null;
+
+	/**
+	 * Contructor for Certificate
+	 *
+	 * @param Tree $tree
+	 * @param string $path
+	 */
+	public function __construct(Tree $tree, string $path)
+	{
+		$this->tree = $tree;
+		$this->path = $path;
+		$this->extractDataFromPath($path);
+	}
+
+	/**
+	 * Populate fields from the filename, based on a predeterminate pattern.
+	 * Logic specific to the author.
+	 *
+	 * @param string $path
+	 */
+	protected function extractDataFromPath(string $path): void
+	{
+		$path_parts = pathinfo($this->gedcomPath());
+		$this->city = $path_parts['dirname'];
+		$this->basename = $path_parts['basename'];
+		$this->filename = $path_parts['filename'];
+		$this->extension = strtoupper($path_parts['extension'] ?? '');
+
+		if (preg_match(self::FILENAME_PATTERN, $this->filename, $match) === 1) {
+			$this->type = $match['type'];
+			$this->description = $match['descr'];
+
+			$day = $match['day'] ?? '';
+			$month_date = DateTime::createFromFormat('m', $match['month'] ?? '');
+			$month = $month_date !== false ? strtoupper($month_date->format('M')) : '';
+			$year = $match['year'] ?? '';
+
+			$this->date = new Date(sprintf('%s %s %s', $day, $month, $year));
+		} else {
+			$this->description = $this->filename;
+		}
+	}
+
+	/**
+	 * Get the family tree of the certificate
+	 *
+	 * @return Tree
+	 */
+	public function tree(): Tree
+	{
+		return $this->tree;
+	}
+
+	/**
+	 * Get the path of the certificate in the file system.
+	 *
+	 * @return string
+	 */
+	public function path(): string
+	{
+		return $this->path;
+	}
+
+	/**
+	 * The the path of the certificate, in a Gedcom canonical form.
+	 *
+	 * @return string
+	 */
+	public function gedcomPath(): string
+	{
+		return str_replace('\\', '/', $this->path);
+	}
+
+	/**
+	 * Get the certificate name.
+	 *
+	 * @return string
+	 */
+	public function name(): string
+	{
+		return $this->filename ?? '';
+	}
+
+	/**
+	 * Get the certificate file name.
+	 *
+	 * @return string
+	 */
+	public function filename(): string
+	{
+		return $this->basename ?? '';
+	}
+
+	/**
+	 * Get the certificate's city (the first level folder).
+	 *
+	 * @return string
+	 */
+	public function city(): string
+	{
+		return $this->city ?? '';
+	}
+
+	/**
+	 * Get the certificate's date. Extracted from the file name.
+	 *
+	 * @return Date
+	 */
+	public function date(): Date
+	{
+		return $this->date ?? new Date('');
+	}
+
+	/**
+	 * Get the certificate's type. Extracted from the file name.
+	 *
+	 * @return string
+	 */
+	public function type(): string
+	{
+		return $this->type ?? '';
+	}
+
+	/**
+	 * Get the certificate's description.  Extracted from the file name.
+	 * @return string
+	 */
+	public function description(): string
+	{
+		return $this->description ?? '';
+	}
+
+	/**
+	 * Get the certificate's description to be used for sorting.
+	 * This is based on surnames (at least 3 letters) found in the file name.
+	 *
+	 * @return string
+	 */
+	public function sortDescription(): string
+	{
+		$sort_prefix = '';
+		if (preg_match_all('/\b([A-Z]{3,})\b/', $this->description(), $matches, PREG_SET_ORDER) >= 1) {
+			$sort_prefix = implode('_', array_map(function ($match) {
+				return $match[1];
+			}, $matches)) . '_';
+		}
+		return $sort_prefix . $this->description();
+	}
+
+	/**
+	 * Get the certificate's MIME type.
+	 *
+	 * @return string
+	 */
+	public function mimeType(): string
+	{
+		return Mime::TYPES[$this->extension] ?? Mime::DEFAULT_TYPE;
+	}
+
+	/**
+	 * Get the base parameters to be used in url referencing the certificate.
+	 *
+	 * @param UrlObfuscatorService $url_obfuscator_service
+	 * @return array{tree: string, cid: mixed}
+	 */
+	public function urlParameters(UrlObfuscatorService $url_obfuscator_service = null): array
+	{
+		$url_obfuscator_service = $url_obfuscator_service ?? app(UrlObfuscatorService::class);
+		return [
+			'tree' => $this->tree->name(),
+			'cid' => $url_obfuscator_service->obfuscate($this->path)
+		];
+	}
 }

app/Module/IsSourced/Data/FactSourceStatus.php

Indentation +229 added lines, -229 removed lines

@@ -22,233 +22,233 @@
  */
 class FactSourceStatus extends SourceStatus
 {
-    /**
-     * @var boolean $has_date
-     */
-    private $has_date = false;
-
-    /**
-     * @var boolean $has_precise_date
-     */
-    private $has_precise_date = false;
-
-    /**
-     * @var boolean $has_source_date
-     */
-    private $has_source_date = false;
-
-    /**
-     * @var boolean $source_date_match
-     */
-    private $source_date_match = false;
-
-    /**
-     * Return whether the fact is dated.
-     *
-     * @return bool
-     */
-    public function factHasDate(): bool
-    {
-        return $this->has_date;
-    }
-
-    /**
-     * Set whether the fact is dated.
-     *
-     * @param bool $has_date
-     * @return $this
-     */
-    public function setFactHasDate(bool $has_date): self
-    {
-        $this->has_date = $has_date;
-        return $this;
-    }
-
-    /**
-     * Combinate whether the fact is dated with the previous status.
-     *
-     * @param bool $has_date
-     * @return $this
-     */
-    public function addFactHasDate(bool $has_date): self
-    {
-        $this->has_date = $this->has_date || $has_date;
-        return $this;
-    }
-
-    /**
-     * Return whether the fact is dated with a precise day.
-     * Any date modifier will be considered as not precise.
-     * A month or year will be considered as not precise.
-     *
-     * @return bool
-     */
-    public function factHasPreciseDate(): bool
-    {
-        return $this->has_date && $this->has_precise_date;
-    }
-
-    /**
-     * Set whather the fact is dated with a precise day.
-     *
-     * @param bool $has_precise_date
-     * @return $this
-     */
-    public function setFactHasPreciseDate(bool $has_precise_date): self
-    {
-        $this->has_precise_date = $has_precise_date;
-        return $this;
-    }
-
-    /**
-     * Combine whether the fact is dated with a precise day.
-     *
-     * @param bool $has_precise_date
-     * @return $this
-     */
-    public function addFactHasPreciseDate(bool $has_precise_date): self
-    {
-        $this->has_precise_date = $this->has_precise_date || $has_precise_date;
-        return $this;
-    }
-
-    /**
-     * Return whether the source citation is dated.
-     *
-     * @return bool
-     */
-    public function sourceHasDate(): bool
-    {
-        return $this->has_source_date;
-    }
-
-    /**
-     * Set whether the source citation is dated.
-     *
-     * @param bool $has_source_date
-     * @return $this
-     */
-    public function setSourceHasDate(bool $has_source_date): self
-    {
-        $this->has_source_date = $has_source_date;
-        return $this;
-    }
-
-    /**
-     * Combine whether the source citation is dated with the previous status.
-     *
-     * @param bool $has_source_date
-     * @return $this
-     */
-    public function addSourceHasDate(bool $has_source_date): self
-    {
-        $this->has_source_date = $this->has_source_date || $has_source_date;
-        return $this;
-    }
-
-    /**
-     * Return whether the source citation date is close to the fact date.
-     *
-     * @return bool
-     */
-    public function sourceMatchesFactDate(): bool
-    {
-        return $this->has_precise_date && $this->has_source_date && $this->source_date_match;
-    }
-
-    /**
-     * Set whether the source citation date is close to the fact date.
-     *
-     * @param bool $source_date_match
-     * @return $this
-     */
-    public function setSourceMatchesFactDate(bool $source_date_match): self
-    {
-        $this->source_date_match = $source_date_match;
-        return $this;
-    }
-
-    /**
-     * Combine whether the source citation date is close to the fact date with the previous status.
-     *
-     * @param bool $source_date_match
-     * @return $this
-     */
-    public function addSourceMatchesFactDate(bool $source_date_match): self
-    {
-        $this->source_date_match = $this->source_date_match || $source_date_match;
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::isFullySourced()
-     */
-    public function isFullySourced(): bool
-    {
-        return parent::isFullySourced() && $this->sourceMatchesFactDate();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::label()
-     */
-    public function label(string $context): string
-    {
-        $context_label = Registry::elementFactory()->make($context)->label();
-
-        if ($this->factHasPreciseDate()) {
-            if ($this->hasSource()) {
-                if ($this->hasSupportingDocument()) {
-                    if ($this->sourceMatchesFactDate()) {
-                        return I18N::translate('%s sourced with exact certificate', $context_label);
-                    } else {
-                        return I18N::translate('%s sourced with a certificate', $context_label);
-                    }
-                }
-
-                if ($this->sourceMatchesFactDate()) {
-                    return I18N::translate('%s precisely sourced', $context_label);
-                }
-                return I18N::translate('%s sourced', $context_label);
-            }
-            return I18N::translate('%s not sourced', $context_label);
-        }
-
-        if ($this->factHasDate()) {
-            return I18N::translate('%s not precise', $context_label);
-        }
-        return I18N::translate('%s not found', $context_label);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::order()
-     */
-    public function order(): int
-    {
-        return ($this->factHasDate() ? 1 : 0) * ($this->hasSource() ? 1 : -1) *
-            ( 1 + ($this->factHasPreciseDate() ? 1 : 0) * (1 +
-                0b010 * ($this->sourceMatchesFactDate() ? 1 : 0) +
-                0b100 * ($this->hasSupportingDocument() ? 1 : 0)
-            )
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::combineWith()
-     */
-    public function combineWith(SourceStatus $other)
-    {
-        if ($other instanceof FactSourceStatus) {
-            $this->addFactHasDate($other->factHasDate());
-            $this->addFactHasPreciseDate($other->factHasPreciseDate());
-            $this->addSourceHasDate($other->sourceHasDate());
-            $this->addSourceMatchesFactDate($other->sourceMatchesFactDate());
-        }
-
-        parent::combineWith($other);
-        return $this;
-    }
+	/**
+	 * @var boolean $has_date
+	 */
+	private $has_date = false;
+
+	/**
+	 * @var boolean $has_precise_date
+	 */
+	private $has_precise_date = false;
+
+	/**
+	 * @var boolean $has_source_date
+	 */
+	private $has_source_date = false;
+
+	/**
+	 * @var boolean $source_date_match
+	 */
+	private $source_date_match = false;
+
+	/**
+	 * Return whether the fact is dated.
+	 *
+	 * @return bool
+	 */
+	public function factHasDate(): bool
+	{
+		return $this->has_date;
+	}
+
+	/**
+	 * Set whether the fact is dated.
+	 *
+	 * @param bool $has_date
+	 * @return $this
+	 */
+	public function setFactHasDate(bool $has_date): self
+	{
+		$this->has_date = $has_date;
+		return $this;
+	}
+
+	/**
+	 * Combinate whether the fact is dated with the previous status.
+	 *
+	 * @param bool $has_date
+	 * @return $this
+	 */
+	public function addFactHasDate(bool $has_date): self
+	{
+		$this->has_date = $this->has_date || $has_date;
+		return $this;
+	}
+
+	/**
+	 * Return whether the fact is dated with a precise day.
+	 * Any date modifier will be considered as not precise.
+	 * A month or year will be considered as not precise.
+	 *
+	 * @return bool
+	 */
+	public function factHasPreciseDate(): bool
+	{
+		return $this->has_date && $this->has_precise_date;
+	}
+
+	/**
+	 * Set whather the fact is dated with a precise day.
+	 *
+	 * @param bool $has_precise_date
+	 * @return $this
+	 */
+	public function setFactHasPreciseDate(bool $has_precise_date): self
+	{
+		$this->has_precise_date = $has_precise_date;
+		return $this;
+	}
+
+	/**
+	 * Combine whether the fact is dated with a precise day.
+	 *
+	 * @param bool $has_precise_date
+	 * @return $this
+	 */
+	public function addFactHasPreciseDate(bool $has_precise_date): self
+	{
+		$this->has_precise_date = $this->has_precise_date || $has_precise_date;
+		return $this;
+	}
+
+	/**
+	 * Return whether the source citation is dated.
+	 *
+	 * @return bool
+	 */
+	public function sourceHasDate(): bool
+	{
+		return $this->has_source_date;
+	}
+
+	/**
+	 * Set whether the source citation is dated.
+	 *
+	 * @param bool $has_source_date
+	 * @return $this
+	 */
+	public function setSourceHasDate(bool $has_source_date): self
+	{
+		$this->has_source_date = $has_source_date;
+		return $this;
+	}
+
+	/**
+	 * Combine whether the source citation is dated with the previous status.
+	 *
+	 * @param bool $has_source_date
+	 * @return $this
+	 */
+	public function addSourceHasDate(bool $has_source_date): self
+	{
+		$this->has_source_date = $this->has_source_date || $has_source_date;
+		return $this;
+	}
+
+	/**
+	 * Return whether the source citation date is close to the fact date.
+	 *
+	 * @return bool
+	 */
+	public function sourceMatchesFactDate(): bool
+	{
+		return $this->has_precise_date && $this->has_source_date && $this->source_date_match;
+	}
+
+	/**
+	 * Set whether the source citation date is close to the fact date.
+	 *
+	 * @param bool $source_date_match
+	 * @return $this
+	 */
+	public function setSourceMatchesFactDate(bool $source_date_match): self
+	{
+		$this->source_date_match = $source_date_match;
+		return $this;
+	}
+
+	/**
+	 * Combine whether the source citation date is close to the fact date with the previous status.
+	 *
+	 * @param bool $source_date_match
+	 * @return $this
+	 */
+	public function addSourceMatchesFactDate(bool $source_date_match): self
+	{
+		$this->source_date_match = $this->source_date_match || $source_date_match;
+		return $this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::isFullySourced()
+	 */
+	public function isFullySourced(): bool
+	{
+		return parent::isFullySourced() && $this->sourceMatchesFactDate();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::label()
+	 */
+	public function label(string $context): string
+	{
+		$context_label = Registry::elementFactory()->make($context)->label();
+
+		if ($this->factHasPreciseDate()) {
+			if ($this->hasSource()) {
+				if ($this->hasSupportingDocument()) {
+					if ($this->sourceMatchesFactDate()) {
+						return I18N::translate('%s sourced with exact certificate', $context_label);
+					} else {
+						return I18N::translate('%s sourced with a certificate', $context_label);
+					}
+				}
+
+				if ($this->sourceMatchesFactDate()) {
+					return I18N::translate('%s precisely sourced', $context_label);
+				}
+				return I18N::translate('%s sourced', $context_label);
+			}
+			return I18N::translate('%s not sourced', $context_label);
+		}
+
+		if ($this->factHasDate()) {
+			return I18N::translate('%s not precise', $context_label);
+		}
+		return I18N::translate('%s not found', $context_label);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::order()
+	 */
+	public function order(): int
+	{
+		return ($this->factHasDate() ? 1 : 0) * ($this->hasSource() ? 1 : -1) *
+			( 1 + ($this->factHasPreciseDate() ? 1 : 0) * (1 +
+				0b010 * ($this->sourceMatchesFactDate() ? 1 : 0) +
+				0b100 * ($this->hasSupportingDocument() ? 1 : 0)
+			)
+		);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::combineWith()
+	 */
+	public function combineWith(SourceStatus $other)
+	{
+		if ($other instanceof FactSourceStatus) {
+			$this->addFactHasDate($other->factHasDate());
+			$this->addFactHasPreciseDate($other->factHasPreciseDate());
+			$this->addSourceHasDate($other->sourceHasDate());
+			$this->addSourceMatchesFactDate($other->sourceMatchesFactDate());
+		}
+
+		parent::combineWith($other);
+		return $this;
+	}
 }

app/Module/IsSourced/Services/SourceStatusService.php

Indentation +122 added lines, -122 removed lines

@@ -29,126 +29,126 @@
  */
 class SourceStatusService
 {
-    /**
-     * Maximum timespan between the date of a source and the date of the event to consider the source precise.
-     * Arbitrally set to approximately a year around the event date.
-     *
-     * @var int DATE_PRECISION_MARGIN
-     */
-    private const DATE_PRECISION_MARGIN = 180;
-
-    /**
-     * Return the status of source citations for a fact.
-     *
-     * @param Fact $fact
-     * @return FactSourceStatus
-     */
-    public function sourceStatusForFact(Fact $fact): FactSourceStatus
-    {
-        $source_status = new FactSourceStatus();
-
-        $date = $fact->date();
-        $source_status
-            ->setFactHasDate($date->isOK())
-            ->setFactHasPreciseDate($date->qual1 === '' && $date->minimumJulianDay() === $date->maximumJulianDay());
-
-        foreach ($fact->getCitations() as $citation) {
-            $source_status
-                ->setHasSource(true)
-                ->addHasSupportingDocument(preg_match('/\n3 _ACT (?:.*)/', $citation) === 1);
-
-            preg_match_all("/\n3 DATA(?:\n[4-9] .*)*\n4 DATE (.*)/", $citation, $date_matches, PREG_SET_ORDER);
-            foreach ($date_matches as $date_match) {
-                $source_date = new Date($date_match[1]);
-                $source_status
-                    ->addSourceHasDate($source_date->isOK())
-                    ->addSourceMatchesFactDate($date->isOK() && $source_date->isOK()
-                        && abs($source_date->julianDay() - $date->julianDay()) < self::DATE_PRECISION_MARGIN);
-            }
-
-            if ($source_status->isFullySourced()) {
-                return $source_status;
-            }
-        }
-
-        return $source_status;
-    }
-
-    /**
-     * Return the status of sources for a Gedcom record.
-     *
-     * @param GedcomRecord $record
-     * @return SourceStatus
-     */
-    public function sourceStatusForRecord(GedcomRecord $record): SourceStatus
-    {
-        $source_status = new SourceStatus();
-
-        foreach ($record->facts(['SOUR']) as $source) {
-            $source_status
-                ->setHasSource(true)
-                ->addHasSupportingDocument($source->attribute('_ACT') !== '');
-
-            if ($source_status->isFullySourced()) {
-                return $source_status;
-            }
-        }
-
-        return $source_status;
-    }
-
-    /**
-     * Return the status of source citations for a list of fact types associated with a record.
-     *
-     * @param GedcomRecord $record
-     * @param string[] $tags
-     * @return FactSourceStatus
-     */
-    public function sourceStatusForFactsWithTags(GedcomRecord $record, array $tags): FactSourceStatus
-    {
-        $source_status = new NullFactSourceStatus();
-
-        foreach ($record->facts($tags) as $fact) {
-            $source_status = $source_status->combineWith($this->sourceStatusForFact($fact));
-            if ($source_status->isFullySourced()) {
-                return $source_status;
-            }
-        }
-
-        return $source_status;
-    }
-
-    /**
-     * Return the status of source citations for an individual's birth events.
-     *
-     * @param Individual $individual
-     * @return FactSourceStatus
-     */
-    public function sourceStatusForBirth(Individual $individual): FactSourceStatus
-    {
-        return $this->sourceStatusForFactsWithTags($individual, Gedcom::BIRTH_EVENTS);
-    }
-
-    /**
-     * Return the status of source citations for an individual's death events.
-     *
-     * @param Individual $individual
-     * @return FactSourceStatus
-     */
-    public function sourceStatusForDeath(Individual $individual): FactSourceStatus
-    {
-        return $this->sourceStatusForFactsWithTags($individual, Gedcom::DEATH_EVENTS);
-    }
-
-    /**
-     * Return the status of source citations for a family's marriage events.
-     *
-     * @param Family $family
-     * @return FactSourceStatus
-     */
-    public function sourceStatusForMarriage(Family $family): FactSourceStatus
-    {
-        $marr_events = [...Gedcom::MARRIAGE_EVENTS, 'MARC', 'MARL', 'MARS'];
-        return $this->sourceStatusForFactsWithTags($family, $marr_events);
-    }
+	/**
+	 * Maximum timespan between the date of a source and the date of the event to consider the source precise.
+	 * Arbitrally set to approximately a year around the event date.
+	 *
+	 * @var int DATE_PRECISION_MARGIN
+	 */
+	private const DATE_PRECISION_MARGIN = 180;
+
+	/**
+	 * Return the status of source citations for a fact.
+	 *
+	 * @param Fact $fact
+	 * @return FactSourceStatus
+	 */
+	public function sourceStatusForFact(Fact $fact): FactSourceStatus
+	{
+		$source_status = new FactSourceStatus();
+
+		$date = $fact->date();
+		$source_status
+			->setFactHasDate($date->isOK())
+			->setFactHasPreciseDate($date->qual1 === '' && $date->minimumJulianDay() === $date->maximumJulianDay());
+
+		foreach ($fact->getCitations() as $citation) {
+			$source_status
+				->setHasSource(true)
+				->addHasSupportingDocument(preg_match('/\n3 _ACT (?:.*)/', $citation) === 1);
+
+			preg_match_all("/\n3 DATA(?:\n[4-9] .*)*\n4 DATE (.*)/", $citation, $date_matches, PREG_SET_ORDER);
+			foreach ($date_matches as $date_match) {
+				$source_date = new Date($date_match[1]);
+				$source_status
+					->addSourceHasDate($source_date->isOK())
+					->addSourceMatchesFactDate($date->isOK() && $source_date->isOK()
+						&& abs($source_date->julianDay() - $date->julianDay()) < self::DATE_PRECISION_MARGIN);
+			}
+
+			if ($source_status->isFullySourced()) {
+				return $source_status;
+			}
+		}
+
+		return $source_status;
+	}
+
+	/**
+	 * Return the status of sources for a Gedcom record.
+	 *
+	 * @param GedcomRecord $record
+	 * @return SourceStatus
+	 */
+	public function sourceStatusForRecord(GedcomRecord $record): SourceStatus
+	{
+		$source_status = new SourceStatus();
+
+		foreach ($record->facts(['SOUR']) as $source) {
+			$source_status
+				->setHasSource(true)
+				->addHasSupportingDocument($source->attribute('_ACT') !== '');
+
+			if ($source_status->isFullySourced()) {
+				return $source_status;
+			}
+		}
+
+		return $source_status;
+	}
+
+	/**
+	 * Return the status of source citations for a list of fact types associated with a record.
+	 *
+	 * @param GedcomRecord $record
+	 * @param string[] $tags
+	 * @return FactSourceStatus
+	 */
+	public function sourceStatusForFactsWithTags(GedcomRecord $record, array $tags): FactSourceStatus
+	{
+		$source_status = new NullFactSourceStatus();
+
+		foreach ($record->facts($tags) as $fact) {
+			$source_status = $source_status->combineWith($this->sourceStatusForFact($fact));
+			if ($source_status->isFullySourced()) {
+				return $source_status;
+			}
+		}
+
+		return $source_status;
+	}
+
+	/**
+	 * Return the status of source citations for an individual's birth events.
+	 *
+	 * @param Individual $individual
+	 * @return FactSourceStatus
+	 */
+	public function sourceStatusForBirth(Individual $individual): FactSourceStatus
+	{
+		return $this->sourceStatusForFactsWithTags($individual, Gedcom::BIRTH_EVENTS);
+	}
+
+	/**
+	 * Return the status of source citations for an individual's death events.
+	 *
+	 * @param Individual $individual
+	 * @return FactSourceStatus
+	 */
+	public function sourceStatusForDeath(Individual $individual): FactSourceStatus
+	{
+		return $this->sourceStatusForFactsWithTags($individual, Gedcom::DEATH_EVENTS);
+	}
+
+	/**
+	 * Return the status of source citations for a family's marriage events.
+	 *
+	 * @param Family $family
+	 * @return FactSourceStatus
+	 */
+	public function sourceStatusForMarriage(Family $family): FactSourceStatus
+	{
+		$marr_events = [...Gedcom::MARRIAGE_EVENTS, 'MARC', 'MARL', 'MARS'];
+		return $this->sourceStatusForFactsWithTags($family, $marr_events);
+	}
 }

app/Common/GeoDispersion/GeoAnalysis/GeoAnalysisPlace.php

Indentation +129 added lines, -129 removed lines

@@ -28,133 +28,133 @@
  */
 class GeoAnalysisPlace
 {
-    /**
-     * The default place name for invalid places
-     * @var string INVALID_PLACE
-     */
-    private const INVALID_PLACE = '##INVALID##';
-
-    private Place $place;
-    private bool $is_excluded;
-
-    /**
-     * Constructor for GeoAnalysisPlace
-     *
-     * @param Tree $tree Default tree
-     * @param Place|null $place Place resulting from the analysis
-     * @param int $depth Place hierarchy depth defined by the geographical analysis view
-     * @param bool $strict_depth Checks whether places with a lower depth than defined should be flagged as invalid
-     */
-    public function __construct(Tree $tree, ?Place $place, int $depth, bool $strict_depth = false)
-    {
-        $this->place = $this->extractPlace($place, $depth, $strict_depth) ?? new Place('', $tree);
-        $this->is_excluded = false;
-    }
-
-    /**
-     * Process the provided Place to determine its status for further usage
-     *
-     * @param Place|null $place
-     * @param int $depth
-     * @param bool $strict_depth
-     * @return Place|NULL
-     */
-    private function extractPlace(?Place $place, int $depth, bool $strict_depth): ?Place
-    {
-        if ($place === null) {
-            return null;
-        }
-        if (mb_strlen($place->gedcomName()) === 0) {
-            return null;
-        }
-        $parts = $place->lastParts($depth);
-        if ($strict_depth && $parts->count() !== $depth) {
-            return new Place(self::INVALID_PLACE, $place->tree());
-        }
-        return new Place($parts->implode(', '), $place->tree());
-    }
-
-    /**
-     * Get the GeoAnalysis Place key
-     *
-     * @return string
-     */
-    public function key(): string
-    {
-        return $this->place->gedcomName();
-    }
-
-    /**
-     * Get the underlying Place object
-     *
-     * @return Place
-     */
-    public function place(): Place
-    {
-        return $this->place;
-    }
-
-    /**
-     * Check if the GeoAnalysis Place is in the Known status
-     *
-     * @return bool
-     */
-    public function isKnown(): bool
-    {
-        return !$this->isUnknown();
-    }
-
-    /**
-     * Check if the GeoAnalysis Place is in the Unknown status
-     *
-     * @return bool
-     */
-    public function isUnknown(): bool
-    {
-        return mb_strlen($this->place->gedcomName()) === 0;
-    }
-
-    /**
-     * Check if the GeoAnalysis Place is in the Invalid status
-     *
-     * @return bool
-     */
-    public function isInvalid(): bool
-    {
-        return $this->place->gedcomName() === self::INVALID_PLACE;
-    }
-
-    /**
-     * Check if the GeoAnalysis Place is in the Excluded status
-     *
-     * @return bool
-     */
-    public function isExcluded(): bool
-    {
-        return $this->isUnknown() || $this->isInvalid() || $this->is_excluded;
-    }
-
-    /**
-     * Set the GeoAnalysis Place status to Found, if the parameter is true
-     *
-     * @param bool $include
-     * @return $this
-     */
-    public function include(bool $include = true): self
-    {
-        $this->is_excluded = !$include;
-        return $this;
-    }
-
-    /**
-     * Set the GeoAnalysis Place status to Excluded, if the parameter is true
-     *
-     * @param bool $exclude
-     * @return $this
-     */
-    public function exclude(bool $exclude = true): self
-    {
-        $this->is_excluded = $exclude;
-        return $this;
-    }
+	/**
+	 * The default place name for invalid places
+	 * @var string INVALID_PLACE
+	 */
+	private const INVALID_PLACE = '##INVALID##';
+
+	private Place $place;
+	private bool $is_excluded;
+
+	/**
+	 * Constructor for GeoAnalysisPlace
+	 *
+	 * @param Tree $tree Default tree
+	 * @param Place|null $place Place resulting from the analysis
+	 * @param int $depth Place hierarchy depth defined by the geographical analysis view
+	 * @param bool $strict_depth Checks whether places with a lower depth than defined should be flagged as invalid
+	 */
+	public function __construct(Tree $tree, ?Place $place, int $depth, bool $strict_depth = false)
+	{
+		$this->place = $this->extractPlace($place, $depth, $strict_depth) ?? new Place('', $tree);
+		$this->is_excluded = false;
+	}
+
+	/**
+	 * Process the provided Place to determine its status for further usage
+	 *
+	 * @param Place|null $place
+	 * @param int $depth
+	 * @param bool $strict_depth
+	 * @return Place|NULL
+	 */
+	private function extractPlace(?Place $place, int $depth, bool $strict_depth): ?Place
+	{
+		if ($place === null) {
+			return null;
+		}
+		if (mb_strlen($place->gedcomName()) === 0) {
+			return null;
+		}
+		$parts = $place->lastParts($depth);
+		if ($strict_depth && $parts->count() !== $depth) {
+			return new Place(self::INVALID_PLACE, $place->tree());
+		}
+		return new Place($parts->implode(', '), $place->tree());
+	}
+
+	/**
+	 * Get the GeoAnalysis Place key
+	 *
+	 * @return string
+	 */
+	public function key(): string
+	{
+		return $this->place->gedcomName();
+	}
+
+	/**
+	 * Get the underlying Place object
+	 *
+	 * @return Place
+	 */
+	public function place(): Place
+	{
+		return $this->place;
+	}
+
+	/**
+	 * Check if the GeoAnalysis Place is in the Known status
+	 *
+	 * @return bool
+	 */
+	public function isKnown(): bool
+	{
+		return !$this->isUnknown();
+	}
+
+	/**
+	 * Check if the GeoAnalysis Place is in the Unknown status
+	 *
+	 * @return bool
+	 */
+	public function isUnknown(): bool
+	{
+		return mb_strlen($this->place->gedcomName()) === 0;
+	}
+
+	/**
+	 * Check if the GeoAnalysis Place is in the Invalid status
+	 *
+	 * @return bool
+	 */
+	public function isInvalid(): bool
+	{
+		return $this->place->gedcomName() === self::INVALID_PLACE;
+	}
+
+	/**
+	 * Check if the GeoAnalysis Place is in the Excluded status
+	 *
+	 * @return bool
+	 */
+	public function isExcluded(): bool
+	{
+		return $this->isUnknown() || $this->isInvalid() || $this->is_excluded;
+	}
+
+	/**
+	 * Set the GeoAnalysis Place status to Found, if the parameter is true
+	 *
+	 * @param bool $include
+	 * @return $this
+	 */
+	public function include(bool $include = true): self
+	{
+		$this->is_excluded = !$include;
+		return $this;
+	}
+
+	/**
+	 * Set the GeoAnalysis Place status to Excluded, if the parameter is true
+	 *
+	 * @param bool $exclude
+	 * @return $this
+	 */
+	public function exclude(bool $exclude = true): self
+	{
+		$this->is_excluded = $exclude;
+		return $this;
+	}
 }

app/Common/GeoDispersion/GeoAnalysis/GeoAnalysisResultItem.php

Indentation +57 added lines, -57 removed lines

@@ -20,67 +20,67 @@
  */
 class GeoAnalysisResultItem
 {
-    private GeoAnalysisPlace $place;
-    private int $count;
+	private GeoAnalysisPlace $place;
+	private int $count;
 
-    /**
-     * Constructor for GeoAnalysisResultItem
-     *
-     * @param GeoAnalysisPlace $place
-     * @param int $count
-     */
-    public function __construct(GeoAnalysisPlace $place, int $count = 0)
-    {
-        $this->place = $place;
-        $this->count = $count;
-    }
+	/**
+	 * Constructor for GeoAnalysisResultItem
+	 *
+	 * @param GeoAnalysisPlace $place
+	 * @param int $count
+	 */
+	public function __construct(GeoAnalysisPlace $place, int $count = 0)
+	{
+		$this->place = $place;
+		$this->count = $count;
+	}
 
-    /**
-     * Get the item key.
-     *
-     * @return string
-     */
-    public function key(): string
-    {
-        return $this->place->key();
-    }
+	/**
+	 * Get the item key.
+	 *
+	 * @return string
+	 */
+	public function key(): string
+	{
+		return $this->place->key();
+	}
 
-    /**
-     * Get the referenced GeoAnalysis Place
-     *
-     * @return GeoAnalysisPlace
-     */
-    public function place(): GeoAnalysisPlace
-    {
-        return $this->place;
-    }
+	/**
+	 * Get the referenced GeoAnalysis Place
+	 *
+	 * @return GeoAnalysisPlace
+	 */
+	public function place(): GeoAnalysisPlace
+	{
+		return $this->place;
+	}
 
-    /**
-     * Get the count of occurrences of the GeoAnalysis Place in the analysis
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return $this->count;
-    }
+	/**
+	 * Get the count of occurrences of the GeoAnalysis Place in the analysis
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return $this->count;
+	}
 
-    /**
-     * Increment the count of occurrences of the GeoAnalysis Place in the analysis
-     *
-     * @return $this
-     */
-    public function increment(): self
-    {
-        $this->count++;
-        return $this;
-    }
+	/**
+	 * Increment the count of occurrences of the GeoAnalysis Place in the analysis
+	 *
+	 * @return $this
+	 */
+	public function increment(): self
+	{
+		$this->count++;
+		return $this;
+	}
 
-    /**
-     * Clone the item object
-     */
-    public function __clone()
-    {
-        $this->place = clone $this->place;
-    }
+	/**
+	 * Clone the item object
+	 */
+	public function __clone()
+	{
+		$this->place = clone $this->place;
+	}
 }

app/Http/Middleware/AuthTreePreference.php

Indentation +31 added lines, -31 removed lines

@@ -31,40 +31,40 @@
  */
 class AuthTreePreference implements MiddlewareInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\MiddlewareInterface::process()
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $tree = Validator::attributes($request)->tree();
-        $route = Validator::attributes($request)->route();
-        $user = Validator::attributes($request)->user();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\MiddlewareInterface::process()
+	 */
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
+		$route = Validator::attributes($request)->route();
+		$user = Validator::attributes($request)->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 Registry::responseFactory()->redirect(
-            LoginPage::class,
-            ['tree' => $tree->name(), 'url' => (string) $request->getUri()]
-        );
-    }
+		return Registry::responseFactory()->redirect(
+			LoginPage::class,
+			['tree' => $tree->name(), 'url' => (string) $request->getUri()]
+		);
+	}
 }

app/Common/Tasks/TaskSchedule.php

Indentation +229 added lines, -229 removed lines

@@ -23,252 +23,252 @@
  */
 class TaskSchedule
 {
-    private int $id;
-    private bool $enabled;
-    private string $task_id;
-    private CarbonInterface $last_run;
-    private bool $last_result;
-    private int $frequency;
-    private int $nb_occurrences;
-    private bool $is_running;
+	private int $id;
+	private bool $enabled;
+	private string $task_id;
+	private CarbonInterface $last_run;
+	private bool $last_result;
+	private int $frequency;
+	private int $nb_occurrences;
+	private bool $is_running;
 
-    /**
-     * Constructor for TaskSchedule
-     *
-     * @param int $id Schedule ID
-     * @param string $task_id Task ID
-     * @param bool $enabled Is the schedule enabled
-     * @param CarbonInterface $last_run Last successful run date/time
-     * @param bool $last_result Result of the last run
-     * @param int $frequency Schedule frequency in minutes
-     * @param int $nb_occurrences Number of remaining occurrences to be run
-     * @param bool $is_running Is the task currently running
-     */
-    public function __construct(
-        int $id,
-        string $task_id,
-        bool $enabled,
-        CarbonInterface $last_run,
-        bool $last_result,
-        int $frequency,
-        int $nb_occurrences,
-        bool $is_running
-    ) {
-        $this->id = $id;
-        $this->task_id = $task_id;
-        $this->enabled = $enabled;
-        $this->last_run = $last_run;
-        $this->last_result = $last_result;
-        $this->frequency = $frequency;
-        $this->nb_occurrences = $nb_occurrences;
-        $this->is_running = $is_running;
-    }
+	/**
+	 * Constructor for TaskSchedule
+	 *
+	 * @param int $id Schedule ID
+	 * @param string $task_id Task ID
+	 * @param bool $enabled Is the schedule enabled
+	 * @param CarbonInterface $last_run Last successful run date/time
+	 * @param bool $last_result Result of the last run
+	 * @param int $frequency Schedule frequency in minutes
+	 * @param int $nb_occurrences Number of remaining occurrences to be run
+	 * @param bool $is_running Is the task currently running
+	 */
+	public function __construct(
+		int $id,
+		string $task_id,
+		bool $enabled,
+		CarbonInterface $last_run,
+		bool $last_result,
+		int $frequency,
+		int $nb_occurrences,
+		bool $is_running
+	) {
+		$this->id = $id;
+		$this->task_id = $task_id;
+		$this->enabled = $enabled;
+		$this->last_run = $last_run;
+		$this->last_result = $last_result;
+		$this->frequency = $frequency;
+		$this->nb_occurrences = $nb_occurrences;
+		$this->is_running = $is_running;
+	}
 
-    /**
-     * Get the schedule ID.
-     *
-     * @return int
-     */
-    public function id(): int
-    {
-        return $this->id;
-    }
+	/**
+	 * Get the schedule ID.
+	 *
+	 * @return int
+	 */
+	public function id(): int
+	{
+		return $this->id;
+	}
 
-    /**
-     * Get the task ID.
-     *
-     * @return string
-     */
-    public function taskId(): string
-    {
-        return $this->task_id;
-    }
+	/**
+	 * Get the task ID.
+	 *
+	 * @return string
+	 */
+	public function taskId(): string
+	{
+		return $this->task_id;
+	}
 
-    /**
-     * Returns whether the schedule is enabled
-     *
-     * @return bool
-     */
-    public function isEnabled(): bool
-    {
-        return $this->enabled;
-    }
+	/**
+	 * Returns whether the schedule is enabled
+	 *
+	 * @return bool
+	 */
+	public function isEnabled(): bool
+	{
+		return $this->enabled;
+	}
 
-    /**
-     * Enable the schedule
-     *
-     * @return $this
-     */
-    public function enable(): self
-    {
-        $this->enabled = true;
-        return $this;
-    }
+	/**
+	 * Enable the schedule
+	 *
+	 * @return $this
+	 */
+	public function enable(): self
+	{
+		$this->enabled = true;
+		return $this;
+	}
 
-    /**
-     * Disable the schedule
-     *
-     * @return $this
-     */
-    public function disable(): self
-    {
-        $this->enabled = false;
-        return $this;
-    }
+	/**
+	 * Disable the schedule
+	 *
+	 * @return $this
+	 */
+	public function disable(): self
+	{
+		$this->enabled = false;
+		return $this;
+	}
 
-    /**
-     * Get the frequency of the schedule
-     *
-     * @return int
-     */
-    public function frequency(): int
-    {
-        return $this->frequency;
-    }
+	/**
+	 * Get the frequency of the schedule
+	 *
+	 * @return int
+	 */
+	public function frequency(): int
+	{
+		return $this->frequency;
+	}
 
-    /**
-     * Set the frequency of the schedule
-     *
-     * @param int $frequency
-     * @return $this
-     */
-    public function setFrequency(int $frequency): self
-    {
-        $this->frequency = $frequency;
-        return $this;
-    }
+	/**
+	 * Set the frequency of the schedule
+	 *
+	 * @param int $frequency
+	 * @return $this
+	 */
+	public function setFrequency(int $frequency): self
+	{
+		$this->frequency = $frequency;
+		return $this;
+	}
 
-    /**
-     * Get the date/time of the last successful run.
-     *
-     * @return CarbonInterface
-     */
-    public function lastRunTime(): CarbonInterface
-    {
-        return $this->last_run;
-    }
+	/**
+	 * Get the date/time of the last successful run.
+	 *
+	 * @return CarbonInterface
+	 */
+	public function lastRunTime(): CarbonInterface
+	{
+		return $this->last_run;
+	}
 
-    /**
-     * Set the last successful run date/time
-     *
-     * @param CarbonInterface $last_run
-     * @return $this
-     */
-    public function setLastRunTime(CarbonInterface $last_run): self
-    {
-        $this->last_run = $last_run;
-        return $this;
-    }
+	/**
+	 * Set the last successful run date/time
+	 *
+	 * @param CarbonInterface $last_run
+	 * @return $this
+	 */
+	public function setLastRunTime(CarbonInterface $last_run): self
+	{
+		$this->last_run = $last_run;
+		return $this;
+	}
 
-    /**
-     * Returns whether the last run was successful
-     *
-     * @return bool
-     */
-    public function wasLastRunSuccess(): bool
-    {
-        return $this->last_result;
-    }
+	/**
+	 * Returns whether the last run was successful
+	 *
+	 * @return bool
+	 */
+	public function wasLastRunSuccess(): bool
+	{
+		return $this->last_result;
+	}
 
-    /**
-     * Set the last run result
-     *
-     * @param bool $last_result
-     * @return $this
-     */
-    public function setLastResult(bool $last_result): self
-    {
-        $this->last_result = $last_result;
-        return $this;
-    }
+	/**
+	 * Set the last run result
+	 *
+	 * @param bool $last_result
+	 * @return $this
+	 */
+	public function setLastResult(bool $last_result): self
+	{
+		$this->last_result = $last_result;
+		return $this;
+	}
 
-    /**
-     * Get the number of remaining of occurrences of task runs.
-     * Returns 0 if the tasks must be run indefinitely.
-     *
-     * @return int
-     */
-    public function remainingOccurrences(): int
-    {
-        return $this->nb_occurrences;
-    }
+	/**
+	 * Get the number of remaining of occurrences of task runs.
+	 * Returns 0 if the tasks must be run indefinitely.
+	 *
+	 * @return int
+	 */
+	public function remainingOccurrences(): int
+	{
+		return $this->nb_occurrences;
+	}
 
-    /**
-     * Decrements the number of remaining occurrences by 1.
-     * The task will be disabled when the number reaches 0.
-     *
-     * @return $this
-     */
-    public function decrementRemainingOccurrences(): self
-    {
-        if ($this->nb_occurrences > 0) {
-            $this->nb_occurrences--;
-            if ($this->nb_occurrences === 0) {
-                $this->disable();
-            }
-        }
-        return $this;
-    }
+	/**
+	 * Decrements the number of remaining occurrences by 1.
+	 * The task will be disabled when the number reaches 0.
+	 *
+	 * @return $this
+	 */
+	public function decrementRemainingOccurrences(): self
+	{
+		if ($this->nb_occurrences > 0) {
+			$this->nb_occurrences--;
+			if ($this->nb_occurrences === 0) {
+				$this->disable();
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Set the number of remaining occurrences of task runs.
-     *
-     * @param int $nb_occurrences
-     * @return $this
-     */
-    public function setRemainingOccurrences(int $nb_occurrences): self
-    {
-        $this->nb_occurrences = $nb_occurrences;
-        return $this;
-    }
+	/**
+	 * Set the number of remaining occurrences of task runs.
+	 *
+	 * @param int $nb_occurrences
+	 * @return $this
+	 */
+	public function setRemainingOccurrences(int $nb_occurrences): self
+	{
+		$this->nb_occurrences = $nb_occurrences;
+		return $this;
+	}
 
-    /**
-     * Returns whether the task is running
-     * @return bool
-     */
-    public function isRunning(): bool
-    {
-        return $this->is_running;
-    }
+	/**
+	 * Returns whether the task is running
+	 * @return bool
+	 */
+	public function isRunning(): bool
+	{
+		return $this->is_running;
+	}
 
-    /**
-     * Informs the schedule that the task is going to run
-     *
-     * @return $this
-     */
-    public function startRunning(): self
-    {
-        $this->is_running = true;
-        return $this;
-    }
+	/**
+	 * Informs the schedule that the task is going to run
+	 *
+	 * @return $this
+	 */
+	public function startRunning(): self
+	{
+		$this->is_running = true;
+		return $this;
+	}
 
-    /**
-     * Informs the schedule that the task has stopped running.
-     * @return $this
-     */
-    public function stopRunning(): self
-    {
-        $this->is_running = false;
-        return $this;
-    }
+	/**
+	 * Informs the schedule that the task has stopped running.
+	 * @return $this
+	 */
+	public function stopRunning(): self
+	{
+		$this->is_running = false;
+		return $this;
+	}
 
-    /**
-     * Returns the schedule details as an associate array
-     *
-     * @phpcs:ignore Generic.Files.LineLength.TooLong
-     * @return array{id: int, task_id: string, enabled: bool, last_run: CarbonInterface, last_result: bool, frequency: int, nb_occurrences: int, is_running: bool}
-     */
-    public function toArray(): array
-    {
-        return [
-            'id'            =>  $this->id,
-            'task_id'       =>  $this->task_id,
-            'enabled'       =>  $this->enabled,
-            'last_run'      =>  $this->last_run,
-            'last_result'   =>  $this->last_result,
-            'frequency'     =>  $this->frequency,
-            'nb_occurrences' =>  $this->nb_occurrences,
-            'is_running'    =>  $this->is_running
-        ];
-    }
+	/**
+	 * Returns the schedule details as an associate array
+	 *
+	 * @phpcs:ignore Generic.Files.LineLength.TooLong
+	 * @return array{id: int, task_id: string, enabled: bool, last_run: CarbonInterface, last_result: bool, frequency: int, nb_occurrences: int, is_running: bool}
+	 */
+	public function toArray(): array
+	{
+		return [
+			'id'            =>  $this->id,
+			'task_id'       =>  $this->task_id,
+			'enabled'       =>  $this->enabled,
+			'last_run'      =>  $this->last_run,
+			'last_result'   =>  $this->last_result,
+			'frequency'     =>  $this->frequency,
+			'nb_occurrences' =>  $this->nb_occurrences,
+			'is_running'    =>  $this->is_running
+		];
+	}
 }

app/Module/Sosa/Http/RequestHandlers/SosaComputeModal.php

Indentation +31 added lines, -31 removed lines

@@ -28,39 +28,39 @@
  */
 class SosaComputeModal implements RequestHandlerInterface
 {
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for SosaComputeModal Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for SosaComputeModal Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            return Registry::responseFactory()->response(view('modals/error', [
-                'title' => I18N::translate('Error'),
-                'error' => I18N::translate('The attached module could not be found.')
-            ]));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			return Registry::responseFactory()->response(view('modals/error', [
+				'title' => I18N::translate('Error'),
+				'error' => I18N::translate('The attached module could not be found.')
+			]));
+		}
 
-        $tree = Validator::attributes($request)->tree();
+		$tree = Validator::attributes($request)->tree();
 
-        return Registry::responseFactory()->response(view($this->module->name() . '::modals/sosa-compute', [
-            'tree'          => $tree,
-            'xref'          => Validator::attributes($request)->isXref()->string('xref', '')
-        ]));
-    }
+		return Registry::responseFactory()->response(view($this->module->name() . '::modals/sosa-compute', [
+			'tree'          => $tree,
+			'xref'          => Validator::attributes($request)->isXref()->string('xref', '')
+		]));
+	}
 }