jon48 / webtrees-lib

app/Module/Certificates/CertificatesModule.php

Spacing +7 added lines, -7 removed lines

@@ -102,11 +102,11 @@ 
      */
     public function loadRoutes($router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/certificates', static function (Map $router): void {
+            $router->attach('', '/module-maj/certificates', static function(Map $router): void {
 
-                $router->attach('', '/admin', static function (Map $router): void {
+                $router->attach('', '/admin', static function(Map $router): void {
 
                     $router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
                     $router->post(AdminConfigAction::class, '/config/{tree}', AdminConfigAction::class)
@@ -129,7 +129,7 @@ 
                         'permission_preference' =>  'MAJ_CERTIF_SHOW_CERT'
                     ]);
 
-                $router->attach('', '/certificate/{tree}/{cid}', static function (Map $router): void {
+                $router->attach('', '/certificate/{tree}/{cid}', static function(Map $router): void {
 
                     $router->extras([
                         'middleware'            =>  [AuthTreePreference::class],
@@ -167,7 +167,7 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 
     /**
@@ -176,7 +176,7 @@ 
      */
     public function listUrl(Tree $tree, array $parameters = []): string
     {
-        return route(CertificatesList::class, ['tree' => $tree->name() ] + $parameters);
+        return route(CertificatesList::class, ['tree' => $tree->name()] + $parameters);
     }
 
     /**
@@ -194,7 +194,7 @@ 
      */
     public function listIsEmpty(Tree $tree): bool
     {
-        return Auth::accessLevel($tree) > (int) $tree->getPreference('MAJ_CERTIF_SHOW_CERT', (string) Auth::PRIV_HIDE);
+        return Auth::accessLevel($tree) > (int)$tree->getPreference('MAJ_CERTIF_SHOW_CERT', (string)Auth::PRIV_HIDE);
     }
 
     /**

app/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(

app/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);
     }
 
     /**

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

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(),

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

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             throw new HttpAccessDeniedException();
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  $this->module->title(),
             'tree'              =>  $tree,

app/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(),

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

Spacing +2 added lines, -2 removed lines

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

app/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) {

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