From abf9ced7558cda74004c4bbc8f21ee8a3ed69b49 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Sun, 15 Sep 2019 20:45:58 +0200
Subject: [PATCH] add FQNize same-namespace test

---
 packages/Autodiscovery/src/FileMover/FileMover.php    |  2 --
 .../Fixture/Command/ExpectedBananaCommand.php         | 11 +++++++++++
 .../MoveServicesBySuffixToDirectoryRectorTest.php     |  8 +++++++-
 .../Source/Controller/BananaCommand.php               | 11 +++++++++++
 .../Source/Controller/Orange.php                      |  8 ++++++++
 src/PhpParser/Printer/BetterStandardPrinter.php       | 11 +++++++++++
 .../Expected/UnknownImageFileException.php            |  2 +-
 7 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Fixture/Command/ExpectedBananaCommand.php
 create mode 100644 packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Source/Controller/BananaCommand.php
 create mode 100644 packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Source/Controller/Orange.php

diff --git a/packages/Autodiscovery/src/FileMover/FileMover.php b/packages/Autodiscovery/src/FileMover/FileMover.php
index 2f23688050a..94482720cee 100644
--- a/packages/Autodiscovery/src/FileMover/FileMover.php
+++ b/packages/Autodiscovery/src/FileMover/FileMover.php
@@ -83,8 +83,6 @@ final class FileMover
             }
         }
 
-        // @todo: nodes must be sometimes FQNized
-
         // 3. return changed nodes and new file destination
         $newFileDestination = $this->fileRelocationResolver->createNewFileDestination(
             $smartFileInfo,
diff --git a/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Fixture/Command/ExpectedBananaCommand.php b/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Fixture/Command/ExpectedBananaCommand.php
new file mode 100644
index 00000000000..1d13847f921
--- /dev/null
+++ b/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Fixture/Command/ExpectedBananaCommand.php
@@ -0,0 +1,11 @@
+<?php
+declare(strict_types=1);
+namespace Rector\Autodiscovery\Tests\Rector\FileSystem\MoveServicesBySuffixToDirectoryRector\Source\Command;
+
+final class BananaCommand
+{
+    public function run()
+    {
+        return new \Rector\Autodiscovery\Tests\Rector\FileSystem\MoveServicesBySuffixToDirectoryRector\Source\Controller\Orange();
+    }
+}
diff --git a/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/MoveServicesBySuffixToDirectoryRectorTest.php b/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/MoveServicesBySuffixToDirectoryRectorTest.php
index de64c8266f5..59332c0dfcc 100644
--- a/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/MoveServicesBySuffixToDirectoryRectorTest.php
+++ b/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/MoveServicesBySuffixToDirectoryRectorTest.php
@@ -35,13 +35,19 @@ final class MoveServicesBySuffixToDirectoryRectorTest extends AbstractFileSystem
             __DIR__ . '/Source/Fixture/Repository/AppleRepository.php',
             __DIR__ . '/Fixture/ExpectedAppleRepository.php',
         ];
+
+        yield 'prefix_same_namespace' => [
+            __DIR__ . '/Source/Controller/BananaCommand.php',
+            __DIR__ . '/Source/Fixture/Command/BananaCommand.php',
+            __DIR__ . '/Fixture/Command/ExpectedBananaCommand.php',
+        ];
     }
 
     protected function getRectorsWithConfiguration(): array
     {
         return [
             MoveServicesBySuffixToDirectoryRector::class => [
-                '$groupNamesBySuffix' => ['Repository'],
+                '$groupNamesBySuffix' => ['Repository', 'Command'],
             ],
         ];
     }
diff --git a/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Source/Controller/BananaCommand.php b/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Source/Controller/BananaCommand.php
new file mode 100644
index 00000000000..a63daf89188
--- /dev/null
+++ b/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Source/Controller/BananaCommand.php
@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Autodiscovery\Tests\Rector\FileSystem\MoveServicesBySuffixToDirectoryRector\Source\Controller;
+
+final class BananaCommand
+{
+    public function run()
+    {
+        return new Orange();
+    }
+}
diff --git a/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Source/Controller/Orange.php b/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Source/Controller/Orange.php
new file mode 100644
index 00000000000..25dbda5eae0
--- /dev/null
+++ b/packages/Autodiscovery/tests/Rector/FileSystem/MoveServicesBySuffixToDirectoryRector/Source/Controller/Orange.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Autodiscovery\Tests\Rector\FileSystem\MoveServicesBySuffixToDirectoryRector\Source\Controller;
+
+final class Orange
+{
+
+}
diff --git a/src/PhpParser/Printer/BetterStandardPrinter.php b/src/PhpParser/Printer/BetterStandardPrinter.php
index 9f1483f1871..e95d7ffaaf6 100644
--- a/src/PhpParser/Printer/BetterStandardPrinter.php
+++ b/src/PhpParser/Printer/BetterStandardPrinter.php
@@ -12,6 +12,7 @@ use PhpParser\Node\Scalar\EncapsedStringPart;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Nop;
 use PhpParser\Node\Stmt\TraitUse;
@@ -225,6 +226,16 @@ final class BetterStandardPrinter extends Standard
         return parent::pStmt_Class($class);
     }
 
+    /**
+     * It remove all spaces extra to parent
+     */
+    protected function pStmt_Declare(Declare_ $declare): string
+    {
+        $declareString = parent::pStmt_Declare($declare);
+
+        return Strings::replace($declareString, '#\s+#');
+    }
+
     /**
      * @param Node[] $nodes
      */
diff --git a/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/Expected/UnknownImageFileException.php b/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/Expected/UnknownImageFileException.php
index 676240b5d95..6421fcb8db7 100644
--- a/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/Expected/UnknownImageFileException.php
+++ b/tests/Rector/Psr4/MultipleClassFileToPsr4ClassesRector/Expected/UnknownImageFileException.php
@@ -3,7 +3,7 @@
  * This file is part of the Nette Framework (https://nette.org)
  * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
-declare (strict_types=1);
+declare(strict_types=1);
 namespace NettePostfixedToUniqueAutoload\Utils;
 
 /**