fixes

Author: degami

app/base/abstracts/Controllers/FrontendPage.php

@@ -247,9 +247,6 @@ public function renderPage(RouteInfo $route_info = null, $route_data = [])
      *
      * @param bool $reset
      * @return Rewrite|null
-     * @throws BasicException
-     * @throws DependencyException
-     * @throws NotFoundException
      */
     public function getRewrite($reset = false): ?Rewrite
     {
@@ -339,17 +336,18 @@ public function getCurrentWebsite()
      *
      * @return array
      * @throws BasicException
-     * @throws DependencyException
-     * @throws NotFoundException
      */
     public function getTranslations(): array
     {
-        return array_map(
-            function ($el) {
-                return $el->url;
-            },
-            $this->getRewrite()->getTranslations()
-        );
+        if ($this->getRewrite() != null) {
+            return array_map(
+                function ($el) {
+                    return $el->url;
+                },
+                $this->getRewrite()->getTranslations()
+            );
+        }
+        return [];
     }
 
 

app/base/abstracts/Models/FrontendModel.php

@@ -52,7 +52,9 @@ public function getRewrite(): ?Rewrite
         if (!($this->rewriteObj instanceof Rewrite)) {
             try {
                 $this->rewriteObj = $this->getContainer()->call([Rewrite::class, 'loadBy'], ['field' => 'route', 'value' => '/' . $this->getRewritePrefix() . '/' . $this->getId()]);
-            } catch (Exception $e) {}
+            } catch (Exception $e) {
+                $this->rewriteObj = $this->getContainer()->call([Rewrite::class, 'new']);
+            }
         }
         return $this->rewriteObj;
     }

app/site/blocks/ChangeLanguage.php

@@ -14,6 +14,7 @@
 
 use \App\Base\Abstracts\Blocks\BaseCodeBlock;
 use \App\Base\Abstracts\Controllers\BasePage;
+use App\Base\Abstracts\Controllers\FrontendPage;
 use \Degami\PHPFormsApi as FAPI;
 use \App\Site\Models\Language;
 use \Exception;
@@ -42,7 +43,8 @@ public function renderHTML(BasePage $current_page = null, $data = []): string
                 ];
             }
 
-            if (is_callable([$current_page, 'getTranslations'])) {
+
+            if (($current_page instanceof FrontendPage) && is_callable([$current_page, 'getTranslations'])) {
                 if (($translations = $current_page->getTranslations()) && !empty($translations)) {
                     $changelanguage_links = $this->getContainer()->make(TagElement::class, ['options' => [
                         'tag' => 'ul',

app/site/migrations/InitialDataMigration.php

@@ -129,17 +129,15 @@ private function addAdmin(): BaseModel
      * @param string $permission_name
      * @throws BasicException
      * @throws InvalidValueException
-     * @throws DependencyException
-     * @throws NotFoundException
      */
     private function addPermission(Role $role_model, string $permission_name)
     {
-        $permission_dbrow = $this->getDb()->table('permission')->where(['name' => $permission_name])->fetch();
-        $permission_model = Permission::new($this->getContainer());
-        if ($permission_dbrow) {
-            $permission_model = $this->getContainer()->make(Permission::class, ['db_row' => $permission_dbrow]);
-        } else {
-            $permission_model->setName($permission_name);
+        /** @var Permission $permission_model */
+        $permission_model = null;
+        try {
+            $permission_model = $this->getContainer()->call([Permission::class, 'loadBy'], ['field' => 'name', 'value' => $permission_name]);
+        } catch (\Exception $e) {
+            $permission_model = $this->getContainer()->call([Permission::class, 'new'], ['initial_data' => ['name' => $permission_name]]);
             $permission_model->persist();
         }
 
@@ -154,8 +152,6 @@ private function addPermission(Role $role_model, string $permission_name)
      *
      * @throws BasicException
      * @throws InvalidValueException
-     * @throws DependencyException
-     * @throws NotFoundException
      */
     private function addRolesPermissions()
     {
@@ -247,11 +243,11 @@ private function addLanguages()
      * @param User $owner_model
      * @return Page
      * @throws BasicException
-     * @throws InvalidValueException
      */
     private function addHomePage(Website $website_model, User $owner_model): Page
     {
-        $page_model = Page::new($this->getContainer());
+        /** @var Page $page_model */
+        $page_model = $this->getContainer()->call([Page::class, 'new']);
 
         $page_model->setWebsiteId($website_model->getId());
         $page_model->setUrl('homepage');