8000 Merge branch '6.4' into 7.2 · symfony/symfony@337851f · GitHub
[go: up one dir, main page]
Skip to content

Commit 337851f

Browse files
fabpotfabpot
committed
Merge branch '6.4' into 7.2
* 6.4: Remove unneeded use statements Redundant assignment to promoted property Revert "[Messenger] Add call to `gc_collect_cycles()` after each message is handled"
2 parents ff0fc69 + bfe2d66 commit 337851f

File tree

9 files changed

+2
-28
lines changed

9 files changed

+2
-28
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,6 @@ private function createRegistry(?ObjectManager $manager = null): ManagerRegistry
494494
$registry->method('getManager')->willReturn($manager);
495495
}
496496

497-
498497
return $registry;
499498
}
500499
}

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Doctrine\Common\Collections\ArrayCollection;
1515
use Doctrine\DBAL\Types\Type;
1616
use Doctrine\ORM\EntityRepository;
17-
use Doctrine\ORM\Mapping\ClassMetadataInfo;
1817
use Doctrine\ORM\Tools\SchemaTool;
1918
use Doctrine\Persistence\ManagerRegistry;
2019
use Doctrine\Persistence\ObjectManager;
@@ -32,7 +31,6 @@
3231
use Symfony\Bridge\Doctrine\Tests\Fixtures\Employee;
3332
use Symfony\Bridge\Doctrine\Tests\Fixtures\HireAnEmployee;
3433
use Symfony\Bridge\Doctrine\Tests\Fixtures\Person;
35-
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntityRepository;
3634
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
3735
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
3836
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdStringWrapperNameEntity;

‎src/Symfony/Component/Form/Extension/Core/Type/TimeType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Form\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\AbstractType;
15+
use Symfony\Component\Form\Event\PreSubmitEvent;
1516
use Symfony\Component\Form\Exception\InvalidConfigurationException;
1617
use Symfony\Component\Form\Exception\LogicException;
1718
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeImmutableToDateTimeTransformer;

‎src/Symfony/Component/Messenger/Tests/WorkerTest.php

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -586,25 +586,6 @@ public function testFlushBatchOnStop()
586586
$this->assertSame($expectedMessages, $handler->processedMessages);
587587
}
588588

589-
public function testGcCollectCyclesIsCalledOnMessageHandle()
590-
{
591-
$apiMessage = new DummyMessage('API');
592-
593-
$receiver = new DummyReceiver([[new Envelope($apiMessage)]]);
594-
595-
$bus = $this->createMock(MessageBusInterface::class);
596-
597-
$dispatcher = new EventDispatcher();
598-
$dispatcher->addSubscriber(new StopWorkerOnMessageLimitListener(1));
599-
600-
$worker = new Worker(['transport' => $receiver], $bus, $dispatcher);
601-
$worker->run();
602-
603-
$gcStatus = gc_status();
604-
605-
$this->assertGreaterThan(0, $gcStatus['runs']);
606-
}
607-
608589
/**
609590
* @requires extension pcntl
610591
*/

‎src/Symfony/Component/Messenger/Worker.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ public function run(array $options = []): void
128128
// this should prevent multiple lower priority receivers from
129129
// blocking too long before the higher priority are checked
130130
if ($envelopeHandled) {
131-
gc_collect_cycles();
132-
133131
break;
134132
}
135133
}

‎src/Symfony/Component/Mime/Part/Multipart/FormDataPart.php

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

1414
use Symfony\Component\Mime\Exception\InvalidArgumentException;
1515
use Symfony\Component\Mime\Part\AbstractMultipartPart;
16-
use Symfony\Component\Mime\Part\DataPart;
1716
use Symfony\Component\Mime\Part\TextPart;
1817

1918
/**

‎src/Symfony/Component/Serializer/Tests/SerializerTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
use Symfony\Component\Serializer\Tests\Fixtures\DummyObjectWithEnumProperty;
6666
use Symfony\Component\Serializer\Tests\Fixtures\DummyWithObjectOrNull;
6767
use Symfony\Component\Serializer\Tests\Fixtures\DummyWithVariadicParameter;
68-
use Symfony\Component\Serializer\Tests\Fixtures\DummyWithVariadicProperty;
6968
use Symfony\Component\Serializer\Tests\Fixtures\FalseBuiltInDummy;
7069
use Symfony\Component\Serializer\Tests\Fixtures\FooImplementationDummy;
7170
use Symfony\Component\Serializer\Tests\Fixtures\FooInterfaceDummyDenormalizer;

‎src/Symfony/Component/VarExporter/Tests/LazyProxyTraitTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\RegularClass;
2222
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\AbstractHooked;
2323
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\AsymmetricVisibility;
24-
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\Hooked;
2524
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\FinalPublicClass;
25+
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\Hooked;
2626
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\ReadOnlyClass;
2727
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\StringMagicGetClass;
2828
use Symfony\Component\VarExporter\Tests\Fixtures\LazyProxy\TestClass;

‎src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Workflow\Tests\Validator;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\Workflow\Arc;
1615
use Symfony\Component\Workflow\Definition;
1716
use Symfony\Component\Workflow\Exception\InvalidDefinitionException;
1817
use Symfony\Component\Workflow\Tests\WorkflowBuilderTrait;

0 commit comments

Comments
 (0)
0