2019-06-04 22:36:32 +02:00
|
|
|
<?php
|
|
|
|
namespace Psalm\Tests\FileManipulation;
|
|
|
|
|
|
|
|
use Psalm\Context;
|
2020-08-23 16:32:07 +02:00
|
|
|
use Psalm\Internal\RuntimeCaches;
|
2019-06-04 22:36:32 +02:00
|
|
|
use Psalm\Tests\Internal\Provider;
|
|
|
|
use Psalm\Tests\TestConfig;
|
2019-06-26 22:52:29 +02:00
|
|
|
use function strpos;
|
2019-06-04 22:36:32 +02:00
|
|
|
|
|
|
|
class ClassMoveTest extends \Psalm\Tests\TestCase
|
|
|
|
{
|
|
|
|
/** @var \Psalm\Internal\Analyzer\ProjectAnalyzer */
|
|
|
|
protected $project_analyzer;
|
|
|
|
|
|
|
|
public function setUp() : void
|
|
|
|
{
|
2020-08-23 16:32:07 +02:00
|
|
|
RuntimeCaches::clearAll();
|
2019-06-04 22:36:32 +02:00
|
|
|
|
|
|
|
$this->file_provider = new Provider\FakeFileProvider();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @dataProvider providerValidCodeParse
|
|
|
|
*
|
|
|
|
* @param array<string, string> $constants_to_move
|
|
|
|
* @param array<string, string> $call_transforms
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
public function testValidCode(
|
|
|
|
string $input_code,
|
|
|
|
string $output_code,
|
|
|
|
array $constants_to_move
|
2020-09-12 17:24:05 +02:00
|
|
|
): void {
|
2019-06-04 22:36:32 +02:00
|
|
|
$test_name = $this->getTestName();
|
|
|
|
if (strpos($test_name, 'SKIPPED-') !== false) {
|
|
|
|
$this->markTestSkipped('Skipped due to a bug.');
|
|
|
|
}
|
|
|
|
|
|
|
|
$config = new TestConfig();
|
|
|
|
|
|
|
|
$this->project_analyzer = new \Psalm\Internal\Analyzer\ProjectAnalyzer(
|
|
|
|
$config,
|
|
|
|
new \Psalm\Internal\Provider\Providers(
|
|
|
|
$this->file_provider,
|
|
|
|
new Provider\FakeParserCacheProvider()
|
|
|
|
)
|
|
|
|
);
|
|
|
|
|
|
|
|
$context = new Context();
|
|
|
|
|
|
|
|
$file_path = self::$src_dir_path . 'somefile.php';
|
|
|
|
|
|
|
|
$this->addFile(
|
|
|
|
$file_path,
|
|
|
|
$input_code
|
|
|
|
);
|
|
|
|
|
|
|
|
$codebase = $this->project_analyzer->getCodebase();
|
|
|
|
|
|
|
|
$this->project_analyzer->refactorCodeAfterCompletion($constants_to_move);
|
|
|
|
|
|
|
|
$this->analyzeFile($file_path, $context);
|
|
|
|
|
|
|
|
$this->project_analyzer->prepareMigration();
|
|
|
|
|
|
|
|
$codebase->analyzer->updateFile($file_path, false);
|
|
|
|
|
|
|
|
$this->project_analyzer->migrateCode();
|
|
|
|
|
|
|
|
$this->assertSame($output_code, $codebase->getFileContents($file_path));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @return array<string,array{string,string,array<string, string>}>
|
|
|
|
*/
|
2020-09-12 17:24:05 +02:00
|
|
|
public function providerValidCodeParse(): array
|
2019-06-04 22:36:32 +02:00
|
|
|
{
|
|
|
|
return [
|
|
|
|
'renameEmptyClass' => [
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class A {}
|
|
|
|
|
|
|
|
class C extends A {
|
|
|
|
/**
|
|
|
|
* @var A
|
|
|
|
*/
|
|
|
|
public $one;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param A $a
|
2019-06-06 23:18:24 +02:00
|
|
|
* @param A::class|C::class $b
|
2019-06-04 22:36:32 +02:00
|
|
|
* @return A
|
|
|
|
*/
|
2019-06-06 23:18:24 +02:00
|
|
|
function foo(A $a, string $b) : A {
|
2019-06-04 22:36:32 +02:00
|
|
|
return $a;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** @var A */
|
|
|
|
$i = new A();
|
|
|
|
|
|
|
|
if ($i instanceof A) {}',
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class B {}
|
|
|
|
|
|
|
|
class C extends B {
|
|
|
|
/**
|
|
|
|
* @var B
|
|
|
|
*/
|
|
|
|
public $one;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param B $a
|
2019-06-06 23:18:24 +02:00
|
|
|
* @param B::class|C::class $b
|
2019-06-04 22:36:32 +02:00
|
|
|
* @return B
|
|
|
|
*/
|
2019-06-06 23:18:24 +02:00
|
|
|
function foo(B $a, string $b) : B {
|
2019-06-04 22:36:32 +02:00
|
|
|
return $a;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** @var B */
|
|
|
|
$i = new B();
|
|
|
|
|
|
|
|
if ($i instanceof B) {}',
|
|
|
|
[
|
|
|
|
'Ns\A' => 'Ns\B',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-04 22:36:32 +02:00
|
|
|
],
|
2019-06-06 19:57:00 +02:00
|
|
|
'renameEmptyClassWithSpacesInDocblock' => [
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class A {}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param ?A $a
|
|
|
|
* @param string | null $b
|
2019-06-06 20:27:49 +02:00
|
|
|
* @param callable(): A $c
|
2019-06-06 19:57:00 +02:00
|
|
|
* @return A | null
|
|
|
|
*/
|
2019-06-06 20:27:49 +02:00
|
|
|
function foo(?A $a, $b, $c) : ?A {
|
2019-06-06 19:57:00 +02:00
|
|
|
return $a;
|
|
|
|
}',
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class B {}
|
|
|
|
|
|
|
|
/**
|
2019-10-17 07:14:33 +02:00
|
|
|
* @param B|null $a
|
2019-06-06 19:57:00 +02:00
|
|
|
* @param string | null $b
|
2019-06-06 20:27:49 +02:00
|
|
|
* @param callable():B $c
|
2019-10-17 07:14:33 +02:00
|
|
|
* @return B|null
|
2019-06-06 19:57:00 +02:00
|
|
|
*/
|
2019-06-06 20:27:49 +02:00
|
|
|
function foo(?B $a, $b, $c) : ?B {
|
2019-06-06 19:57:00 +02:00
|
|
|
return $a;
|
|
|
|
}',
|
|
|
|
[
|
|
|
|
'Ns\A' => 'Ns\B',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-06 19:57:00 +02:00
|
|
|
],
|
2019-06-04 22:36:32 +02:00
|
|
|
'renameClassWithInstanceMethod' => [
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class A {
|
|
|
|
/**
|
|
|
|
* @param self $one
|
|
|
|
* @param A $two
|
|
|
|
*/
|
|
|
|
public function foo(self $one, A $two) : void {}
|
|
|
|
}
|
|
|
|
|
|
|
|
function foo(A $a) : A {
|
|
|
|
return $a->foo($a, $a);
|
|
|
|
}',
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class B {
|
|
|
|
/**
|
|
|
|
* @param self $one
|
|
|
|
* @param self $two
|
|
|
|
*/
|
|
|
|
public function foo(self $one, self $two) : void {}
|
|
|
|
}
|
|
|
|
|
|
|
|
function foo(B $a) : B {
|
|
|
|
return $a->foo($a, $a);
|
|
|
|
}',
|
|
|
|
[
|
|
|
|
'Ns\A' => 'Ns\B',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-04 22:36:32 +02:00
|
|
|
],
|
|
|
|
'renameClassWithStaticMethod' => [
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
2019-11-15 21:34:25 +01:00
|
|
|
class AParent {
|
|
|
|
public static function foo(A $one, A $two) {
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
class A extends AParent {
|
2019-06-04 22:36:32 +02:00
|
|
|
/**
|
|
|
|
* @param self $one
|
|
|
|
* @param A $two
|
2019-11-15 22:50:43 +01:00
|
|
|
* @return static
|
2019-06-04 22:36:32 +02:00
|
|
|
*/
|
|
|
|
public static function foo(self $one, A $two) : void {
|
|
|
|
A::foo($one, $two);
|
2019-11-17 01:59:08 +01:00
|
|
|
self::foo($one, $two);
|
2019-11-15 21:34:25 +01:00
|
|
|
parent::foo($one, $two);
|
|
|
|
static::foo($one, $two);
|
2019-11-15 22:50:43 +01:00
|
|
|
return new static();
|
2019-06-04 22:36:32 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-15 21:34:25 +01:00
|
|
|
$a = A::class;
|
|
|
|
|
|
|
|
$a::foo(new A(), new A());
|
|
|
|
|
2019-06-04 22:36:32 +02:00
|
|
|
function foo() {
|
|
|
|
A::foo(new A(), A::foo());
|
|
|
|
}',
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
2019-11-15 21:34:25 +01:00
|
|
|
class AParent {
|
|
|
|
public static function foo(B $one, B $two) {
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
class B extends AParent {
|
2019-06-04 22:36:32 +02:00
|
|
|
/**
|
|
|
|
* @param self $one
|
|
|
|
* @param self $two
|
2019-11-15 22:50:43 +01:00
|
|
|
* @return static
|
2019-06-04 22:36:32 +02:00
|
|
|
*/
|
|
|
|
public static function foo(self $one, self $two) : void {
|
2019-11-17 01:59:08 +01:00
|
|
|
B::foo($one, $two);
|
2019-06-05 17:22:09 +02:00
|
|
|
self::foo($one, $two);
|
2019-11-15 21:34:25 +01:00
|
|
|
parent::foo($one, $two);
|
|
|
|
static::foo($one, $two);
|
2019-11-15 22:50:43 +01:00
|
|
|
return new static();
|
2019-06-04 22:36:32 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-15 21:34:25 +01:00
|
|
|
$a = B::class;
|
|
|
|
|
|
|
|
$a::foo(new B(), new B());
|
|
|
|
|
2019-06-04 22:36:32 +02:00
|
|
|
function foo() {
|
|
|
|
B::foo(new B(), B::foo());
|
|
|
|
}',
|
|
|
|
[
|
|
|
|
'Ns\A' => 'Ns\B',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-04 22:36:32 +02:00
|
|
|
],
|
|
|
|
'renameClassWithInstanceProperty' => [
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class A {
|
|
|
|
/**
|
|
|
|
* @var A
|
|
|
|
*/
|
|
|
|
public $one;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @var self
|
|
|
|
*/
|
|
|
|
public $two;
|
|
|
|
}',
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class B {
|
|
|
|
/**
|
|
|
|
* @var self
|
|
|
|
*/
|
|
|
|
public $one;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @var self
|
|
|
|
*/
|
|
|
|
public $two;
|
|
|
|
}',
|
|
|
|
[
|
|
|
|
'Ns\A' => 'Ns\B',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-04 22:36:32 +02:00
|
|
|
],
|
|
|
|
'renameClassWithStaticProperty' => [
|
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class A {
|
|
|
|
/**
|
|
|
|
* @var string
|
|
|
|
*/
|
|
|
|
public static $one = "one";
|
2019-11-15 21:34:25 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @var array
|
|
|
|
*/
|
|
|
|
public static $vars = ["one"];
|
2019-06-04 22:36:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
echo A::$one;
|
2019-11-15 21:34:25 +01:00
|
|
|
A::$one = "two";
|
|
|
|
|
|
|
|
foreach (A::$vars as $var) {}',
|
2019-06-04 22:36:32 +02:00
|
|
|
'<?php
|
|
|
|
namespace Ns;
|
|
|
|
|
|
|
|
class B {
|
|
|
|
/**
|
|
|
|
* @var string
|
|
|
|
*/
|
|
|
|
public static $one = "one";
|
2019-11-15 21:34:25 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @var array<array-key, mixed>
|
|
|
|
*/
|
|
|
|
public static $vars = ["one"];
|
2019-06-04 22:36:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
echo B::$one;
|
2019-11-15 21:34:25 +01:00
|
|
|
B::$one = "two";
|
|
|
|
|
|
|
|
foreach (B::$vars as $var) {}',
|
2019-06-04 22:36:32 +02:00
|
|
|
[
|
|
|
|
'Ns\A' => 'Ns\B',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-04 22:36:32 +02:00
|
|
|
],
|
|
|
|
'moveClassIntoNamespace' => [
|
|
|
|
'<?php
|
2019-06-05 17:15:52 +02:00
|
|
|
use Exception;
|
|
|
|
|
2019-06-04 22:36:32 +02:00
|
|
|
class A {
|
|
|
|
/** @var ?Exception */
|
|
|
|
public $x;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param ArrayObject<int, A> $a
|
2019-11-15 21:34:25 +01:00
|
|
|
* @throws RunTimeException
|
2019-06-04 22:36:32 +02:00
|
|
|
*/
|
|
|
|
public function foo(ArrayObject $a) : Exception {
|
|
|
|
foreach ($a as $b) {
|
|
|
|
$b->bar();
|
|
|
|
}
|
|
|
|
|
2019-06-05 17:33:04 +02:00
|
|
|
try {
|
|
|
|
// something
|
|
|
|
} catch (InvalidArgumentException $e) {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2019-06-05 17:15:52 +02:00
|
|
|
echo \A::class;
|
2019-06-14 21:54:15 +02:00
|
|
|
echo __CLASS__;
|
2019-11-17 01:59:08 +01:00
|
|
|
echo self::class;
|
2019-06-05 17:15:52 +02:00
|
|
|
|
2019-06-05 17:22:09 +02:00
|
|
|
ArrayObject::foo();
|
|
|
|
|
2019-06-04 22:36:32 +02:00
|
|
|
return new Exception("bad");
|
|
|
|
}
|
|
|
|
|
|
|
|
public function bar() : void {}
|
|
|
|
}',
|
|
|
|
'<?php
|
|
|
|
namespace Foo\Bar\Baz;
|
|
|
|
|
2019-06-05 17:15:52 +02:00
|
|
|
use Exception;
|
|
|
|
|
2019-06-04 22:36:32 +02:00
|
|
|
class B {
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var Exception|null */
|
2019-06-04 22:36:32 +02:00
|
|
|
public $x;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param \ArrayObject<int, self> $a
|
2019-11-15 21:34:25 +01:00
|
|
|
* @throws \RunTimeException
|
2019-06-04 22:36:32 +02:00
|
|
|
*/
|
2019-06-05 17:15:52 +02:00
|
|
|
public function foo(\ArrayObject $a) : Exception {
|
2019-06-04 22:36:32 +02:00
|
|
|
foreach ($a as $b) {
|
|
|
|
$b->bar();
|
|
|
|
}
|
|
|
|
|
2019-06-05 17:33:04 +02:00
|
|
|
try {
|
|
|
|
// something
|
|
|
|
} catch (\InvalidArgumentException $e) {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2019-11-17 01:59:08 +01:00
|
|
|
echo B::class;
|
|
|
|
echo B::class;
|
2019-06-05 17:15:52 +02:00
|
|
|
echo self::class;
|
|
|
|
|
2019-06-05 17:22:09 +02:00
|
|
|
\ArrayObject::foo();
|
|
|
|
|
2019-06-05 17:15:52 +02:00
|
|
|
return new Exception("bad");
|
2019-06-04 22:36:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public function bar() : void {}
|
|
|
|
}',
|
|
|
|
[
|
|
|
|
'A' => 'Foo\Bar\Baz\B',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-04 22:36:32 +02:00
|
|
|
],
|
2019-06-07 00:46:40 +02:00
|
|
|
'moveClassDeeperIntoNamespaceAdjustUseWithoutAlias' => [
|
2019-06-04 22:36:32 +02:00
|
|
|
'<?php
|
2019-06-06 04:13:33 +02:00
|
|
|
namespace Foo {
|
|
|
|
use Bar\Bat;
|
2019-06-04 22:36:32 +02:00
|
|
|
|
2019-06-06 13:05:30 +02:00
|
|
|
echo Bat::FOO;
|
2019-06-07 00:46:40 +02:00
|
|
|
echo Bat::FAR;
|
2019-06-06 13:05:30 +02:00
|
|
|
|
2019-06-04 22:36:32 +02:00
|
|
|
/**
|
2019-06-06 04:13:33 +02:00
|
|
|
* @param Bat $b
|
2019-06-07 00:46:40 +02:00
|
|
|
* @param Bat::FOO|Bat::FAR $c
|
2019-06-04 22:36:32 +02:00
|
|
|
*/
|
2019-06-07 00:46:40 +02:00
|
|
|
function doSomething(Bat $b, int $c) : void {}
|
2019-06-06 23:42:23 +02:00
|
|
|
|
|
|
|
class A {
|
|
|
|
/** @var ?Bat */
|
|
|
|
public $x = null;
|
|
|
|
}
|
2019-06-06 04:13:33 +02:00
|
|
|
}
|
|
|
|
namespace Bar {
|
2019-06-06 13:05:30 +02:00
|
|
|
class Bat {
|
|
|
|
const FOO = 5;
|
2019-06-07 00:46:40 +02:00
|
|
|
const FAR = 7;
|
2019-06-06 13:05:30 +02:00
|
|
|
}
|
2019-06-04 22:36:32 +02:00
|
|
|
}',
|
|
|
|
'<?php
|
2019-06-06 04:13:33 +02:00
|
|
|
namespace Foo {
|
|
|
|
use Bar\Baz\Bahh;
|
2019-06-04 22:36:32 +02:00
|
|
|
|
2019-06-06 13:05:30 +02:00
|
|
|
echo Bahh::FOO;
|
2019-06-07 00:46:40 +02:00
|
|
|
echo Bahh::FAR;
|
2019-06-06 13:05:30 +02:00
|
|
|
|
2019-06-04 22:36:32 +02:00
|
|
|
/**
|
2019-06-06 04:13:33 +02:00
|
|
|
* @param Bahh $b
|
2019-10-17 07:14:33 +02:00
|
|
|
* @param Bahh::FAR|Bahh::FOO $c
|
2019-06-04 22:36:32 +02:00
|
|
|
*/
|
2019-06-07 00:46:40 +02:00
|
|
|
function doSomething(Bahh $b, int $c) : void {}
|
2019-06-06 23:42:23 +02:00
|
|
|
|
|
|
|
class A {
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var Bahh|null */
|
2019-06-06 23:42:23 +02:00
|
|
|
public $x = null;
|
|
|
|
}
|
2019-06-06 04:13:33 +02:00
|
|
|
}
|
|
|
|
namespace Bar\Baz {
|
2019-06-06 13:05:30 +02:00
|
|
|
class Bahh {
|
|
|
|
const FOO = 5;
|
2019-06-07 00:46:40 +02:00
|
|
|
const FAR = 7;
|
|
|
|
}
|
|
|
|
}',
|
|
|
|
[
|
|
|
|
'Bar\Bat' => 'Bar\Baz\Bahh',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-07 00:46:40 +02:00
|
|
|
],
|
2019-06-10 23:09:34 +02:00
|
|
|
'moveClassesIntoNamespace' => [
|
|
|
|
'<?php
|
|
|
|
namespace Foo {
|
|
|
|
class A {
|
|
|
|
/** @var ?B */
|
|
|
|
public $x = null;
|
|
|
|
/** @var ?A */
|
|
|
|
public $y = null;
|
|
|
|
/** @var A|B|C|null */
|
|
|
|
public $z = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace Foo {
|
|
|
|
class B {
|
|
|
|
/** @var ?A */
|
|
|
|
public $x = null;
|
|
|
|
/** @var ?B */
|
|
|
|
public $y = null;
|
|
|
|
/** @var A|B|C|null */
|
|
|
|
public $z = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-11 16:33:52 +02:00
|
|
|
namespace Bar {
|
|
|
|
use Foo\A;
|
|
|
|
use Foo\B;
|
|
|
|
|
2019-06-10 23:09:34 +02:00
|
|
|
class C {
|
|
|
|
/** @var ?A */
|
|
|
|
public $x = null;
|
|
|
|
/** @var ?B */
|
|
|
|
public $y = null;
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var A|B|null */
|
2019-06-11 16:33:52 +02:00
|
|
|
public $z = null;
|
2019-06-10 23:09:34 +02:00
|
|
|
}
|
|
|
|
}',
|
|
|
|
'<?php
|
|
|
|
namespace Bar\Baz {
|
|
|
|
class A {
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var B|null */
|
2019-06-10 23:09:34 +02:00
|
|
|
public $x = null;
|
|
|
|
/** @var null|self */
|
|
|
|
public $y = null;
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var B|\Foo\C|null|self */
|
2019-06-10 23:09:34 +02:00
|
|
|
public $z = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace Bar\Baz {
|
|
|
|
class B {
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var A|null */
|
2019-06-10 23:09:34 +02:00
|
|
|
public $x = null;
|
|
|
|
/** @var null|self */
|
|
|
|
public $y = null;
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var A|\Foo\C|null|self */
|
2019-06-10 23:09:34 +02:00
|
|
|
public $z = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-11 16:33:52 +02:00
|
|
|
namespace Bar {
|
|
|
|
use Bar\Baz\A;
|
|
|
|
use Bar\Baz\B;
|
|
|
|
|
2019-06-10 23:09:34 +02:00
|
|
|
class C {
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var A|null */
|
2019-06-10 23:09:34 +02:00
|
|
|
public $x = null;
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var B|null */
|
2019-06-10 23:09:34 +02:00
|
|
|
public $y = null;
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var A|B|null */
|
2019-06-11 16:33:52 +02:00
|
|
|
public $z = null;
|
2019-06-10 23:09:34 +02:00
|
|
|
}
|
|
|
|
}',
|
|
|
|
[
|
|
|
|
'Foo\A' => 'Bar\Baz\A',
|
|
|
|
'Foo\B' => 'Bar\Baz\B',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-10 23:09:34 +02:00
|
|
|
],
|
2019-11-15 22:50:43 +01:00
|
|
|
'moveClassesIntoNamespaceWithoutAlias' => [
|
|
|
|
'<?php
|
|
|
|
namespace Foo {
|
|
|
|
class A {
|
|
|
|
/** @var ?B */
|
|
|
|
public $x = null;
|
|
|
|
/** @var ?A */
|
|
|
|
public $y = null;
|
|
|
|
/** @var A|B|C|null */
|
|
|
|
public $z = null;
|
|
|
|
|
|
|
|
public static $vars = [1, 2, 3];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace Foo {
|
|
|
|
class B {
|
|
|
|
/** @var ?A */
|
|
|
|
public $x = null;
|
|
|
|
/** @var ?B */
|
|
|
|
public $y = null;
|
|
|
|
/** @var A|B|C|null */
|
|
|
|
public $z = null;
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (A::$vars[$foo] as $var) {}
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace Bar {
|
|
|
|
class C {
|
|
|
|
/** @var ?\Foo\A */
|
|
|
|
public $x = null;
|
|
|
|
/** @var ?\Foo\B */
|
|
|
|
public $y = null;
|
|
|
|
/** @var \Foo\A|\Foo\B|null */
|
|
|
|
public $z = null;
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (\Foo\A::$vars as $var) {}
|
|
|
|
}',
|
|
|
|
'<?php
|
|
|
|
namespace Bar\Baz {
|
|
|
|
class A {
|
|
|
|
/** @var B|null */
|
|
|
|
public $x = null;
|
|
|
|
/** @var null|self */
|
|
|
|
public $y = null;
|
|
|
|
/** @var B|\Foo\C|null|self */
|
|
|
|
public $z = null;
|
|
|
|
|
|
|
|
public static $vars = [1, 2, 3];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace Bar\Baz {
|
|
|
|
class B {
|
|
|
|
/** @var A|null */
|
|
|
|
public $x = null;
|
|
|
|
/** @var null|self */
|
|
|
|
public $y = null;
|
|
|
|
/** @var A|\Foo\C|null|self */
|
|
|
|
public $z = null;
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (\Bar\Baz\A::$vars[$foo] as $var) {}
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace Bar {
|
|
|
|
class C {
|
|
|
|
/** @var Baz\A|null */
|
|
|
|
public $x = null;
|
|
|
|
/** @var Baz\B|null */
|
|
|
|
public $y = null;
|
|
|
|
/** @var Baz\A|Baz\B|null */
|
|
|
|
public $z = null;
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach (Baz\A::$vars as $var) {}
|
|
|
|
}',
|
|
|
|
[
|
|
|
|
'Foo\A' => 'Bar\Baz\A',
|
|
|
|
'Foo\B' => 'Bar\Baz\B',
|
|
|
|
],
|
|
|
|
],
|
2019-06-07 00:46:40 +02:00
|
|
|
'moveClassDeeperIntoNamespaceAdjustUseWithAlias' => [
|
|
|
|
'<?php
|
|
|
|
namespace Foo {
|
|
|
|
use Bar\Bat as Kappa;
|
|
|
|
|
|
|
|
echo Kappa::FOO;
|
|
|
|
echo Kappa::FAR;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param Kappa $b
|
|
|
|
* @param Kappa::FOO|Kappa::FAR $c
|
|
|
|
*/
|
|
|
|
function doSomething(Kappa $b, int $c) : void {}
|
|
|
|
|
|
|
|
class A {
|
|
|
|
/** @var ?Kappa */
|
|
|
|
public $x = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
namespace Bar {
|
|
|
|
class Bat {
|
|
|
|
const FOO = 5;
|
|
|
|
const FAR = 7;
|
|
|
|
}
|
|
|
|
}',
|
|
|
|
'<?php
|
|
|
|
namespace Foo {
|
|
|
|
use Bar\Baz\Bahh as Kappa;
|
|
|
|
|
|
|
|
echo Kappa::FOO;
|
|
|
|
echo Kappa::FAR;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param Kappa $b
|
2019-10-17 07:14:33 +02:00
|
|
|
* @param Kappa::FAR|Kappa::FOO $c
|
2019-06-07 00:46:40 +02:00
|
|
|
*/
|
|
|
|
function doSomething(Kappa $b, int $c) : void {}
|
|
|
|
|
|
|
|
class A {
|
2019-10-17 07:14:33 +02:00
|
|
|
/** @var Kappa|null */
|
2019-06-07 00:46:40 +02:00
|
|
|
public $x = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
namespace Bar\Baz {
|
|
|
|
class Bahh {
|
|
|
|
const FOO = 5;
|
|
|
|
const FAR = 7;
|
2019-06-06 13:05:30 +02:00
|
|
|
}
|
2019-06-06 04:13:33 +02:00
|
|
|
}',
|
|
|
|
[
|
|
|
|
'Bar\Bat' => 'Bar\Baz\Bahh',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-06 04:13:33 +02:00
|
|
|
],
|
|
|
|
'moveClassDeeperIntoNamespaceDontAdjustGroupUse' => [
|
|
|
|
'<?php
|
|
|
|
namespace Foo {
|
|
|
|
use Bar\{Bat};
|
2019-06-04 22:36:32 +02:00
|
|
|
|
2019-06-06 04:13:33 +02:00
|
|
|
/**
|
|
|
|
* @param Bat $b
|
|
|
|
*/
|
|
|
|
function doSomething(Bat $b) : void {}
|
|
|
|
}
|
|
|
|
namespace Bar {
|
|
|
|
class Bat {}
|
|
|
|
}',
|
|
|
|
'<?php
|
|
|
|
namespace Foo {
|
|
|
|
use Bar\{Bat};
|
2019-06-04 22:36:32 +02:00
|
|
|
|
2019-06-06 04:13:33 +02:00
|
|
|
/**
|
|
|
|
* @param \Bar\Baz\Bahh $b
|
|
|
|
*/
|
|
|
|
function doSomething(\Bar\Baz\Bahh $b) : void {}
|
|
|
|
}
|
|
|
|
namespace Bar\Baz {
|
|
|
|
class Bahh {}
|
2019-06-04 22:36:32 +02:00
|
|
|
}',
|
|
|
|
[
|
2019-06-06 04:13:33 +02:00
|
|
|
'Bar\Bat' => 'Bar\Baz\Bahh',
|
2019-07-05 22:24:00 +02:00
|
|
|
],
|
2019-06-04 22:36:32 +02:00
|
|
|
],
|
|
|
|
];
|
|
|
|
}
|
|
|
|
}
|