Skip to content

Commit 71843a3

Browse files
soyukasoyuka
committed
fix: components split dependencies
1 parent 7694219 commit 71843a3

Some content is hidden

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

59 files changed

+2251
-420
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ jobs:
6262
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
6363
restore-keys: ${{ runner.os }}-composer-
6464
- name: Update project dependencies
65-
run: |
66-
composer update --no-interaction --no-progress --ansi
67-
- run: php components.php
65+
run: composer update --no-interaction --no-progress --ansi
66+
- run: composer check-dependencies
6867

6968
php-cs-fixer:
7069
name: PHP CS Fixer (PHP ${{ matrix.php }})

‎components.php

Lines changed: 0 additions & 168 deletions
This file was deleted.

‎composer.json

Lines changed: 63 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,25 @@
3838
"willdurand/negotiation": "^3.0"
3939
},
4040
"require-dev": {
41+
"soyuka/pmu": "^0.0.1",
42+
"api-platform/doctrine-common": "*@dev",
43+
"api-platform/doctrine-orm": "*@dev",
44+
"api-platform/doctrine-odm": "*@dev",
45+
"api-platform/metadata": "*@dev",
46+
"api-platform/json-schema": "*@dev",
47+
"api-platform/elasticsearch": "*@dev",
48+
"api-platform/jsonld": "*@dev",
49+
"api-platform/hydra": "*@dev",
50+
"api-platform/openapi": "*@dev",
51+
"api-platform/graphql": "*@dev",
52+
"api-platform/http-cache": "*@dev",
53+
"api-platform/documentation": "*@dev",
54+
"api-platform/parameter-validator": "*@dev",
55+
"api-platform/ramsey-uuid": "*@dev",
56+
"api-platform/serializer": "*@dev",
57+
"api-platform/state": "*@dev",
58+
"api-platform/symfony": "*@dev",
59+
"api-platform/validator": "*@dev",
4160
"behat/behat": "^3.11",
4261
"behat/mink": "^1.9",
4362
"doctrine/cache": "^1.11 || ^2.1",
@@ -149,7 +168,8 @@
149168
"allow-plugins": {
150169
"composer/package-versions-deprecated": true,
151170
"phpstan/extension-installer": true,
152-
"php-http/discovery": true
171+
"php-http/discovery": true,
172+
"soyuka/pmu": true
153173
}
154174
},
155175
"extra": {
@@ -158,6 +178,46 @@
158178
},
159179
"symfony": {
160180
"require": "^6.4 || ^7.0"
161-
}
162-
}
181+
},
182+
"projects": [
183+
"api-platform/doctrine-common",
184+
"api-platform/doctrine-orm",
185+
"api-platform/doctrine-odm",
186+
"api-platform/metadata",
187+
"api-platform/json-schema",
188+
"api-platform/elasticsearch",
189+
"api-platform/jsonld",
190+
"api-platform/hydra",
191+
"api-platform/openapi",
192+
"api-platform/graphql",
193+
"api-platform/http-cache",
194+
"api-platform/documentation",
195+
"api-platform/parameter-validator",
196+
"api-platform/ramsey-uuid",
197+
"api-platform/serializer",
198+
"api-platform/state",
199+
"api-platform/symfony",
200+
"api-platform/validator"
201+
]
202+
},
203+
"repositories": [
204+
{"type": "path", "url": "./src/Doctrine/Common"},
205+
{"type": "path", "url": "./src/Doctrine/Orm"},
206+
{"type": "path", "url": "./src/Doctrine/Odm"},
207+
{"type": "path", "url": "./src/Metadata"},
208+
{"type": "path", "url": "./src/JsonSchema"},
209+
{"type": "path", "url": "./src/Elasticsearch"},
210+
{"type": "path", "url": "./src/JsonLd"},
211+
{"type": "path", "url": "./src/Hydra"},
212+
{"type": "path", "url": "./src/OpenApi"},
213+
{"type": "path", "url": "./src/GraphQl"},
214+
{"type": "path", "url": "./src/HttpCache"},
215+
{"type": "path", "url": "./src/Documentation"},
216+
{"type": "path", "url": "./src/ParameterValidator"},
217+
{"type": "path", "url": "./src/RamseyUuid"},
218+
{"type": "path", "url": "./src/Serializer"},
219+
{"type": "path", "url": "./src/State"},
220+
{"type": "path", "url": "./src/Symfony"},
221+
{"type": "path", "url": "./src/Validator"}
222+
]
163223
}

‎src/Doctrine/Common/composer.json

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
],
2424
"require": {
2525
"php": ">=8.1",
26-
"api-platform/metadata": "*@dev || ^3.1",
27-
"api-platform/state": "*@dev || ^3.1",
26+
"api-platform/metadata": "@dev",
27+
"api-platform/state": "@dev",
2828
"doctrine/collections": "^2.1",
2929
"doctrine/common": "^3.2.2",
3030
"doctrine/persistence": "^3.2"
@@ -62,15 +62,5 @@
6262
"symfony": {
6363
"require": "^6.4"
6464
}
65-
},
66-
"repositories": [
67-
{
68-
"type": "path",
69-
"url": "../../Metadata"
70-
},
71-
{
72-
"type": "path",
73-
"url": "../../State"
74-
}
75-
]
65+
}
7666
}

‎src/Doctrine/Odm/Tests/AppKernel.php

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

