cleanup

Author: Enno Woortmann

.claude/settings.local.json

@@ -18,20 +18,20 @@
       "Bash(cat:*)",
       "Bash(where gh:*)",
       "Bash(composer update:*)",
-      "Bash(./vendor/bin/rector process:*)",
+      "Bash(./vendor/bin/rector:*)",
       "Bash(git checkout:*)",
       "Bash(git add:*)",
-      "Bash(./vendor/bin/rector --version 2>&1 | grep Rector)",
-      "Bash(./vendor/bin/phpcs --standard=PSR12 --report=summary src/ 2>&1)",
-      "Bash(./vendor/bin/phpcs --standard=PSR12 --report=source src/)",
-      "Bash(./vendor/bin/phpcs --standard=PSR12 --report=json src/)",
       "Bash(python3 -c \":*)",
-      "Bash(./vendor/bin/phpcbf --standard=phpcs.xml src/)",
-      "Bash(./vendor/bin/phpcs --standard=phpcs.xml --report=full src/)",
-      "Bash(./vendor/bin/phpcs --standard=phpcs.xml src/)",
-      "Bash(./vendor/bin/phpcs --standard=phpcs.xml --report=summary src/)",
+      "Bash(./vendor/bin/phpcbf:*)",
+      "Bash(./vendor/bin/phpcs:*)",
       "Bash(git merge:*)",
-      "Bash(gh api:*)"
+      "Bash(gh api:*)",
+      "Bash(git restore:*)",
+      "Bash(git stash:*)",
+      "Bash(composer show:*)",
+      "Bash(php -r \":*)",
+      "Bash(gh pr:*)",
+      "Bash(xargs wc:*)"
     ]
   }
 }

src/SchemaProcessor/PostProcessor/Internal/CompositionRequiredPromotionPostProcessor.php

@@ -11,7 +11,6 @@
 use PHPModelGenerator\Model\Validator\AbstractComposedPropertyValidator;
 use PHPModelGenerator\Model\Validator\ComposedPropertyValidator;
 use PHPModelGenerator\Model\Validator\ConditionalPropertyValidator;
-use PHPModelGenerator\Model\Validator\PropertyValidatorInterface;
 use PHPModelGenerator\PropertyProcessor\ComposedValue\AllOfProcessor;
 use PHPModelGenerator\SchemaProcessor\PostProcessor\PostProcessor;
 
@@ -114,20 +113,12 @@ private function collectFromComposed(ComposedPropertyValidator $validator): arra
      */
     private function promoteProperty(Schema $schema, string $propertyName): void
     {
-        $property = null;
-
-        foreach ($schema->getProperties() as $candidate) {
-            if ($candidate->getName() === $propertyName) {
-                $property = $candidate;
-                break;
-            }
-        }
-
-        if ($property === null) {
-            return;
-        }
+        $property = array_find(
+            $schema->getProperties(),
+            static fn (PropertyInterface $property): bool => $property->getName() === $propertyName,
+        );
 
-        if ($property->isRequired()) {
+        if (!$property || $property->isRequired()) {
             return;
         }
 

tests/ComposedValue/ComposedRequiredPromotionTest.php

@@ -125,8 +125,6 @@ public function testAllOfPromotedPropertyAbsentUnderImplicitNullCollectsOnlyComp
         $className = $this->generateClassFromFile(
             'AllOfRequiredInAnyBranch.json',
             (new GeneratorConfiguration())->setCollectErrors(true),
-            false,
-            true,
         );
 
         try {
@@ -371,8 +369,6 @@ public function testOneOfPromotedPropertyAbsentUnderImplicitNullCollectsOnlyComp
         $className = $this->generateClassFromFile(
             'OneOfRequiredInAllBranches.json',
             (new GeneratorConfiguration())->setCollectErrors(true),
-            false,
-            true,
         );
 
         try {
@@ -491,7 +487,7 @@ public function testPromotionSuppressesNullUnderImplicitNull(): void
     {
         // With implicitNull=true every non-required property would normally be nullable.
         // Promotion must override that and force non-nullable.
-        $className = $this->generateClassFromFile('AnyOfRequiredInAllBranches.json', null, false, true);
+        $className = $this->generateClassFromFile('AnyOfRequiredInAllBranches.json');
 
         $this->assertNonNullableStringProperty($className, 'name');
     }
@@ -505,8 +501,6 @@ public function testPromotedPropertyAbsentUnderImplicitNullCollectsOnlyCompositi
         $className = $this->generateClassFromFile(
             'AnyOfRequiredInAllBranches.json',
             (new GeneratorConfiguration())->setCollectErrors(true),
-            false,
-            true,
         );
 
         try {