123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992 |
- <?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\ClassNotation;
- use PhpCsFixer\ConfigurationException\InvalidFixerConfigurationException;
- use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
- use PhpCsFixer\WhitespacesFixerConfig;
- /**
- * @author Javier Spagnoletti <phansys@gmail.com>
- *
- * @internal
- *
- * @covers \PhpCsFixer\Fixer\ClassNotation\SingleClassElementPerStatementFixer
- */
- final class SingleClassElementPerStatementFixerTest extends AbstractFixerTestCase
- {
- /**
- * @dataProvider provideFixCases
- */
- public function testFix(string $expected, ?string $input = null): void
- {
- $this->doTest($expected, $input);
- }
- public static function provideFixCases(): iterable
- {
- yield [
- '<?php
- class Foo
- {
- private static $bar1 = array(1,2,3);
- private static $bar2 = [1,2,3];
- private static $baz1 = array(array(1,2), array(3, 4));
- private static $baz2 = array(1,2,3);
- private static $aaa1 = 1;
- private static $aaa2 = array(2, 2);
- private static $aaa3 = 3;
- }',
- '<?php
- class Foo
- {
- private static $bar1 = array(1,2,3), $bar2 = [1,2,3];
- private static $baz1 = array(array(1,2), array(3, 4)), $baz2 = array(1,2,3);
- private static $aaa1 = 1, $aaa2 = array(2, 2), $aaa3 = 3;
- }',
- ];
- yield [
- '<?php
- class Foo
- {
- const A = 1;
- const B = 2;
- }
- echo Foo::A, Foo::B;
- ',
- '<?php
- class Foo
- {
- const A = 1, B = 2;
- }
- echo Foo::A, Foo::B;
- ',
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { protected static $foo = 1; protected static $bar; protected static $baz=2 ; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { protected static $foo = 1,$bar,$baz=2 ; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo {}
- class Bar
- {
- }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { protected static $foo = 1; protected static $bar; protected static $baz=2 ; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { protected static $foo = 1, $bar, $baz=2 ; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { const ONE = 1; const TWO = 2; protected static $foo = 1; protected static $bar; protected static $baz=2 ; const THREE = 3; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { const ONE = 1, TWO = 2; protected static $foo = 1, $bar, $baz=2 ; const THREE = 3; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo {
- protected static $foo = 1;
- protected static $bar;
- protected static $baz=2;
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo {
- protected static $foo = 1,
- $bar,
- $baz=2;
- }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo {
- /**
- * Some great docblock
- */
- protected static $foo = 1;
- protected static $bar;
- protected static $baz=2;
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo {
- /**
- * Some great docblock
- */
- protected static $foo = 1,
- $bar,
- $baz=2;
- }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo {
- /**
- * @int
- */
- protected static $foo = 1;
- protected static $bar;
- protected static $baz=2;
- // this is an inline comment, not a docblock
- private $var = false;
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo {
- /**
- * @int
- */
- protected static $foo = 1,
- $bar,
- $baz=2;
- // this is an inline comment, not a docblock
- private $var = false;
- }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo {
- /**
- * @int
- */
- protected static $foo = 1;
- protected static $bar;
- protected static $baz=2;
- function doSomething()
- {
- }
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo {
- /**
- * @int
- */
- protected static $foo = 1,
- $bar,
- $baz=2;
- function doSomething()
- {
- }
- }
- EOT
- ];
- yield 'line_breaks_1' => [
- <<<'EOT'
- <?php
- class Foo
- {
- public $bar = null;
- public $initialized = false;
- public $configured = false;
- public $called = false;
- public $arguments = array();
- public $baz = null;
- public $drop = false;
- function doSomething()
- {
- }
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo
- {
- public $bar = null, $initialized = false, $configured = false, $called = false, $arguments = array();
- public $baz = null, $drop = false;
- function doSomething()
- {
- }
- }
- EOT
- ];
- yield 'line_breaks_2' => [
- <<<'EOT'
- <?php
- class Foo
- {
- const TWO = '2';
- public $bar = null;
- public $initialized = false;
- function doSomething()
- {
- }
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo
- {
- const TWO = '2';
- public $bar = null, $initialized = false;
- function doSomething()
- {
- }
- }
- EOT
- ];
- yield 'line_breaks_3' => [
- <<<'EOT'
- <?php
- class Foo
- {
- const TWO = '2';
- public $bar = null;
- public $initialized = false;
- function doSomething()
- {
- }
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo
- {
- const TWO = '2';
- public $bar = null, $initialized = false;
- function doSomething()
- {
- }
- }
- EOT
- ];
- yield 'line_breaks_4' => [
- <<<'EOT'
- <?php
- class Foo
- {
- public $one = 1;
- public $bar = null;
- public $initialized = false;
- public $configured = false;
- public $called = false;
- public $arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo
- {
- public $one = 1;
- public $bar = null, $initialized = false, $configured = false, $called = false, $arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- ];
- yield 'line_breaks_5' => [
- <<<'EOT'
- <?php
- class Foo
- {
- public $one = 1; public $bar = null; public $initialized = false; public $configured = false; public $called = false; public $arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo
- {
- public $one = 1; public $bar = null, $initialized = false, $configured = false, $called = false, $arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- ];
- yield 'line_breaks_6' => [
- <<<'EOT'
- <?php
- class Foo
- {
- public $one = 1;public $bar = null;public $initialized = false;public $configured = false;public $called = false;public $arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo
- {
- public $one = 1;public $bar = null, $initialized = false, $configured = false, $called = false, $arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- ];
- yield 'whitespace_1' => [
- <<<'EOT'
- <?php
- class Foo { public $one = 1; public $bar = null; public $initialized = false; public $configured = false; public $called = false; public $arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo { public $one = 1; public $bar = null,$initialized = false,$configured = false,$called = false,$arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- ];
- yield 'whitespace_2' => [
- <<<'EOT'
- <?php
- class Foo { public $one = 1; public $bar = null; public $initialized = false; public $configured = false; public $called=false; public $arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- , <<<'EOT'
- <?php
- class Foo { public $one = 1; public $bar = null,$initialized = false,$configured = false,$called=false,$arguments = array();
- function doSomething()
- {
- }
- }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { protected static $foo = 1; protected static $bar; protected static $baz=1; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { protected static $foo = 1, $bar, $baz=1; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { protected static $foo = 1; protected static $bar; protected static $baz=1; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { protected static $foo = 1, $bar, $baz=1; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { protected $foo = 1; protected $bar; protected $baz=2; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { protected $foo = 1, $bar, $baz=2; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { var $foo = 1; var $bar; var $baz=2; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { var $foo = 1, $bar, $baz=2; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { var $foo = 1; var $bar; public function doSomething1() {} var $baz=2; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { var $foo = 1, $bar; public function doSomething1() {} var $baz=2; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { var $foo = 1; var $bar; public function doSomething2() { global $one, $two, $three; } var $baz=2; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { var $foo = 1, $bar; public function doSomething2() { global $one, $two, $three; } var $baz=2; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { public function doSomething3() {} protected $foo = 1; protected $bar; protected $baz=2; }
- EOT
- , <<<'EOT'
- <?php
- class Foo { public function doSomething3() {} protected $foo = 1, $bar, $baz=2; }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { public function doSomethingElse() {} protected $foo = 1; protected $bar; protected $baz=2; private $acme =array(); }
- EOT
- , <<<'EOT'
- <?php
- class Foo { public function doSomethingElse() {} protected $foo = 1, $bar, $baz=2; private $acme =array(); }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { public function doSomewhere() {} protected $foo = 1; protected $bar; protected $baz=2; private $acme1 =array(); }
- EOT
- , <<<'EOT'
- <?php
- class Foo { public function doSomewhere() {} protected $foo = 1, $bar, $baz=2; private $acme1 =array(); }
- EOT
- ];
- yield [
- <<<'EOT'
- <?php
- class Foo { public function doThis() { global $one1, $two2, $three3; } protected $foo = 1; protected $bar; protected $baz=2; private $acme2 =array(); }
- EOT
- , <<<'EOT'
- <?php
- class Foo { public function doThis() { global $one1, $two2, $three3; } protected $foo = 1, $bar, $baz=2; private $acme2 =array(); }
- EOT
- ];
- yield [
- '<?php
- class Foo
- {
- const A = 1;
- const #
- B#
- =#
- 2#
- ;#
- }
- echo Foo::A, Foo::B;
- ',
- '<?php
- class Foo
- {
- const A = 1,#
- B#
- =#
- 2#
- ;#
- }
- echo Foo::A, Foo::B;
- ',
- ];
- yield [
- '<?php
- class Token {
- const PUBLIC_CONST = 0;
- private const PRIVATE_CONST = 0;
- protected const PROTECTED_CONST = 0;
- public const PUBLIC_CONST_TWO = 0;
- public const TEST_71 = 0;
- }
- ',
- '<?php
- class Token {
- const PUBLIC_CONST = 0;
- private const PRIVATE_CONST = 0;
- protected const PROTECTED_CONST = 0;
- public const PUBLIC_CONST_TWO = 0, TEST_71 = 0;
- }
- ',
- ];
- yield [
- '<?php class Foo {
- private int $foo;
- private int $bar;
- }',
- '<?php class Foo {
- private int $foo, $bar;
- }',
- ];
- yield [
- '<?php class Foo {
- protected ?string $foo;
- protected ?string $bar;
- }',
- '<?php class Foo {
- protected ?string $foo, $bar;
- }',
- ];
- yield [
- '<?php class Foo {
- public ? string $foo;
- public ? string $bar;
- }',
- '<?php class Foo {
- public ? string $foo, $bar;
- }',
- ];
- yield [
- '<?php class Foo {
- var ? Foo\Bar $foo;
- var ? Foo\Bar $bar;
- }',
- '<?php class Foo {
- var ? Foo\Bar $foo, $bar;
- }',
- ];
- yield [
- '<?php class Foo {
- var array $foo;
- var array $bar;
- }',
- '<?php class Foo {
- var array $foo, $bar;
- }',
- ];
- }
- /**
- * @param array<string, mixed> $configuration
- *
- * @dataProvider provideFixWithConfigurationCases
- */
- public function testFixWithConfiguration(array $configuration, string $expected): void
- {
- static $input = <<<'EOT'
- <?php
- class Foo
- {
- const SOME_CONST = 'a', OTHER_CONST = 'b';
- protected static $foo = 1, $bar = 2;
- }
- EOT;
- $this->fixer->configure(['elements' => $configuration]);
- $this->doTest($expected, $input);
- }
- public static function provideFixWithConfigurationCases(): iterable
- {
- yield [
- ['const', 'property'],
- <<<'EOT'
- <?php
- class Foo
- {
- const SOME_CONST = 'a';
- const OTHER_CONST = 'b';
- protected static $foo = 1;
- protected static $bar = 2;
- }
- EOT
- ];
- yield [
- ['const'],
- <<<'EOT'
- <?php
- class Foo
- {
- const SOME_CONST = 'a';
- const OTHER_CONST = 'b';
- protected static $foo = 1, $bar = 2;
- }
- EOT
- ];
- yield [
- ['property'],
- <<<'EOT'
- <?php
- class Foo
- {
- const SOME_CONST = 'a', OTHER_CONST = 'b';
- protected static $foo = 1;
- protected static $bar = 2;
- }
- EOT
- ];
- }
- public function testWrongConfig(): void
- {
- $this->expectException(InvalidFixerConfigurationException::class);
- $this->expectExceptionMessageMatches('/^\[single_class_element_per_statement\] Invalid configuration: The option "elements" .*\.$/');
- $this->fixer->configure(['elements' => ['foo']]);
- }
- /**
- * @dataProvider provideMessyWhitespacesCases
- */
- public function testMessyWhitespaces(string $expected, ?string $input = null): void
- {
- $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
- $this->doTest($expected, $input);
- }
- public static function provideMessyWhitespacesCases(): iterable
- {
- yield [
- "<?php\r\n\tclass Foo {\r\n\t\tconst AAA=0;\r\n\t\tconst BBB=1;\r\n\t}",
- "<?php\r\n\tclass Foo {\r\n\t\tconst AAA=0, BBB=1;\r\n\t}",
- ];
- }
- public function testAnonymousClassFixing(): void
- {
- $this->doTest(
- '<?php
- $a = new class() {
- const PUBLIC_CONST_TWO = 0;
- const TEST_70 = 0;
- public function a() {
- }
- };
- class C
- {
- public function A()
- {
- $a = new class() {
- const PUBLIC_CONST_TWO = 0;
- const TEST_70 = 0;
- public function a() {}
- };
- }
- }
- ',
- '<?php
- $a = new class() {
- const PUBLIC_CONST_TWO = 0, TEST_70 = 0;
- public function a() {
- }
- };
- class C
- {
- public function A()
- {
- $a = new class() {
- const PUBLIC_CONST_TWO = 0, TEST_70 = 0;
- public function a() {}
- };
- }
- }
- '
- );
- }
- /**
- * @dataProvider provideFix80Cases
- *
- * @requires PHP 8.0
- */
- public function testFix80(string $expected, string $input): void
- {
- $this->doTest($expected, $input);
- }
- public static function provideFix80Cases(): iterable
- {
- yield [
- '<?php
- class Foo
- {
- private string|int $prop1;
- private string|int $prop2;
- }
- ',
- '<?php
- class Foo
- {
- private string|int $prop1, $prop2;
- }
- ',
- ];
- }
- /**
- * @dataProvider provideFix81Cases
- *
- * @requires PHP 8.1
- */
- public function testFix81(string $expected, ?string $input = null): void
- {
- $this->doTest($expected, $input);
- }
- public static function provideFix81Cases(): iterable
- {
- yield [
- '<?php
- class Foo
- {
- readonly int $a;
- readonly int $b;
- public readonly int $c;
- public readonly int $d;
- readonly private string /*1*/$e;
- readonly private string /*2*/$f;
- readonly float $g;
- protected readonly float $h1;
- protected readonly float $h2;
- readonly float $z1;
- readonly float $z2;
- readonly float $z3;
- }',
- '<?php
- class Foo
- {
- readonly int $a, $b;
- public readonly int $c, $d;
- readonly private string /*1*/$e,/*2*/$f;
- readonly float $g;
- protected readonly float $h1, $h2;
- readonly float $z1, $z2, $z3;
- }',
- ];
- yield [
- '<?php
- class Foo
- {
- final public const B1 = "2";
- final public const B2 = "2";
- readonly float $z2;
- }
- ',
- ];
- yield [
- '<?php
- class Foo
- {
- private Foo&Bar $prop1;
- private Foo&Bar $prop2;
- }
- ',
- '<?php
- class Foo
- {
- private Foo&Bar $prop1, $prop2;
- }
- ',
- ];
- yield [
- "<?php
- enum Foo: string {
- public const A = 'A';
- public const B = 'B';
- case Hearts = 'H';
- case Spades = 'S';
- }
- var_dump(Foo::A.Foo::B);",
- "<?php
- enum Foo: string {
- public const A = 'A', B = 'B';
- case Hearts = 'H';
- case Spades = 'S';
- }
- var_dump(Foo::A.Foo::B);",
- ];
- }
- /**
- * @dataProvider provideFix82Cases
- *
- * @requires PHP 8.2
- */
- public function testFix82(string $expected, ?string $input = null): void
- {
- $this->doTest($expected, $input);
- }
- public static function provideFix82Cases(): iterable
- {
- yield [
- '<?php trait Foo { public const Bar = 1; public const Baz = 1; }',
- '<?php trait Foo { public const Bar = 1, Baz = 1; }',
- ];
- }
- }
|