Skip to content

Commit 3a1af77

Browse files
authored
Merge pull request #64 from TomHAnderson/feature/laravel-12
Laravel 12
2 parents e50c617 + 9f47c99 commit 3a1af77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+878
-1138
lines changed

.github/workflows/ldog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
DB_PORT: ${{ job.services.mysql.ports['3306'] }}
8383

8484
- name: Import Fixtures
85-
run: php artisan doctrine:data-fixtures:import faker
85+
run: php artisan db:seed --class=FakerSeeder
8686
env:
8787
DB_PORT: ${{ job.services.mysql.ports['3306'] }}
8888

LICENSE

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2025 API Skeletons, Inc. <[email protected]>
4+
Copyright (c) Taylor Otwell
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.
23+

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ Documentation
3535
* magidoc - https://magidoc.js.org/introduction/welcome
3636
* graphiql - https://github.com/graphql/graphiql/blob/main/packages/graphiql/README.md
3737
* migrations - https://laraveldoctrine.org/docs/1.8/migrations
38-
* data fixtures - https://github.com/API-Skeletons/laravel-doctrine-data-fixtures/blob/main/README.md

app/Http/Controllers/GraphQLController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use ApiSkeletons\Doctrine\ORM\GraphQL\Config;
88
use ApiSkeletons\Doctrine\ORM\GraphQL\Driver;
9-
use ApiSkeletons\Laravel\ApiProblem\Facades\ApiProblem;
109
use App\GraphQL\Mutation;
1110
use App\GraphQL\Query;
1211
use Doctrine\Laminas\Hydrator\DoctrineObject;
@@ -21,6 +20,7 @@
2120
use GraphQL\Validator\Rules\QueryComplexity;
2221
use Illuminate\Http\Request;
2322

23+
use function abort;
2424
use function array_map;
2525
use function config;
2626

@@ -34,7 +34,7 @@ public function __invoke(EntityManager $entityManager, Request $request): array
3434
$operationName = $request->json('operationName');
3535

3636
if (! $query) {
37-
return ApiProblem::response('Query is required', 422);
37+
abort(422, 'Missing query parameter');
3838
}
3939

4040
$context = [];

composer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,21 @@
77
"require": {
88
"php": "^8.2",
99
"api-skeletons/doctrine-orm-graphql": "^12.3",
10-
"api-skeletons/laravel-doctrine-apikey": "^2.0",
11-
"api-skeletons/laravel-doctrine-data-fixtures": "^1.0",
1210
"laravel-doctrine/orm": "^3.0",
13-
"laravel/framework": "^11.9",
14-
"laravel/tinker": "^2.9",
11+
"laravel/framework": "^12.0",
12+
"laravel/tinker": "^2.10.1",
1513
"mll-lab/laravel-graphiql": "^3.2"
1614
},
1715
"require-dev": {
1816
"doctrine/coding-standard": "^12.0",
1917
"fakerphp/faker": "^1.23",
20-
"laravel/pail": "^1.1",
18+
"laravel/pail": "^1.2.2",
2119
"laravel/pint": "^1.13",
2220
"mockery/mockery": "^1.6",
23-
"nunomaduro/collision": "^8.1",
21+
"nunomaduro/collision": "^8.6",
2422
"php-parallel-lint/php-parallel-lint": "^1.4",
2523
"phpstan/phpstan": "^1.12",
26-
"phpunit/phpunit": "^11.0.1"
24+
"phpunit/phpunit": "^11.5.3"
2725
},
2826
"autoload": {
2927
"psr-4": {

0 commit comments

Comments
 (0)