123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909 |
- <?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\Semicolon;
- use PhpCsFixer\Fixer\Semicolon\MultilineWhitespaceBeforeSemicolonsFixer;
- use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
- use PhpCsFixer\WhitespacesFixerConfig;
- /**
- * @author John Kelly <wablam@gmail.com>
- * @author Graham Campbell <graham@alt-three.com>
- * @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
- {
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideMultiLineWhitespaceFixCases
- */
- public function testFixMultiLineWhitespace($expected, $input = null)
- {
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NO_MULTI_LINE]);
- $this->doTest($expected, $input);
- }
- public function provideMultiLineWhitespaceFixCases()
- {
- return [
- [
- '<?php
- $foo->bar() // test
- ;',
- '<?php
- $foo->bar() // test
- ;',
- ],
- [
- "<?php echo(1) // test\n;",
- ],
- [
- '<?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()
- ;',
- ],
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideMessyWhitespacesMultiLineWhitespaceFixCases
- */
- public function testMessyWhitespacesMultiLineWhitespace($expected, $input = null)
- {
- $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NO_MULTI_LINE]);
- $this->doTest($expected, $input);
- }
- public function provideMessyWhitespacesMultiLineWhitespaceFixCases()
- {
- return [
- [
- "<?php echo(1) // test\r\n;",
- ],
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideSemicolonForChainedCallsFixCases
- */
- public function testSemicolonForChainedCallsFix($expected, $input = null)
- {
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NEW_LINE_FOR_CHAINED_CALLS]);
- $this->doTest($expected, $input);
- }
- public function provideSemicolonForChainedCallsFixCases()
- {
- 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 $this
- ->methodA()
- ->methodB();',
- ],
- ];
- }
- /**
- * @param string $expected
- * @param null|string $input
- *
- * @dataProvider provideMessyWhitespacesSemicolonForChainedCallsFixCases
- */
- public function testMessyWhitespacesSemicolonForChainedCalls($expected, $input = null)
- {
- $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NEW_LINE_FOR_CHAINED_CALLS]);
- $this->doTest($expected, $input);
- }
- public function provideMessyWhitespacesSemicolonForChainedCallsFixCases()
- {
- 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?>",
- ],
- ];
- }
- /**
- * @param string $expected
- * @param string $input
- *
- * @requires PHP 7.3
- * @dataProvider provideFix73Cases
- */
- public function testFix73($expected, $input)
- {
- $this->fixer->configure(['strategy' => MultilineWhitespaceBeforeSemicolonsFixer::STRATEGY_NEW_LINE_FOR_CHAINED_CALLS]);
- $this->doTest($expected, $input);
- }
- public function provideFix73Cases()
- {
- return [
- [
- "<?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();",
- ],
- ];
- }
- }
|