jon48 / webtrees-lib

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

Indentation +208 added lines, -208 removed lines

@@ -25,212 +25,212 @@
  */
 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
-
-    /**
-     * @var Tree $tree
-     */
-    private $tree;
-
-    /**
-     * @var string $path
-     * */
-    private $path;
-
-    /**
-     * @var string|null $city
-     * $city */
-    private $city;
-
-    /**
-     * @var string|null $filename
-     */
-    private $filename;
-
-    /**
-     * @var string|null $extension
-     */
-    private $extension;
-
-    /**
-     * @var string|null $type
-     */
-    private $type;
-
-    /**
-     * @var string|null $description
-     */
-    private $description;
-
-    /**
-     * @var Date|null $date
-     */
-    private $date;
-
-    /**
-     * 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($path);
-        $this->city = $path_parts['dirname'];
-        $this->filename = $path_parts['filename'];
-        $this->extension = $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'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
-     */
-    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
+
+	/**
+	 * @var Tree $tree
+	 */
+	private $tree;
+
+	/**
+	 * @var string $path
+	 * */
+	private $path;
+
+	/**
+	 * @var string|null $city
+	 * $city */
+	private $city;
+
+	/**
+	 * @var string|null $filename
+	 */
+	private $filename;
+
+	/**
+	 * @var string|null $extension
+	 */
+	private $extension;
+
+	/**
+	 * @var string|null $type
+	 */
+	private $type;
+
+	/**
+	 * @var string|null $description
+	 */
+	private $description;
+
+	/**
+	 * @var Date|null $date
+	 */
+	private $date;
+
+	/**
+	 * 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($path);
+		$this->city = $path_parts['dirname'];
+		$this->filename = $path_parts['filename'];
+		$this->extension = $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'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
+	 */
+	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)
+		];
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -202,11 +202,11 @@
     {
         $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) {
+            $sort_prefix = implode('_', array_map(function($match) {
                 return $match[1];
-            }, $matches)) . '_';
+            }, $matches)).'_';
         }
