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

Laravel 10 (#4706)

Browse source
This commit is contained in:
Matthew Penner 2023-02-23 12:30:16 -07:00 • committed by GitHub
parent ad4ddc6300
commit 1d38b4f0e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
136 changed files with 1735 additions and 2008 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/Traits/Controllers/JavascriptInjection.php
View file

@ -2,7 +2,6 @@
namespace Pterodactyl\Traits\Controllers;
use JavaScript;
use Illuminate\Http\Request;
trait JavascriptInjection
@ -24,6 +23,6 @@ trait JavascriptInjection
*/
public function plainInject(array $args = []): string
{
return JavaScript::put($args);
return \JavaScript::put($args);
}
}

2
app/Traits/Controllers/PlainJavascriptInjection.php
View file

@ -11,6 +11,6 @@ trait PlainJavascriptInjection
*/
public function injectJavascript($data)
{
JavaScript::put($data);
\JavaScript::put($data);
}
}

3
app/Traits/Services/ValidatesValidationRules.php
View file

@ -2,7 +2,6 @@
namespace Pterodactyl\Traits\Services;
use BadMethodCallException;
use Illuminate\Support\Str;
use Illuminate\Contracts\Validation\Factory as ValidationFactory;
use Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException;
@ -21,7 +20,7 @@ trait ValidatesValidationRules
{
try {
$this->getValidator()->make(['__TEST' => 'test'], ['__TEST' => $rules])->fails();
} catch (BadMethodCallException $exception) {
} catch (\BadMethodCallException $exception) {
$matches = [];
if (preg_match('/Method \[(.+)\] does not exist\./', $exception->getMessage(), $matches)) {
throw new BadValidationRuleException(trans('exceptions.nest.variables.bad_validation_rule', ['rule' => Str::snake(str_replace('validate', '', array_get($matches, 1, 'unknownRule')))]), $exception);