RomanNum3ral
/
kcal
mirror of https://github.com/kcal-app/kcal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Laravel 10

This commit is contained in:
Christopher C. Wells 2024-02-03 08:36:44 -08:00
parent 9aea9114f7
commit 0660c4bfa4
18 changed files with 2486 additions and 1442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

407
.phpstorm.meta.php
View File

File diff suppressed because it is too large Load Diff

1436
_ide_helper.php
View File

File diff suppressed because it is too large Load Diff

6
app/Http/Controllers/IngredientPickerController.php
View File

@ -5,9 +5,9 @@ namespace App\Http\Controllers;
use App\Models\Food; use App\Models\Food;
use App\Models\Recipe; use App\Models\Recipe;
use App\Search\Ingredient; use App\Search\Ingredient;
use ElasticScoutDriverPlus\Builders\MultiMatchQueryBuilder; use Elastic\ScoutDriverPlus\Builders\MultiMatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\TermsQueryBuilder; use Elastic\ScoutDriverPlus\Builders\TermsQueryBuilder;
use ElasticScoutDriverPlus\Support\Query; use Elastic\ScoutDriverPlus\Support\Query;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;

2
app/Http/Kernel.php
View File

@ -12,7 +12,7 @@ class Kernel extends HttpKernel
protected $middleware = [ protected $middleware = [
// \App\Http\Middleware\TrustHosts::class, // \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class, \App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class, \Illuminate\Http\Middleware\HandleCors::class,
\App\Http\Middleware\PreventRequestsDuringMaintenance::class, \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class, \App\Http\Middleware\TrimStrings::class,

4
app/JsonApi/Schemas/FoodSchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
class FoodSchema extends SchemaProvider class FoodSchema extends SchemaProvider
{ {
@ -10,7 +10,7 @@ class FoodSchema extends SchemaProvider
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $resourceType = 'foods'; protected string $resourceType = 'foods';
/** /**
* {@inheritdoc} * {@inheritdoc}

4
app/JsonApi/Schemas/GoalSchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
class GoalSchema extends SchemaProvider class GoalSchema extends SchemaProvider
{ {
@ -10,7 +10,7 @@ class GoalSchema extends SchemaProvider
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $resourceType = 'goals'; protected string $resourceType = 'goals';
/** /**
* {@inheritdoc} * {@inheritdoc}

4
app/JsonApi/Schemas/IngredientAmountSchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
class IngredientAmountSchema extends SchemaProvider class IngredientAmountSchema extends SchemaProvider
{ {
@ -10,7 +10,7 @@ class IngredientAmountSchema extends SchemaProvider
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $resourceType = 'ingredient-amounts'; protected string $resourceType = 'ingredient-amounts';
/** /**
* {@inheritdoc} * {@inheritdoc}

4
app/JsonApi/Schemas/JournalEntrySchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
class JournalEntrySchema extends SchemaProvider class JournalEntrySchema extends SchemaProvider
{ {
@ -10,7 +10,7 @@ class JournalEntrySchema extends SchemaProvider
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $resourceType = 'journal-entries'; protected string $resourceType = 'journal-entries';
/** /**
* {@inheritdoc} * {@inheritdoc}

4
app/JsonApi/Schemas/MediumSchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
/** /**
* Media schema. * Media schema.
@ -18,7 +18,7 @@ class MediumSchema extends SchemaProvider
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $resourceType = 'media'; protected string $resourceType = 'media';
/** /**
* {@inheritdoc} * {@inheritdoc}

4
app/JsonApi/Schemas/RecipeSchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
class RecipeSchema extends SchemaProvider class RecipeSchema extends SchemaProvider
{ {
@ -10,7 +10,7 @@ class RecipeSchema extends SchemaProvider
/** /**
* @var string * @var string
*/ */
protected $resourceType = 'recipes'; protected string $resourceType = 'recipes';
/** /**
* {@inheritdoc} * {@inheritdoc}

4
app/JsonApi/Schemas/RecipeSeparatorSchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
class RecipeSeparatorSchema extends SchemaProvider class RecipeSeparatorSchema extends SchemaProvider
{ {
@ -10,7 +10,7 @@ class RecipeSeparatorSchema extends SchemaProvider
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $resourceType = 'recipe-separators'; protected string $resourceType = 'recipe-separators';
/** /**
* {@inheritdoc} * {@inheritdoc}

4
app/JsonApi/Schemas/RecipeStepSchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
class RecipeStepSchema extends SchemaProvider class RecipeStepSchema extends SchemaProvider
{ {
@ -10,7 +10,7 @@ class RecipeStepSchema extends SchemaProvider
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $resourceType = 'recipe-steps'; protected string $resourceType = 'recipe-steps';
/** /**
* {@inheritdoc} * {@inheritdoc}

4
app/JsonApi/Schemas/TagSchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
class TagSchema extends SchemaProvider class TagSchema extends SchemaProvider
{ {
@ -10,7 +10,7 @@ class TagSchema extends SchemaProvider
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $resourceType = 'tags'; protected string $resourceType = 'tags';
/** /**
* {@inheritdoc} * {@inheritdoc}

4
app/JsonApi/Schemas/UserSchema.php
View File

@ -2,7 +2,7 @@
namespace App\JsonApi\Schemas; namespace App\JsonApi\Schemas;
use Neomerx\JsonApi\Schema\SchemaProvider; use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;
class UserSchema extends SchemaProvider class UserSchema extends SchemaProvider
{ {
@ -10,7 +10,7 @@ class UserSchema extends SchemaProvider
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $resourceType = 'users'; protected string $resourceType = 'users';
/** /**
* {@inheritdoc} * {@inheritdoc}

2
app/Models/Food.php
View File

@ -7,7 +7,7 @@ use App\Models\Traits\Journalable;
use App\Models\Traits\Sluggable; use App\Models\Traits\Sluggable;
use App\Models\Traits\Taggable; use App\Models\Traits\Taggable;
use App\Support\Number; use App\Support\Number;
use ElasticScoutDriverPlus\Searchable; use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;

2
app/Models/Recipe.php
View File

@ -9,7 +9,7 @@ use App\Models\Traits\Sluggable;
use App\Models\Traits\Taggable; use App\Models\Traits\Taggable;
use App\Support\Number; use App\Support\Number;
use App\Support\Nutrients; use App\Support\Nutrients;
use ElasticScoutDriverPlus\Searchable; use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;

26
composer.json
View File

@ -10,17 +10,16 @@
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"algolia/algoliasearch-client-php": "^3.2", "algolia/algoliasearch-client-php": "^3.2",
"algolia/scout-extended": "^2.0", "algolia/scout-extended": "^3.0",
"babenkoivan/elastic-migrations": "^2.0", "babenkoivan/elastic-migrations": "^3.0",
"babenkoivan/elastic-scout-driver": "^2.0", "babenkoivan/elastic-scout-driver": "^3.0",
"babenkoivan/elastic-scout-driver-plus": "^3.3", "babenkoivan/elastic-scout-driver-plus": "^4.0",
"cloudcreativity/laravel-json-api": "^4.0", "cloudcreativity/laravel-json-api": "^6.0",
"cviebrock/eloquent-sluggable": "^9.0", "cviebrock/eloquent-sluggable": "^10.0",
"doctrine/dbal": "^3.0", "doctrine/dbal": "^3.0",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1", "guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^9.0", "laravel/framework": "^10.0",
"laravel/scout": "^9.0", "laravel/scout": "^10.0",
"laravel/tinker": "^2.7", "laravel/tinker": "^2.7",
"league/flysystem-aws-s3-v3": "^3.0", "league/flysystem-aws-s3-v3": "^3.0",
"phospr/fraction": "^1.2", "phospr/fraction": "^1.2",
@ -31,7 +30,7 @@
"require-dev": { "require-dev": {
"barryvdh/laravel-ide-helper": "^2.9", "barryvdh/laravel-ide-helper": "^2.9",
"brianium/paratest": "^6.2", "brianium/paratest": "^6.2",
"cloudcreativity/json-api-testing": "^4.0", "cloudcreativity/json-api-testing": "^5.0",
"fakerphp/faker": "^1.9.1", "fakerphp/faker": "^1.9.1",
"laravel/breeze": "^1.0", "laravel/breeze": "^1.0",
"laravel/sail": "^1.10", "laravel/sail": "^1.10",
@ -40,12 +39,15 @@
"nunomaduro/larastan": "^2.0", "nunomaduro/larastan": "^2.0",
"php-coveralls/php-coveralls": "^2.4", "php-coveralls/php-coveralls": "^2.4",
"phpunit/phpunit": "^9.3.3", "phpunit/phpunit": "^9.3.3",
"spatie/laravel-ignition": "^1.0" "spatie/laravel-ignition": "^2.0"
}, },
"config": { "config": {
"optimize-autoloader": true, "optimize-autoloader": true,
"preferred-install": "dist", "preferred-install": "dist",
"sort-packages": true "sort-packages": true,
"allow-plugins": {
"php-http/discovery": true
}
}, },
"extra": { "extra": {
"laravel": { "laravel": {

2007
composer.lock generated
View File

File diff suppressed because it is too large Load Diff