dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

[L6] Update cursor() calls to work with new lazy collections

Browse Source
This commit is contained in:
Dane Everitt 2019-09-04 21:05:46 -07:00
parent 08bdc9705f
commit 1c5b9dbb87
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/Server/BulkPowerActionCommand.php
View File

@ -98,7 +98,7 @@ class BulkPowerActionCommand extends Command
$bar = $this->output->createProgressBar($count);
$servers = $this->repository->getServersForPowerAction($servers, $nodes);
foreach ($servers as $server) {
$servers->each(function ($server) use ($action, &$bar) {
$bar->clear();
try {
@ -117,7 +117,7 @@ class BulkPowerActionCommand extends Command
$bar->advance();
$bar->display();
}
});
$this->line('');
}

6
app/Contracts/Repository/NodeRepositoryInterface.php
View File

@ -2,9 +2,9 @@
namespace Pterodactyl\Contracts\Repository;
use Generator;
use Pterodactyl\Models\Node;
use Illuminate\Support\Collection;
use Illuminate\Support\LazyCollection;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Pterodactyl\Contracts\Repository\Attributes\SearchableInterface;
@ -69,7 +69,7 @@ interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterfa
* @param array $locations
* @param int $disk
* @param int $memory
* @return \Generator
* @return \Illuminate\Support\LazyCollection
*/
public function getNodesWithResourceUse(array $locations, int $disk, int $memory): Generator;
public function getNodesWithResourceUse(array $locations, int $disk, int $memory): LazyCollection;
}

2
app/Contracts/Repository/ServerRepositoryInterface.php
View File

@ -133,7 +133,7 @@ interface ServerRepositoryInterface extends RepositoryInterface, SearchableInter
* @param int[] $servers
* @param int[] $nodes
* @param bool $returnCount
* @return int|\Generator
* @return int|\Illuminate\Support\LazyCollection
*/
public function getServersForPowerAction(array $servers = [], array $nodes = [], bool $returnCount = false);

6
app/Repositories/Eloquent/NodeRepository.php
View File

@ -2,9 +2,9 @@
namespace Pterodactyl\Repositories\Eloquent;
use Generator;
use Pterodactyl\Models\Node;
use Illuminate\Support\Collection;
use Illuminate\Support\LazyCollection;
use Pterodactyl\Repositories\Concerns\Searchable;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
@ -172,9 +172,9 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
* @param array $locations
* @param int $disk
* @param int $memory
* @return \Generator
* @return \Illuminate\Support\LazyCollection
*/
public function getNodesWithResourceUse(array $locations, int $disk, int $memory): Generator
public function getNodesWithResourceUse(array $locations, int $disk, int $memory): LazyCollection
{
$instance = $this->getBuilder()
->select(['nodes.id', 'nodes.memory', 'nodes.disk', 'nodes.memory_overallocate', 'nodes.disk_overallocate'])

2
app/Repositories/Eloquent/ServerRepository.php
View File

@ -291,7 +291,7 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
* @param int[] $servers
* @param int[] $nodes
* @param bool $returnCount
* @return int|\Generator
* @return int|\Illuminate\Support\LazyCollection
*/
public function getServersForPowerAction(array $servers = [], array $nodes = [], bool $returnCount = false)
{