-        return $sort_prefix . $this->description();
+        return $sort_prefix.$this->description();
     }
 
     /**

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

Indentation +108 added lines, -108 removed lines

@@ -19,112 +19,112 @@
  */
 class Watermark
 {
-    /**
-     * Default font color for watermarks
-     * @var string DEFAULT_COLOR
-     * */
-    public const DEFAULT_COLOR = '#4D6DF3';
-
-    /**
-     * Default maximum font size for watermarks
-     * @var string DEFAULT_SIZE
-     * */
-    public const DEFAULT_SIZE = 18;
-
-    /**
-     * @var string $text
-     */
-    private $text;
-
-    /**
-     * @var string $color;
-     */
-    private $color;
-
-
-    /**
-     * @var int $size
-     */
-    private $size;
-
-    /**
-     * Constructor for Watermark data class
-     *
-     * @param string $text
-     * @param string $color
-     * @param int $size
-     */
-    public function __construct(string $text, string $color, int $size)
-    {
-        $this->text = $text;
-        $this->color = $color;
-        $this->size = $size;
-    }
-
-    /**
-     * Get the watermark text.
-     *
-     * @return string
-     */
-    public function text(): string
-    {
-        return $this->text;
-    }
-
-    /**
-     * Get the watermark font color.
-     *
-     * @return string
-     */
-    public function color(): string
-    {
-        return $this->color;
-    }
-
-    /**
-     * Get the watermark maximum font size.
-     * @return int
-     */
-    public function size(): int
-    {
-        return $this->size;
-    }
-
-    /**
-     * Return an estimate of the size in pixels of the watermark text length.
-     *
-     * @return int
-     */
-    public function textLengthEstimate(): int
-    {
-        return $this->stringLengthEstimate(mb_strlen($this->text), $this->size);
-    }
-
-    /**
-     * Decrease the font size if necessary, based on the image width.
-     *
-     * @param int $width
-     */
-    public function adjustSize(int $width): void
-    {
-        $len = mb_strlen($this->text);
-        while ($this->stringLengthEstimate($len, $this->size) > 0.9 * $width) {
-            $this->size--;
-            if ($this->size == 2) {
-                return;
-            }
-        }
-    }
-
-    /**
-     * Return an estimate of the size in pixels of a text in a specified font size.
-     *
-     * @param int $text_length
-     * @param int $font_size
-     * @return int
-     */
-    private function stringLengthEstimate(int $text_length, int $font_size): int
-    {
-        return $text_length * (int) ceil(($font_size + 2) * 0.5);
-    }
+	/**
+	 * Default font color for watermarks
+	 * @var string DEFAULT_COLOR
+	 * */
+	public const DEFAULT_COLOR = '#4D6DF3';
+
+	/**
+	 * Default maximum font size for watermarks
+	 * @var string DEFAULT_SIZE
+	 * */
+	public const DEFAULT_SIZE = 18;
+
+	/**
+	 * @var string $text
+	 */
+	private $text;
+
+	/**
+	 * @var string $color;
+	 */
+	private $color;
+
+
+	/**
+	 * @var int $size
+	 */
+	private $size;
+
+	/**
+	 * Constructor for Watermark data class
+	 *
+	 * @param string $text
+	 * @param string $color
+	 * @param int $size
+	 */
+	public function __construct(string $text, string $color, int $size)
+	{
+		$this->text = $text;
+		$this->color = $color;
+		$this->size = $size;
+	}
+
+	/**
+	 * Get the watermark text.
+	 *
+	 * @return string
+	 */
+	public function text(): string
+	{
+		return $this->text;
+	}
+
+	/**
+	 * Get the watermark font color.
+	 *
+	 * @return string
+	 */
+	public function color(): string
+	{
+		return $this->color;
+	}
+
+	/**
+	 * Get the watermark maximum font size.
+	 * @return int
+	 */
+	public function size(): int
+	{
+		return $this->size;
+	}
+
+	/**
+	 * Return an estimate of the size in pixels of the watermark text length.
+	 *
+	 * @return int
+	 */
+	public function textLengthEstimate(): int
+	{
+		return $this->stringLengthEstimate(mb_strlen($this->text), $this->size);
+	}
+
+	/**
+	 * Decrease the font size if necessary, based on the image width.
+	 *
+	 * @param int $width
+	 */
+	public function adjustSize(int $width): void
+	{
+		$len = mb_strlen($this->text);
+		while ($this->stringLengthEstimate($len, $this->size) > 0.9 * $width) {
+			$this->size--;
+			if ($this->size == 2) {
+				return;
+			}
+		}
+	}
+
+	/**
+	 * Return an estimate of the size in pixels of a text in a specified font size.
+	 *
+	 * @param int $text_length
+	 * @param int $font_size
+	 * @return int
+	 */
+	private function stringLengthEstimate(int $text_length, int $font_size): int
+	{
+		return $text_length * (int) ceil(($font_size + 2) * 0.5);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -125,6 +125,6 @@
      */
     private function stringLengthEstimate(int $text_length, int $font_size): int
     {
-        return $text_length * (int) ceil(($font_size + 2) * 0.5);
+        return $text_length * (int)ceil(($font_size + 2) * 0.5);
     }
 }

src/Webtrees/Module/Certificates/Http/RequestHandlers/CertificatesList.php

Indentation +69 added lines, -69 removed lines

@@ -31,73 +31,73 @@
  */
 class CertificatesList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var CertificateFilesystemService $certif_filesystem
-     */
-    private $certif_filesystem;
-
-    /**
-     * @var UrlObfuscatorService $url_obfuscator_service
-     */
-    private $url_obfuscator_service;
-
-
-    /**
-     * Constructor for CertificatesList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        CertificateFilesystemService $certif_filesystem,
-        UrlObfuscatorService $url_obfuscator_service
-    ) {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-        $this->certif_filesystem = $certif_filesystem;
-        $this->url_obfuscator_service = $url_obfuscator_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $title = I18N::translate('Certificates');
-
-        $cities = array_map(function (string $item): array {
-            return [$this->url_obfuscator_service->obfuscate($item), $item];
-        }, $this->certif_filesystem->cities($tree));
-
-        $city = $request->getQueryParams()['cityobf'] ?? $request->getAttribute('cityobf') ?? '';
-
-        if ($city !== '' && $this->url_obfuscator_service->tryDeobfuscate($city)) {
-            $title = I18N::translate('Certificates for %s', $city);
-            $certificates = $this->certif_filesystem->certificatesForCity($tree, $city);
-        }
-
-        return $this->viewResponse($this->module->name() . '::certificates-list', [
-            'title'                     =>  $title,
-            'tree'                      =>  $tree,
-            'module_name'               =>  $this->module->name(),
-            'cities'                    =>  $cities,
-            'selected_city'             =>  $city,
-            'certificates_list'         =>  $certificates ?? collect(),
-            'url_obfuscator_service'    =>  $this->url_obfuscator_service
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var CertificateFilesystemService $certif_filesystem
+	 */
+	private $certif_filesystem;
+
+	/**
+	 * @var UrlObfuscatorService $url_obfuscator_service
+	 */
+	private $url_obfuscator_service;
+
+
+	/**
+	 * Constructor for CertificatesList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		CertificateFilesystemService $certif_filesystem,
+		UrlObfuscatorService $url_obfuscator_service
+	) {
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+		$this->certif_filesystem = $certif_filesystem;
+		$this->url_obfuscator_service = $url_obfuscator_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$title = I18N::translate('Certificates');
+
+		$cities = array_map(function (string $item): array {
+			return [$this->url_obfuscator_service->obfuscate($item), $item];
+		}, $this->certif_filesystem->cities($tree));
+
+		$city = $request->getQueryParams()['cityobf'] ?? $request->getAttribute('cityobf') ?? '';
+
+		if ($city !== '' && $this->url_obfuscator_service->tryDeobfuscate($city)) {
+			$title = I18N::translate('Certificates for %s', $city);
+			$certificates = $this->certif_filesystem->certificatesForCity($tree, $city);
+		}
+
+		return $this->viewResponse($this->module->name() . '::certificates-list', [
+			'title'                     =>  $title,
+			'tree'                      =>  $tree,
+			'module_name'               =>  $this->module->name(),
+			'cities'                    =>  $cities,
+			'selected_city'             =>  $city,
+			'certificates_list'         =>  $certificates ?? collect(),
+			'url_obfuscator_service'    =>  $this->url_obfuscator_service
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 
         $title = I18N::translate('Certificates');
 
-        $cities = array_map(function (string $item): array {
+        $cities = array_map(function(string $item): array {
             return [$this->url_obfuscator_service->obfuscate($item), $item];
         }, $this->certif_filesystem->cities($tree));
 
@@ -90,7 +90,7 @@ 
             $certificates = $this->certif_filesystem->certificatesForCity($tree, $city);
         }
 
-        return $this->viewResponse($this->module->name() . '::certificates-list', [
+        return $this->viewResponse($this->module->name().'::certificates-list', [
             'title'                     =>  $title,
             'tree'                      =>  $tree,
             'module_name'               =>  $this->module->name(),

src/Webtrees/Module/Certificates/Http/RequestHandlers/AdminTreesPage.php

Indentation +40 added lines, -40 removed lines

@@ -30,51 +30,51 @@
  */
 class AdminTreesPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
 
-    /**
-     *
-     * @var TreeService $tree_service
-     */
-    private $tree_service;
+	/**
+	 *
+	 * @var TreeService $tree_service
+	 */
+	private $tree_service;
 
-    /**
-     * Constructor for Admin Trees request handler
-     *
-     * @param ModuleService $module_service
-     * @param TreeService $tree_service
-     */
-    public function __construct(ModuleService $module_service, TreeService $tree_service)
-    {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-        $this->tree_service = $tree_service;
-    }
+	/**
+	 * Constructor for Admin Trees request handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TreeService $tree_service
+	 */
+	public function __construct(ModuleService $module_service, TreeService $tree_service)
+	{
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+		$this->tree_service = $tree_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $trees = $this->tree_service->all();
-        if ($trees->count() == 1) {
-            return redirect(route(AdminConfigPage::class, ['tree' => $trees->first()]));
-        }
+		$trees = $this->tree_service->all();
+		if ($trees->count() == 1) {
+			return redirect(route(AdminConfigPage::class, ['tree' => $trees->first()]));
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/trees', [
-            'title'             =>  $this->module->title(),
-            'trees'             =>  $this->tree_service->all()
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/trees', [
+			'title'             =>  $this->module->title(),
+			'trees'             =>  $this->tree_service->all()
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
             return redirect(route(AdminConfigPage::class, ['tree' => $trees->first()]));
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/trees', [
+        return $this->viewResponse($this->module->name().'::admin/trees', [
             'title'             =>  $this->module->title(),
             'trees'             =>  $this->tree_service->all()
         ]);

src/Webtrees/Module/Certificates/Http/RequestHandlers/CertificateImage.php

Indentation +124 added lines, -124 removed lines

@@ -37,128 +37,128 @@
  */
 class CertificateImage implements RequestHandlerInterface
 {
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var CertificateFilesystemService $certif_filesystem
-     */
-    private $certif_filesystem;
-
-    /**
-     * @var CertificateImageFactory $certif_image_factory
-     */
-    private $certif_image_factory;
-
-    /**
-     * @var CertificateDataService $certif_data_service
-     */
-    private $certif_data_service;
-
-    /**
-     * @var UrlObfuscatorService $url_obfuscator_service
-     */
-    private $url_obfuscator_service;
-
-    /**
-     * Constructor for Certificate Image Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        CertificateFilesystemService $certif_filesystem,
-        CertificateDataService $certif_data_service,
-        UrlObfuscatorService $url_obfuscator_service
-    ) {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-        $this->certif_filesystem = $certif_filesystem;
-        $this->certif_image_factory = new CertificateImageFactory($this->certif_filesystem);
-        $this->certif_data_service = $certif_data_service;
-        $this->url_obfuscator_service = $url_obfuscator_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $user = $request->getAttribute('user');
-        assert($user instanceof UserInterface);
-
-        $certif_path = $request->getAttribute('cid');
-        $certificate = null;
-        if ($certif_path !== '' && $this->url_obfuscator_service->tryDeobfuscate($certif_path)) {
-            $certificate = $this->certif_filesystem->certificate($tree, $certif_path);
-        }
-
-        if ($certificate === null) {
-            return $this->certif_image_factory
-            ->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND)
-            ->withHeader('X-Image-Exception', I18N::translate('The certificate was not found in this family tree.'))
-            ;
-        }
-
-        $use_watermark = $this->certif_image_factory->certificateNeedsWatermark($certificate, $user);
-        $watermark = $use_watermark ? $this->watermark($request, $certificate) : null;
-
-        return $this->certif_image_factory->certificateFileResponse(
-            $certificate,
-            $use_watermark,
-            $watermark
-        );
-    }
-
-    /**
-     * Get watermark data for a certificate.
-     *
-     * @param ServerRequestInterface $request
-     * @param Certificate $certificate
-     * @return Watermark
-     */
-    private function watermark(ServerRequestInterface $request, Certificate $certificate): Watermark
-    {
-        $color = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_COLOR', Watermark::DEFAULT_COLOR);
-        $size = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_MAXSIZE');
-        $text = $this->watermarkText($request, $certificate);
-
-        return new Watermark($text, $color, is_numeric($size) ? (int) $size : Watermark::DEFAULT_SIZE);
-    }
-
-    /**
-     * Get the text to be watermarked for a certificate.
-     *
-     * @param ServerRequestInterface $request
-     * @param Certificate $certificate
-     * @return string
-     */
-    private function watermarkText(ServerRequestInterface $request, Certificate $certificate): string
-    {
-        $sid = $request->getQueryParams()['sid'] ?? '';
-        if ($sid !== '') {
-            $source = Registry::sourceFactory()->make($sid, $certificate->tree());
-        } else {
-            $source = $this->certif_data_service->oneLinkedSource($certificate);
-        }
-
-        if ($source !== null && $source->canShowName()) {
-            $repo = $source->facts(['REPO'])->first();
-            if ($repo !== null && ($repo = $repo->target()) !== null && $repo->canShowName()) {
-                return I18N::translate('© %s - %s', strip_tags($repo->fullName()), strip_tags($source->fullName()));
-            }
-            return $source->fullName();
-        }
-        $default_text = $certificate->tree()->getPreference('MAJ_CERTIF_WM_DEFAULT');
-        return $default_text !== '' ? $default_text : I18N::translate('This image is protected under copyright law.');
-    }
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var CertificateFilesystemService $certif_filesystem
+	 */
+	private $certif_filesystem;
+
+	/**
+	 * @var CertificateImageFactory $certif_image_factory
+	 */
+	private $certif_image_factory;
+
+	/**
+	 * @var CertificateDataService $certif_data_service
+	 */
+	private $certif_data_service;
+
+	/**
+	 * @var UrlObfuscatorService $url_obfuscator_service
+	 */
+	private $url_obfuscator_service;
+
+	/**
+	 * Constructor for Certificate Image Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		CertificateFilesystemService $certif_filesystem,
+		CertificateDataService $certif_data_service,
+		UrlObfuscatorService $url_obfuscator_service
+	) {
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+		$this->certif_filesystem = $certif_filesystem;
+		$this->certif_image_factory = new CertificateImageFactory($this->certif_filesystem);
+		$this->certif_data_service = $certif_data_service;
+		$this->url_obfuscator_service = $url_obfuscator_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$user = $request->getAttribute('user');
+		assert($user instanceof UserInterface);
+
+		$certif_path = $request->getAttribute('cid');
+		$certificate = null;
+		if ($certif_path !== '' && $this->url_obfuscator_service->tryDeobfuscate($certif_path)) {
+			$certificate = $this->certif_filesystem->certificate($tree, $certif_path);
+		}
+
+		if ($certificate === null) {
+			return $this->certif_image_factory
+			->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND)
+			->withHeader('X-Image-Exception', I18N::translate('The certificate was not found in this family tree.'))
+			;
+		}
+
+		$use_watermark = $this->certif_image_factory->certificateNeedsWatermark($certificate, $user);
+		$watermark = $use_watermark ? $this->watermark($request, $certificate) : null;
+
+		return $this->certif_image_factory->certificateFileResponse(
+			$certificate,
+			$use_watermark,
+			$watermark
+		);
+	}
+
+	/**
+	 * Get watermark data for a certificate.
+	 *
+	 * @param ServerRequestInterface $request
+	 * @param Certificate $certificate
+	 * @return Watermark
+	 */
+	private function watermark(ServerRequestInterface $request, Certificate $certificate): Watermark
+	{
+		$color = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_COLOR', Watermark::DEFAULT_COLOR);
+		$size = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_MAXSIZE');
+		$text = $this->watermarkText($request, $certificate);
+
+		return new Watermark($text, $color, is_numeric($size) ? (int) $size : Watermark::DEFAULT_SIZE);
+	}
+
+	/**
+	 * Get the text to be watermarked for a certificate.
+	 *
+	 * @param ServerRequestInterface $request
+	 * @param Certificate $certificate
+	 * @return string
+	 */
+	private function watermarkText(ServerRequestInterface $request, Certificate $certificate): string
+	{
+		$sid = $request->getQueryParams()['sid'] ?? '';
+		if ($sid !== '') {
+			$source = Registry::sourceFactory()->make($sid, $certificate->tree());
+		} else {
+			$source = $this->certif_data_service->oneLinkedSource($certificate);
+		}
+
+		if ($source !== null && $source->canShowName()) {
+			$repo = $source->facts(['REPO'])->first();
+			if ($repo !== null && ($repo = $repo->target()) !== null && $repo->canShowName()) {
+				return I18N::translate('© %s - %s', strip_tags($repo->fullName()), strip_tags($source->fullName()));
+			}
+			return $source->fullName();
+		}
+		$default_text = $certificate->tree()->getPreference('MAJ_CERTIF_WM_DEFAULT');
+		return $default_text !== '' ? $default_text : I18N::translate('This image is protected under copyright law.');
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
 
         if ($certificate === null) {
             return $this->certif_image_factory
-            ->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND)
+            ->replacementImageResponse((string)StatusCodeInterface::STATUS_NOT_FOUND)
             ->withHeader('X-Image-Exception', I18N::translate('The certificate was not found in this family tree.'))
             ;
         }
@@ -132,7 +132,7 @@ 
         $size = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_MAXSIZE');
         $text = $this->watermarkText($request, $certificate);
 
-        return new Watermark($text, $color, is_numeric($size) ? (int) $size : Watermark::DEFAULT_SIZE);
+        return new Watermark($text, $color, is_numeric($size) ? (int)$size : Watermark::DEFAULT_SIZE);
     }
 
     /**

src/Webtrees/Module/Certificates/Http/RequestHandlers/CertificatePage.php

Indentation +76 added lines, -76 removed lines

@@ -34,80 +34,80 @@
  */
 class CertificatePage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var CertificateFilesystemService $certif_filesystem
-     */
-    private $certif_filesystem;
-
-    /**
-     * @var CertificateDataService $certif_data_service
-     */
-    private $certif_data_service;
-
-    /**
-     * @var UrlObfuscatorService $url_obfuscator_service
-     */
-    private $url_obfuscator_service;
-
-
-    /**
-     * Constructor for CertificatePage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param CertificateFilesystemService $certif_filesystem
-     * @param CertificateDataService $certif_data_service
-     * @param UrlObfuscatorService $url_obfuscator_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        CertificateFilesystemService $certif_filesystem,
-        CertificateDataService $certif_data_service,
-        UrlObfuscatorService $url_obfuscator_service
-    ) {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-        $this->certif_filesystem = $certif_filesystem;
-        $this->certif_data_service = $certif_data_service;
-        $this->url_obfuscator_service = $url_obfuscator_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $certif_path = $request->getAttribute('cid');
-        if ($certif_path !== '' && $this->url_obfuscator_service->tryDeobfuscate($certif_path)) {
-            $certificate = $this->certif_filesystem->certificate($tree, $certif_path);
-        }
-
-        if (!isset($certificate)) {
-            FlashMessages::addMessage('The requested certificate is not valid.');
-            return redirect(route(TreePage::class, ['tree' => $tree->name()]));
-        }
-
-        return $this->viewResponse($this->module->name() . '::certificate-page', [
-            'title'                     =>  I18N::translate('Certificate - %s', $certificate->name()),
-            'tree'                      =>  $tree,
-            'module_name'               =>  $this->module->name(),
-            'certificate'               =>  $certificate,
-            'url_obfuscator_service'    =>  $this->url_obfuscator_service,
-            'linked_individuals'        =>  $this->certif_data_service->linkedIndividuals($certificate),
-            'linked_families'           =>  $this->certif_data_service->linkedFamilies($certificate)
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var CertificateFilesystemService $certif_filesystem
+	 */
+	private $certif_filesystem;
+
+	/**
+	 * @var CertificateDataService $certif_data_service
+	 */
+	private $certif_data_service;
+
+	/**
+	 * @var UrlObfuscatorService $url_obfuscator_service
+	 */
+	private $url_obfuscator_service;
+
+
+	/**
+	 * Constructor for CertificatePage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param CertificateFilesystemService $certif_filesystem
+	 * @param CertificateDataService $certif_data_service
+	 * @param UrlObfuscatorService $url_obfuscator_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		CertificateFilesystemService $certif_filesystem,
+		CertificateDataService $certif_data_service,
+		UrlObfuscatorService $url_obfuscator_service
+	) {
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+		$this->certif_filesystem = $certif_filesystem;
+		$this->certif_data_service = $certif_data_service;
+		$this->url_obfuscator_service = $url_obfuscator_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$certif_path = $request->getAttribute('cid');
+		if ($certif_path !== '' && $this->url_obfuscator_service->tryDeobfuscate($certif_path)) {
+			$certificate = $this->certif_filesystem->certificate($tree, $certif_path);
+		}
+
+		if (!isset($certificate)) {
+			FlashMessages::addMessage('The requested certificate is not valid.');
+			return redirect(route(TreePage::class, ['tree' => $tree->name()]));
+		}
+
+		return $this->viewResponse($this->module->name() . '::certificate-page', [
+			'title'                     =>  I18N::translate('Certificate - %s', $certificate->name()),
+			'tree'                      =>  $tree,
+			'module_name'               =>  $this->module->name(),
+			'certificate'               =>  $certificate,
+			'url_obfuscator_service'    =>  $this->url_obfuscator_service,
+			'linked_individuals'        =>  $this->certif_data_service->linkedIndividuals($certificate),
+			'linked_families'           =>  $this->certif_data_service->linkedFamilies($certificate)
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
             return redirect(route(TreePage::class, ['tree' => $tree->name()]));
         }
 
-        return $this->viewResponse($this->module->name() . '::certificate-page', [
+        return $this->viewResponse($this->module->name().'::certificate-page', [
             'title'                     =>  I18N::translate('Certificate - %s', $certificate->name()),
             'tree'                      =>  $tree,
             'module_name'               =>  $this->module->name(),

src/Webtrees/Module/Certificates/Http/RequestHandlers/AdminConfigAction.php

Indentation +67 added lines, -67 removed lines

@@ -29,71 +29,71 @@
  */
 class AdminConfigAction implements RequestHandlerInterface
 {
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
-
-    /**
-     * Constructor for Admin Config Action request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
-
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
-
-        $params = (array) $request->getParsedBody();
-
-        $tree->setPreference('MAJ_CERTIF_SHOW_CERT', $params['MAJ_CERTIF_SHOW_CERT'] ?? (string) Auth::PRIV_HIDE);
-        $tree->setPreference(
-            'MAJ_CERTIF_SHOW_NO_WATERMARK',
-            $params['MAJ_CERTIF_SHOW_NO_WATERMARK'] ?? (string) Auth::PRIV_HIDE
-        );
-        $tree->setPreference('MAJ_CERTIF_WM_DEFAULT', $params['MAJ_CERTIF_WM_DEFAULT'] ?? '');
-
-        $watermark_font_size = $params['MAJ_CERTIF_WM_FONT_MAXSIZE'] ?? '';
-        if (is_numeric($watermark_font_size) && $watermark_font_size > 0) {
-            $tree->setPreference('MAJ_CERTIF_WM_FONT_MAXSIZE', $params['MAJ_CERTIF_WM_FONT_MAXSIZE']);
-        }
-
-        // Only accept valid color for MAJ_WM_FONT_COLOR
-        $watermark_color = $params['MAJ_CERTIF_WM_FONT_COLOR'] ?? '';
-        if (preg_match('/#([a-fA-F0-9]{3}){1,2}/', $watermark_color) === 1) {
-            $tree->setPreference('MAJ_CERTIF_WM_FONT_COLOR', $watermark_color);
-        }
-
-        // Only accept valid folders for MAJ_CERT_ROOTDIR
-        $cert_root_dir = $params['MAJ_CERTIF_ROOTDIR'] ?? '';
-        $cert_root_dir = preg_replace('/[:\/\\\\]+/', '/', $cert_root_dir);
-        $cert_root_dir = trim($cert_root_dir, '/') . '/';
-        $tree->setPreference('MAJ_CERTIF_ROOTDIR', $cert_root_dir);
-
-        FlashMessages::addMessage(
-            I18N::translate('The preferences for the module “%s” have been updated.', $this->module->title()),
-            'success'
-        );
-
-        return redirect($admin_config_route);
-    }
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * Constructor for Admin Config Action request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
+
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
+
+		$params = (array) $request->getParsedBody();
+
+		$tree->setPreference('MAJ_CERTIF_SHOW_CERT', $params['MAJ_CERTIF_SHOW_CERT'] ?? (string) Auth::PRIV_HIDE);
+		$tree->setPreference(
+			'MAJ_CERTIF_SHOW_NO_WATERMARK',
+			$params['MAJ_CERTIF_SHOW_NO_WATERMARK'] ?? (string) Auth::PRIV_HIDE
+		);
+		$tree->setPreference('MAJ_CERTIF_WM_DEFAULT', $params['MAJ_CERTIF_WM_DEFAULT'] ?? '');
+
+		$watermark_font_size = $params['MAJ_CERTIF_WM_FONT_MAXSIZE'] ?? '';
+		if (is_numeric($watermark_font_size) && $watermark_font_size > 0) {
+			$tree->setPreference('MAJ_CERTIF_WM_FONT_MAXSIZE', $params['MAJ_CERTIF_WM_FONT_MAXSIZE']);
+		}
+
+		// Only accept valid color for MAJ_WM_FONT_COLOR
+		$watermark_color = $params['MAJ_CERTIF_WM_FONT_COLOR'] ?? '';
+		if (preg_match('/#([a-fA-F0-9]{3}){1,2}/', $watermark_color) === 1) {
+			$tree->setPreference('MAJ_CERTIF_WM_FONT_COLOR', $watermark_color);
+		}
+
+		// Only accept valid folders for MAJ_CERT_ROOTDIR
+		$cert_root_dir = $params['MAJ_CERTIF_ROOTDIR'] ?? '';
+		$cert_root_dir = preg_replace('/[:\/\\\\]+/', '/', $cert_root_dir);
+		$cert_root_dir = trim($cert_root_dir, '/') . '/';
+		$tree->setPreference('MAJ_CERTIF_ROOTDIR', $cert_root_dir);
+
+		FlashMessages::addMessage(
+			I18N::translate('The preferences for the module “%s” have been updated.', $this->module->title()),
+			'success'
+		);
+
+		return redirect($admin_config_route);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -63,12 +63,12 @@ 
             return redirect($admin_config_route);
         }
 
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
-        $tree->setPreference('MAJ_CERTIF_SHOW_CERT', $params['MAJ_CERTIF_SHOW_CERT'] ?? (string) Auth::PRIV_HIDE);
+        $tree->setPreference('MAJ_CERTIF_SHOW_CERT', $params['MAJ_CERTIF_SHOW_CERT'] ?? (string)Auth::PRIV_HIDE);
         $tree->setPreference(
             'MAJ_CERTIF_SHOW_NO_WATERMARK',
-            $params['MAJ_CERTIF_SHOW_NO_WATERMARK'] ?? (string) Auth::PRIV_HIDE
+            $params['MAJ_CERTIF_SHOW_NO_WATERMARK'] ?? (string)Auth::PRIV_HIDE
         );
         $tree->setPreference('MAJ_CERTIF_WM_DEFAULT', $params['MAJ_CERTIF_WM_DEFAULT'] ?? '');
 
@@ -86,7 +86,7 @@ 
         // Only accept valid folders for MAJ_CERT_ROOTDIR
         $cert_root_dir = $params['MAJ_CERTIF_ROOTDIR'] ?? '';
         $cert_root_dir = preg_replace('/[:\/\\\\]+/', '/', $cert_root_dir);
-        $cert_root_dir = trim($cert_root_dir, '/') . '/';
+        $cert_root_dir = trim($cert_root_dir, '/').'/';
         $tree->setPreference('MAJ_CERTIF_ROOTDIR', $cert_root_dir);
 
         FlashMessages::addMessage(

src/Webtrees/Module/Certificates/Http/RequestHandlers/AdminConfigPage.php

Indentation +33 added lines, -33 removed lines

@@ -30,44 +30,44 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for Admin Config page request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-    }
+	/**
+	 * Constructor for Admin Config page request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $data_folder = Registry::filesystem()->dataName();
+		$data_folder = Registry::filesystem()->dataName();
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'title'             =>  $this->module->title(),
-            'tree'              =>  $tree,
-            'data_folder'       =>  $data_folder
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'title'             =>  $this->module->title(),
+			'tree'              =>  $tree,
+			'data_folder'       =>  $data_folder
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
         $data_folder = Registry::filesystem()->dataName();
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'title'             =>  $this->module->title(),
             'tree'              =>  $tree,
             'data_folder'       =>  $data_folder

src/Webtrees/Module/Certificates/Elements/SourceCertificate.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
  */
 class SourceCertificate extends AbstractElement
 {
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Elements\AbstractElement::canonical()
-     */
-    public function canonical($value): string
-    {
-        return strtr($value, '\\', '/');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Elements\AbstractElement::canonical()
+	 */
+	public function canonical($value): string
+	{
+		return strtr($value, '\\', '/');
+	}
 }