composer update
This commit is contained in:
@@ -29,7 +29,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
const VERSION = '5.6.38';
|
||||
const VERSION = '5.6.39';
|
||||
|
||||
/**
|
||||
* The base path for the Laravel installation.
|
||||
|
@@ -53,12 +53,12 @@
|
||||
@component('mail::subcopy')
|
||||
@lang(
|
||||
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
|
||||
'into your web browser: [:actionURL](:actionURL)',
|
||||
'into your web browser: ',
|
||||
[
|
||||
'actionText' => $actionText,
|
||||
'actionURL' => $actionUrl
|
||||
'actionText' => $actionText
|
||||
]
|
||||
)
|
||||
[{{ $actionUrl }}]({!! $actionUrl !!})
|
||||
@endcomponent
|
||||
@endisset
|
||||
@endcomponent
|
||||
|
@@ -18,7 +18,7 @@
|
||||
"ext-mbstring": "*",
|
||||
"doctrine/inflector": "~1.1",
|
||||
"illuminate/contracts": "5.6.*",
|
||||
"nesbot/carbon": "^1.24.1"
|
||||
"nesbot/carbon": "1.25.*"
|
||||
},
|
||||
"conflict": {
|
||||
"tightenco/collect": "<5.5.33"
|
||||
|
@@ -18,7 +18,7 @@ trait CompilesTranslations
|
||||
return "<?php \$__env->startTranslation{$expression}; ?>";
|
||||
}
|
||||
|
||||
return "<?php echo e(app('translator')->getFromJson{$expression}); ?>";
|
||||
return "<?php echo app('translator')->getFromJson{$expression}; ?>";
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -28,7 +28,7 @@ trait CompilesTranslations
|
||||
*/
|
||||
protected function compileEndlang()
|
||||
{
|
||||
return '<?php echo e($__env->renderTranslation()); ?>';
|
||||
return '<?php echo $__env->renderTranslation(); ?>';
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -39,6 +39,6 @@ trait CompilesTranslations
|
||||
*/
|
||||
protected function compileChoice($expression)
|
||||
{
|
||||
return "<?php echo e(app('translator')->choice{$expression}); ?>";
|
||||
return "<?php echo app('translator')->choice{$expression}; ?>";
|
||||
}
|
||||
}
|
||||
|
12
vendor/laravel/tinker/README.md
vendored
12
vendor/laravel/tinker/README.md
vendored
@@ -17,20 +17,10 @@ To get started with Laravel Tinker, simply run:
|
||||
|
||||
composer require laravel/tinker
|
||||
|
||||
If you are using Laravel 5.5+, there is no need to manually register the service provider. However, if you are using an earlier version of Laravel, register the `TinkerServiceProvider` in your `app` configuration file:
|
||||
|
||||
```php
|
||||
'providers' => [
|
||||
// Other service providers...
|
||||
|
||||
Laravel\Tinker\TinkerServiceProvider::class,
|
||||
],
|
||||
```
|
||||
|
||||
## Basic Usage
|
||||
|
||||
From your console, execute the `php artisan tinker` command.
|
||||
|
||||
## License
|
||||
|
||||
Laravel Tinker is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
|
||||
Laravel Tinker is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
|
||||
|
15
vendor/laravel/tinker/config/tinker.php
vendored
15
vendor/laravel/tinker/config/tinker.php
vendored
@@ -2,6 +2,21 @@
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Console Commands
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| This option allows you to add additional Artisan commands that should
|
||||
| be available within the Tinker environment. Once the command is in
|
||||
| this array you may execute the command in Tinker using its name.
|
||||
|
|
||||
*/
|
||||
|
||||
'commands' => [
|
||||
// App\Console\Commands\ExampleCommand::class,
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Alias Blacklist
|
||||
|
@@ -54,7 +54,7 @@ class TinkerCommand extends Command
|
||||
$shell->addCommands($this->getCommands());
|
||||
$shell->setIncludes($this->argument('include'));
|
||||
|
||||
$path = $this->getLaravel()->basePath('vendor/composer/autoload_classmap.php');
|
||||
$path = $this->getLaravel()->basePath().DIRECTORY_SEPARATOR.'vendor/composer/autoload_classmap.php';
|
||||
|
||||
$loader = ClassAliasAutoloader::register($shell, $path);
|
||||
|
||||
|
Reference in New Issue
Block a user