Skip to content

Commit 013d45a

Browse files
committed
minor #183 Removing branch-alias (weaverryan)
This PR was squashed before being merged into the 1.x branch. Discussion ---------- Removing branch-alias | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | Tickets | None | License | MIT We now have named branches, so no need to have branch-alias, I beileve. Commits ------- 66bf8d4 Fixing deprecation and making test failure more obvious c4d3419 fixing tests 8815348 removing branch-alias
2 parents ddd7953 + 66bf8d4 commit 013d45a

File tree

10 files changed

+5
-28
lines changed

10 files changed

+5
-28
lines changed

src/Chartjs/composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
"symfony/flex": "<1.13"
4242
},
4343
"extra": {
44-
"branch-alias": {
45-
"dev-main": "1.3-dev"
46-
},
4744
"thanks": {
4845
"name": "symfony/ux",
4946
"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.3-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"
4040
},
4141
"extra": {
42-
"branch-alias": {
43-
"dev-main": "1.3-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"
4141
},
4242
"extra": {
43-
"branch-alias": {
44-
"dev-main": "1.3-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.3-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.3-dev"
37-
},
3835
"thanks": {
3936
"name": "symfony/ux-turbo",
4037
"url": "https://github.com/symfony/ux"

src/Turbo/Doctrine/BroadcastListener.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ private function storeEntitiesToPublish(EntityManagerInterface $em, object $enti
129129

130130
if (\PHP_VERSION_ID >= 80000 && $options = ($r = new \ReflectionClass($class))->getAttributes(Broadcast::class)) {
131131
$options = $options[0]->newInstance();
132-
// @phpstan-ignore-next-line
133132
$this->broadcastedClasses[$class] = $options->options;
134133
} elseif ($this->annotationReader && $options = $this->annotationReader->getClassAnnotation($r ?? new \ReflectionClass($class), Broadcast::class)) {
135134
$this->broadcastedClasses[$class] = $options->options;

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/Tests/app/Kernel.php

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

1414
use App\Entity\Book;
1515
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
16-
use Doctrine\Bundle\DoctrineBundle\Mapping\MappingDriver;
1716
use Doctrine\ORM\EntityManagerInterface;
1817
use Symfony\Bundle\DebugBundle\DebugBundle;
1918
use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
@@ -91,10 +90,6 @@ protected function configureContainer(ContainerConfigurator $container): void
9190
],
9291
];
9392

94-
if (class_exists(MappingDriver::class)) {
95-
$doctrineConfig['dbal']['override_url'] = true;
96-
}
97-
9893
$container
9994
->extension('doctrine', $doctrineConfig);
10095

src/Turbo/composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"require-dev": {
4343
"doctrine/annotations": "^1.12",
4444
"doctrine/doctrine-bundle": "^2.2",
45-
"doctrine/orm": "~2.8.0",
45+
"doctrine/orm": "^2.8.0",
4646
"phpstan/phpstan": "^0.12",
4747
"symfony/debug-bundle": "^5.2",
4848
"symfony/form": "^5.2",
@@ -61,9 +61,6 @@
6161
"symfony/flex": "<1.13"
6262
},
6363
"extra": {
64-
"branch-alias": {
65-
"dev-main": "1.3-dev"
66-
},
6764
"thanks": {
6865
"name": "symfony/ux",
6966
"url": "https://github.com/symfony/ux"

0 commit comments

Comments
 (0)