php8

Author: degami

app/base/abstracts/Controllers/AdminManageModelsPage.php

@@ -142,11 +142,7 @@ public function getObject(): ?BaseModel
      */
     public function getTable(): ?string
     {
-        if (!is_null($this->getTemplate())) {
-            return $this->getTemplate()->data()['table'] ?? null;
-        }
-
-        return $this->getTemplateData()['table'] ?? null;
+        return $this->getTemplate()?->data()['table'] ?? ($this->getTemplateData()['table'] ?? null);
     }
 
     /**
@@ -156,11 +152,7 @@ public function getTable(): ?string
      */
     public function getPaginator(): ?string
     {
-        if (!is_null($this->getTemplate())) {
-            return $this->getTemplate()->data()['paginator'] ?? null;
-        }
-
-        return $this->getTemplateData()['paginator'] ?? null;
+        return $this->getTemplate()?->data()['paginator'] ?? ($this->getTemplateData()['paginator'] ?? null);
     }
 
     /**

app/base/abstracts/Controllers/FormPage.php

@@ -64,8 +64,6 @@ public function __construct(ContainerInterface $container, Request $request, Rou
     protected function processFormSubmit() : void
     {
         $this->getApp()->event('before_form_process', ['form' => $this->getForm()]);
-        if ($this->getForm() != null) {
-            $this->getForm()->process();
-        }
+        $this->getForm()?->process();
     }
 }

app/base/abstracts/Controllers/FrontendPage.php

@@ -284,7 +284,7 @@ public function getCurrentLocale(): ?string
         if ($this->locale == null) {
             // try by menu
             $rewrite = $this->getRewrite();
-            if ($rewrite != null && (($menu_obj = $rewrite->menuList()->fetch()) != null)) {
+            if (($menu_obj = $rewrite?->menuList()->fetch()) != null) {
                 /** @var Menu $menu_obj */
                 $menu_obj = $this->getContainer()->make(Menu::class, ['db_row' => $menu_obj]);
                 $this->locale = $menu_obj->getLocale();
@@ -342,15 +342,12 @@ public function getCurrentWebsite(): ?Website
      */
     public function getTranslations(): array
     {
-        if ($this->getRewrite() != null) {
-            return array_map(
-                function ($el) {
-                    return $el->url;
-                },
-                $this->getRewrite()->getTranslations()
-            );
-        }
-        return [];
+        return array_map(
+            function ($el) {
+                return $el->url;
+            },
+            $this->getRewrite()?->getTranslations() ?? []
+        );
     }
 
 

app/base/tools/Utils/Globals.php

@@ -373,7 +373,7 @@ public function logException(Throwable $e, $prefix = null, Request $request = nu
     {
         $this->getLog()->error($prefix . ($prefix != null ? ' - ' : '') . $e->getMessage());
         $this->getLog()->debug($e->getTraceAsString());
-        if ($request != null && !empty($request->request->all())) {
+        if (!empty($request?->request->all())) {
             $this->getLog()->debug(serialize($request->request->all()));
         }
     }

app/base/traits/FormPageTrait.php

@@ -46,11 +46,7 @@ protected function getFormId(): string
      */
     public function getForm(): ?FAPI\Form
     {
-        if (!is_null($this->getTemplate())) {
-            return $this->getTemplate()->data()['form'] ?? null;
-        }
-
-        return $this->template_data['form'] ?? null;
+        return $this->getTemplate()?->data()['form'] ?? ($this->template_data['form'] ?? null);
     }
 
     /**

app/site/blocks/RewriteMedia.php

@@ -41,8 +41,8 @@ public function renderHTML(BasePage $current_page = null, $data = []): string
     {
 
         $rewrite_id = [];
-        if ($current_page != null && $current_page->getRewrite() && $current_page->getRewrite()->getId()) {
-            $rewrite_id[] = $current_page->getRewrite()->getId();
+        if ($current_page?->getRewrite()?->getId()) {
+            $rewrite_id[] = $current_page?->getRewrite()?->getId();
             $rewrite_id[] = null;
         } else {
             $rewrite_id = null;

app/site/controllers/Admin/MediaRewrites.php

@@ -239,9 +239,9 @@ function ($elem) {
                     'ID' => $elem->getId(),
                     'Preview' => $elem->getMediaElement()->getThumb('100x100'),
                     'Filename - Path' => $elem->getMediaElement()->getFilename(),
-                    'Website' => $elem->getRewriteId() != null ? $elem->getRewrite()->getWebsite()->getDomain() : 'All',
-                    'Rewrite - Url' => $elem->getRewriteId() != null ? $elem->getRewrite()->getUrl() : 'Everywhere',
-                    'Locale' => $elem->getRewriteId() != null ? $elem->getRewrite()->getLocale() : 'Any',
+                    'Website' => $elem->getRewrite()?->getWebsite()?->getDomain() ?? 'All',
+                    'Rewrite - Url' => $elem->getRewrite()?->getUrl() ?? 'Everywhere',
+                    'Locale' => $elem->getRewrite()?->getLocale() ?? 'Any',
                     'Owner' => $elem->getOwner()->username,
                     'actions' => implode(
                         " ",

app/site/migrations/optionals/FakeDataMigration.php

@@ -568,7 +568,7 @@ private function addMenuItem(string $title, string $menu_name, Rewrite $rewrite,
             'title' => $title,
             'locale' => $locale,
             'rewrite_id' => $rewrite->getId(),
-            'parent_id' => ($parent != null) ? $parent->getId() : null,
+            'parent_id' => $parent?->getId() ?? null,
             //'breadcrumb' => $menu_item_model->getParentIds(),
         ]]);
         $menu_item_model->persist();

bin/docker

@@ -84,6 +84,9 @@ case "$1" in
         echo "missing container name"
       fi
       ;;
+  ps)
+      $docker_compose_bin ps
+      ;;
   console)
       if [[ $(dockerps php-fpm) = 1 ]]; then
         shift