Who doesn't love a good mystery novel. 🍞

Fix ide helper stubs?

app/Http/Controllers/Admin/NodesController.php

@@ -34,6 +34,7 @@ use Illuminate\Cache\Repository as CacheRepository;
 use Pterodactyl\Services\Nodes\NodeCreationService;
 use Pterodactyl\Services\Nodes\NodeDeletionService;
 use Pterodactyl\Services\Allocations\AssignmentService;
+use Pterodactyl\Services\Helpers\SoftwareVersionService;
 use Pterodactyl\Http\Requests\Admin\Node\NodeFormRequest;
 use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
 use Pterodactyl\Http\Requests\Admin\Node\AllocationFormRequest;
@@ -88,6 +89,11 @@ class NodesController extends Controller
      */
     protected $updateService;
 
+    /**
+     * @var \Pterodactyl\Services\Helpers\SoftwareVersionService
+     */
+    protected $versionService;
+
     /**
      * NodesController constructor.
      *
@@ -100,6 +106,7 @@ class NodesController extends Controller
      * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface   $locationRepository
      * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface       $repository
      * @param \Pterodactyl\Services\Nodes\NodeUpdateService                   $updateService
+     * @param \Pterodactyl\Services\Helpers\SoftwareVersionService            $versionService
      */
     public function __construct(
         AlertsMessageBag $alert,
@@ -110,7 +117,8 @@ class NodesController extends Controller
         NodeDeletionService $deletionService,
         LocationRepositoryInterface $locationRepository,
         NodeRepositoryInterface $repository,
-        NodeUpdateService $updateService
+        NodeUpdateService $updateService,
+        SoftwareVersionService $versionService
     ) {
         $this->alert = $alert;
         $this->allocationRepository = $allocationRepository;
@@ -121,6 +129,7 @@ class NodesController extends Controller
         $this->locationRepository = $locationRepository;
         $this->repository = $repository;
         $this->updateService = $updateService;
+        $this->versionService = $versionService;
     }
 
     /**
@@ -182,6 +191,7 @@ class NodesController extends Controller
         return view('admin.nodes.view.index', [
             'node' => $this->repository->getSingleNode($node),
             'stats' => $this->repository->getUsageStats($node),
+            'version' => $this->versionService,
         ]);
     }
 

app/Http/ViewComposers/VersionComposer.php

@@ -1,56 +0,0 @@
-<?php
-/*
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-namespace Pterodactyl\Http\ViewComposers;
-
-use Illuminate\View\View;
-use Pterodactyl\Services\Helpers\SoftwareVersionService;
-
-class VersionComposer
-{
-    /**
-     * @var \Pterodactyl\Services\Helpers\SoftwareVersionService
-     */
-    protected $version;
-
-    /**
-     * VersionComposer constructor.
-     *
-     * @param \Pterodactyl\Services\Helpers\SoftwareVersionService $version
-     */
-    public function __construct(SoftwareVersionService $version)
-    {
-        $this->version = $version;
-    }
-
-    /**
-     * Attach server data to a view automatically.
-     *
-     * @param \Illuminate\View\View $view
-     */
-    public function compose(View $view)
-    {
-        $view->with('version', $this->version);
-    }
-}

app/Providers/ViewComposerServiceProvider.php

@@ -25,7 +25,6 @@
 namespace Pterodactyl\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Pterodactyl\Http\ViewComposers\VersionComposer;
 use Pterodactyl\Http\ViewComposers\Server\ServerDataComposer;
 
 class ViewComposerServiceProvider extends ServiceProvider
@@ -36,6 +35,5 @@ class ViewComposerServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->app->make('view')->composer('server.*', ServerDataComposer::class);
-        $this->app->make('view')->composer('*', VersionComposer::class);
     }
 }