Dependency updates and update version number

This commit is contained in:
Kode
2018-06-13 19:35:28 +01:00
parent 18ec208381
commit e3ec7de23a
1261 changed files with 45582 additions and 29687 deletions

View File

@@ -14,7 +14,7 @@
"illuminate/console": "~5.1",
"illuminate/contracts": "~5.1",
"illuminate/support": "~5.1",
"psy/psysh": "0.7.*|0.8.*",
"psy/psysh": "0.7.*|0.8.*|0.9.*",
"symfony/var-dumper": "~3.0|~4.0"
},
"require-dev": {

18
vendor/laravel/tinker/config/tinker.php vendored Normal file
View File

@@ -0,0 +1,18 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Alias Blacklist
|--------------------------------------------------------------------------
|
| Typically, Tinker automatically aliases classes as you require them in
| Tinker. However, you may wish to never alias certain classes, which
| you may accomplish by listing the classes in the following array.
|
*/
'dont_alias' => [],
];

View File

@@ -50,11 +50,19 @@ class ClassAliasAutoloader
$classes = require $classMapPath;
$excludedAliases = collect(config('tinker.dont_alias', []));
foreach ($classes as $class => $path) {
if (! Str::contains($class, '\\') || Str::startsWith($path, $vendorPath)) {
continue;
}
if (! $excludedAliases->filter(function ($alias) use ($class) {
return Str::startsWith($class, $alias);
})->isEmpty()) {
continue;
}
$name = class_basename($class);
if (! isset($this->classes[$name])) {

View File

@@ -80,6 +80,10 @@ class TinkerCommand extends Command
}
}
foreach (config('tinker.commands', []) as $command) {
$commands[] = $this->getApplication()->resolve($command);
}
return $commands;
}

View File

@@ -2,7 +2,9 @@
namespace Laravel\Tinker;
use Illuminate\Foundation\Application as LaravelApplication;
use Illuminate\Support\ServiceProvider;
use Laravel\Lumen\Application as LumenApplication;
use Laravel\Tinker\Console\TinkerCommand;
class TinkerServiceProvider extends ServiceProvider
@@ -14,6 +16,24 @@ class TinkerServiceProvider extends ServiceProvider
*/
protected $defer = true;
/**
* Boot the service provider.
*
* @return void
*/
public function boot()
{
$source = realpath($raw = __DIR__ . '/../config/tinker.php') ?: $raw;
if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
$this->publishes([$source => config_path('tinker.php')]);
} elseif ($this->app instanceof LumenApplication) {
$this->app->configure('tinker');
}
$this->mergeConfigFrom($source, 'tinker');
}
/**
* Register the service provider.
*