StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More tests

Browse source
This commit is contained in:
Dane Everitt 2017-08-13 14:55:09 -05:00
parent fd24729ab9
commit 6d1b994b7d
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
11 changed files with 626 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/Services/Services/Variables/VariableCreationService.php
View file

@ -53,8 +53,8 @@ class VariableCreationService
/**
* Create a new variable for a given service option.
*
* @param int $option
* @param array $data
* @param int|\Pterodactyl\Models\ServiceOption $option
* @param array $data
* @return \Pterodactyl\Models\ServiceVariable
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
@ -67,7 +67,9 @@ class VariableCreationService
}
if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', ServiceVariable::RESERVED_ENV_NAMES))) {
throw new ReservedVariableNameException(sprintf('Cannot use the protected name %s for this environment variable.'));
throw new ReservedVariableNameException(sprintf(
'Cannot use the protected name %s for this environment variable.', array_get($data, 'env_variable')
));
}
$options = array_get($data, 'options', []);

24
app/Services/Services/Variables/VariableUpdateService.php
View file

@ -34,11 +34,16 @@ class VariableUpdateService
/**
* @var \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface
*/
protected $serviceVariableRepository;
protected $repository;
public function __construct(ServiceVariableRepositoryInterface $serviceVariableRepository)
/**
* VariableUpdateService constructor.
*
* @param \Pterodactyl\Contracts\Repository\ServiceVariableRepositoryInterface $repository
*/
public function __construct(ServiceVariableRepositoryInterface $repository)
{
$this->serviceVariableRepository = $serviceVariableRepository;
$this->repository = $repository;
}
/**
@ -46,16 +51,17 @@ class VariableUpdateService
*
* @param int|\Pterodactyl\Models\ServiceVariable $variable
* @param array $data
* @return \Pterodactyl\Models\ServiceVariable
* @return mixed
*
* @throws \Pterodactyl\Exceptions\DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
* @throws \Pterodactyl\Exceptions\Services\ServiceVariable\ReservedVariableNameException
*/
public function handle($variable, array $data)
{
if (! $variable instanceof ServiceVariable) {
$variable = $this->serviceVariableRepository->find($variable);
$variable = $this->repository->find($variable);
}
if (! is_null(array_get($data, 'env_variable'))) {
@ -65,7 +71,7 @@ class VariableUpdateService
]));
}
$search = $this->serviceVariableRepository->withColumns('id')->findCountWhere([
$search = $this->repository->withColumns('id')->findCountWhere([
['env_variable', '=', array_get($data, 'env_variable')],
['option_id', '=', $variable->option_id],
['id', '!=', $variable->id],
@ -80,9 +86,9 @@ class VariableUpdateService
$options = array_get($data, 'options', []);
return $this->serviceVariableRepository->update($variable->id, array_merge([
'user_viewable' => in_array('user_viewable', $options, $variable->user_viewable),
'user_editable' => in_array('user_editable', $options, $variable->user_editable),
return $this->repository->withoutFresh()->update($variable->id, array_merge([
'user_viewable' => in_array('user_viewable', $options),
'user_editable' => in_array('user_editable', $options),
], $data));
}
}