Skip to content

Commit b5d534c

Browse files
weaverryanweaverryan
committed
[WIP] All Package directory restructure
1 parent 43c03f8 commit b5d534c

Some content is hidden

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

64 files changed

+34
-22
lines changed

‎.gitattributes

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
/.symfony.bundle.yaml export-ignore
44
/phpunit.xml.dist export-ignore
55
/phpstan.neon.dist export-ignore
6-
/Resources/assets/test export-ignore
7-
/Resources/assets/jest.config.js export-ignore
8-
/Tests export-ignore
6+
/assets/test export-ignore
7+
/assets/jest.config.js export-ignore
8+
/tests export-ignore

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/composer.lock
66
/phpunit.xml
77
/vendor/
8-
/Tests/app/var
9-
/Tests/app/public/build/
8+
/tests/app/var
9+
/tests/app/public/build/
1010
node_modules/
1111
package-lock.json
1212
yarn.lock

‎.symfony.bundle.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
branches: ["2.x"]
22
maintained_branches: ["2.x"]
3-
doc_dir: "Resources/doc"
3+
doc_dir: "doc"

‎CHANGELOG.md

+7

‎CONTRIBUTING.md

+1-1

‎Resources/assets/jest.config.js

-1
This file was deleted.

‎Resources/assets/dist/turbo_controller.js ‎assets/dist/turbo_controller.js

File renamed without changes.

‎assets/jest.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('../../../jest.config.js');

‎Resources/assets/package.json ‎assets/package.json

File renamed without changes.

‎Resources/assets/src/turbo_controller.ts ‎assets/src/turbo_controller.ts

File renamed without changes.

‎Resources/assets/test/turbo_controller.test.ts ‎assets/test/turbo_controller.test.ts

File renamed without changes.

