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

Merge branch 'develop' into pr/1129

Browse source
This commit is contained in:
Dane Everitt 2018-05-26 10:34:29 -07:00
commit e3bbd85f3f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
174 changed files with 1485 additions and 1116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Providers/AuthServiceProvider.php
View file

@ -17,8 +17,6 @@ class AuthServiceProvider extends ServiceProvider
/**
* Register any application authentication / authorization services.
*
* @param \Illuminate\Contracts\Auth\Access\Gate $gate
*/
public function boot()
{

2
app/Providers/HashidsServiceProvider.php
View file

@ -27,7 +27,7 @@ class HashidsServiceProvider extends ServiceProvider
return new Hashids(
$config->get('hashids.salt', ''),
$config->get('hashids.length', 0),
$config->get('hashids.alphabet', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
$config->get('hashids.alphabet', 'abcdefghijkmlnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
);
});

4
app/Providers/SettingsServiceProvider.php
View file

@ -2,7 +2,7 @@
namespace Pterodactyl\Providers;
use Illuminate\Contracts\Logging\Log;
use Psr\Log\LoggerInterface as Log;
use Illuminate\Database\QueryException;
use Illuminate\Support\ServiceProvider;
use Illuminate\Contracts\Encryption\Encrypter;
@ -62,7 +62,7 @@ class SettingsServiceProvider extends ServiceProvider
*
* @param \Illuminate\Contracts\Config\Repository $config
* @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
* @param \Illuminate\Contracts\Logging\Log $log
* @param \Psr\Log\LoggerInterface $log
* @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings
*/
public function boot(ConfigRepository $config, Encrypter $encrypter, Log $log, SettingsRepositoryInterface $settings)