Merge branch '2.2' into 2.3

keradus · keradus · commit 03d9f1bf0cad · 2017-05-24T23:48:40.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
 /tests export-ignore
 .appveyor.yml export-ignore
+.composer-require-checker.json export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .github/ export-ignore
diff --git a/tests/Fixer/Phpdoc/PhpdocScalarFixerTest.php b/tests/Fixer/Phpdoc/PhpdocScalarFixerTest.php
@@ -19,7 +19,7 @@
  *
  * @internal
  *
- * @covers \AbstractPhpdocTypesFixer
+ * @covers \PhpCsFixer\AbstractPhpdocTypesFixer
  * @covers \PhpCsFixer\Fixer\Phpdoc\PhpdocScalarFixer
  */
 final class PhpdocScalarFixerTest extends AbstractFixerTestCase
diff --git a/tests/Fixer/Phpdoc/PhpdocTypesFixerTest.php b/tests/Fixer/Phpdoc/PhpdocTypesFixerTest.php
@@ -19,7 +19,7 @@
  *
  * @internal
  *
- * @covers \AbstractPhpdocTypesFixer
+ * @covers \PhpCsFixer\AbstractPhpdocTypesFixer
  * @covers \PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer
  */
 final class PhpdocTypesFixerTest extends AbstractFixerTestCase

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*`
`20`	`20`	`* @internal`
`21`	`21`	`*`
`22`		`- * @covers \AbstractPhpdocTypesFixer`
	`22`	`+ * @covers \PhpCsFixer\AbstractPhpdocTypesFixer`
`23`	`23`	`* @covers \PhpCsFixer\Fixer\Phpdoc\PhpdocScalarFixer`
`24`	`24`	`*/`
`25`	`25`	`final class PhpdocScalarFixerTest extends AbstractFixerTestCase`