1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072 |
- <?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\Semicolon;
- use PhpCsFixer\Fixer\Semicolon\MultilineWhitespaceBeforeSemicolonsFixer;
- use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
- use PhpCsFixer\WhitespacesFixerConfig;
- /**
- * @author John Kelly <wablam@gmail.com>
- * @author Graham Campbell <hello@gjcampbell.co.uk>
- * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
- * @author Egidijus Girčys <e.gircys@gmail.com>
- *
- * @internal
- *
- * @covers \PhpCsFixer\Fixer\Semicolon\MultilineWhitespaceBeforeSemicolonsFixer
- */
- final class MultilineWhitespaceBeforeSemicolonsFixerTest extends AbstractFixerTestCase
- {
- /**
- * @dataProvider provideMultiLineWhitespaceFixCases
- */
- public function testFixMultiLineWhitespace(string $expected, ?string $input = null): void
- {
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NO_MULTI_LINE]);
- $this->doTest($expected, $input);
- }
- public static function provideMultiLineWhitespaceFixCases(): array
- {
- return [
- [
- '<?php
- $foo->bar(); // test',
- '<?php
- $foo->bar() // test
- ;',
- ],
- [
- '<?php echo(1); // test',
- "<?php echo(1) // test\n;",
- ],
- [
- "<?php echo(1); // test\n",
- ],
- [
- '<?php
- $foo->bar(); # test',
- '<?php
- $foo->bar() # test
- ;',
- ],
- [
- '<?php
- $foo->bar();// test',
- '<?php
- $foo->bar()// test
- ;',
- ],
- [
- "<?php\n;",
- ],
- [
- '<?php
- $this
- ->setName(\'readme1\')
- ->setDescription(\'Generates the README\');
- ',
- '<?php
- $this
- ->setName(\'readme1\')
- ->setDescription(\'Generates the README\')
- ;
- ',
- ],
- [
- '<?php
- $this
- ->setName(\'readme2\')
- ->setDescription(\'Generates the README\');
- ',
- '<?php
- $this
- ->setName(\'readme2\')
- ->setDescription(\'Generates the README\')
- ;
- ',
- ],
- [
- '<?php echo "$this->foo(\'with param containing ;\') ;" ;',
- ],
- [
- '<?php $this->foo();',
- ],
- [
- '<?php $this->foo() ;',
- ],
- [
- '<?php $this->foo(\'with param containing ;\') ;',
- ],
- [
- '<?php $this->foo(\'with param containing ) ; \') ;',
- ],
- [
- '<?php $this->foo("with param containing ) ; ") ; ?>',
- ],
- [
- '<?php $this->foo("with semicolon in string) ; "); ?>',
- ],
- [
- '<?php
- $this
- ->example();',
- '<?php
- $this
- ->example()
- ;',
- ],
- [
- '<?php
- Foo::bar(); // test',
- '<?php
- Foo::bar() // test
- ;',
- ],
- [
- '<?php
- Foo::bar(); # test',
- '<?php
- Foo::bar() # test
- ;',
- ],
- [
- '<?php
- self
- ::setName(\'readme1\')
- ->setDescription(\'Generates the README\');
- ',
- '<?php
- self
- ::setName(\'readme1\')
- ->setDescription(\'Generates the README\')
- ;
- ',
- ],
- [
- '<?php
- self
- ::setName(\'readme2\')
- ->setDescription(\'Generates the README\');
- ',
- '<?php
- self
- ::setName(\'readme2\')
- ->setDescription(\'Generates the README\')
- ;
- ',
- ],
- [
- '<?php echo "self::foo(\'with param containing ;\') ;" ;',
- ],
- [
- '<?php self::foo();',
- ],
- [
- '<?php self::foo() ;',
- ],
- [
- '<?php self::foo(\'with param containing ;\') ;',
- ],
- [
- '<?php self::foo(\'with param containing ) ; \') ;',
- ],
- [
- '<?php self::foo("with param containing ) ; ") ; ?>',
- ],
- [
- '<?php self::foo("with semicolon in string) ; "); ?>',
- ],
- [
- '<?php
- self
- ::example();',
- '<?php
- self
- ::example()
- ;',
- ],
- [
- '<?php
- $seconds = $minutes
- * 60; // seconds in a minute',
- '<?php
- $seconds = $minutes
- * 60 // seconds in a minute
- ;',
- ],
- [
- '<?php
- $seconds = $minutes
- * (int) \'60\'; // seconds in a minute',
- '<?php
- $seconds = $minutes
- * (int) \'60\' // seconds in a minute
- ;',
- ],
- [
- '<?php
- $secondsPerMinute = 60;
- $seconds = $minutes
- * $secondsPerMinute; // seconds in a minute',
- '<?php
- $secondsPerMinute = 60;
- $seconds = $minutes
- * $secondsPerMinute // seconds in a minute
- ;',
- ],
- [
- '<?php
- $secondsPerMinute = 60;
- $seconds = $minutes
- * 60 * (int) true; // seconds in a minute',
- '<?php
- $secondsPerMinute = 60;
- $seconds = $minutes
- * 60 * (int) true // seconds in a minute
- ;',
- ],
- ];
- }
- /**
- * @dataProvider provideMessyWhitespacesMultiLineWhitespaceFixCases
- */
- public function testMessyWhitespacesMultiLineWhitespace(string $expected, ?string $input = null): void
- {
- $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NO_MULTI_LINE]);
- $this->doTest($expected, $input);
- }
- public static function provideMessyWhitespacesMultiLineWhitespaceFixCases(): array
- {
- return [
- [
- '<?php echo(1); // test',
- "<?php echo(1) // test\r\n;",
- ],
- ];
- }
- /**
- * @dataProvider provideSemicolonForChainedCallsFixCases
- */
- public function testSemicolonForChainedCallsFix(string $expected, ?string $input = null): void
- {
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NEW_LINE_FOR_CHAINED_CALLS]);
- $this->doTest($expected, $input);
- }
- public static function provideSemicolonForChainedCallsFixCases(): array
- {
- return [
- [
- '<?php
- $this
- ->method1()
- ->method2()
- ;
- ?>',
- '<?php
- $this
- ->method1()
- ->method2();
- ?>',
- ],
- [
- '<?php
- $this
- ->method1()
- ->method2() // comment
- ;
- ',
- '<?php
- $this
- ->method1()
- ->method2(); // comment
- ',
- ],
- [
- '<?php
- $service->method1()
- ->method2()
- ;
- $service->method3();
- $this
- ->method1()
- ->method2()
- ;',
- '<?php
- $service->method1()
- ->method2()
- ;
- $service->method3();
- $this
- ->method1()
- ->method2();',
- ],
- [
- '<?php
- $service
- ->method2()
- ;
- ?>',
- '<?php
- $service
- ->method2();
- ?>',
- ],
- [
- '<?php
- $service->method1()
- ->method2()
- ->method3()
- ->method4()
- ;
- ?>',
- '<?php
- $service->method1()
- ->method2()
- ->method3()
- ->method4();
- ?>',
- ],
- [
- '<?php
- $this->service->method1()
- ->method2([1, 2])
- ->method3(
- "2",
- 2,
- [1, 2]
- )
- ->method4()
- ;
- ?>',
- '<?php
- $this->service->method1()
- ->method2([1, 2])
- ->method3(
- "2",
- 2,
- [1, 2]
- )
- ->method4();
- ?>',
- ],
- [
- '<?php
- $service
- ->method1()
- ->method2()
- ->method3()
- ->method4()
- ;
- ?>',
- '<?php
- $service
- ->method1()
- ->method2()
- ->method3()
- ->method4();
- ?>',
- ],
- [
- '<?php
- $f = "g";
- $service
- ->method1("a", true)
- ->method2(true, false)
- ->method3([1, 2, 3], ["a" => "b", "c" => 1, "d" => true])
- ->method4(1, "a", $f)
- ;
- ?>',
- '<?php
- $f = "g";
- $service
- ->method1("a", true)
- ->method2(true, false)
- ->method3([1, 2, 3], ["a" => "b", "c" => 1, "d" => true])
- ->method4(1, "a", $f);
- ?>',
- ],
- [
- '<?php
- $f = "g";
- $service
- ->method1("a", true) // this is a comment
- /* ->method2(true, false) */
- ->method3([1, 2, 3], ["a" => "b", "c" => 1, "d" => true])
- ->method4(1, "a", $f) /* this is a comment */
- ;
- ?>',
- '<?php
- $f = "g";
- $service
- ->method1("a", true) // this is a comment
- /* ->method2(true, false) */
- ->method3([1, 2, 3], ["a" => "b", "c" => 1, "d" => true])
- ->method4(1, "a", $f); /* this is a comment */
- ?>',
- ],
- [
- '<?php
- $service->method1();
- $service->method2()->method3();
- ?>',
- ],
- [
- '<?php
- $service->method1() ;
- $service->method2()->method3() ;
- ?>',
- ],
- [
- '<?php
- $service
- ->method2(function ($a) {
- $a->otherCall()
- ->a()
- ->b()
- ;
- })
- ;
- ?>',
- '<?php
- $service
- ->method2(function ($a) {
- $a->otherCall()
- ->a()
- ->b()
- ;
- });
- ?>',
- ],
- [
- '<?php
- $data = $service
- ->method2(function ($a) {
- $a->otherCall()
- ->a()
- ->b(array_merge([
- 1 => 1,
- 2 => 2,
- ], $this->getOtherArray()
- ))
- ;
- })
- ;
- ?>',
- '<?php
- $data = $service
- ->method2(function ($a) {
- $a->otherCall()
- ->a()
- ->b(array_merge([
- 1 => 1,
- 2 => 2,
- ], $this->getOtherArray()
- ));
- });
- ?>',
- ],
- [
- '<?php
- $service
- ->method1(null, null, [
- null => null,
- 1 => $data->getId() > 0,
- ])
- ->method2(4, Type::class)
- ;
- ',
- '<?php
- $service
- ->method1(null, null, [
- null => null,
- 1 => $data->getId() > 0,
- ])
- ->method2(4, Type::class);
- ',
- ],
- [
- '<?php
- $this
- ->method1()
- ->method2()
- ;
- ?>',
- '<?php
- $this
- ->method1()
- ->method2();
- ?>',
- ],
- [
- '<?php
- self
- ::method1()
- ->method2()
- ;
- ?>',
- '<?php
- self
- ::method1()
- ->method2();
- ?>',
- ],
- [
- '<?php
- self
- ::method1()
- ->method2() // comment
- ;
- ',
- '<?php
- self
- ::method1()
- ->method2(); // comment
- ',
- ],
- [
- '<?php
- Service::method1()
- ->method2()
- ;
- Service::method3();
- $this
- ->method1()
- ->method2()
- ;',
- '<?php
- Service::method1()
- ->method2()
- ;
- Service::method3();
- $this
- ->method1()
- ->method2();',
- ],
- [
- '<?php
- Service
- ::method2()
- ;
- ?>',
- '<?php
- Service
- ::method2();
- ?>',
- ],
- [
- '<?php
- Service::method1()
- ->method2()
- ->method3()
- ->method4()
- ;
- ?>',
- '<?php
- Service::method1()
- ->method2()
- ->method3()
- ->method4();
- ?>',
- ],
- [
- '<?php
- self::method1()
- ->method2([1, 2])
- ->method3(
- "2",
- 2,
- [1, 2]
- )
- ->method4()
- ;
- ?>',
- '<?php
- self::method1()
- ->method2([1, 2])
- ->method3(
- "2",
- 2,
- [1, 2]
- )
- ->method4();
- ?>',
- ],
- [
- '<?php
- Service
- ::method1()
- ->method2()
- ->method3()
- ->method4()
- ;
- ?>',
- '<?php
- Service
- ::method1()
- ->method2()
- ->method3()
- ->method4();
- ?>',
- ],
- [
- '<?php
- $f = "g";
- Service
- ::method1("a", true)
- ->method2(true, false)
- ->method3([1, 2, 3], ["a" => "b", "c" => 1, "d" => true])
- ->method4(1, "a", $f)
- ;
- ?>',
- '<?php
- $f = "g";
- Service
- ::method1("a", true)
- ->method2(true, false)
- ->method3([1, 2, 3], ["a" => "b", "c" => 1, "d" => true])
- ->method4(1, "a", $f);
- ?>',
- ],
- [
- '<?php
- $f = "g";
- Service
- ::method1("a", true) // this is a comment
- /* ->method2(true, false) */
- ->method3([1, 2, 3], ["a" => "b", "c" => 1, "d" => true])
- ->method4(1, "a", $f) /* this is a comment */
- ;
- ?>',
- '<?php
- $f = "g";
- Service
- ::method1("a", true) // this is a comment
- /* ->method2(true, false) */
- ->method3([1, 2, 3], ["a" => "b", "c" => 1, "d" => true])
- ->method4(1, "a", $f); /* this is a comment */
- ?>',
- ],
- [
- '<?php
- Service::method1();
- Service::method2()->method3();
- ?>',
- ],
- [
- '<?php
- Service::method1() ;
- Service::method2()->method3() ;
- ?>',
- ],
- [
- '<?php
- Service
- ::method2(function ($a) {
- $a->otherCall()
- ->a()
- ->b()
- ;
- })
- ;
- ?>',
- '<?php
- Service
- ::method2(function ($a) {
- $a->otherCall()
- ->a()
- ->b()
- ;
- });
- ?>',
- ],
- [
- '<?php
- $data = Service
- ::method2(function () {
- Foo::otherCall()
- ->a()
- ->b(array_merge([
- 1 => 1,
- 2 => 2,
- ], $this->getOtherArray()
- ))
- ;
- })
- ;
- ?>',
- '<?php
- $data = Service
- ::method2(function () {
- Foo::otherCall()
- ->a()
- ->b(array_merge([
- 1 => 1,
- 2 => 2,
- ], $this->getOtherArray()
- ));
- });
- ?>',
- ],
- [
- '<?php
- Service
- ::method1(null, null, [
- null => null,
- 1 => $data->getId() > 0,
- ])
- ->method2(4, Type::class)
- ;
- ',
- '<?php
- Service
- ::method1(null, null, [
- null => null,
- 1 => $data->getId() > 0,
- ])
- ->method2(4, Type::class);
- ',
- ],
- [
- '<?php
- Service
- ::method1()
- ->method2()
- ;
- ?>',
- '<?php
- Service
- ::method1()
- ->method2();
- ?>',
- ],
- [
- '<?php
- function foo($bar)
- {
- if ($bar === 1) {
- $baz
- ->bar()
- ;
- }
- return (new Foo($bar))
- ->baz()
- ;
- }
- ?>',
- '<?php
- function foo($bar)
- {
- if ($bar === 1) {
- $baz
- ->bar();
- }
- return (new Foo($bar))
- ->baz();
- }
- ?>',
- ],
- [
- '<?php
- $foo = (new Foo($bar))
- ->baz()
- ;
- function foo($bar)
- {
- $foo = (new Foo($bar))
- ->baz()
- ;
- }
- ?>',
- '<?php
- $foo = (new Foo($bar))
- ->baz();
- function foo($bar)
- {
- $foo = (new Foo($bar))
- ->baz();
- }
- ?>',
- ],
- [
- '<?php
- $object
- ->methodA()
- ->methodB()
- ;
- ',
- '<?php
- $object
- ->methodA()
- ->methodB();
- ',
- ],
- [
- '<?php $object
- ->methodA()
- ->methodB()
- ;
- ',
- '<?php $object
- ->methodA()
- ->methodB();
- ',
- ],
- [
- "<?php\n\$this\n ->one()\n ->two(2, )\n;",
- "<?php\n\$this\n ->one()\n ->two(2, );",
- ],
- [
- "<?php\n\$this\n ->one(1, )\n ->two()\n;",
- "<?php\n\$this\n ->one(1, )\n ->two();",
- ],
- [
- '<?php
- $foo->bar();
- Service::method1()
- ->method2()
- ->method3()->method4()
- ;
- ?>',
- '<?php
- $foo->bar()
- ;
- Service::method1()
- ->method2()
- ->method3()->method4();
- ?>',
- ],
- [
- '<?php
- $foo->bar();
- \Service::method1()
- ->method2()
- ->method3()->method4()
- ;
- ?>',
- '<?php
- $foo->bar()
- ;
- \Service::method1()
- ->method2()
- ->method3()->method4();
- ?>',
- ],
- [
- '<?php
- $foo->bar();
- Ns\Service::method1()
- ->method2()
- ->method3()->method4()
- ;
- ?>',
- '<?php
- $foo->bar()
- ;
- Ns\Service::method1()
- ->method2()
- ->method3()->method4();
- ?>',
- ],
- [
- '<?php
- $foo->bar();
- \Ns\Service::method1()
- ->method2()
- ->method3()->method4()
- ;
- ?>',
- '<?php
- $foo->bar()
- ;
- \Ns\Service::method1()
- ->method2()
- ->method3()->method4();
- ?>',
- ],
- [
- '<?php
- $this
- ->setName(\'readme2\')
- ->setDescription(\'Generates the README\')
- ;
- ',
- '<?php
- $this
- ->setName(\'readme2\')
- ->setDescription(\'Generates the README\')
- ;
- ',
- ],
- [
- '<?php
- $this
- ->foo()
- ->{$bar ? \'bar\' : \'baz\'}()
- ;
- ',
- ],
- ];
- }
- /**
- * @dataProvider provideMessyWhitespacesSemicolonForChainedCallsFixCases
- */
- public function testMessyWhitespacesSemicolonForChainedCalls(string $expected, ?string $input = null): void
- {
- $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NEW_LINE_FOR_CHAINED_CALLS]);
- $this->doTest($expected, $input);
- }
- public static function provideMessyWhitespacesSemicolonForChainedCallsFixCases(): array
- {
- return [
- [
- "<?php\r\n\r\n \$this\r\n\t->method1()\r\n\t\t->method2()\r\n ;",
- "<?php\r\n\r\n \$this\r\n\t->method1()\r\n\t\t->method2();",
- ],
- [
- "<?php\r\n\r\n\t\$this->method1()\r\n\t\t->method2()\r\n\t\t->method(3)\r\n\t;",
- "<?php\r\n\r\n\t\$this->method1()\r\n\t\t->method2()\r\n\t\t->method(3);",
- ],
- [
- "<?php\r\n\r\n\t\$data = \$service\r\n\t ->method2(function (\$a) {\r\n\t\t\t\$a->otherCall()\r\n\t\t\t\t->a()\r\n\t\t\t\t->b(array_merge([\r\n\t\t\t\t\t\t1 => 1,\r\n\t\t\t\t\t\t2 => 2,\r\n\t\t\t\t\t], \$this->getOtherArray()\r\n\t\t\t\t))\r\n\t\t\t;\r\n\t\t})\r\n\t;\r\n?>",
- "<?php\r\n\r\n\t\$data = \$service\r\n\t ->method2(function (\$a) {\r\n\t\t\t\$a->otherCall()\r\n\t\t\t\t->a()\r\n\t\t\t\t->b(array_merge([\r\n\t\t\t\t\t\t1 => 1,\r\n\t\t\t\t\t\t2 => 2,\r\n\t\t\t\t\t], \$this->getOtherArray()\r\n\t\t\t\t));\r\n\t\t});\r\n?>",
- ],
- ];
- }
- /**
- * @requires PHP 8.0
- */
- public function testFix80(): void
- {
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NEW_LINE_FOR_CHAINED_CALLS]);
- $this->doTest(
- '<?php
- $foo?->method1()
- ?->method2()
- ?->method3()
- ;
- ',
- '<?php
- $foo?->method1()
- ?->method2()
- ?->method3();
- '
- );
- }
- }
|