Merge branch '2.2'

keradus · keradus · commit 582025e89d7f · 2017-07-29T03:22:06.000+02:00
# Conflicts:
#	src/WhitespacesFixerConfig.php
#	tests/WhitespacesFixerConfigTest.php
diff --git a/src/WhitespacesFixerConfig.php b/src/WhitespacesFixerConfig.php
@@ -27,11 +27,11 @@ final class WhitespacesFixerConfig
     public function __construct($indent = '    ', $lineEnding = "\n")
     {
         if (!in_array($indent, ['  ', '    ', "\t"], true)) {
-            throw new \InvalidArgumentException('Invalid "indent" param.');
+            throw new \InvalidArgumentException('Invalid "indent" param, expected tab or two or four spaces.');
         }
 
         if (!in_array($lineEnding, ["\n", "\r\n"], true)) {
-            throw new \InvalidArgumentException('Invalid "lineEnding" param.');
+            throw new \InvalidArgumentException('Invalid "lineEnding" param, expected "\n" or "\r\n".');
         }
 
         $this->indent = $indent;
diff --git a/tests/WhitespacesFixerConfigTest.php b/tests/WhitespacesFixerConfigTest.php
@@ -34,7 +34,10 @@ final class WhitespacesFixerConfigTest extends TestCase
     public function testCases($indent, $lineEnding, $exceptionRegExp = null)
     {
         if (null !== $exceptionRegExp) {
-            $this->setExpectedExceptionRegExp(\InvalidArgumentException::class, $exceptionRegExp);
+            $this->setExpectedExceptionRegExp(
+                \InvalidArgumentException::class,
+                '%^'.preg_quote($exceptionRegExp, '%').'$%'
+            );
         }
 
         $config = new WhitespacesFixerConfig($indent, $lineEnding);
@@ -50,10 +53,10 @@ public function provideTestCases()
             ["\t", "\n"],
             ['    ', "\r\n"],
             ["\t", "\r\n"],
-            ['    ', 'asd', '/lineEnding/'],
-            ['    ', [], '/lineEnding/'],
-            ['std', "\n", '/indent/'],
-            [[], "\n", '/indent/'],
+            ['    ', 'asd', 'Invalid "lineEnding" param, expected "\n" or "\r\n".'],
+            ['    ', [], 'Invalid "lineEnding" param, expected "\n" or "\r\n".'],
+            ['std', "\n", 'Invalid "indent" param, expected tab or two or four spaces.'],
+            [[], "\n", 'Invalid "indent" param, expected tab or two or four spaces.'],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ final class WhitespacesFixerConfig`
`27`	`27`	`public function __construct($indent = ' ', $lineEnding = "\n")`
`28`	`28`	`{`
`29`	`29`	`if (!in_array($indent, [' ', ' ', "\t"], true)) {`
`30`		`- throw new \InvalidArgumentException('Invalid "indent" param.');`
	`30`	`+ throw new \InvalidArgumentException('Invalid "indent" param, expected tab or two or four spaces.');`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`if (!in_array($lineEnding, ["\n", "\r\n"], true)) {`
`34`		`- throw new \InvalidArgumentException('Invalid "lineEnding" param.');`
	`34`	`+ throw new \InvalidArgumentException('Invalid "lineEnding" param, expected "\n" or "\r\n".');`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`$this->indent = $indent;`