Skip to content

Commit 86ab9e3

Browse files
lchrusciellchrusciel
authored
Merge pull request #852 from loic425/refactor-component-directories
Refactor component directories
2 parents 91a5e74 + 3db224b commit 86ab9e3

File tree

180 files changed

+468
-453
lines changed

Some content is hidden

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

180 files changed

+468
-453
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
/psalm.xml export-ignore
1515
/rector.php
1616
/src/Bundle/spec export-ignore
17+
/src/Component/legacy/spec export-ignore
18+
/src/Component/legacy/tests export-ignore
1719
/src/Component/spec export-ignore
18-
/src/Component/legacyTests export-ignore
1920
/src/Component/tests export-ignore
2021
/src/Component/phpspec.yml.dist export-ignore
2122
/src/Component/phpunit.xml.dist export-ignore

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ jobs:
109109
run: |
110110
vendor/bin/phpspec run --ansi --no-interaction
111111
(cd src/Component && vendor/bin/phpspec run --no-interaction)
112+
(cd src/Component && vendor/bin/phpspec run --no-interaction --config legacy/phpspec.yml.dist)
112113
113114
-
114115
name: Run PHPUnit tests

‎composer.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"require": {
2828
"php": "^8.0",
2929
"babdev/pagerfanta-bundle": "^3.7 || ^4.0",
30+
"doctrine/annotations": "^2.0",
3031
"doctrine/collections": "^1.8 || ^2.0",
3132
"doctrine/doctrine-bundle": "^2.0",
3233
"doctrine/event-manager": "^1.1",
@@ -102,16 +103,18 @@
102103
"autoload": {
103104
"psr-4": {
104105
"Sylius\\Bundle\\ResourceBundle\\": "src/Bundle/",
105-
"Sylius\\Component\\Resource\\": "src/Component/",
106+
"Sylius\\Component\\Resource\\": "src/Component/legacy/src/",
106107
"Sylius\\Resource\\": "src/Component/src/"
107108
}
108109
},
109110
"autoload-dev": {
110111
"psr-4": {
111-
"Sylius\\Bundle\\ResourceBundle\\spec\\": "src/Bundle/spec/",
112+
"spec\\Sylius\\Bundle\\ResourceBundle\\": "src/Bundle/spec/",
113+
"spec\\Sylius\\Resource\\": "src/Component/spec/",
112114
"Sylius\\Bundle\\ResourceBundle\\Tests\\": "tests/Bundle/",
113-
"Sylius\\Component\\Resource\\spec\\": "src/Component/spec/",
114-
"Sylius\\Component\\Resource\\Tests\\": "src/Component/legacyTests/",
115+
"Sylius\\Component\\Resource\\spec\\": "src/Component/legacy/spec/",
116+
"Sylius\\Component\\Resource\\Tests\\": "src/Component/legacy/tests/",
117+
"Sylius\\Resource\\Tests\\": "src/Component/tests/",
115118
"App\\": "tests/Application/src/"
116119
}
117120
},

‎phpspec.yml.dist‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ suites:
77
Component:
88
namespace: Sylius\Component\Resource
99
psr4_prefix: Sylius\Component\Resource
10-
src_path: src/Component
11-
spec_path: src/Component
10+
src_path: src/Component/legacy
11+
spec_path: src/Component/legacy
1212
Package:
1313
namespace: Sylius\Resource
1414
psr4_prefix: Sylius\Resource
15-
src_path: src/Component/src
16-
spec_path: src/Component/tests
15+
src_path: src/Component
16+
spec_path: src/Component
1717

1818
extensions:
1919
Akeneo\SkipExampleExtension: ~

‎phpstan.neon‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ parameters:
2323
- %currentWorkingDirectory%/src/Bundle/Routing/Configuration.php
2424
- %currentWorkingDirectory%/src/Bundle/spec/*
2525
- %currentWorkingDirectory%/src/Bundle/Tests/*
26-
- %currentWorkingDirectory%/src/Component/Annotation/*
27-
- %currentWorkingDirectory%/src/Component/Factory/*
28-
- %currentWorkingDirectory%/src/Component/Metadata/*
29-
- %currentWorkingDirectory%/src/Component/Generator/*
30-
- %currentWorkingDirectory%/src/Component/legacyTests/*
31-
- %currentWorkingDirectory%/src/Component/Model/*
32-
- %currentWorkingDirectory%/src/Component/Reflection/ClassReflection.php
33-
- %currentWorkingDirectory%/src/Component/Repository/*
26+
- %currentWorkingDirectory%/src/Component/legacy/spec/*
27+
- %currentWorkingDirectory%/src/Component/legacy/src/Annotation/*
28+
- %currentWorkingDirectory%/src/Component/legacy/src/Factory/*
29+
- %currentWorkingDirectory%/src/Component/legacy/src/Generator/*
30+
- %currentWorkingDirectory%/src/Component/legacy/src/Metadata/*
31+
- %currentWorkingDirectory%/src/Component/legacy/src/Model/*
32+
- %currentWorkingDirectory%/src/Component/legacy/src/Reflection/ClassReflection.php
33+
- %currentWorkingDirectory%/src/Component/legacy/src/Repository/*
34+
- %currentWorkingDirectory%/src/Component/legacy/src/Storage/*
35+
- %currentWorkingDirectory%/src/Component/legacy/tests/*
3436
- %currentWorkingDirectory%/src/Component/spec/*
35-
- %currentWorkingDirectory%/src/Component/Storage/*
3637
- %currentWorkingDirectory%/src/Component/tests/*
3738
- %currentWorkingDirectory%/src/Component/vendor/*
3839

‎phpunit.xml.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<testsuites>
1616
<testsuite name="SyliusResourceBundle Test Suite">
1717
<directory>./tests/</directory>
18-
<directory>./src/Component/legacyTests/</directory>
18+
<directory>./src/Component/legacy/tests/</directory>
1919
<directory>./src/Component/tests/</directory>
2020
</testsuite>
2121
</testsuites>

‎psalm.xml‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
<directory name="vendor" />
1111
<directory name="src/Bundle/Doctrine/ODM" />
1212
<directory name="src/Bundle/spec" />
13-
<directory name="src/Component/legacyTests" />
13+
<directory name="src/Component/legacy/spec" />
14+
<directory name="src/Component/legacy/tests" />
1415
<directory name="src/Component/spec" />
1516
<directory name="src/Component/tests" />
1617
<directory name="src/Component/vendor" />
17-
<file name="src/Component/Model/ArchivableTrait.php" />
18-
<file name="src/Component/Model/TimestampableTrait.php" />
19-
<file name="src/Component/Model/ToggleableTrait.php" />
20-
<file name="src/Component/Model/TranslatableTrait.php" />
18+
<file name="src/Component/legacy/src/Model/ArchivableTrait.php" />
19+
<file name="src/Component/legacy/src/Model/TimestampableTrait.php" />
20+
<file name="src/Component/legacy/src/Model/ToggleableTrait.php" />
21+
<file name="src/Component/legacy/src/Model/TranslatableTrait.php" />
2122
<file name="src/Bundle/Controller/ControllerTrait.php" />
2223
<file name="src/Bundle/DependencyInjection/Driver/Doctrine/DoctrineODMDriver.php" />
2324
<file name="src/Bundle/DependencyInjection/Driver/Doctrine/DoctrinePHPCRDriver.php" />
@@ -222,14 +223,14 @@
222223

223224
<TypeDoesNotContainType>
224225
<errorLevel type="suppress">
225-
<directory name="src/Component/Annotation" />
226-
<directory name="src/Component/Factory" />
227-
<directory name="src/Component/Generator" />
228-
<directory name="src/Component/Metadata" />
229-
<directory name="src/Component/Model" />
230-
<directory name="src/Component/Reflection" />
231-
<directory name="src/Component/Repository" />
232-
<directory name="src/Component/Storage" />
226+
<directory name="src/Component/legacy/src/Annotation" />
227+
<directory name="src/Component/legacy/src/Factory" />
228+
<directory name="src/Component/legacy/src/Generator" />
229+
<directory name="src/Component/legacy/src/Metadata" />
230+
<directory name="src/Component/legacy/src/Model" />
231+
<directory name="src/Component/legacy/src/Reflection" />
232+
<directory name="src/Component/legacy/src/Repository" />
233+
<directory name="src/Component/legacy/src/Storage" />
233234
<file name="src/Bundle/Event/ResourceControllerEvent.php" />
234235
<file name="src/Component/src/Symfony/Request/State/TwigResponder.php" />
235236
</errorLevel>
@@ -262,12 +263,12 @@
262263

263264
<UnrecognizedStatement>
264265
<errorLevel type="suppress">
265-
<directory name="src/Component/Factory" />
266-
<directory name="src/Component/Generator" />
267-
<directory name="src/Component/Metadata" />
268-
<directory name="src/Component/Model" />
269-
<directory name="src/Component/Repository" />
270-
<directory name="src/Component/Storage" />
266+
<directory name="src/Component/legacy/src/Factory" />
267+
<directory name="src/Component/legacy/src/Generator" />
268+
<directory name="src/Component/legacy/src/Metadata" />
269+
<directory name="src/Component/legacy/src/Model" />
270+
<directory name="src/Component/legacy/src/Repository" />
271+
<directory name="src/Component/legacy/src/Storage" />
271272
</errorLevel>
272273
</UnrecognizedStatement>
273274

‎src/Component/composer.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,16 @@
6565
},
6666
"autoload": {
6767
"psr-4": {
68-
"Sylius\\Component\\Resource\\": "",
68+
"Sylius\\Component\\Resource\\": "legacy/src/",
6969
"Sylius\\Resource\\": "src/"
7070
}
7171
},
7272
"autoload-dev": {
7373
"psr-4": {
74-
"Sylius\\Component\\Resource\\spec\\": "spec/",
75-
"Sylius\\Component\\Resource\\Tests\\": "legacyTests",
76-
"Sylius\\Resource\\Tests\\": "tests"
74+
"spec\\Sylius\\Component\\Resource\\": "legacy/spec/",
75+
"spec\\Sylius\\Resource\\": "spec/",
76+
"Sylius\\Component\\Resource\\Tests\\": "legacy/tests/",
77+
"Sylius\\Resource\\Tests\\": "tests/"
7778
}
7879
}
7980
}

‎src/Component/legacy/phpspec.yml.dist‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
suites:
2+
main:
3+
namespace: Sylius\Component\Resource
4+
psr4_prefix: Sylius\Component\Resource
5+
src_path: legacy
6+
spec_path: legacy

src/Component/spec/Exception/DeleteHandlingExceptionSpec.php renamed to src/Component/legacy/spec/Exception/DeleteHandlingExceptionSpec.php

File renamed without changes.

0 commit comments

Comments
 (0)