FIX: fix registering service providers in templates

app/CMS/Helpers/PageRenderer.php

@@ -1,37 +0,0 @@
-<?php
-namespace App\CMS\Helpers;
-
-use App\CMS\Handlers\Contracts\AppHandler;
-use App\Models\Content\Content;
-use Webwizo\Shortcodes\Facades\Shortcode;
-
-/**
- * Class PageRenderer
- *
- * Simple class for rendering page for visitor
- *
- * @package App\CMS\Helpers
- */
-class PageRenderer
-{
-    /**
-     * Render page
-     *
-     * @param Content $page
-     *
-     * @return mixed
-     */
-    public static function render(Content $page)
-    {
-        // do something template-specific
-        $parameters = call_user_func_array([CurrentTemplate::handler(), 'beforeRender'], [&$page]);
-
-        /**
-         * @var $handler AppHandler
-         */
-        $handler = new $page->moduleHandler;
-
-        // render page
-        return $handler->render($page, $parameters);
-    }
-}

app/CMS/ModuleManager/Providers/ModuleManager.php

@@ -16,7 +16,7 @@ class ModuleManager extends ServiceProvider
     {
         // this service provider needs published config - config is merged right after this service provider
         try {
-            $modules = app(ModuleRepository::class)->getOnlyModules();
+            $modules = app(ModuleRepository::class)->all();
         } catch (QueryException $e) {
             return;
         }
@@ -32,7 +32,13 @@ class ModuleManager extends ServiceProvider
             // include files (if any)
             if (isset($module->module_settings['files']) && !empty($module->module_settings['files'])) {
                 foreach ($module->module_settings['files'] as $file) {
-                    include config('modules.paths.modules') . '/' . $module->static_name . '/' . $file;
+                    $path = config('modules.paths.modules') . '/' . $module->static_name . '/' . $file;
+
+                    if (!file_exists($path)) {
+                        $path = base_path($file);
+                    }
+
+                    @include_once $path;
                 }
             }
         }