[DX] Accept Y/y for confirmation of init config (#5616)

rectorphp · Feb 14, 2024 · d62be32 · d62be32
1 parent 82d1e1b
commit d62be32
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php b/src/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php
@@ -26,18 +26,18 @@
 
 final readonly class DoctrineAnnotationDecorator implements PhpDocNodeDecoratorInterface
 {
-    /**
-     * Special short annotations, that are resolved as FQN by Doctrine annotation parser
-     * @var string[]
-     */
-    private const ALLOWED_SHORT_ANNOTATIONS = ['Target'];
-
     /**
      * @see https://regex101.com/r/bGp2V0/2
      * @var string
      */
     public const LONG_ANNOTATION_REGEX = '#@\\\\(?<class_name>.*?)(?<annotation_content>\(.*?\)|,|\r?\n|$)#';
 
+    /**
+     * Special short annotations, that are resolved as FQN by Doctrine annotation parser
+     * @var string[]
+     */
+    private const ALLOWED_SHORT_ANNOTATIONS = ['Target'];
+
     /**
      * @see https://regex101.com/r/xWaLOz/1
      * @var string

diff --git a/src/Configuration/ConfigInitializer.php b/src/Configuration/ConfigInitializer.php
@@ -35,7 +35,8 @@ public function createConfig(string $projectDirectory): void
         }
 
         $response = $this->symfonyStyle->ask('No "rector.php" config found. Should we generate it for you?', 'yes');
-        if ($response !== 'yes') {
+        // be tolerant about input
+        if (! in_array($response, ['yes', 'YES', 'y', 'Y'], true)) {
             // okay, nothing we can do
             return;
         }

diff --git a/src/PhpAttribute/NodeFactory/PhpNestedAttributeGroupFactory.php b/src/PhpAttribute/NodeFactory/PhpNestedAttributeGroupFactory.php
@@ -225,7 +225,10 @@ private function createFromExplicitProperties(
                 if (! $nestedDoctrineAnnotationTagValueNode instanceof DoctrineAnnotationTagValueNode) {
                     Assert::string($nestedDoctrineAnnotationTagValueNode);
 
-                    $match = Strings::match($nestedDoctrineAnnotationTagValueNode, DoctrineAnnotationDecorator::LONG_ANNOTATION_REGEX);
+                    $match = Strings::match(
+                        $nestedDoctrineAnnotationTagValueNode,
+                        DoctrineAnnotationDecorator::LONG_ANNOTATION_REGEX
+                    );
 
                     if (! isset($match['class_name'])) {
                         throw new ShouldNotHappenException();