Skip to content

Commit 8ae6621

Browse files
committed
chore(deps): removal of doctrine/annotations from dev dependencies
1 parent 7c01db5 commit 8ae6621

19 files changed

+27
-226
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"require-dev": {
4747
"ext-ffi": "^8.1",
4848
"blackfire/php-sdk": "^1.30",
49-
"doctrine/annotations": "^1.13",
5049
"doctrine/dbal": "^3.4",
5150
"doctrine/doctrine-bundle": "^2.7",
5251
"doctrine/doctrine-migrations-bundle": "^3.2.4",

composer.lock

Lines changed: 2 additions & 78 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpstan.tests.neon

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ parameters:
2121

2222
# Symfony configuration files
2323
- '#Variable \$container might not be defined#'
24-
- '#Attribute class Symfony\\Component\\Routing\\Attribute\\Route does not exist\.#'
2524
tmpDir: /tmp/phpstan_tests

symfony.lock

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
{
2-
"doctrine/annotations": {
3-
"version": "1.14",
4-
"recipe": {
5-
"repo": "github.com/symfony/recipes",
6-
"branch": "main",
7-
"version": "1.10",
8-
"ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05"
9-
}
10-
},
112
"doctrine/doctrine-bundle": {
123
"version": "2.10",
134
"recipe": {

tests/Feature/SwooleServerCoroutinesTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ public function testOpcacheBlacklistFileGeneration(array $options): void
5050
}
5151

5252
/**
53-
* @param array<array<array{
53+
* @param array{
5454
* APP_ENV: string,
5555
* APP_DEBUG: string,
5656
* WORKER_COUNT: string,
5757
* REACTOR_COUNT: string,
5858
* OVERRIDE_PROD_ENV?: string,
59-
* }>> $envs
59+
* } $envs
6060
*/
6161
#[DataProvider('coroutineTestDataProvider')]
6262
public function testCoroutinesWithEnvs(array $envs): void
@@ -136,13 +136,13 @@ public function testCoroutinesWithEnvs(array $envs): void
136136
}
137137

138138
/**
139-
* @param array<array<array{
139+
* @param array{
140140
* APP_ENV: string,
141141
* APP_DEBUG: string,
142142
* WORKER_COUNT: string,
143143
* REACTOR_COUNT: string,
144144
* OVERRIDE_PROD_ENV?: string,
145-
* }>> $envs
145+
* } $envs
146146
*/
147147
#[DataProvider('coroutineTestDataProvider')]
148148
public function testCoroutinesAndDoctrineWithEnvs(array $envs): void
@@ -247,13 +247,13 @@ public function testCoroutinesAndDoctrineWithEnvs(array $envs): void
247247
}
248248

249249
/**
250-
* @param array<array<array{
250+
* @param array{
251251
* APP_ENV: string,
252252
* APP_DEBUG: string,
253253
* WORKER_COUNT: string,
254254
* REACTOR_COUNT: string,
255255
* OVERRIDE_PROD_ENV?: string,
256-
* }>> $envs
256+
* } $envs
257257
*/
258258
#[DataProvider('coroutineTestDataProvider')]
259259
public function testCoroutinesAndAdvancedDoctrineWithEnvs(array $envs): void
@@ -342,14 +342,14 @@ public function testCoroutinesAndAdvancedDoctrineWithEnvs(array $envs): void
342342
}
343343

344344
/**
345-
* @param array<array<array{
345+
* @param array{
346346
* APP_ENV: string,
347347
* APP_DEBUG: string,
348348
* WORKER_COUNT: string,
349349
* REACTOR_COUNT: string,
350350
* TASK_WORKER_COUNT: string,
351351
* OVERRIDE_PROD_ENV?: string,
352-
* }>> $envs
352+
* } $envs
353353
*/
354354
#[DataProvider('coroutineTestDataProviderForTaskWorkers')]
355355
public function testCoroutinesAndTaskWorkersWithEnvs(array $envs): void
@@ -421,14 +421,14 @@ public function testCoroutinesAndTaskWorkersWithEnvs(array $envs): void
421421
}
422422

423423
/**
424-
* @param array<array<array{
424+
* @param array{
425425
* APP_ENV: string,
426426
* APP_DEBUG: string,
427427
* WORKER_COUNT: string,
428428
* REACTOR_COUNT: string,
429429
* TASK_WORKER_COUNT: string,
430430
* OVERRIDE_PROD_ENV?: string,
431-
* }>> $envs
431+
* } $envs
432432
*/
433433
#[DataProvider('coroutineTestDataProviderForTaskWorkers')]
434434
public function testCoroutinesWithTaskWorkersWithDoctrine(array $envs): void

tests/Fixtures/Symfony/TestBundle/Controller/BlackfireController.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,11 @@
88
use Exception;
99
use Symfony\Component\HttpFoundation\JsonResponse;
1010
use Symfony\Component\HttpFoundation\Response;
11-
use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
12-
use Symfony\Component\Routing\Attribute\Route;
11+
use Symfony\Component\Routing\Annotation\Route;
1312

