Browse Source

Upgrade to laravel 11.

pull/581/head
James Cole 2 years ago
parent
commit
3d8f733189
No known key found for this signature in database GPG Key ID: B49A324B7EAD6D80
  1. 2
      app/Http/Controllers/Import/ConfigurationController.php
  2. 5
      composer.json
  3. 1029
      composer.lock

2
app/Http/Controllers/Import/ConfigurationController.php

@ -146,7 +146,7 @@ class ConfigurationController extends Controller
$dateObj = new Date();
[$locale, $format] = $dateObj->splitLocaleFormat((string)$request->get('format'));
$date = Carbon::make('1984-09-17')->locale($locale);
$date = today()->locale($locale);
return response()->json(['result' => $date->translatedFormat($format)]);
}

5
composer.json

@ -78,8 +78,7 @@
"doctrine/dbal": "^3.8",
"firefly-iii/api-support-classes": "@dev",
"guzzlehttp/guzzle": "^7.0",
"laravel/framework": "^10.48",
"laravel/tinker": "^2.0",
"laravel/framework": "^11",
"league/csv": "9.*",
"rcrowe/twigbridge": "^0.14.2",
"spatie/enum": "^3.10",
@ -95,7 +94,7 @@
"filp/whoops": "^2.0",
"laravel/ui": "^4.5",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^7.0",
"nunomaduro/collision": "^8",
"nunomaduro/larastan": "^2.9",
"phpstan/extension-installer": "*",
"phpstan/phpstan": "^1.10",

1029
composer.lock
File diff suppressed because it is too large
View File

Loading…
Cancel
Save