‎composer.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424
],
2525
"autoload": {
2626
"psr-4": {
27-
"Symfony\\UX\\Turbo\\": ""
28-
},
29-
"exclude-from-classmap": [
30-
"/Tests/"
31-
]
27+
"Symfony\\UX\\Turbo\\": "src/",
28+
"Symfony\\UX\\Turbo\\Bridge\\Mercure\\": "src/Bridge/Mercure/src"
29+
}
3230
},
3331
"autoload-dev": {
3432
"psr-4": {
35-
"App\\": "Tests/app/"
33+
"App\\": "tests/app/",
34+
"Symfony\\UX\\Turbo\\Tests\\": "tests/"
3635
}
3736
},
3837
"require": {

‎Resources/config/services.php ‎config/services.php

File renamed without changes.

‎Resources/doc/index.rst ‎doc/index.rst

‎drivers/chromedriver

-15.8 MB
Binary file not shown.

‎drivers/geckodriver

-4.48 MB
Binary file not shown.

‎phpstan.neon.dist

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ parameters:
44
- .
55
excludes_analyse:
66
- vendor/*
7-
- Tests/app/var/*
7+
- tests/app/var/*
88
# The Symfony Configuration API isn't good enough to be analysed
9-
- DependencyInjection/Configuration.php
9+
- src/DependencyInjection/Configuration.php
1010
inferPrivatePropertyTypeFromConstructor: true
1111
bootstrapFiles:
1212
- vendor/bin/.phpunit/phpunit/vendor/autoload.php

‎phpunit.xml.dist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<server name="APP_DEBUG" value="false" force="true" />
1414
<server name="SHELL_VERBOSITY" value="-1" />
1515
<server name="KERNEL_CLASS" value="App\Kernel" />
16-
<server name="PANTHER_WEB_SERVER_DIR" value="./Tests/app/public" />
16+
<server name="PANTHER_WEB_SERVER_DIR" value="./tests/app/public" />
1717
</php>
1818

1919
<testsuites>
2020
<testsuite name="Project Test Suite">
21-
<directory>Tests</directory>
21+
<directory>tests</directory>
2222
</testsuite>
2323
</testsuites>
2424

‎Attribute/Broadcast.php ‎src/Attribute/Broadcast.php

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* Marks the entity as broadcastable.
1818
*
1919
* @Annotation
20+
*
2021
* @Target({"CLASS"})
2122
*
2223
* @author Kévin Dunglas <[email protected]>

‎Bridge/Mercure/LICENSE ‎src/Bridge/Mercure/LICENSE

File renamed without changes.

‎Bridge/Mercure/README.md ‎src/Bridge/Mercure/README.md

‎Bridge/Mercure/Resources/assets/dist/turbo_stream_controller.js ‎src/Bridge/Mercure/assets/dist/turbo_stream_controller.js

File renamed without changes.

‎Bridge/Mercure/Resources/assets/jest.config.js ‎src/Bridge/Mercure/assets/jest.config.js

File renamed without changes.

‎Bridge/Mercure/Resources/assets/package.json ‎src/Bridge/Mercure/assets/package.json

File renamed without changes.

‎Bridge/Mercure/Resources/assets/src/turbo_stream_controller.ts ‎src/Bridge/Mercure/assets/src/turbo_stream_controller.ts

File renamed without changes.

‎Bridge/Mercure/Resources/assets/test/turbo_stream_controller.test.ts ‎src/Bridge/Mercure/assets/test/turbo_stream_controller.test.ts

File renamed without changes.

‎Bridge/Mercure/composer.json ‎src/Bridge/Mercure/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
],
2323
"autoload": {
2424
"psr-4": {
25-
"Symfony\\UX\\Turbo\\Bridge\\Mercure\\": ""
25+
"Symfony\\UX\\Turbo\\Bridge\\Mercure\\": "src/"
2626
}
2727
},
2828
"require": {

‎Bridge/Mercure/Broadcaster.php ‎src/Bridge/Mercure/src/Broadcaster.php

File renamed without changes.

‎Bridge/Mercure/TurboStreamListenRenderer.php ‎src/Bridge/Mercure/src/TurboStreamListenRenderer.php

File renamed without changes.

‎Broadcaster/BroadcasterInterface.php ‎src/Broadcaster/BroadcasterInterface.php

File renamed without changes.

‎Broadcaster/IdAccessor.php ‎src/Broadcaster/IdAccessor.php

File renamed without changes.

‎Broadcaster/ImuxBroadcaster.php ‎src/Broadcaster/ImuxBroadcaster.php

File renamed without changes.

‎Broadcaster/TwigBroadcaster.php ‎src/Broadcaster/TwigBroadcaster.php

File renamed without changes.

‎DependencyInjection/Configuration.php ‎src/DependencyInjection/Configuration.php

File renamed without changes.

‎DependencyInjection/TurboExtension.php ‎src/DependencyInjection/TurboExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function load(array $configs, ContainerBuilder $container): void
3838
$configuration = new Configuration();
3939
$config = $this->processConfiguration($configuration, $configs);
4040

41-
$loader = (new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config')));
41+
$loader = (new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/../config')));
4242
$loader->load('services.php');
4343
$container->getDefinition('turbo.twig.extension')->replaceArgument(1, $config['default_transport']);
4444

‎Doctrine/BroadcastListener.php ‎src/Doctrine/BroadcastListener.php

File renamed without changes.

‎TurboBundle.php ‎src/TurboBundle.php

+5
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,9 @@ public function process(ContainerBuilder $container): void
4848
}
4949
}, PassConfig::TYPE_BEFORE_REMOVING);
5050
}
51+
52+
public function getPath(): string
53+
{
54+
return \dirname(__DIR__);
55+
}
5156
}

‎Twig/TurboStreamListenRendererInterface.php ‎src/Twig/TurboStreamListenRendererInterface.php

File renamed without changes.

‎Twig/TwigExtension.php ‎src/Twig/TwigExtension.php

File renamed without changes.

‎Tests/BroadcastTest.php ‎tests/BroadcastTest.php

File renamed without changes.

‎Tests/TurboFrameTest.php ‎tests/TurboFrameTest.php

File renamed without changes.

‎Tests/TurboStreamTest.php ‎tests/TurboStreamTest.php

File renamed without changes.

‎Tests/app/Entity/Artist.php ‎tests/app/Entity/Artist.php

File renamed without changes.

‎Tests/app/Entity/Book.php ‎tests/app/Entity/Book.php

File renamed without changes.

‎Tests/app/Entity/Song.php ‎tests/app/Entity/Song.php

File renamed without changes.

‎Tests/app/Kernel.php ‎tests/app/Kernel.php

File renamed without changes.

‎Tests/app/assets/app.js ‎tests/app/assets/app.js

File renamed without changes.

‎Tests/app/package.json ‎tests/app/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"devDependencies": {
33
"@hotwired/turbo": "^7.0.1",
4-
"@symfony/ux-turbo": "file:../../Resources/assets",
5-
"@symfony/ux-turbo-mercure": "file:../../Bridge/Mercure/Resources/assets",
4+
"@symfony/ux-turbo": "file:../../assets",
5+
"@symfony/ux-turbo-mercure": "file:../../src/Bridge/Mercure/assets",
66
"@symfony/webpack-encore": "^0.32.0",
77
"core-js": "^3.0.0",
88
"regenerator-runtime": "^0.13.2",

‎Tests/app/public/index.php ‎tests/app/public/index.php

File renamed without changes.

‎Tests/app/templates/artist.html.twig ‎tests/app/templates/artist.html.twig

File renamed without changes.

‎Tests/app/templates/artists.html.twig ‎tests/app/templates/artists.html.twig

File renamed without changes.

‎Tests/app/templates/base.html.twig ‎tests/app/templates/base.html.twig

File renamed without changes.

‎Tests/app/templates/block.html.twig ‎tests/app/templates/block.html.twig

File renamed without changes.

‎Tests/app/templates/books.html.twig ‎tests/app/templates/books.html.twig

File renamed without changes.

‎Tests/app/templates/broadcast/Artist.stream.html.twig ‎tests/app/templates/broadcast/Artist.stream.html.twig

File renamed without changes.

‎Tests/app/templates/broadcast/Book.stream.html.twig ‎tests/app/templates/broadcast/Book.stream.html.twig

File renamed without changes.

‎Tests/app/templates/broadcast/Song.stream.html.twig ‎tests/app/templates/broadcast/Song.stream.html.twig

File renamed without changes.

‎Tests/app/templates/chat/index.html.twig ‎tests/app/templates/chat/index.html.twig

File renamed without changes.

‎Tests/app/templates/chat/message.stream.html.twig ‎tests/app/templates/chat/message.stream.html.twig

File renamed without changes.

‎Tests/app/templates/form.stream.html.twig ‎tests/app/templates/form.stream.html.twig

File renamed without changes.

‎Tests/app/templates/home.html.twig ‎tests/app/templates/home.html.twig

File renamed without changes.

‎Tests/app/templates/lazy.html.twig ‎tests/app/templates/lazy.html.twig

File renamed without changes.

‎Tests/app/templates/songs.html.twig ‎tests/app/templates/songs.html.twig

File renamed without changes.

‎Tests/app/webpack.config.js ‎tests/app/webpack.config.js

File renamed without changes.

0 commit comments

Comments
 (0)