1414
namespace ApiPlatform\Doctrine\Odm\Tests;
1515

16-
use ApiPlatform\Symfony\Bundle\ApiPlatformBundle;
1716
use Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle;
1817
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
1918
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -41,7 +40,6 @@ public function __construct(string $environment, bool $debug)
4140
public function registerBundles(): array
4241
{
4342
return [
44-
new ApiPlatformBundle(),
4543
new FrameworkBundle(),
4644
new DoctrineMongoDBBundle(),
4745
];

‎src/Doctrine/Odm/Tests/Filter/BooleanFilterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

16-
use ApiPlatform\Doctrine\Common\Tests\Filter\BooleanFilterTestTrait;
16+
use ApiPlatform\Doctrine\Odm\Tests\Filter\BooleanFilterTestTrait;
1717
use ApiPlatform\Doctrine\Odm\Filter\BooleanFilter;
1818
use ApiPlatform\Doctrine\Odm\Tests\DoctrineMongoDbOdmFilterTestCase;
1919
use ApiPlatform\Doctrine\Odm\Tests\Fixtures\Document\Dummy;

‎src/Doctrine/Common/Tests/Filter/BooleanFilterTestTrait.php renamed to ‎src/Doctrine/Odm/Tests/Filter/BooleanFilterTestTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace ApiPlatform\Doctrine\Common\Tests\Filter;
14+
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

1616
/**
1717
* @author Amrouche Hamza <[email protected]>

‎src/Doctrine/Odm/Tests/Filter/DateFilterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

16-
use ApiPlatform\Doctrine\Common\Tests\Filter\DateFilterTestTrait;
16+
use ApiPlatform\Doctrine\Odm\Tests\Filter\DateFilterTestTrait;
1717
use ApiPlatform\Doctrine\Odm\Filter\DateFilter;
1818
use ApiPlatform\Doctrine\Odm\Tests\DoctrineMongoDbOdmFilterTestCase;
1919
use ApiPlatform\Doctrine\Odm\Tests\Fixtures\Document\Dummy;

‎src/Doctrine/Common/Tests/Filter/DateFilterTestTrait.php renamed to ‎src/Doctrine/Odm/Tests/Filter/DateFilterTestTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace ApiPlatform\Doctrine\Common\Tests\Filter;
14+
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

1616
/**
1717
* @author Théo FIDRY <[email protected]>

‎src/Doctrine/Odm/Tests/Filter/ExistsFilterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

16-
use ApiPlatform\Doctrine\Common\Tests\Filter\ExistsFilterTestTrait;
16+
use ApiPlatform\Doctrine\Odm\Tests\Filter\ExistsFilterTestTrait;
1717
use ApiPlatform\Doctrine\Odm\Filter\ExistsFilter;
1818
use ApiPlatform\Doctrine\Odm\Tests\DoctrineMongoDbOdmFilterTestCase;
1919
use ApiPlatform\Doctrine\Odm\Tests\Fixtures\Document\Dummy;

‎src/Doctrine/Common/Tests/Filter/ExistsFilterTestTrait.php renamed to ‎src/Doctrine/Odm/Tests/Filter/ExistsFilterTestTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace ApiPlatform\Doctrine\Common\Tests\Filter;
14+
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

1616
/**
1717
* @author Antoine Bluchet <[email protected]>

‎src/Doctrine/Odm/Tests/Filter/NumericFilterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

16-
use ApiPlatform\Doctrine\Common\Tests\Filter\NumericFilterTestTrait;
16+
use ApiPlatform\Doctrine\Odm\Tests\Filter\NumericFilterTestTrait;
1717
use ApiPlatform\Doctrine\Odm\Filter\NumericFilter;
1818
use ApiPlatform\Doctrine\Odm\Tests\DoctrineMongoDbOdmFilterTestCase;
1919
use ApiPlatform\Doctrine\Odm\Tests\Fixtures\Document\Dummy;

‎src/Doctrine/Common/Tests/Filter/NumericFilterTestTrait.php renamed to ‎src/Doctrine/Odm/Tests/Filter/NumericFilterTestTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace ApiPlatform\Doctrine\Common\Tests\Filter;
14+
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

1616
/**
1717
* @author Amrouche Hamza <[email protected]>

‎src/Doctrine/Odm/Tests/Filter/OrderFilterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

16-
use ApiPlatform\Doctrine\Common\Tests\Filter\OrderFilterTestTrait;
16+
use ApiPlatform\Doctrine\Odm\Tests\Filter\OrderFilterTestTrait;
1717
use ApiPlatform\Doctrine\Odm\Filter\OrderFilter;
1818
use ApiPlatform\Doctrine\Odm\Tests\DoctrineMongoDbOdmFilterTestCase;
1919
use ApiPlatform\Doctrine\Odm\Tests\Fixtures\CustomConverter;

‎src/Doctrine/Common/Tests/Filter/OrderFilterTestTrait.php renamed to ‎src/Doctrine/Odm/Tests/Filter/OrderFilterTestTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
declare(strict_types=1);
1313

14-
namespace ApiPlatform\Doctrine\Common\Tests\Filter;
14+
namespace ApiPlatform\Doctrine\Odm\Tests\Filter;
1515

1616
/**
1717
* @author Théo FIDRY <[email protected]>

0 commit comments

Comments
 (0)