@@ -47,7 +47,7 @@ |
||
| 47 | 47 | * |
| 48 | 48 | * @param string $time |
| 49 | 49 | * @param string|DateTimeZone $timezone |
| 50 | - * @return \Illuminate\Support\DateFactory|string |
|
| 50 | + * @return Illuminate\Support\Carbon|null |
|
| 51 | 51 | */ |
| 52 | 52 | function carbon($time = null, $timezone = null) |
| 53 | 53 | { |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | use Illuminate\Support\Facades\Date; |
| 4 | 4 | |
| 5 | -if (! function_exists('country')) { |
|
| 5 | +if (!function_exists('country')) { |
|
| 6 | 6 | /** |
| 7 | 7 | * Get a localized country name. |
| 8 | 8 | * |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | -if (! function_exists('currency')) { |
|
| 22 | +if (!function_exists('currency')) { |
|
| 23 | 23 | /** |
| 24 | 24 | * Get a localized currency or currency amount. |
| 25 | 25 | * |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | -if (! function_exists('carbon')) { |
|
| 44 | +if (!function_exists('carbon')) { |
|
| 45 | 45 | /** |
| 46 | 46 | * Get a localized Carbon instance. |
| 47 | 47 | * |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | -if (! function_exists('language')) { |
|
| 58 | +if (!function_exists('language')) { |
|
| 59 | 59 | /** |
| 60 | 60 | * Get a localized language name. |
| 61 | 61 | * |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | -if (! function_exists('number')) { |
|
| 75 | +if (!function_exists('number')) { |
|
| 76 | 76 | /** |
| 77 | 77 | * Get a formatted localized number. |
| 78 | 78 | * |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | public function boot() |
| 29 | 29 | { |
| 30 | - $this->app['events']->listen(LocaleUpdated::class, function ($locale) { |
|
| 30 | + $this->app['events']->listen(LocaleUpdated::class, function($locale) { |
|
| 31 | 31 | $this->setLocale(); |
| 32 | 32 | }); |
| 33 | 33 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | protected function registerCountry() |
| 43 | 43 | { |
| 44 | - $this->app->singleton(Country::class, function ($app) { |
|
| 44 | + $this->app->singleton(Country::class, function($app) { |
|
| 45 | 45 | $repository = new Country; |
| 46 | 46 | |
| 47 | 47 | return $repository->setLocale($app['config']['app.locale'])->setFallbackLocale($app['config']['app.fallback_locale']); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | protected function registerCurrency() |
| 59 | 59 | { |
| 60 | - $this->app->singleton(Currency::class, function ($app) { |
|
| 60 | + $this->app->singleton(Currency::class, function($app) { |
|
| 61 | 61 | $repository = new Currency; |
| 62 | 62 | |
| 63 | 63 | return $repository->setLocale($app['config']['app.locale'])->setFallbackLocale($app['config']['app.fallback_locale']); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | protected function registerLanguage() |
| 75 | 75 | { |
| 76 | - $this->app->singleton(Language::class, function ($app) { |
|
| 76 | + $this->app->singleton(Language::class, function($app) { |
|
| 77 | 77 | $repository = new Language; |
| 78 | 78 | |
| 79 | 79 | return $repository->setLocale($app['config']['app.locale'])->setFallbackLocale($app['config']['app.fallback_locale']); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | protected function registerNumber() |
| 91 | 91 | { |
| 92 | - $this->app->singleton(Number::class, function ($app) { |
|
| 92 | + $this->app->singleton(Number::class, function($app) { |
|
| 93 | 93 | $repository = new Number; |
| 94 | 94 | |
| 95 | 95 | return $repository->setLocale($app['config']['app.locale'])->setFallbackLocale($app['config']['app.fallback_locale']); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | */ |
| 106 | 106 | protected function registerDate() |
| 107 | 107 | { |
| 108 | - require __DIR__.'/Macros/Carbon.php'; |
|
| 108 | + require __DIR__ . '/Macros/Carbon.php'; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |