Skip to content

Commit 861033a

Browse files
Merge branch 'turbo-mercure' into turbo
* turbo-mercure: run yarn tests for all workspaces - - - fix cs fix build re-add main package.json Fix JS Move Mercure integration to a dedicated bridge
2 parents 63efb1d + 57da895 commit 861033a

File tree

27 files changed

+131
-159
lines changed

27 files changed

+131
-159
lines changed

.php_cs.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ return PhpCsFixer\Config::create()
2424
->append([__FILE__])
2525
->notPath('#/Fixtures/#')
2626
->notPath('#/app/var/#')
27-
->notPath('Turbo/Broadcast.php') // Need https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4702
27+
->notPath('Turbo/Attribute/Broadcast.php') // Need https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4702
2828
)
2929
;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"workspaces": [
4-
"src/*/Resources/assets"
4+
"src/**/Resources/assets"
55
],
66
"scripts": {
77
"build": "yarn workspaces run build",

src/Chartjs/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"extra": {
4141
"branch-alias": {
42-
"dev-main": "1.1-dev"
42+
"dev-main": "1.3-dev"
4343
},
4444
"thanks": {
4545
"name": "symfony/ux",

src/Cropperjs/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
},
4343
"extra": {
4444
"branch-alias": {
45-
"dev-main": "1.1-dev"
45+
"dev-main": "1.3-dev"
4646
},
4747
"thanks": {
4848
"name": "symfony/ux",

src/Dropzone/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
},
4141
"extra": {
4242
"branch-alias": {
43-
"dev-main": "1.1-dev"
43+
"dev-main": "1.3-dev"
4444
},
4545
"thanks": {
4646
"name": "symfony/ux",

src/LazyImage/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
"extra": {
4343
"branch-alias": {
44-
"dev-main": "1.1-dev"
44+
"dev-main": "1.3-dev"
4545
},
4646
"thanks": {
4747
"name": "symfony/ux",

src/Swup/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
],
2020
"extra": {
2121
"branch-alias": {
22-
"dev-main": "1.1-dev"
22+
"dev-main": "1.3-dev"
2323
},
2424
"thanks": {
2525
"name": "symfony/ux",

src/Turbo/Attribute/Broadcast.php

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

1212
namespace Symfony\UX\Turbo\Attribute;
1313

14-
use Symfony\UX\Turbo\Mercure\Broadcaster;
14+
use Symfony\UX\Turbo\Bridge\Mercure\Broadcaster;
1515

1616
/**
1717
* Marks the entity as broadcastable.

src/Turbo/Mercure/Broadcaster.php renamed to src/Turbo/Bridge/Mercure/Broadcaster.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\UX\Turbo\Mercure;
12+
namespace Symfony\UX\Turbo\Bridge\Mercure;
1313

1414
use Symfony\Component\Mercure\HubInterface;
1515
use Symfony\Component\Mercure\Update;

src/Turbo/Bridge/Mercure/LICENSE

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

0 commit comments

Comments
 (0)