1413
final class BlackfireController
1514
{
1615
/**
17-
* @RouteAnnotation(
18-
* methods={"GET"},
19-
* path="/blackfire/index"
20-
* )
2116
* @throws Exception
2217
*/
2318
#[Route(path: '/blackfire/index', methods: ['GET'])]

tests/Fixtures/Symfony/TestBundle/Controller/CoroutinesTaskController.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,11 @@
1010
use Symfony\Component\HttpFoundation\Request;
1111
use Symfony\Component\HttpFoundation\Response;
1212
use Symfony\Component\Messenger\MessageBusInterface;
13-
use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
14-
use Symfony\Component\Routing\Attribute\Route;
13+
use Symfony\Component\Routing\Annotation\Route;
1514

1615
final class CoroutinesTaskController
1716
{
1817
/**
19-
* @RouteAnnotation(
20-
* methods={"GET","POST"},
21-
* path="/coroutines/message/sleep-and-append"
22-
* )
2318
* @throws Exception
2419
*/
2520
#[Route(path: '/coroutines/message/sleep-and-append', methods: ['GET', 'POST'])]
@@ -35,13 +30,9 @@ public function dispatchSleepAndAppendMessage(MessageBusInterface $bus, Request
3530
}
3631

3732
/**
38-
* @RouteAnnotation(
39-
* methods={"GET","POST"},
40-
* path="/coroutines/message/run-dummy"
41-
* )
4233
* @throws Exception
4334
*/
44-
#[Route(methods: ['GET', 'POST'], path: '/coroutines/message/run-dummy')]
35+
#[Route(path: '/coroutines/message/run-dummy', methods: ['GET', 'POST'])]
4536
public function dispatchRunDummyMessage(MessageBusInterface $bus): Response
4637
{
4738
$message = new RunDummy();

tests/Fixtures/Symfony/TestBundle/Controller/DoctrineController.php

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
use Symfony\Bridge\Doctrine\Middleware\Debug\DebugDataHolder;
1212
use Symfony\Component\HttpFoundation\JsonResponse;
1313
use Symfony\Component\HttpFoundation\Response;
14-
use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
15-
use Symfony\Component\Routing\Attribute\Route;
14+
use Symfony\Component\Routing\Annotation\Route;
1615

1716
final class DoctrineController
1817
{
@@ -27,12 +26,6 @@ public function __construct(
2726
private readonly ?DebugDataHolder $dataHolder = null,
2827
) {}
2928

30-
/**
31-
* @RouteAnnotation(
32-
* methods={"GET"},
33-
* path="/doctrine"
34-
* )
35-
*/
3629
#[Route(path: '/doctrine', methods: ['GET'])]
3730
public function index(): Response
3831
{
@@ -47,12 +40,6 @@ public function index(): Response
4740
return new Response('<html><body>' . $testsStr . '</body></html>');
4841
}
4942

50-
/**
51-
* @RouteAnnotation(
52-
* methods={"GET"},
53-
* path="/doctrine-advanced"
54-
* )
55-
*/
5643
#[Route(path: '/doctrine-advanced', methods: ['GET'])]
5744
public function advancedUsage(): JsonResponse
5845
{
@@ -65,24 +52,12 @@ public function advancedUsage(): JsonResponse
6552
]);
6653
}
6754

68-
/**
69-
* @RouteAnnotation(
70-
* methods={"GET"},
71-
* path="/doctrine-queries"
72-
* )
73-
*/
7455
#[Route(path: '/doctrine-queries', methods: ['GET'])]
7556
public function queries(): JsonResponse
7657
{
7758
return new JsonResponse($this->dataHolder->getData()['default']);
7859
}
7960

80-
/**
81-
* @RouteAnnotation(
82-
* methods={"GET"},
83-
* path="/doctrine-resets"
84-
* )
85-
*/
8661
#[Route(path: '/doctrine-resets', methods: ['GET'])]
8762
public function pings(): JsonResponse
8863
{

tests/Fixtures/Symfony/TestBundle/Controller/EventsController.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,12 @@
66

77
use SwooleBundle\SwooleBundle\Tests\Fixtures\Symfony\TestBundle\EventHandler\LifecycleEventsEventHandler;
88
use Symfony\Component\HttpFoundation\JsonResponse;
9-
use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
10-
use Symfony\Component\Routing\Attribute\Route;
9+
use Symfony\Component\Routing\Annotation\Route;
1110

1211
final class EventsController
1312
{
1413
public function __construct(private readonly LifecycleEventsEventHandler $eventHandler) {}
1514

16-
/**
17-
* @RouteAnnotation(
18-
* methods={"GET"},
19-
* path="/list-events"
20-
* )
21-
*/
2215
#[Route(path: '/list-events', methods: ['GET'])]
2316
public function listEvents(): JsonResponse
2417
{

tests/Fixtures/Symfony/TestBundle/Controller/IndexController.php

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,16 @@
66

77
use co;
88
use Symfony\Component\HttpFoundation\JsonResponse;
9-
use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
10-
use Symfony\Component\Routing\Attribute\Route;
9+
use Symfony\Component\Routing\Annotation\Route;
1110

1211
final class IndexController
1312
{
14-
/**
15-
* @RouteAnnotation(
16-
* methods={"GET"},
17-
* path="/"
18-
* )
19-
*/
2013
#[Route(path: '/', methods: ['GET'])]
2114
public function index(): JsonResponse
2215
{
2316
return new JsonResponse(['hello' => 'world!'], 200);
2417
}
2518

26-
/**
27-
* @RouteAnnotation(
28-
* methods={"GET"},
29-
* path="/dummy-sleep"
30-
* )
31-
*/
3219
#[Route(path: '/dummy-sleep', methods: ['GET'])]
3320
public function sleep(): JsonResponse
3421
{

0 commit comments

Comments
 (0)