From fb426c199007e396af83910efdc32494e13a9e8d Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Tue, 28 Mar 2023 17:09:16 -0300 Subject: [PATCH 1/2] Revert "Remove restart from factory" This reverts commit ac071b54 --- src/Composer/Factory.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Composer/Factory.php b/src/Composer/Factory.php index cbeef04..715694d 100644 --- a/src/Composer/Factory.php +++ b/src/Composer/Factory.php @@ -15,6 +15,16 @@ class Factory extends ComposerFactory implements PlugAndPlayInterface { + private static bool $loaded = false; + + /** + * Restart factory. + */ + public static function restart(): void + { + static::$loaded = false; + } + /** * Loads Composer JSON file if it has a validated schema. * @@ -161,6 +171,10 @@ private function definePluggedAndIgnoredPackages(IOInterface $io, array &$plugge */ private function writePluggedAndIgnoredPackages(IOInterface $io, array $plugged, array $ignored): void { + if (static::$loaded) { + return; + } + if ($plugged) { sort($plugged); @@ -180,5 +194,7 @@ private function writePluggedAndIgnoredPackages(IOInterface $io, array $plugged, foreach ($ignored as $package) { $io->write(" Ignored: $package"); } + + static::$loaded = true; } } From 3eacdd490e81e5924c3b8972b56d03009fc87cad Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Tue, 28 Mar 2023 17:11:30 -0300 Subject: [PATCH 2/2] Return again `Factory::restart()` --- tests/FactoryTestCase.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/FactoryTestCase.php b/tests/FactoryTestCase.php index 54f19b1..8e194ca 100644 --- a/tests/FactoryTestCase.php +++ b/tests/FactoryTestCase.php @@ -9,15 +9,15 @@ abstract class FactoryTestCase extends TestCase { use TestConcerns; - protected function factory(): Factory + protected function factory(): void { + Factory::restart(); + $factory = new Factory(); $io = new BufferIO(); $factory->createComposer(io: $io, cwd: $this->path() . $this->fixture()); $this->output = $io->getOutput(); - - return $factory; } }