123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364 |
- <?php
- declare(strict_types=1);
- /*
- * This file is part of PHP CS Fixer.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- * Dariusz Rumiński <dariusz.ruminski@gmail.com>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
- namespace PhpCsFixer\Tests\Fixer\Operator;
- use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
- /**
- * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
- *
- * @internal
- *
- * @covers \PhpCsFixer\Fixer\Operator\NewWithBracesFixer
- */
- final class NewWithBracesFixerTest extends AbstractFixerTestCase
- {
- /**
- * @dataProvider provideFixCases
- */
- public function testFix(string $expected, ?string $input = null): void
- {
- $this->doTest($expected, $input);
- }
- /**
- * @dataProvider provideFix70Cases
- * @requires PHP 7.0
- */
- public function testFix70(string $expected, ?string $input = null): void
- {
- $this->doTest($expected, $input);
- }
- public function provideFixCases()
- {
- $tests = [
- [
- '<?php class A { public function B(){ $static = new static(new \SplFileInfo(__FILE__)); }}',
- ],
- [
- '<?php $static = new self(new \SplFileInfo(__FILE__));',
- ],
- [
- '<?php $x = new X/**/ /**/ /**//**//**/ /**//**/ (/**/ /**/ /**//**//**/ /**//**/)/**/ /**/ /**//**//**/ /**//**/;/**/ /**/ /**//**//**/ /**//**/',
- ],
- [
- '<?php $x = new X();',
- '<?php $x = new X;',
- ],
- [
- '<?php $y = new Y() ;',
- '<?php $y = new Y ;',
- ],
- [
- '<?php $x = new Z() /**/;//',
- '<?php $x = new Z /**/;//',
- ],
- [
- '<?php $foo = new $foo();',
- '<?php $foo = new $foo;',
- ],
- [
- '<?php
- $bar1 = new $foo[0]->bar();
- $bar2 = new $foo[0][1]->bar();
- ',
- ],
- [
- '<?php $xyz = new X(new Y(new Z()));',
- '<?php $xyz = new X(new Y(new Z));',
- ],
- [
- '<?php $foo = (new $bar())->foo;',
- '<?php $foo = (new $bar)->foo;',
- ],
- [
- '<?php $foo = (new $bar((new Foo())->bar))->foo;',
- '<?php $foo = (new $bar((new Foo)->bar))->foo;',
- ],
- [
- '<?php $self = new self();',
- '<?php $self = new self;',
- ],
- [
- '<?php $static = new static();',
- '<?php $static = new static;',
- ],
- [
- '<?php $a = array( "key" => new DateTime(), );',
- '<?php $a = array( "key" => new DateTime, );',
- ],
- [
- '<?php $a = array( "key" => new DateTime() );',
- '<?php $a = array( "key" => new DateTime );',
- ],
- [
- '<?php $a = new $b[$c]();',
- '<?php $a = new $b[$c];',
- ],
- [
- '<?php $a = new $b[$c][0]();',
- '<?php $a = new $b[$c][0];',
- ],
- [
- '<?php $a = new $b[$c[$d ? foo() : bar("bar[...]") - 1]]();',
- '<?php $a = new $b[$c[$d ? foo() : bar("bar[...]") - 1]];',
- ],
- [
- '<?php $a = new $b[\'class\']();',
- '<?php $a = new $b[\'class\'];',
- ],
- [
- '<?php $a = new $b[\'class\'] ($foo[\'bar\']);',
- ],
- [
- '<?php $a = new $b[\'class\'] () ;',
- ],
- [
- '<?php $a = new $b[$c] ($hello[$world]) ;',
- ],
- [
- "<?php \$a = new \$b['class']()\r\n\t ;",
- "<?php \$a = new \$b['class']\r\n\t ;",
- ],
- [
- '<?php $a = $b ? new DateTime() : $b;',
- '<?php $a = $b ? new DateTime : $b;',
- ],
- [
- '<?php new self::$adapters[$name]["adapter"]();',
- '<?php new self::$adapters[$name]["adapter"];',
- ],
- [
- '<?php $a = new \Exception()?> <?php echo 1;',
- '<?php $a = new \Exception?> <?php echo 1;',
- ],
- [
- '<?php $b = new \StdClass() /**/?>',
- '<?php $b = new \StdClass /**/?>',
- ],
- [
- '<?php $a = new Foo() instanceof Foo;',
- '<?php $a = new Foo instanceof Foo;',
- ],
- [
- '<?php
- $a = new Foo() + 1;
- $a = new Foo() - 1;
- $a = new Foo() * 1;
- $a = new Foo() / 1;
- $a = new Foo() % 1;
- ',
- '<?php
- $a = new Foo + 1;
- $a = new Foo - 1;
- $a = new Foo * 1;
- $a = new Foo / 1;
- $a = new Foo % 1;
- ',
- ],
- [
- '<?php
- $a = new Foo() & 1;
- $a = new Foo() | 1;
- $a = new Foo() ^ 1;
- $a = new Foo() << 1;
- $a = new Foo() >> 1;
- ',
- '<?php
- $a = new Foo & 1;
- $a = new Foo | 1;
- $a = new Foo ^ 1;
- $a = new Foo << 1;
- $a = new Foo >> 1;
- ',
- ],
- [
- '<?php
- $a = new Foo() and 1;
- $a = new Foo() or 1;
- $a = new Foo() xor 1;
- $a = new Foo() && 1;
- $a = new Foo() || 1;
- ',
- '<?php
- $a = new Foo and 1;
- $a = new Foo or 1;
- $a = new Foo xor 1;
- $a = new Foo && 1;
- $a = new Foo || 1;
- ',
- ],
- [
- '<?php
- if (new DateTime() > $this->startDate) {}
- if (new DateTime() >= $this->startDate) {}
- if (new DateTime() < $this->startDate) {}
- if (new DateTime() <= $this->startDate) {}
- if (new DateTime() == $this->startDate) {}
- if (new DateTime() != $this->startDate) {}
- if (new DateTime() <> $this->startDate) {}
- if (new DateTime() === $this->startDate) {}
- if (new DateTime() !== $this->startDate) {}
- ',
- '<?php
- if (new DateTime > $this->startDate) {}
- if (new DateTime >= $this->startDate) {}
- if (new DateTime < $this->startDate) {}
- if (new DateTime <= $this->startDate) {}
- if (new DateTime == $this->startDate) {}
- if (new DateTime != $this->startDate) {}
- if (new DateTime <> $this->startDate) {}
- if (new DateTime === $this->startDate) {}
- if (new DateTime !== $this->startDate) {}
- ',
- ],
- [
- '<?php $a = new \stdClass() ? $b : $c;',
- '<?php $a = new \stdClass ? $b : $c;',
- ],
- [
- '<?php foreach (new Collection() as $x) {}',
- '<?php foreach (new Collection as $x) {}',
- ],
- [
- '<?php $a = [(string) new Foo() => 1];',
- '<?php $a = [(string) new Foo => 1];',
- ],
- [
- '<?php $a = [ "key" => new DateTime(), ];',
- '<?php $a = [ "key" => new DateTime, ];',
- ],
- [
- '<?php $a = [ "key" => new DateTime() ];',
- '<?php $a = [ "key" => new DateTime ];',
- ],
- [
- '<?php
- $a = new Foo() ** 1;
- ',
- '<?php
- $a = new Foo ** 1;
- ',
- ],
- ];
- foreach ($tests as $index => $test) {
- yield $index => $test;
- }
- if (\PHP_VERSION_ID < 80000) {
- yield [
- '<?php $a = new $b{$c}();',
- '<?php $a = new $b{$c};',
- ];
- yield [
- '<?php $a = new $b{$c}{0}{1}() ?>',
- '<?php $a = new $b{$c}{0}{1} ?>',
- ];
- yield [
- '<?php $a = new $b{$c}[1]{0}[2]();',
- '<?php $a = new $b{$c}[1]{0}[2];',
- ];
- }
- }
- public function provideFix70Cases()
- {
- return [
- [
- '<?php
- $a = new Foo() <=> 1;
- ',
- '<?php
- $a = new Foo <=> 1;
- ',
- ],
- [
- '<?php
- $a = new class() {use SomeTrait;};
- $a = new class() implements Foo{};
- $a = new class() /**/ extends Bar1{};
- $a = new class() extends Bar2 implements Foo{};
- $a = new class() extends Bar3 implements Foo, Foo2{};
- $a = new class() {}?>
- ',
- '<?php
- $a = new class {use SomeTrait;};
- $a = new class implements Foo{};
- $a = new class /**/ extends Bar1{};
- $a = new class extends Bar2 implements Foo{};
- $a = new class extends Bar3 implements Foo, Foo2{};
- $a = new class {}?>
- ',
- ],
- [
- '<?php
- class A {
- public function B() {
- $static = new static(new class(){});
- }
- }
- ',
- '<?php
- class A {
- public function B() {
- $static = new static(new class{});
- }
- }
- ',
- ],
- ];
- }
- /**
- * @dataProvider provideFix80Cases
- * @requires PHP 8.0
- */
- public function testFix80(string $expected, ?string $input = null): void
- {
- $this->doTest($expected, $input);
- }
- public function provideFix80Cases()
- {
- yield [
- '<?php $a = new (foo());',
- ];
- yield [
- '<?php
- class Bar {
- public function __construct(int $a = null) {
- echo $a;
- }
- };
- $foo = "B";
- $a = new ($foo."ar");',
- ];
- yield [
- '<?php
- $bar1 = new $foo[0]?->bar();
- $bar2 = new $foo[0][1]?->bar();
- ',
- ];
- }
- }
|