Locales: Fixed errors occuring for PHP < 8.2

diff --git a/app/Entities/Tools/ExportFormatter.php b/app/Entities/Tools/ExportFormatter.php
index 9e4d63cf7b0ab3c45a04ef88fec4b36cbdc5f5be..6779797d10b45fe336c43ec1d7521c181acb9ef6 100644 (file)
--- a/app/Entities/Tools/ExportFormatter.php
+++ b/app/Entities/Tools/ExportFormatter.php
@@ -16,18 +16,11 @@ use Throwable;
 
 class ExportFormatter
 {
 
 class ExportFormatter
 {

-    protected ImageService $imageService;
-    protected PdfGenerator $pdfGenerator;
-    protected CspService $cspService;
-
-    /**
-     * ExportService constructor.
-     */
-    public function __construct(ImageService $imageService, PdfGenerator $pdfGenerator, CspService $cspService)
-    {
-        $this->imageService = $imageService;
-        $this->pdfGenerator = $pdfGenerator;
-        $this->cspService = $cspService;
+    public function __construct(
+        protected ImageService $imageService,
+        protected PdfGenerator $pdfGenerator,
+        protected CspService $cspService
+    ) {

     }
 
     /**
     }
 
     /**


@@ -36,13 +29,14 @@ class ExportFormatter
      *
      * @throws Throwable
      */
      *
      * @throws Throwable
      */

-    public function pageToContainedHtml(Page $page)
+    public function pageToContainedHtml(Page $page): string

     {
         $page->html = (new PageContent($page))->render();
         $pageHtml = view('exports.page', [
             'page'       => $page,
             'format'     => 'html',
             'cspContent' => $this->cspService->getCspMetaTagValue(),
     {
         $page->html = (new PageContent($page))->render();
         $pageHtml = view('exports.page', [
             'page'       => $page,
             'format'     => 'html',
             'cspContent' => $this->cspService->getCspMetaTagValue(),

+            'locale'     => user()->getLocale(),

         ])->render();
 
         return $this->containHtml($pageHtml);
         ])->render();
 
         return $this->containHtml($pageHtml);


@@ -53,7 +47,7 @@ class ExportFormatter
      *
      * @throws Throwable
      */
      *
      * @throws Throwable
      */

-    public function chapterToContainedHtml(Chapter $chapter)
+    public function chapterToContainedHtml(Chapter $chapter): string

     {
         $pages = $chapter->getVisiblePages();
         $pages->each(function ($page) {
     {
         $pages = $chapter->getVisiblePages();
         $pages->each(function ($page) {


@@ -64,6 +58,7 @@ class ExportFormatter
             'pages'      => $pages,
             'format'     => 'html',
             'cspContent' => $this->cspService->getCspMetaTagValue(),
             'pages'      => $pages,
             'format'     => 'html',
             'cspContent' => $this->cspService->getCspMetaTagValue(),

+            'locale'     => user()->getLocale(),

         ])->render();
 
         return $this->containHtml($html);
         ])->render();
 
         return $this->containHtml($html);


@@ -74,7 +69,7 @@ class ExportFormatter
      *
      * @throws Throwable
      */
      *
      * @throws Throwable
      */

-    public function bookToContainedHtml(Book $book)
+    public function bookToContainedHtml(Book $book): string

     {
         $bookTree = (new BookContents($book))->getTree(false, true);
         $html = view('exports.book', [
     {
         $bookTree = (new BookContents($book))->getTree(false, true);
         $html = view('exports.book', [


@@ -82,6 +77,7 @@ class ExportFormatter
             'bookChildren' => $bookTree,
             'format'       => 'html',
             'cspContent'   => $this->cspService->getCspMetaTagValue(),
             'bookChildren' => $bookTree,
             'format'       => 'html',
             'cspContent'   => $this->cspService->getCspMetaTagValue(),

+            'locale'       => user()->getLocale(),

         ])->render();
 
         return $this->containHtml($html);
         ])->render();
 
         return $this->containHtml($html);


@@ -92,13 +88,14 @@ class ExportFormatter
      *
      * @throws Throwable
      */
      *
      * @throws Throwable
      */

-    public function pageToPdf(Page $page)
+    public function pageToPdf(Page $page): string

     {
         $page->html = (new PageContent($page))->render();
         $html = view('exports.page', [
             'page'   => $page,
             'format' => 'pdf',
             'engine' => $this->pdfGenerator->getActiveEngine(),
     {
         $page->html = (new PageContent($page))->render();
         $html = view('exports.page', [
             'page'   => $page,
             'format' => 'pdf',
             'engine' => $this->pdfGenerator->getActiveEngine(),

+            'locale' => user()->getLocale(),

         ])->render();
 
         return $this->htmlToPdf($html);
         ])->render();
 
         return $this->htmlToPdf($html);


@@ -109,7 +106,7 @@ class ExportFormatter
      *
      * @throws Throwable
      */
      *
      * @throws Throwable
      */

-    public function chapterToPdf(Chapter $chapter)
+    public function chapterToPdf(Chapter $chapter): string

     {
         $pages = $chapter->getVisiblePages();
         $pages->each(function ($page) {
     {
         $pages = $chapter->getVisiblePages();
         $pages->each(function ($page) {


@@ -121,6 +118,7 @@ class ExportFormatter
             'pages'   => $pages,
             'format'  => 'pdf',
             'engine'  => $this->pdfGenerator->getActiveEngine(),
             'pages'   => $pages,
             'format'  => 'pdf',
             'engine'  => $this->pdfGenerator->getActiveEngine(),

+            'locale'  => user()->getLocale(),

         ])->render();
 
         return $this->htmlToPdf($html);
         ])->render();
 
         return $this->htmlToPdf($html);


@@ -131,7 +129,7 @@ class ExportFormatter
      *
      * @throws Throwable
      */
      *
      * @throws Throwable
      */

-    public function bookToPdf(Book $book)
+    public function bookToPdf(Book $book): string

     {
         $bookTree = (new BookContents($book))->getTree(false, true);
         $html = view('exports.book', [
     {
         $bookTree = (new BookContents($book))->getTree(false, true);
         $html = view('exports.book', [


@@ -139,6 +137,7 @@ class ExportFormatter
             'bookChildren' => $bookTree,
             'format'       => 'pdf',
             'engine'       => $this->pdfGenerator->getActiveEngine(),
             'bookChildren' => $bookTree,
             'format'       => 'pdf',
             'engine'       => $this->pdfGenerator->getActiveEngine(),

+            'locale'       => user()->getLocale(),

         ])->render();
 
         return $this->htmlToPdf($html);
         ])->render();
 
         return $this->htmlToPdf($html);


@@ -194,7 +193,7 @@ class ExportFormatter
         /** @var DOMElement $iframe */
         foreach ($iframes as $iframe) {
             $link = $iframe->getAttribute('src');
         /** @var DOMElement $iframe */
         foreach ($iframes as $iframe) {
             $link = $iframe->getAttribute('src');

-            if (strpos($link, '//') === 0) {
+            if (str_starts_with($link, '//')) {

                 $link = 'https:' . $link;
             }
 
                 $link = 'https:' . $link;
             }
 


@@ -240,7 +239,7 @@ class ExportFormatter
             foreach ($linksOutput[0] as $index => $linkMatch) {
                 $oldLinkString = $linkMatch;
                 $srcString = $linksOutput[2][$index];
             foreach ($linksOutput[0] as $index => $linkMatch) {
                 $oldLinkString = $linkMatch;
                 $srcString = $linksOutput[2][$index];

-                if (strpos(trim($srcString), 'http') !== 0) {
+                if (!str_starts_with(trim($srcString), 'http')) {

                     $newSrcString = url($srcString);
                     $newLinkString = str_replace($srcString, $newSrcString, $oldLinkString);
                     $htmlContent = str_replace($oldLinkString, $newLinkString, $htmlContent);
                     $newSrcString = url($srcString);
                     $newLinkString = str_replace($srcString, $newSrcString, $oldLinkString);
                     $htmlContent = str_replace($oldLinkString, $newLinkString, $htmlContent);

diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index ca8570d36f840c4ecc7b08c2643fac468285734e..f303aff267752caaca1419eba7e07ba019d02e61 100644 (file)
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!DOCTYPE html>

-<html lang="{{ $locale?->htmlLang() ?? config('app.default_locale') }}"
-      dir="{{ $locale?->htmlDirection() ?? 'auto' }}"
+<html lang="{{ isset($locale) ? $locale->htmlLang() : config('app.default_locale') }}"
+      dir="{{ isset($locale) ? $locale->htmlDirection() : 'auto' }}"

       class="{{ setting()->getForCurrentUser('dark-mode-enabled') ? 'dark-mode ' : '' }}">
 <head>
     <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }}</title>
       class="{{ setting()->getForCurrentUser('dark-mode-enabled') ? 'dark-mode ' : '' }}">
 <head>
     <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }}</title>

diff --git a/resources/views/layouts/export.blade.php b/resources/views/layouts/export.blade.php
index c2c3880e4c63bced2b1922d93d84ac4134a86a8b..eb2397a759a3dad6e1c51331909086f387adbbaf 100644 (file)
--- a/resources/views/layouts/export.blade.php
+++ b/resources/views/layouts/export.blade.php
@@ -1,5 +1,5 @@
 <!doctype html>
 <!doctype html>

-<html lang="{{ $locale?->htmlLang() ?? config('app.default_locale') }}">
+<html lang="{{ $locale->htmlLang() }}">

 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>@yield('title')</title>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>@yield('title')</title>

diff --git a/resources/views/layouts/plain.blade.php b/resources/views/layouts/plain.blade.php
index 7ce9078e2dc743e890e3034d9a58a59deadb9f1b..a3ee74143b3749d658e3836d313677f148518dee 100644 (file)
--- a/resources/views/layouts/plain.blade.php
+++ b/resources/views/layouts/plain.blade.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!DOCTYPE html>

-<html lang="{{ $locale?->htmlLang() ?? config('app.default_locale') }}"
-      dir="{{ $locale?->htmlDirection() ?? 'auto' }}"
+<html lang="{{ isset($locale) ? $locale->htmlLang() : config('app.default_locale') }}"
+      dir="{{ isset($locale) ? $locale->htmlDirection() : 'auto' }}"

       class="@yield('document-class')">
 <head>
     <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }}</title>
       class="@yield('document-class')">
 <head>
     <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }}</title>