jon48 / webtrees-lib

app/Module/Certificates/Factories/CertificateImageFactory.php

Spacing +10 added lines, -10 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::SUPPORTED_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());
         }
     }
@@ -140,7 +140,7 @@ 
     public function certificateNeedsWatermark(Certificate $certificate, UserInterface $user): bool
     {
         $tree = $certificate->tree();
-        $watermark_level = (int) ($tree->getPreference('MAJ_CERTIF_SHOW_NO_WATERMARK', (string) Auth::PRIV_HIDE));
+        $watermark_level = (int)($tree->getPreference('MAJ_CERTIF_SHOW_NO_WATERMARK', (string)Auth::PRIV_HIDE));
 
         return Auth::accessLevel($tree, $user) > $watermark_level;
     }

app/Module/Certificates/Http/RequestHandlers/AutoCompleteFile.php

Spacing +2 added lines, -2 removed lines

@@ -71,10 +71,10 @@
             return collect();
         }
 
-        $query  =  Validator::attributes($request)->string('query', '');
+        $query = Validator::attributes($request)->string('query', '');
 
         /** @var Collection<int, string> $results */
-        $results =  $this->certif_filesystem
+        $results = $this->certif_filesystem
             ->certificatesForCityContaining($tree, $city, $query)
             ->map(fn(Certificate $certificate): string => $certificate->filename());
 

app/Module/Certificates/Http/RequestHandlers/CertificateImage.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,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.'))
             ;
         }
@@ -111,7 +111,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);
     }
 
     /**

app/Module/Certificates/Http/RequestHandlers/AdminConfigAction.php

Spacing +4 added lines, -4 removed lines

@@ -62,11 +62,11 @@ 
 
         $tree->setPreference(
             'MAJ_CERTIF_SHOW_CERT',
-            (string) Validator::parsedBody($request)->integer('MAJ_CERTIF_SHOW_CERT', Auth::PRIV_HIDE)
+            (string)Validator::parsedBody($request)->integer('MAJ_CERTIF_SHOW_CERT', Auth::PRIV_HIDE)
         );
         $tree->setPreference(
             'MAJ_CERTIF_SHOW_NO_WATERMARK',
-            (string) Validator::parsedBody($request)->integer('MAJ_CERTIF_SHOW_NO_WATERMARK', Auth::PRIV_HIDE)
+            (string)Validator::parsedBody($request)->integer('MAJ_CERTIF_SHOW_NO_WATERMARK', Auth::PRIV_HIDE)
         );
         $tree->setPreference(
             'MAJ_CERTIF_WM_DEFAULT',
@@ -75,7 +75,7 @@ 
 
         $tree->setPreference(
             'MAJ_CERTIF_WM_FONT_MAXSIZE',
-            (string) (
+            (string)(
                 Validator::parsedBody($request)->isBetween(0, PHP_INT_MAX)->integer('MAJ_CERTIF_WM_FONT_MAXSIZE', 18)
             )
         );
@@ -89,7 +89,7 @@ 
         // Only accept valid folders for MAJ_CERT_ROOTDIR
         $cert_root_dir = Validator::parsedBody($request)->string('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(

app/Module/Certificates/Services/CertificateFilesystemService.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,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);
         }
@@ -89,7 +89,7 @@ 
      */
     public function cities(Tree $tree): array
     {
-        $cities =  $this->filesystem($tree)
+        $cities = $this->filesystem($tree)
             ->listContents('')
             ->filter(fn (StorageAttributes $attributes): bool => $attributes->isDir())
             ->map(fn (StorageAttributes $attributes): string => $attributes->path())
@@ -150,7 +150,7 @@ 
         try {
             $mime = $filesystem->mimeType($path);
             return Registry::cache()->array()->remember(
-                'maj-certif-supportedfiles-' . $mime,
+                'maj-certif-supportedfiles-'.$mime,
                 fn (): bool => app(CertificateImageFactory::class)->isMimeTypeSupported($mime)
             );
         } catch (UnableToRetrieveMetadata | FilesystemException $ex) {

app/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;
@@ -77,7 +76,7 @@ 
         }
 
         $encryted = sodium_crypto_secretbox($cleartext, $nonce, $key);
-        return strtr(base64_encode($nonce . $encryted), '+/=', '._-');
+        return strtr(base64_encode($nonce.$encryted), '+/=', '._-');
     }
 
     /**

app/Common/GeoDispersion/GeoAnalysis/GeoAnalysisResult.php

Spacing +2 added lines, -2 removed lines

@@ -134,7 +134,7 @@ 
      */
     public function merge(GeoAnalysisResult $other): self
     {
-        $this->places->each(function (GeoAnalysisResultItem $item) use ($other): void {
+        $this->places->each(function(GeoAnalysisResultItem $item) use ($other): void {
             if ($other->places->has($item->key())) {
                 $item->place()->exclude(
                     $item->place()->isExcluded()
@@ -143,7 +143,7 @@ 
             }
         });
 
-        $other->places->each(function (GeoAnalysisResultItem $item): void {
+        $other->places->each(function(GeoAnalysisResultItem $item): void {
             if (!$this->places->has($item->key())) {
                 $this->addPlace($item->place());
             }

app/Http/Middleware/AuthTreePreference.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
         // Permissions are configured
         if (is_numeric($permission_level)) {
             // Logged in with the correct role?
-            if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
+            if (Auth::accessLevel($tree, $user) <= (int)$permission_level) {
                     return $handler->handle($request);
             }
 
@@ -64,7 +64,7 @@ 
 
         return Registry::responseFactory()->redirect(
             LoginPage::class,
-            ['tree' => $tree->name(), 'url' => (string) $request->getUri()]
+            ['tree' => $tree->name(), 'url' => (string)$request->getUri()]
         );
     }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 
         $tree = Validator::attributes($request)->tree();
 
-        return Registry::responseFactory()->response(view($this->module->name() . '::modals/sosa-compute', [
+        return Registry::responseFactory()->response(view($this->module->name().'::modals/sosa-compute', [
             'tree'          => $tree,
             'xref'          => Validator::attributes($request)->isXref()->string('xref', '')
         ]));