jon48 / webtrees-lib

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

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

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

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

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/Services/CertificateFilesystemService.php

Spacing +11 added lines, -11 removed lines

@@ -46,7 +46,7 @@ 
     {
         if (!isset($this->filesystem[$tree->id()])) {
             $cert_dir = $tree->getPreference('MAJ_CERTIF_ROOTDIR', 'certificates/');
-            $adapter   = new ChrootAdapter(Registry::filesystem()->data(), $cert_dir);
+            $adapter = new ChrootAdapter(Registry::filesystem()->data(), $cert_dir);
 
             $this->filesystem[$tree->id()] = new FileSystem($adapter);
         }
@@ -90,9 +90,9 @@ 
     {
         return $this->filesystem($tree)
             ->listContents('')
-            ->filter(function (StorageAttributes $attributes): bool {
+            ->filter(function(StorageAttributes $attributes): bool {
                 return $attributes->isDir();
-            })->map(function (StorageAttributes $attributes): string {
+            })->map(function(StorageAttributes $attributes): string {
                 return $attributes->path();
             })->toArray();
     }
@@ -109,13 +109,13 @@ 
         $filesystem = $this->filesystem($tree);
         $certificate_paths = collect($filesystem
             ->listContents($city)
-            ->filter(function (StorageAttributes $attributes) use ($filesystem): bool {
+            ->filter(function(StorageAttributes $attributes) use ($filesystem): bool {
                 return $attributes->isFile() && $this->isFileSupported($filesystem, $attributes->path());
-            })->map(function (StorageAttributes $attributes): string {
+            })->map(function(StorageAttributes $attributes): string {
                 return $attributes->path();
             })->toArray());
 
-        return $certificate_paths->map(function (string $path) use ($tree): Certificate {
+        return $certificate_paths->map(function(string $path) use ($tree): Certificate {
             return new Certificate($tree, $path);
         });
     }
@@ -133,14 +133,14 @@ 
         $filesystem = $this->filesystem($tree);
         $certificate_paths = collect($filesystem
             ->listContents($city)
-            ->filter(function (StorageAttributes $attributes) use ($filesystem, $contains): bool {
+            ->filter(function(StorageAttributes $attributes) use ($filesystem, $contains): bool {
                 return $attributes->isFile() && $this->isFileSupported($filesystem, $attributes->path())
                     && mb_stripos($attributes->path(), $contains) !== false;
-            })->map(function (StorageAttributes $attributes): string {
+            })->map(function(StorageAttributes $attributes): string {
                 return $attributes->path();
             })->toArray());
 
-        return $certificate_paths->map(function (string $path) use ($tree): Certificate {
+        return $certificate_paths->map(function(string $path) use ($tree): Certificate {
             return new Certificate($tree, $path);
         });
     }
@@ -157,8 +157,8 @@ 
         try {
             $mime = $filesystem->mimeType($path);
             return Registry::cache()->array()->remember(
-                'maj-certif-supportedfiles-' . $mime,
-                function () use ($mime): bool {
+                'maj-certif-supportedfiles-'.$mime,
+                function() use ($mime): bool {
                     return app(CertificateImageFactory::class)->isMimeTypeSupported($mime);
                 }
             );

src/Webtrees/Module/Certificates/Services/UrlObfuscatorService.php

Spacing +2 added lines, -3 removed lines

@@ -43,8 +43,7 @@ 
             $server_software = $request->getServerParams()['SERVER_SOFTWARE'] ?? '';
             $this->encryption_key = str_pad(md5(
                 $server_name !== '' && $server_software !== '' ?
-                $server_name . $server_software :
-                'STANDARDKEYIFNOSERVER'
+                $server_name.$server_software : 'STANDARDKEYIFNOSERVER'
             ), SODIUM_CRYPTO_SECRETBOX_KEYBYTES, "1234567890ABCDEF");
         }
         return $this->encryption_key;
@@ -78,7 +77,7 @@ 
 
         \Fisharebest\Webtrees\DebugBar::addMessage($key);
         $encryted = sodium_crypto_secretbox($cleartext, $nonce, $key);
-        return strtr(base64_encode($nonce . $encryted), '+/=', '._-');
+        return strtr(base64_encode($nonce.$encryted), '+/=', '._-');
     }
 
     /**

src/Webtrees/Module/Certificates/Services/CertificateDataService.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
         $tree = $certificate->tree();
         return DB::table('individuals')
             ->where('i_file', '=', $tree->id())
-            ->where('i_gedcom', 'like', '% _ACT ' . $this->escapedSqlPath($certificate) . '%')
+            ->where('i_gedcom', 'like', '% _ACT '.$this->escapedSqlPath($certificate).'%')
             ->select(['individuals.*'])
             ->get()
             ->map(Registry::individualFactory()->mapper($tree))
@@ -64,7 +64,7 @@ 
         $tree = $certificate->tree();
         return DB::table('families')
             ->where('f_file', '=', $tree->id())
-            ->where('f_gedcom', 'like', '% _ACT ' . $this->escapedSqlPath($certificate) . '%')
+            ->where('f_gedcom', 'like', '% _ACT '.$this->escapedSqlPath($certificate).'%')
             ->select(['families.*'])
             ->get()
             ->map(Registry::familyFactory()->mapper($tree))
@@ -85,7 +85,7 @@ 
         $tree = $certificate->tree();
         return DB::table('media')
             ->where('m_file', '=', $tree->id())
-            ->where('m_gedcom', 'like', '% _ACT ' . $this->escapedSqlPath($certificate) . '%')
+            ->where('m_gedcom', 'like', '% _ACT '.$this->escapedSqlPath($certificate).'%')
             ->select(['media.*'])
             ->get()
             ->map(Registry::mediaFactory()->mapper($tree))
@@ -107,7 +107,7 @@ 
         return DB::table('other')
             ->where('o_file', '=', $tree->id())
             ->where('o_type', '=', 'NOTE')
-            ->where('o_gedcom', 'like', '% _ACT ' . $this->escapedSqlPath($certificate) . '%')
+            ->where('o_gedcom', 'like', '% _ACT '.$this->escapedSqlPath($certificate).'%')
             ->select(['other.*'])
             ->get()
             ->map(Registry::noteFactory()->mapper($tree))
@@ -135,7 +135,7 @@ 
     public function oneLinkedSource(Certificate $certificate): ?Source
     {
         $regex_query = preg_quote($certificate->gedcomPath(), '/');
-        $regex_pattern = '/[1-9] SOUR @(' . Gedcom::REGEX_XREF . ')@(?:\n[2-9]\s(?:(?!SOUR)\w+)\s.*)*\n[2-9] _ACT ' . $regex_query . '/i'; //phpcs:ignore Generic.Files.LineLength.TooLong
+        $regex_pattern = '/[1-9] SOUR @('.Gedcom::REGEX_XREF.')@(?:\n[2-9]\s(?:(?!SOUR)\w+)\s.*)*\n[2-9] _ACT '.$regex_query.'/i'; //phpcs:ignore Generic.Files.LineLength.TooLong
 
         foreach ($this->linkedRecordsLists($certificate) as $linked_records) {
             foreach ($linked_records as $gedcom_record) {

src/Webtrees/Module/Certificates/Factories/CertificateImageFactory.php

Spacing +9 added lines, -9 removed lines

@@ -79,7 +79,7 @@ 
         bool $add_watermark = false,
         Watermark $watermark = null
     ): ResponseInterface {
-        $filesystem =  $this->filesystem_service->filesystem($certificate->tree());
+        $filesystem = $this->filesystem_service->filesystem($certificate->tree());
         $filename   = $certificate->path();
 
         if (!$add_watermark) {
@@ -98,34 +98,34 @@ 
             $height = $image->height();
 
             $watermark->adjustSize($width);
-            $watermark_x = (int) ceil($watermark->textLengthEstimate() * 1.5);
+            $watermark_x = (int)ceil($watermark->textLengthEstimate() * 1.5);
             $watermark_y = $watermark->size() * 12 + 1;
 
-            $font_definition = function (AbstractFont $font) use ($watermark): void {
-                $font->file(Webtrees::ROOT_DIR . 'resources/fonts/DejaVuSans.ttf');
+            $font_definition = function(AbstractFont $font) use ($watermark): void {
+                $font->file(Webtrees::ROOT_DIR.'resources/fonts/DejaVuSans.ttf');
                 $font->color($watermark->color());
                 $font->size($watermark->size());
                 $font->valign('top');
             };
 
-            for ($i = min((int) ceil($width * 0.1), $watermark_x); $i < $width; $i += $watermark_x) {
-                for ($j = min((int) ceil($height * 0.1), $watermark_y); $j < $height; $j += $watermark_y) {
+            for ($i = min((int)ceil($width * 0.1), $watermark_x); $i < $width; $i += $watermark_x) {
+                for ($j = min((int)ceil($height * 0.1), $watermark_y); $j < $height; $j += $watermark_y) {
                     $image = $image->text($watermark->text(), $i, $j, $font_definition);
                 }
             }
 
             $format  = static::INTERVENTION_FORMATS[$image->mime()] ?? 'jpg';
             $quality = $this->extractImageQuality($image, static::GD_DEFAULT_IMAGE_QUALITY);
-            $data    = (string) $image->encode($format, $quality);
+            $data    = (string)$image->encode($format, $quality);
 
             return $this->imageResponse($data, $image->mime(), '');
         } catch (NotReadableException $ex) {
             return $this->replacementImageResponse(pathinfo($filename, PATHINFO_EXTENSION))
             ->withHeader('X-Image-Exception', $ex->getMessage());
         } catch (FilesystemException | UnableToReadFile $ex) {
-            return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND);
+            return $this->replacementImageResponse((string)StatusCodeInterface::STATUS_NOT_FOUND);
         } catch (Throwable $ex) {
-            return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR)
+            return $this->replacementImageResponse((string)StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR)
             ->withHeader('X-Image-Exception', $ex->getMessage());
         }
     }

src/Webtrees/Module/GeoDispersion/Model/GeoAnalysisMapAdapter.php

Spacing +4 added lines, -4 removed lines

@@ -123,7 +123,7 @@ 
                     ->withProperty(
                         'places',
                         $feature_data->places()
-                            ->map(fn(GeoAnalysisPlace $place): string => $place->place()->firstParts(1)->first())
+                            ->map(fn(GeoAnalysisPlace $place) : string => $place->place()->firstParts(1)->first())
                             ->sort(I18N::comparator())
                             ->toArray()
                     );
@@ -135,7 +135,7 @@ 
         $features_data
             ->filter(fn(MapFeatureAnalysisData $data) => !$data->existsInMap())
             ->each(
-                fn (MapFeatureAnalysisData $data) =>
+                fn(MapFeatureAnalysisData $data) =>
                     $data->places()->each(
                         fn(GeoAnalysisPlace $place) => $result->exclude($place)
                     )
@@ -155,7 +155,7 @@ 
         $features_mapping = new Collection();
 
         $byplaces = $result->knownPlaces();
-        $byplaces->each(function (GeoAnalysisResultItem $item) use ($features_mapping, $result): void {
+        $byplaces->each(function(GeoAnalysisResultItem $item) use ($features_mapping, $result): void {
             $id = $this->place_mapper->map($item->place()->place(), $this->config->mapMappingProperty());
 
             if ($id !== null && mb_strlen($id) > 0) {
@@ -168,7 +168,7 @@ 
             }
         });
 
-        return [ $features_mapping, $result];
+        return [$features_mapping, $result];
     }
 
     /**