Merge pull request #144 from lara-zeus/queries

improve queries
lara-zeus · Sep 1, 2023 · edd33fa · edd33fa
2 parents 83d687b + 28ce4ba
commit edd33fa
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 55 deletions.
diff --git a/database/seeders/SkySeeder.php b/database/seeders/SkySeeder.php
@@ -7,7 +7,7 @@
 
 class SkySeeder extends Seeder
 {
-    public function run()
+    public function run(): void
     {
         SkyPlugin::get()->getTagModel()::create(['name' => ['en' => 'laravel', 'ar' => 'لارافل'], 'type' => 'category']);
         SkyPlugin::get()->getTagModel()::create(['name' => ['en' => 'talks', 'ar' => 'اخبار'], 'type' => 'category']);

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -5,10 +5,9 @@ parameters:
     level: 6
     paths:
         - src
-        - config
         - database
-        - tests
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
     checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
diff --git a/routes/web.php b/routes/web.php
@@ -13,7 +13,7 @@
 
 $filament = app('filament');
 
-if (app('filament')->hasPlugin('zeus-sky')) {
+if (! defined('__PHPSTAN_RUNNING__') && app('filament')->hasPlugin('zeus-sky')) {
     Route::prefix(SkyPlugin::get()->getSkyPrefix())
         ->middleware(SkyPlugin::get()->getMiddleware())
         ->group(function () {

diff --git a/src/Classes/BoltParser.php b/src/Classes/BoltParser.php
@@ -3,7 +3,6 @@
 namespace LaraZeus\Sky\Classes;
 
 use Illuminate\Support\Facades\Blade;
-use LaraZeus\Bolt\BoltPlugin;
 
 class BoltParser
 {
@@ -14,7 +13,8 @@ public function __invoke(string $content): string
             preg_match('/<bolt>(.*?)<\/bolt>/s', $content, $bolt);
             if (is_array($bolt) && isset($bolt[1])) {
                 $formSlug = trim($bolt[1]);
-                $checkForm = BoltPlugin::getModel('Form')::where('slug', $formSlug)->first();
+                // @phpstan-ignore-next-line
+                $checkForm = \LaraZeus\Bolt\BoltPlugin::getModel('Form')::where('slug', $formSlug)->first();
                 if ($checkForm !== null) {
                     $boltComponent = Blade::render('<livewire:bolt.fill-form inline="true" slug="' . $formSlug . '" />');
                     $content = str_replace('<bolt>' . $formSlug . '</bolt>', $boltComponent, $content);

diff --git a/src/Classes/RenderNavItem.php b/src/Classes/RenderNavItem.php
@@ -6,7 +6,7 @@
 
 class RenderNavItem
 {
-    public static function render($item, $class = '')
+    public static function render(array $item, string $class = ''): string
     {
         if ($item['type'] === 'page-link') {
             $page = SkyPlugin::get()->getPostModel()::page()->find($item['data']['page_id']) ?? '';

diff --git a/src/Console/PublishCommand.php b/src/Console/PublishCommand.php
@@ -22,10 +22,8 @@ class PublishCommand extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return void
      */
-    public function handle()
+    public function handle(): void
     {
         // publish Sky files
         $this->callSilent('vendor:publish', ['--tag' => 'zeus-sky-migrations', '--force' => $this->option('force')]);

diff --git a/src/Console/migrateCommand.php b/src/Console/migrateCommand.php
@@ -23,10 +23,8 @@ class migrateCommand extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return void
      */
-    public function handle()
+    public function handle(): void
     {
         $posts = SkyPlugin::get()->getPostModel()::get();
         foreach ($posts as $post) {
@@ -55,7 +53,7 @@ public function handle()
         }
     }
 
-    public function isJson($string)
+    public function isJson(string $string): bool
     {
         json_decode($string);
 

diff --git a/src/Http/Livewire/Faq.php b/src/Http/Livewire/Faq.php
@@ -2,12 +2,13 @@
 
 namespace LaraZeus\Sky\Http\Livewire;
 
+use Illuminate\View\View;
 use LaraZeus\Sky\SkyPlugin;
 use Livewire\Component;
 
 class Faq extends Component
 {
-    public function render()
+    public function render(): View
     {
         seo()
             ->site(config('zeus.site_title', 'Laravel'))

diff --git a/src/Http/Livewire/LibrarTag.php b/src/Http/Livewire/LibrarTag.php
@@ -2,21 +2,23 @@
 
 namespace LaraZeus\Sky\Http\Livewire;
 
+use Illuminate\View\View;
+use LaraZeus\Sky\Models\Tag;
 use LaraZeus\Sky\SkyPlugin;
 use Livewire\Component;
 
 class LibrarTag extends Component
 {
-    public $tag;
+    public Tag $tag;
 
-    public function mount($slug)
+    public function mount(string $slug): void
     {
         $this->tag = SkyPlugin::get()->getTagModel()::findBySlug($slug, 'library');
 
         abort_if($this->tag === null, 404);
     }
 
-    public function render()
+    public function render(): View
     {
         seo()
             ->site(config('zeus.site_title', 'Laravel'))

diff --git a/src/Http/Livewire/Library.php b/src/Http/Livewire/Library.php
@@ -2,12 +2,13 @@
 
 namespace LaraZeus\Sky\Http\Livewire;
 
+use Illuminate\View\View;
 use LaraZeus\Sky\SkyPlugin;
 use Livewire\Component;
 
 class Library extends Component
 {
-    public function render()
+    public function render(): View
     {
         seo()
             ->site(config('zeus.site_title', 'Laravel'))

diff --git a/src/Http/Livewire/LibraryItem.php b/src/Http/Livewire/LibraryItem.php
@@ -2,19 +2,20 @@
 
 namespace LaraZeus\Sky\Http\Livewire;
 
+use Illuminate\View\View;
 use LaraZeus\Sky\SkyPlugin;
 use Livewire\Component;
 
 class LibraryItem extends Component
 {
-    public $item;
+    public \LaraZeus\Sky\Models\Library $item;
 
-    public function mount($slug)
+    public function mount(string $slug): void
     {
         $this->item = SkyPlugin::get()->getLibraryModel()::where('slug', $slug)->firstOrFail();
     }
 
-    public function render()
+    public function render(): View
     {
         seo()
             ->site(config('zeus.site_title', 'Laravel'))

diff --git a/src/Http/Livewire/Page.php b/src/Http/Livewire/Page.php
@@ -2,19 +2,20 @@
 
 namespace LaraZeus\Sky\Http\Livewire;
 
+use Illuminate\View\View;
 use LaraZeus\Sky\SkyPlugin;
 use Livewire\Component;
 
 class Page extends Component
 {
-    public $page;
+    public \LaraZeus\Sky\Models\Post $page;
 
-    public function mount($slug)
+    public function mount(string $slug): void
     {
         $this->page = SkyPlugin::get()->getPostModel()::where('slug', $slug)->page()->firstOrFail();
     }
 
-    public function render()
+    public function render(): View
     {
         $this->setSeo();
 

diff --git a/src/Http/Livewire/Post.php b/src/Http/Livewire/Post.php
@@ -2,19 +2,20 @@
 
 namespace LaraZeus\Sky\Http\Livewire;
 
+use Illuminate\View\View;
 use LaraZeus\Sky\SkyPlugin;
 use Livewire\Component;
 
 class Post extends Component
 {
-    public $post;
+    public \LaraZeus\Sky\Models\Post $post;
 
-    public function mount($slug)
+    public function mount(string $slug): void
     {
         $this->post = SkyPlugin::get()->getPostModel()::where('slug', $slug)->firstOrFail();
     }
 
-    public function render()
+    public function render(): View
     {
         $this->setSeo();
 

diff --git a/src/Http/Livewire/Posts.php b/src/Http/Livewire/Posts.php
@@ -2,27 +2,30 @@
 
 namespace LaraZeus\Sky\Http\Livewire;
 
+use Illuminate\View\View;
 use LaraZeus\Sky\SkyPlugin;
 use Livewire\Component;
 
 class Posts extends Component
 {
     use SearchHelpers;
 
-    public function render()
+    public function render(): View
     {
         $search = request('search');
         $category = request('category');
 
         $posts = SkyPlugin::get()->getPostModel()::NotSticky()
             ->search($search)
+            ->with(['tags', 'author', 'media'])
             ->forCategory($category)
             ->published()
             ->orderBy('published_at', 'desc')
             ->get();
 
         $pages = SkyPlugin::get()->getPostModel()::page()
             ->search($search)
+            ->with(['tags', 'author', 'media'])
             ->forCategory($category)
             ->orderBy('published_at', 'desc')
             ->whereNull('parent_id')
@@ -33,6 +36,7 @@ public function render()
 
         $recent = SkyPlugin::get()->getPostModel()::posts()
             ->published()
+            ->with(['tags', 'author', 'media'])
             ->limit(SkyPlugin::get()->getRecentPostsLimit())
             ->orderBy('published_at', 'desc')
             ->get();
@@ -46,13 +50,16 @@ public function render()
             ->withUrl()
             ->twitter();
 
-        return view(app('skyTheme') . '.home')->with([
-            'posts' => $posts,
-            'pages' => $pages,
-            'recent' => $recent,
-            'tags' => SkyPlugin::get()->getTagModel()::withCount('postsPublished')->where('type', 'category')->get(),
-            'stickies' => SkyPlugin::get()->getPostModel()::sticky()->published()->get(),
-        ])
+        return view(app('skyTheme') . '.home')
+            ->with([
+                'posts' => $posts,
+                'pages' => $pages,
+                'recent' => $recent,
+                'tags' => SkyPlugin::get()->getTagModel()::withCount('postsPublished')
+                    ->where('type', 'category')
+                    ->get(),
+                'stickies' => SkyPlugin::get()->getPostModel()::with(['author', 'media'])->sticky()->published()->get(),
+            ])
             ->layout(config('zeus.layout'));
     }
 }
diff --git a/src/Http/Livewire/Tags.php b/src/Http/Livewire/Tags.php
@@ -2,18 +2,20 @@
 
 namespace LaraZeus\Sky\Http\Livewire;
 
+use Illuminate\View\View;
+use LaraZeus\Sky\Models\Tag;
 use LaraZeus\Sky\SkyPlugin;
 use Livewire\Component;
 
 class Tags extends Component
 {
-    public $type;
+    public string $type;
 
-    public $slug;
+    public string $slug;
 
-    public $tag;
+    public Tag $tag;
 
-    public function mount($type, $slug)
+    public function mount(string $type, string $slug): void
     {
         $this->type = $type;
         $this->slug = $slug;
@@ -22,7 +24,7 @@ public function mount($type, $slug)
         abort_if($this->tag === null, 404);
     }
 
-    public function render()
+    public function render(): View
     {
         seo()
             ->site(config('zeus.site_title', 'Laravel'))

diff --git a/src/Models/Faq.php b/src/Models/Faq.php
@@ -8,8 +8,8 @@
 
 class Faq extends Model
 {
-    use HasTranslations;
     use HasTags;
+    use HasTranslations;
 
     public array $translatable = [
         'question',

diff --git a/src/Models/Library.php b/src/Models/Library.php
@@ -23,8 +23,8 @@ class Library extends Model implements HasMedia
 {
     use HasFactory;
     use HasTags;
-    use InteractsWithMedia;
     use HasTranslations;
+    use InteractsWithMedia;
 
     public array $translatable = [
         'title',

diff --git a/src/Models/Post.php b/src/Models/Post.php
@@ -37,12 +37,12 @@
  */
 class Post extends Model implements HasMedia
 {
-    use SoftDeletes;
     use HasFactory;
     use HasTags;
+    use HasTranslations;
     use InteractsWithMedia;
     use PostScope;
-    use HasTranslations;
+    use SoftDeletes;
 
     public array $translatable = [
         'title',

diff --git a/src/Models/PostScope.php b/src/Models/PostScope.php
@@ -3,7 +3,6 @@
 namespace LaraZeus\Sky\Models;
 
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\DB;
 
 trait PostScope
 {
@@ -88,13 +87,13 @@ function ($query) use ($category) {
     /**
      * @param  Builder<Post>  $query
      */
-    public function scopeSearch(Builder $query, $term): Builder
+    public function scopeSearch(Builder $query, ?string $term): Builder
     {
         if ($term !== null) {
             return $query->where(
                 function ($query) use ($term) {
                     foreach (['title', 'slug', 'content', 'description'] as $attribute) {
-                        $query->orWhere(DB::raw("lower({$attribute})"), 'like', "%{$term}%");
+                        $query->orWhere($attribute, 'like', "%{$term}%");
                     }
 
                     return $query;

diff --git a/src/Models/PostStatus.php b/src/Models/PostStatus.php
@@ -14,7 +14,7 @@ class PostStatus extends Model
 {
     use \Sushi\Sushi;
 
-    public function getRows()
+    public function getRows(): array
     {
         return [
             ['name' => 'publish', 'label' => __('Publish'), 'class' => 'px-2 py-0.5 text-xs rounded-xl text-success-700 bg-success-500/10', 'icon' => 'heroicon-o-check-badge'],

diff --git a/src/Models/Tag.php b/src/Models/Tag.php
@@ -11,6 +11,7 @@
  * @property string $slug
  * @property string $type
  * @property string $name
+ * @property string $description
  *
  * @method Builder|static published()
  */