Skip to content

Commit

Permalink
Upgrade to Laravel 10
Browse files Browse the repository at this point in the history
  • Loading branch information
cdubz committed Feb 3, 2024
1 parent 9aea911 commit 0660c4b
Show file tree
Hide file tree
Showing 18 changed files with 2,472 additions and 1,428 deletions.
407 changes: 253 additions & 154 deletions .phpstorm.meta.php

Large diffs are not rendered by default.

1,426 changes: 1,198 additions & 228 deletions _ide_helper.php

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/Http/Controllers/IngredientPickerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
use App\Models\Food;
use App\Models\Recipe;
use App\Search\Ingredient;
use ElasticScoutDriverPlus\Builders\MultiMatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\TermsQueryBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\MultiMatchQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\TermsQueryBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Kernel extends HttpKernel
protected $middleware = [
// \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class,
\Illuminate\Http\Middleware\HandleCors::class,
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/FoodSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

class FoodSchema extends SchemaProvider
{

/**
* {@inheritdoc}
*/
protected $resourceType = 'foods';
protected string $resourceType = 'foods';

/**
* {@inheritdoc}
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/GoalSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

class GoalSchema extends SchemaProvider
{

/**
* {@inheritdoc}
*/
protected $resourceType = 'goals';
protected string $resourceType = 'goals';

/**
* {@inheritdoc}
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/IngredientAmountSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

class IngredientAmountSchema extends SchemaProvider
{

/**
* {@inheritdoc}
*/
protected $resourceType = 'ingredient-amounts';
protected string $resourceType = 'ingredient-amounts';

/**
* {@inheritdoc}
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/JournalEntrySchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

class JournalEntrySchema extends SchemaProvider
{

/**
* {@inheritdoc}
*/
protected $resourceType = 'journal-entries';
protected string $resourceType = 'journal-entries';

/**
* {@inheritdoc}
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/MediumSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

/**
* Media schema.
Expand All @@ -18,7 +18,7 @@ class MediumSchema extends SchemaProvider
/**
* {@inheritdoc}
*/
protected $resourceType = 'media';
protected string $resourceType = 'media';

/**
* {@inheritdoc}
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/RecipeSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

class RecipeSchema extends SchemaProvider
{

/**
* @var string
*/
protected $resourceType = 'recipes';
protected string $resourceType = 'recipes';

/**
* {@inheritdoc}
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/RecipeSeparatorSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

class RecipeSeparatorSchema extends SchemaProvider
{

/**
* {@inheritdoc}
*/
protected $resourceType = 'recipe-separators';
protected string $resourceType = 'recipe-separators';

/**
* {@inheritdoc}
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/RecipeStepSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

class RecipeStepSchema extends SchemaProvider
{

/**
* {@inheritdoc}
*/
protected $resourceType = 'recipe-steps';
protected string $resourceType = 'recipe-steps';

/**
* {@inheritdoc}
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/TagSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

class TagSchema extends SchemaProvider
{

/**
* {@inheritdoc}
*/
protected $resourceType = 'tags';
protected string $resourceType = 'tags';

/**
* {@inheritdoc}
Expand Down
4 changes: 2 additions & 2 deletions app/JsonApi/Schemas/UserSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace App\JsonApi\Schemas;

use Neomerx\JsonApi\Schema\SchemaProvider;
use CloudCreativity\LaravelJsonApi\Schema\SchemaProvider;

class UserSchema extends SchemaProvider
{

/**
* {@inheritdoc}
*/
protected $resourceType = 'users';
protected string $resourceType = 'users';

/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Food.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use App\Models\Traits\Sluggable;
use App\Models\Traits\Taggable;
use App\Support\Number;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;

Expand Down
2 changes: 1 addition & 1 deletion app/Models/Recipe.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use App\Models\Traits\Taggable;
use App\Support\Number;
use App\Support\Nutrients;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
Expand Down
26 changes: 14 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@
"ext-json": "*",
"ext-mbstring": "*",
"algolia/algoliasearch-client-php": "^3.2",
"algolia/scout-extended": "^2.0",
"babenkoivan/elastic-migrations": "^2.0",
"babenkoivan/elastic-scout-driver": "^2.0",
"babenkoivan/elastic-scout-driver-plus": "^3.3",
"cloudcreativity/laravel-json-api": "^4.0",
"cviebrock/eloquent-sluggable": "^9.0",
"algolia/scout-extended": "^3.0",
"babenkoivan/elastic-migrations": "^3.0",
"babenkoivan/elastic-scout-driver": "^3.0",
"babenkoivan/elastic-scout-driver-plus": "^4.0",
"cloudcreativity/laravel-json-api": "^6.0",
"cviebrock/eloquent-sluggable": "^10.0",
"doctrine/dbal": "^3.0",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^9.0",
"laravel/scout": "^9.0",
"laravel/framework": "^10.0",
"laravel/scout": "^10.0",
"laravel/tinker": "^2.7",
"league/flysystem-aws-s3-v3": "^3.0",
"phospr/fraction": "^1.2",
Expand All @@ -31,7 +30,7 @@
"require-dev": {
"barryvdh/laravel-ide-helper": "^2.9",
"brianium/paratest": "^6.2",
"cloudcreativity/json-api-testing": "^4.0",
"cloudcreativity/json-api-testing": "^5.0",
"fakerphp/faker": "^1.9.1",
"laravel/breeze": "^1.0",
"laravel/sail": "^1.10",
Expand All @@ -40,12 +39,15 @@
"nunomaduro/larastan": "^2.0",
"php-coveralls/php-coveralls": "^2.4",
"phpunit/phpunit": "^9.3.3",
"spatie/laravel-ignition": "^1.0"
"spatie/laravel-ignition": "^2.0"
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"php-http/discovery": true
}
},
"extra": {
"laravel": {
Expand Down
Loading

0 comments on commit 0660c4b

Please sign in to comment.