Skip to content

Commit 1855298

Browse files
committed
Merge branch '1.x' into 2.x
* 1.x: Fixing deprecation and making test failure more obvious fixing tests removing branch-alias
2 parents ed5bdcd + 013d45a commit 1855298

File tree

8 files changed

+4
-21
lines changed

8 files changed

+4
-21
lines changed

src/Chartjs/composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
"symfony/webpack-encore-bundle": "<1.11"
4444
},
4545
"extra": {
46-
"branch-alias": {
47-
"dev-main": "1.4-dev"
48-
},
4946
"thanks": {
5047
"name": "symfony/ux",
5148
"url": "https://github.com/symfony/ux"

src/Cropperjs/composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
"symfony/flex": "<1.13"
4545
},
4646
"extra": {
47-
"branch-alias": {
48-
"dev-main": "1.4-dev"
49-
},
5047
"thanks": {
5148
"name": "symfony/ux",
5249
"url": "https://github.com/symfony/ux"

src/Dropzone/composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
"symfony/var-dumper": "^4.4.17|^5.0|^6.0"
4040
},
4141
"extra": {
42-
"branch-alias": {
43-
"dev-main": "1.4-dev"
44-
},
4542
"thanks": {
4643
"name": "symfony/ux",
4744
"url": "https://github.com/symfony/ux"

src/LazyImage/composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
"symfony/var-dumper": "^4.4.17|^5.0|^6.0"
4141
},
4242
"extra": {
43-
"branch-alias": {
44-
"dev-main": "1.4-dev"
45-
},
4643
"thanks": {
4744
"name": "symfony/ux",
4845
"url": "https://github.com/symfony/ux"

src/Swup/composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
"symfony/flex": "<1.13"
2222
},
2323
"extra": {
24-
"branch-alias": {
25-
"dev-main": "1.4-dev"
26-
},
2724
"thanks": {
2825
"name": "symfony/ux",
2926
"url": "https://github.com/symfony/ux"

src/Turbo/Bridge/Mercure/composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
"symfony/ux-turbo": "^1.3"
3333
},
3434
"extra": {
35-
"branch-alias": {
36-
"dev-main": "1.4-dev"
37-
},
3835
"thanks": {
3936
"name": "symfony/ux-turbo",
4037
"url": "https://github.com/symfony/ux"

src/Turbo/Tests/BroadcastTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ class BroadcastTest extends PantherTestCase
2222

2323
public function testBroadcast(): void
2424
{
25+
if (!file_exists(__DIR__.'/app/public/build')) {
26+
throw new \Exception(sprintf('Move into %s and execute Encore before running this test.', realpath(__DIR__.'/app')));
27+
}
28+
2529
($client = self::createPantherClient())->request('GET', '/books');
2630

2731
$crawler = $client->submitForm('Submit', ['title' => self::BOOK_TITLE]);

src/Turbo/composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
"symfony/flex": "<1.13"
6262
},
6363
"extra": {
64-
"branch-alias": {
65-
"dev-main": "1.4-dev"
66-
},
6764
"thanks": {
6865
"name": "symfony/ux",
6966
"url": "https://github.com/symfony/ux"

0 commit comments

Comments
 (0)