From b86ca0a228aa0618819edfa0109404edd3b22a4b Mon Sep 17 00:00:00 2001 From: Kevin Bond Date: Tue, 1 Aug 2023 12:07:46 -0400 Subject: [PATCH 1/4] fix: deprecated code in `StubCommand` (#485) --- src/Bundle/Command/StubCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/Command/StubCommand.php b/src/Bundle/Command/StubCommand.php index 67ba6e9f5..72a453125 100644 --- a/src/Bundle/Command/StubCommand.php +++ b/src/Bundle/Command/StubCommand.php @@ -22,10 +22,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int { (new SymfonyStyle($input, $output)) ->error( - \sprintf("To run \"%s\" you need the \"%s\" which is currently not installed.\n\nTry running \"composer require %s\".", static::$defaultName, 'MakerBundle', 'symfony/maker-bundle --dev') + \sprintf("To run \"%s\" you need the \"MakerBundle\" which is currently not installed.\n\nTry running \"composer require symfony/maker-bundle --dev\".", static::getDefaultName()) ) ; - return Command::SUCCESS; + return Command::FAILURE; } } From 243348280c037e0657a1afb93ba34be8e43004f4 Mon Sep 17 00:00:00 2001 From: Nicolas PHILIPPE Date: Fri, 4 Aug 2023 15:01:32 +0200 Subject: [PATCH 2/4] minor: set `Factory::isPersisting()` protected (#486) --- src/Factory.php | 2 +- src/ZenstruckFoundryBundle.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Factory.php b/src/Factory.php index 9e3dfde2a..ca58ac55f 100644 --- a/src/Factory.php +++ b/src/Factory.php @@ -416,7 +416,7 @@ private static function normalizeObject(object $object): object } } - private function isPersisting(): bool + protected function isPersisting(): bool { if (!$this->persist || !self::configuration()->hasManagerRegistry()) { return false; diff --git a/src/ZenstruckFoundryBundle.php b/src/ZenstruckFoundryBundle.php index c6afe34b8..5ac8be983 100644 --- a/src/ZenstruckFoundryBundle.php +++ b/src/ZenstruckFoundryBundle.php @@ -28,7 +28,7 @@ final class ZenstruckFoundryBundle extends Bundle { public function boot(): void { - if (!Factory::isBooted()) { + if (!Factory::isBooted() && $this->container) { Factory::boot($this->container->get('.zenstruck_foundry.configuration')); } } From 4076da3f8b14acea38d853594116d99a51138e50 Mon Sep 17 00:00:00 2001 From: kbond Date: Fri, 4 Aug 2023 13:03:34 +0000 Subject: [PATCH 3/4] bot: fix cs [skip ci] --- src/Factory.php | 52 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Factory.php b/src/Factory.php index ca58ac55f..e570dcc77 100644 --- a/src/Factory.php +++ b/src/Factory.php @@ -335,6 +335,32 @@ final protected function class(): string return $this->class; } + protected function isPersisting(): bool + { + if (!$this->persist || !self::configuration()->hasManagerRegistry()) { + return false; + } + + try { + $classMetadata = self::configuration()->objectManagerFor($this->class)->getClassMetadata($this->class); + } catch (\RuntimeException) { + // entity not managed (perhaps Embeddable) + return false; + } + + if ($classMetadata instanceof ORMClassMetadata && $classMetadata->isEmbeddedClass) { + // embedded entity + return false; + } + + if ($classMetadata instanceof ODMClassMetadata && $classMetadata->isEmbeddedDocument) { + // embedded document + return false; + } + + return true; + } + private function normalizeAttributes(array|callable $attributes): array { return \is_callable($attributes) ? $attributes() : $attributes; @@ -416,32 +442,6 @@ private static function normalizeObject(object $object): object } } - protected function isPersisting(): bool - { - if (!$this->persist || !self::configuration()->hasManagerRegistry()) { - return false; - } - - try { - $classMetadata = self::configuration()->objectManagerFor($this->class)->getClassMetadata($this->class); - } catch (\RuntimeException) { - // entity not managed (perhaps Embeddable) - return false; - } - - if ($classMetadata instanceof ORMClassMetadata && $classMetadata->isEmbeddedClass) { - // embedded entity - return false; - } - - if ($classMetadata instanceof ODMClassMetadata && $classMetadata->isEmbeddedDocument) { - // embedded document - return false; - } - - return true; - } - /** * @param class-string $factoryClass * From 65c916e31944fa9738eaf82063c879a0154e52fa Mon Sep 17 00:00:00 2001 From: Nicolas PHILIPPE Date: Fri, 4 Aug 2023 15:05:27 +0200 Subject: [PATCH 4/4] changelog: update [skip ci] --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99489f6c5..a3146f014 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## [v1.34.1](https://github.com/zenstruck/foundry/releases/tag/v1.34.1) + +August 4th, 2023 - [v1.34.0...v1.34.1](https://github.com/zenstruck/foundry/compare/v1.34.0...v1.34.1) + +* 2433482 minor: set `Factory::isPersisting()` protected (#486) by @nikophil +* b86ca0a fix: deprecated code in `StubCommand` (#485) by @kbond + ## [v1.34.0](https://github.com/zenstruck/foundry/releases/tag/v1.34.0) July 12th, 2023 - [v1.33.0...v1.34.0](https://github.com/zenstruck/foundry/compare/v1.33.0...v1.34.0)