123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464 |
- <?php
- /*
- * 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\Fixer\ClassNotation\ClassAttributesSeparationFixer;
- use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
- use PhpCsFixer\Tokenizer\Tokens;
- use PhpCsFixer\WhitespacesFixerConfig;
- /**
- * @internal
- *
- * @covers \PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer
- */
- final class ClassAttributesSeparationFixerTest extends AbstractFixerTestCase
- {
- /**
- * @param int $expected
- * @param string $code
- * @param int $index
- *
- * @dataProvider provideCommentBlockStartDetectionCases
- */
- public function testCommentBlockStartDetection($expected, $code, $index)
- {
- Tokens::clearCache();
- $tokens = Tokens::fromCode($code);
- $method = new \ReflectionMethod($this->fixer, 'findCommentBlockStart');
- $method->setAccessible(true);
- $result = $method->invoke($this->fixer, $tokens, $index);
- static::assertSame(
- $expected,
- $result,
- sprintf('Expected index %d (%s) got index %d (%s).', $expected, $tokens[$expected]->toJson(), $result, $tokens[$result]->toJson())
- );
- }
- public function provideCommentBlockStartDetectionCases()
- {
- return [
- [
- 4,
- '<?php
- //ui
- //j1
- //k2
- ',
- 6,
- ],
- [
- 4,
- '<?php
- //ui
- //j1
- //k2
- ',
- 5,
- ],
- [
- 4,
- '<?php
- /**/
- //j1
- //k2
- ',
- 6,
- ],
- [
- 4,
- '<?php
- $a;//j
- //k
- ',
- 6,
- ],
- [
- 2,
- '<?php
- //a
- ',
- 2,
- ],
- [
- 2,
- '<?php
- //b
- //c
- ',
- 2,
- ],
- [
- 2,
- '<?php
- //d
- //e
- ',
- 4,
- ],
- [
- 2,
- '<?php
- /**/
- //f
- //g
- //h
- ',
- 8,
- ],
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideFixClassesCases
- */
- public function testFixClasses($expected, $input = null)
- {
- $this->doTest($expected, $input);
- }
- public function provideFixClassesCases()
- {
- $cases = [];
- $cases[] = ['<?php
- class SomeClass1
- {
- // This comment
- // is multiline.
- public function echoA()
- {
- echo "a";
- }
- }
- '];
- $cases[] = [
- '<?php
- class SomeClass2
- {
- // This comment
- /* is multiline. */
- public function echoA()
- {
- echo "a";
- }
- }
- ',
- '<?php
- class SomeClass2
- {
- // This comment
- /* is multiline. */public function echoA()
- {
- echo "a";
- }
- }
- ',
- ];
- $cases[] = [
- '<?php
- class SomeClass3
- {
- // This comment
- // is multiline.
- public function echoA()
- {
- echo "a";
- }
- }
- ', ];
- $cases[] = [
- '<?php
- class SomeClass1
- {
- private $a; //
- public function methodA()
- {
- }
- private $b;
- //
- public function methodB()
- {
- }
- // C
- public function methodC()
- {
- }
- // D
- public function methodD()
- {
- }
- /* E */
- public function methodE()
- {
- }
- /* F */
- public function methodF()
- {
- }
- }
- ',
- '<?php
- class SomeClass1
- {
- private $a; //
- public function methodA()
- {
- }
- private $b;
- //
- public function methodB()
- {
- }
- // C
- public function methodC()
- {
- }
- // D
- public function methodD()
- {
- }
- /* E */
- public function methodE()
- {
- }
- /* F */
- public function methodF()
- {
- }
- }
- ', ];
- $cases[] = ['<?php
- class SomeClass
- {
- // comment
- public function echoA()
- {
- echo "a";
- }
- }
- '];
- $cases[] = ['<?php
- class SomeClass
- {
- // This comment
- // is multiline.
- public function echoA()
- {
- echo "a";
- }
- }
- '];
- $cases[] = [
- '<?php
- class SomeClass
- {
- // comment
- public function echoA()
- {
- echo "a";
- }
- }
- ',
- '<?php
- class SomeClass
- {
- // comment
- public function echoA()
- {
- echo "a";
- }
- }
- ',
- ];
- $cases[] = [
- '<?php
- class SomeClass
- {
- /* comment */
- public function echoB()
- {
- echo "a";
- }
- }
- ',
- '<?php
- class SomeClass
- {
- /* comment */public function echoB()
- {
- echo "a";
- }
- }
- ',
- ];
- $cases[] = [
- '<?php
- class SomeClass
- {
- /* comment */
- public function echoC()
- {
- echo "a";
- }
- }
- ',
- '<?php
- class SomeClass
- {
- /* comment */ public function echoC()
- {
- echo "a";
- }
- }
- ',
- ];
- $cases[] = [
- '<?php
- abstract class MethodTest2
- {
- public function method045()
- {
- $files = null;
- if (!empty($files)) {
- $this->filter(
- function (\SplFileInfo $file) use ($files) {
- return !in_array($file->getRelativePathname(), $files, true);
- }
- );
- }
- }
- private $a;
- public static function method145()
- {
- }
- abstract protected function method245();
- // comment
- final private function method345()
- {
- }
- }
- function some1(){ echo 1;}
- function some2(){ echo 2;}',
- '<?php
- abstract class MethodTest2
- {
- public function method045()
- {
- $files = null;
- if (!empty($files)) {
- $this->filter(
- function (\SplFileInfo $file) use ($files) {
- return !in_array($file->getRelativePathname(), $files, true);
- }
- );
- }
- }
- private $a;
- public static function method145()
- {
- }
- abstract protected function method245();
- // comment
- final private function method345()
- {
- }
- }
- function some1(){ echo 1;}
- function some2(){ echo 2;}',
- ];
- $cases[] = [
- '<?php
- /*
- * This file is part of the PHP CS utility.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
- namespace PhpCsFixer\Linter;
- /**
- * Dummy linter. No linting is performed. No error is raised.
- *
- * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
- *
- * @internal
- */
- final class NullLinter implements LinterInterface
- {
- /**
- * {@inheritdoc}
- */
- public function lintFile($path)
- {
- unset($path);
- }
- /**
- * {@inheritdoc}
- */
- public function lintSource($source)
- {
- unset($source);
- }
- }
- ',
- ];
- // do not touch anonymous functions (since PHP doesn't allow
- // for class attributes being functions :(, we only have to test
- // those used within methods)
- $cases[] = [
- '<?php
- class MethodTestAnonymous
- {
- public function method444a()
- {
- $text = "hello";
- $example = function ($arg) use ($message) {
- var_dump($arg . " " . $message);
- };
- $example($text);
- $example = function($arg) use ($message) {
- var_dump($arg . " " . $message);
- };
- $example = function /*test*/ ($arg) use ($message) {
- var_dump($arg . " " . $message);
- };
- }
- }',
- ];
- $cases[] = [
- '<?php
- class MethodTest1
- {
- private $c; //
- public function method444a()
- {
- }
- /**
- *
- */
- public function method444b()
- {
- }
- //
- public function method444c()
- {
- }
- private $a;
- public function method444d()
- {
- }
- private $b;
- //
- public function method444e()
- {
- }
- public function method444f()
- {
- }
- private $d; //
- public function method444f1()
- {
- }
- /**/
- public function method444g()
- {
- }
- }',
- '<?php
- class MethodTest1
- {
- private $c; //
- public function method444a()
- {
- }
- /**
- *
- */
- public function method444b()
- {
- }
- //
- public function method444c()
- {
- }
- private $a;
- public function method444d()
- {
- }
- private $b;
- //
- public function method444e()
- {
- }
- public function method444f()
- {
- }
- private $d; //
- public function method444f1()
- {
- }
- /**/
- public function method444g()
- {
- }
- }',
- ];
- // spaces between methods
- $cases[] = [
- '<?php
- abstract class MethodTest3
- {
- public function method021()
- {
- }
- public static function method121()
- {
- }
- abstract protected function method221(); '.'
- final private function method321a()
- {
- }
- }',
- '<?php
- abstract class MethodTest3
- {
- public function method021()
- {
- }
- public static function method121()
- {
- }
- abstract protected function method221();
- '.'
- final private function method321a()
- {
- }
- }', ];
- // don't change correct code
- $cases[] = [
- '<?php
- class SmallHelperException extends \Exception
- {
- public function getId111()
- {
- return 1;
- }
- public function getMessage111()
- {
- return \'message\';
- }
- }
- class MethodTest123124124
- {
- public function method111a(){}
- public function method211a(){}
- }',
- ];
- // do not touch function out of class scope
- $cases[] = [
- '<?php
- function some0() {
- }
- class MethodTest4
- {
- public function method122b()
- {
- }
- public function method222b()
- {
- }
- }
- function some() {
- }
- function some2() {
- }
- ',
- ];
- $cases[] = [
- '<?php interface A {
- public function B1(); // allowed comment
- public function C(); // allowed comment
- }',
- '<?php interface A {public function B1(); // allowed comment
- public function C(); // allowed comment
- }',
- ];
- $cases[] = [
- '<?php class Foo {
- var $a;
- var $b;
- }',
- '<?php class Foo {
- var $a;
- var $b;
- }',
- ];
- $cases[] = [
- '<?php
- class A
- {
- /** 1 */
- function A2() {}
- /** 2 */
- function B2() {}
- }
- ',
- '<?php
- class A
- {
- /** 1 */
- function A2() {}
- /** 2 */
- function B2() {}
- }
- ',
- ];
- return $cases;
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideFixTraitsCases
- */
- public function testFixTraits($expected, $input = null)
- {
- $this->doTest($expected, $input);
- }
- public function provideFixTraitsCases()
- {
- $cases = [];
- // do not touch well formatted traits
- $cases[] = [
- '<?php
- trait OkTrait
- {
- function getReturnTypeOk()
- {
- }
- /**
- *
- */
- function getReturnDescriptionOk()
- {
- }
- }',
- ];
- $cases[] = [
- '<?php
- trait ezcReflectionReturnInfo {
- public $x = 1;
- protected function getA(){echo 1;}
- function getB(){echo 2;}
- protected function getC(){echo 3;}
- /** Description */
- function getD(){echo 4;}
- protected function getE(){echo 3;}
- private $a;
- function getF(){echo 4;}
- }',
- '<?php
- trait ezcReflectionReturnInfo {
- public $x = 1;
- protected function getA(){echo 1;}function getB(){echo 2;}
- protected function getC(){echo 3;}/** Description */function getD(){echo 4;}
- protected function getE(){echo 3;}private $a;function getF(){echo 4;}
- }',
- ];
- $cases[] = [
- '<?php
- trait SomeReturnInfo {
- function getReturnType()
- {
- }
- function getReturnDescription()
- {
- }
- function getReturnDescription2()
- {
- }
- abstract public function getWorld();
- }',
- '<?php
- trait SomeReturnInfo {
- function getReturnType()
- {
- }
- function getReturnDescription()
- {
- } function getReturnDescription2()
- {
- }
- abstract public function getWorld();
- }',
- ];
- return $cases;
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideFixInterfaceCases
- */
- public function testFixInterface($expected, $input = null)
- {
- $this->doTest($expected, $input);
- }
- public function provideFixInterfaceCases()
- {
- $cases = [];
- $cases[] = [
- '<?php
- interface TestInterface
- {
- public function someInterfaceMethod4();
- public function someInterfaceMethod5();
- /**
- * {@link}
- */ '.'
- public function someInterfaceMethod6();
- public function someInterfaceMethod7();
- public function someInterfaceMethod8();
- }',
- '<?php
- interface TestInterface
- { public function someInterfaceMethod4();
- public function someInterfaceMethod5();
- /**
- * {@link}
- */ '.'
- public function someInterfaceMethod6();
- public function someInterfaceMethod7(); public function someInterfaceMethod8();
- }',
- ];
- // do not touch well formatted interfaces
- $cases[] = [
- '<?php
- interface TestInterfaceOK
- {
- public function someMethod1();
- public function someMethod2();
- }',
- ];
- // method after trait use
- $cases[] = [
- '<?php
- trait ezcReflectionReturnInfo {
- function getReturnDescription() {}
- }
- class ezcReflectionMethod extends ReflectionMethod {
- use ezcReflectionReturnInfo;
- function afterUseTrait(){}
- function afterUseTrait2(){}
- }',
- '<?php
- trait ezcReflectionReturnInfo {
- function getReturnDescription() {}
- }
- class ezcReflectionMethod extends ReflectionMethod {
- use ezcReflectionReturnInfo;function afterUseTrait(){}function afterUseTrait2(){}
- }',
- ];
- return $cases;
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideMessyWhitespacesCases
- */
- public function testMessyWhitespaces($expected, $input = null)
- {
- $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
- $this->doTest($expected, $input);
- }
- public function provideMessyWhitespacesCases()
- {
- return [
- [
- "<?php\r\nclass SomeClass\r\n{\r\n // comment\n\n public function echoA()\r\n {\r\n echo 'a';\r\n }\r\n}\r\n",
- "<?php\r\nclass SomeClass\r\n{\r\n // comment\n\n\n public function echoA()\r\n {\r\n echo 'a';\r\n }\r\n}\r\n",
- ],
- [
- "<?php\r\nclass SomeClass\r\n{\r\n // comment\r\n\r\n public function echoA()\r\n {\r\n echo 'a';\r\n }\r\n}\r\n",
- "<?php\r\nclass SomeClass\r\n{\r\n // comment\r\n\r\n\r\n public function echoA()\r\n {\r\n echo 'a';\r\n }\r\n}\r\n",
- ],
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideConfigCases
- */
- public function testWithConfig($expected, $input = null, array $config = [])
- {
- $this->fixer->configure($config);
- $this->doTest($expected, $input);
- }
- public function provideConfigCases()
- {
- return [
- [
- '<?php
- class A
- {
- private $a = null;
- public $b = 1;
- function A() {}
- }
- ',
- '<?php
- class A
- {
- private $a = null;
- public $b = 1;
- function A() {}
- }
- ',
- ['elements' => ['property' => ClassAttributesSeparationFixer::SPACING_ONE]],
- ],
- [
- '<?php
- class A
- {
- private $a = null;
- public $b = 1;
- function A() {}
- }
- ',
- '<?php
- class A
- {
- private $a = null;
- public $b = 1;
- function A() {}
- }
- ',
- ['elements' => ['property' => ClassAttributesSeparationFixer::SPACING_NONE]],
- ],
- [
- '<?php
- class A
- {
- const A = 1;
- const THREE = ONE + self::TWO; /* test */ # test
- const B = 2;
- }
- ',
- '<?php
- class A
- {
- const A = 1;
- const THREE = ONE + self::TWO; /* test */ # test
- const B = 2;
- }
- ',
- ['elements' => ['const' => ClassAttributesSeparationFixer::SPACING_ONE]],
- ],
- [
- '<?php
- class A
- {
- const A = 1;
- const THREE = ONE + self::TWO;
- const B = 2;
- }
- ',
- '<?php
- class A
- {
- const A = 1;
- const THREE = ONE + self::TWO;
- const B = 2;
- }
- ',
- ['elements' => ['const' => ClassAttributesSeparationFixer::SPACING_NONE]],
- ],
- [
- '<?php
- class A
- {
- function D() {}
- function B4() {}
- }
- ',
- '<?php
- class A
- {
- function D() {}
- function B4() {}
- }
- ',
- ['elements' => ['method' => ClassAttributesSeparationFixer::SPACING_ONE]],
- ],
- [
- '<?php
- class A
- {
- function A() {}
- function B() {}
- }
- ',
- '<?php
- class A
- {
- function A() {}
- function B() {}
- }
- ',
- ['elements' => ['method' => ClassAttributesSeparationFixer::SPACING_NONE]],
- ],
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideDeprecatedConfigCases
- * @group legacy
- * @expectedDeprecation A list of elements is deprecated, use a dictionary of `const|method|property` => `none|one` instead.
- */
- public function testWithDeprecatedConfig($expected, $input = null, array $config = [])
- {
- $this->fixer->configure($config);
- $this->doTest($expected, $input);
- }
- public function provideDeprecatedConfigCases()
- {
- return [
- [
- '<?php
- class A
- {
- private $a = null;
- public $b = 1;
- function E() {}
- }
- ',
- '<?php
- class A
- {
- private $a = null;
- public $b = 1;
- function E() {}
- }
- ',
- ['elements' => ['property']],
- ],
- [
- '<?php
- class A
- {
- function F() {}
- function B5() {}
- }
- ',
- '<?php
- class A
- {
- function F() {}
- function B5() {}
- }
- ',
- ['elements' => ['method']],
- ],
- [
- '<?php
- class A
- {
- const A = 1;
- const THREE = ONE + self::TWO; /* test */ # test
- const B = 2;
- }
- ',
- '<?php
- class A
- {
- const A = 1;
- const THREE = ONE + self::TWO; /* test */ # test
- const B = 2;
- }
- ',
- ['elements' => ['const']],
- ],
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideFix70Cases
- * @requires PHP 7.0
- */
- public function testFix70($expected, $input = null)
- {
- $this->doTest($expected, $input);
- }
- public function provideFix70Cases()
- {
- $to = $from = '<?php ';
- for ($i = 0; $i < 15; ++$i) {
- $from .= sprintf('class A%d{public function GA%d(){return new class {public function B6B%d(){}};}public function otherFunction%d(){}}', $i, $i, $i, $i);
- $to .= sprintf("class A%d{\npublic function GA%d(){return new class {\npublic function B6B%d(){}\n};}\n\npublic function otherFunction%d(){}\n}", $i, $i, $i, $i);
- }
- return [
- [$to, $from],
- [
- '<?php $a = new class {
- public function H(){}
- public function B7(){}
- private function C(){}
- };',
- '<?php $a = new class {
- public function H(){}
- public function B7(){}
- private function C(){}
- };',
- ],
- [
- '<?php
- class A
- {
- public function getFilter()
- {
- return new class () implements FilterInterface {
- private $d = 123;
- public function pass($a, $b) {
- echo $a;
- }
- public $e = 5;
- };}
- }
- ',
- '<?php
- class A
- {public function getFilter()
- {
- return new class () implements FilterInterface {private $d = 123;
- public function pass($a, $b) {
- echo $a;
- }
- public $e = 5;};}
- }
- ',
- ],
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideFix71Cases
- * @requires PHP 7.1
- */
- public function testFix71($expected, $input = null)
- {
- $this->fixer->configure([
- 'elements' => ['method' => ClassAttributesSeparationFixer::SPACING_ONE, 'const' => ClassAttributesSeparationFixer::SPACING_ONE],
- ]);
- $this->doTest($expected, $input);
- }
- public function provideFix71Cases()
- {
- return [
- [
- '<?php
- class Foo {
- public function H1(){}
- /** */
- public const BAR = 123;
- /** */
- private const BAZ = "a";
- }',
- '<?php
- class Foo {
- public function H1(){}
- /** */
- public const BAR = 123;
- /** */
- private const BAZ = "a";
- }',
- ],
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideFix74Cases
- * @requires PHP 7.4
- */
- public function testFix74($expected, $input = null)
- {
- $this->doTest($expected, $input);
- }
- public function provideFix74Cases()
- {
- yield [
- '<?php
- class Foo {
- private ?int $foo;
- protected string $bar;
- public iterable $baz;
- var ? Foo\Bar $qux;
- }',
- '<?php
- class Foo {
- private ?int $foo;
- protected string $bar;
- public iterable $baz;
- var ? Foo\Bar $qux;
- }',
- ];
- yield [
- '<?php
- class Foo {
- private array $foo;
- private array $bar;
- }',
- '<?php
- class Foo {
- private array $foo;
- private array $bar;
- }',
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideFixPhp80Cases
- * @requires PHP 8.0
- */
- public function testFixPhp80($expected, $input = null)
- {
- $this->doTest($expected, $input);
- }
- public function provideFixPhp80Cases()
- {
- yield 'attributes' => [
- '<?php
- class User1
- {
- #[ORM\Id, ORM\Column("integer"), ORM\GeneratedValue]
- private $id;
- #[ORM\Column("string", ORM\Column::UNIQUE)]
- #[Assert\String()]
- #[Assert\Email(["message" => "The email {{ value }} is not a valid email."])]
- private $email;
- #[Assert\String()]
- private $name;
- }',
- '<?php
- class User1
- {
- #[ORM\Id, ORM\Column("integer"), ORM\GeneratedValue]
- private $id;
- #[ORM\Column("string", ORM\Column::UNIQUE)]
- #[Assert\String()]
- #[Assert\Email(["message" => "The email {{ value }} is not a valid email."])]
- private $email;
- #[Assert\String()]
- private $name;
- }',
- ];
- yield 'attributes minimal' => [
- '<?php
- class User2{
- #[ORM\Id, ORM\Column("integer"), ORM\GeneratedValue]
- private $id;
- }',
- '<?php
- class User2{#[ORM\Id, ORM\Column("integer"), ORM\GeneratedValue] private $id;}',
- ];
- yield 'attributes not blocks' => [
- '<?php
- class User3
- {
- private $id;
- #[ORM\Column("string")]
- #[Assert\Email(["message" => "Foo"])]
- private $email;
- }',
- '<?php
- class User3
- {
- private $id;
- #[ORM\Column("string")]
- #[Assert\Email(["message" => "Foo"])] private $email;
- }',
- ];
- yield 'constructor property promotion' => [
- '<?php
- class Foo {
- private array $foo;
- private array $bar;
- public function __construct(
- public float $x = 0.0,
- protected float $y = 0.0,
- private float $z = 0.0,
- ) {}
- }',
- '<?php
- class Foo {
- private array $foo;
- private array $bar;
- public function __construct(
- public float $x = 0.0,
- protected float $y = 0.0,
- private float $z = 0.0,
- ) {}
- }',
- ];
- yield 'typed properties' => [
- '<?php
- class Foo {
- private static int | float | null $a;
- private static int | float | null $b;
- private int | float | null $c;
- private int | float | null $d;
- }',
- '<?php
- class Foo {
- private static int | float | null $a;
- private static int | float | null $b;
- private int | float | null $c;
- private int | float | null $d;
- }',
- ];
- }
- }
|