Merge pull request #281 from spatie/livewire-v3

Livewire v3
spatie · Oct 31, 2023 · a56ca92 · a56ca92
2 parents 21756bf + 2152c8f
commit a56ca92
Show file tree

Hide file tree

Showing 42 changed files with 2,215 additions and 1,697 deletions.
diff --git a/.github/workflows/code-formatting.yml b/.github/workflows/code-formatting.yml
@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -7,12 +7,12 @@ jobs:
     name: phpstan
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           coverage: none
 
       - name: Install composer dependencies

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -7,12 +7,12 @@ jobs:
         name: Run tests
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.1'
+                  php-version: '8.2'
                   extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
                   coverage: none
 

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: main
 

diff --git a/app/Domain/Experience/ExperienceAggregateRoot.php b/app/Domain/Experience/ExperienceAggregateRoot.php
@@ -6,7 +6,6 @@
 use App\Domain\Experience\Commands\DeleteUser;
 use App\Domain\Experience\Commands\RegisterPullRequest;
 use App\Domain\Experience\Commands\RegisterSeriesCompletion;
-use App\Domain\Experience\Commands\RegisterVideoCompletion;
 use App\Domain\Experience\Commands\UnlockAchievement;
 use App\Domain\Experience\Events\AchievementUnlocked;
 use App\Domain\Experience\Events\ExperienceEarned;
@@ -16,7 +15,6 @@
 use App\Domain\Experience\Events\VideoCompleted;
 use App\Models\Series;
 use App\Models\User;
-use App\Models\Video;
 use Exception;
 use Spatie\EventSourcing\AggregateRoots\AggregateRoot;
 
@@ -81,23 +79,6 @@ protected function applyPullRequestMerged(PullRequestMerged $event): void
         $this->mergedPullRequests[$event->reference] = true;
     }
 
-    public function registerVideoCompletion(RegisterVideoCompletion $command): self
-    {
-        if ($this->completedVideos[$command->videoId] ?? false) {
-            return $this;
-        }
-
-        $video = Video::query()->findOrFail($command->videoId);
-
-        $this->recordThat(new VideoCompleted(
-            userId: $command->userId,
-            videoId: $command->videoId,
-            seriesId: $video->series_id,
-        ));
-
-        return $this;
-    }
-
     protected function applyVideoCompletion(VideoCompleted $event): void
     {
         $this->completedVideos[$event->videoId] = true;

diff --git a/app/Http/Livewire/ActivationsComponent.php → app/Livewire/ActivationsComponent.php b/app/Http/Livewire/ActivationsComponent.php → app/Livewire/ActivationsComponent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Domain\Shop\Models\License;
 use Livewire\Component;

diff --git a/app/Http/Livewire/DomainComponent.php → app/Livewire/DomainComponent.php b/app/Http/Livewire/DomainComponent.php → app/Livewire/DomainComponent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Domain\Shop\Models\License;
 use Livewire\Component;

diff --git a/...vewire/LessonCompletedButtonComponent.php → ...vewire/LessonCompletedButtonComponent.php b/...vewire/LessonCompletedButtonComponent.php → ...vewire/LessonCompletedButtonComponent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Models\Lesson;
 use Livewire\Component;

diff --git a/app/Http/Livewire/RepositoriesComponent.php → app/Livewire/RepositoriesComponent.php b/app/Http/Livewire/RepositoriesComponent.php → app/Livewire/RepositoriesComponent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Models\Repository;
 use Illuminate\Support\Collection;

diff --git a/app/Http/Livewire/SearchDocsComponent.php → app/Livewire/SearchDocsComponent.php b/app/Http/Livewire/SearchDocsComponent.php → app/Livewire/SearchDocsComponent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Support\Search\DocsVersion;
 use Illuminate\Support\Collection;

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -257,7 +257,7 @@ public function canImpersonate(): bool
     public function hasCompleted(Series $series): bool
     {
         return Video::query()
-            ->where('series_id', $series->id)
+            //->where('series_id', $series->id)
             ->whereDoesntHave('completions', function (Builder|LessonCompletion $builder) {
                 return $builder->where('user_id', $this->id);
             })

diff --git a/app/Providers/LivewireServiceProvider.php b/app/Providers/LivewireServiceProvider.php
@@ -2,11 +2,11 @@
 
 namespace App\Providers;
 
-use App\Http\Livewire\ActivationsComponent;
-use App\Http\Livewire\DomainComponent;
-use App\Http\Livewire\LessonCompletedButtonComponent;
-use App\Http\Livewire\RepositoriesComponent;
-use App\Http\Livewire\SearchDocsComponent;
+use App\Livewire\ActivationsComponent;
+use App\Livewire\DomainComponent;
+use App\Livewire\LessonCompletedButtonComponent;
+use App\Livewire\RepositoriesComponent;
+use App\Livewire\SearchDocsComponent;
 use Illuminate\Support\ServiceProvider;
 use Livewire\Livewire;
 

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "barryvdh/laravel-debugbar": "^3.8",
         "blade-ui-kit/blade-ui-kit": "^0.4",
         "blendbyte/nova-items-field": "^1.0",
-        "coroowicaksono/chart-js-integration": "^0.3.5",
+        "coroowicaksono/chart-js-integration": "^0.4",
         "doctrine/dbal": "^3.5.1",
         "ebess/advanced-nova-media-library": "dev-master as 4.0.5",
         "geoip2/geoip2": "^2.13",
@@ -38,7 +38,7 @@
         "laravel/ui": "^4.2",
         "league/commonmark": "^2.2.1",
         "league/flysystem-aws-s3-v3": "^3.10",
-        "livewire/livewire": "^2.11",
+        "livewire/livewire": "^3.0",
         "meilisearch/meilisearch-php": "^1.0",
         "myclabs/php-enum": "^1.8.4",
         "nyholm/psr7": "^1.5.1",
@@ -55,7 +55,7 @@
         "spatie/laravel-artisan-dispatchable": "^1.3",
         "spatie/laravel-backup": "^8.1.5",
         "spatie/laravel-comments": "^1.3",
-        "spatie/laravel-comments-livewire": "^1.2.8",
+        "spatie/laravel-comments-livewire": "^2.0",
         "spatie/laravel-enum": "^3.0.1",
         "spatie/laravel-event-sourcing": "^7.3",
         "spatie/laravel-feed": "^4.2",
@@ -86,7 +86,7 @@
         "symfony/postmark-mailer": "^6.2",
         "symfony/process": "^6.2",
         "torann/geoip": "^3.0.4",
-        "wire-elements/spotlight": "^1.0"
+        "wire-elements/spotlight": "^2.0"
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "^2.13",