composer update

This commit is contained in:
Manish Verma
2018-12-05 10:50:52 +05:30
parent 9eabcacfa7
commit 4addd1e9c6
3328 changed files with 156676 additions and 138988 deletions

View File

@@ -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.

View File

@@ -53,12 +53,12 @@
@component('mail::subcopy')
@lang(
"If youre 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

View File

@@ -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"

View File

@@ -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}; ?>";
}
}