Merge pull request #2172 from HDInnovations/6.x.x

(Release) 6.0.5
HDInnovations · Mar 27, 2022 · 5f8553f · 5f8553f
2 parents 3dafd2d + 3d0ffb5
commit 5f8553f
Show file tree

Hide file tree

Showing 9 changed files with 14,443 additions and 274 deletions.
diff --git a/.github/workflows/phpunit-test.yml b/.github/workflows/phpunit-test.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Configure NPM
         uses: actions/setup-node@v1
         with:
-          node-version: '14.x'
+          node-version: '16.x'
       - name: Install Composer Dependencies
         env:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}

diff --git a/app/Http/Controllers/RequestController.php b/app/Http/Controllers/RequestController.php
@@ -86,7 +86,11 @@ public function request(Request $request, int $id): \Illuminate\Contracts\View\F
                 'cover'    => ['url', 'image_id'],
                 'artworks' => ['url', 'image_id'],
                 'genres'   => ['name'],
-            ])->find($torrentRequest->igdb);
+                'videos'   => ['video_id', 'name'],
+                'involved_companies.company',
+                'involved_companies.company.logo',
+                'platforms', ])
+                ->find($torrentRequest->igdb);
         }
 
         return \view('requests.request', [

diff --git a/app/Http/Controllers/Staff/VersionController.php b/app/Http/Controllers/Staff/VersionController.php
@@ -21,7 +21,7 @@
  */
 class VersionController extends Controller
 {
-    private readonly \App\Http\Controllers\Staff\VersionController $versionController;
+    private readonly mixed $versionController;
 
     public function __construct()
     {

diff --git a/composer.lock b/composer.lock