Merge branch '9.1'

sebastianbergmann · sebastianbergmann · commit e865713e15d6 · 2020-04-13T08:41:57.000+02:00
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -110,7 +110,9 @@ return PhpCsFixer\Config::create()
         'no_spaces_after_function_name' => true,
         'no_spaces_inside_parenthesis' => true,
         'no_superfluous_elseif' => true,
-        'no_superfluous_phpdoc_tags' => true,
+        'no_superfluous_phpdoc_tags' => [
+            'allow_mixed' => true,
+        ],
         'no_trailing_comma_in_list_call' => true,
         'no_trailing_comma_in_singleline_array' => true,
         'no_trailing_whitespace' => true,
@@ -157,7 +159,7 @@ return PhpCsFixer\Config::create()
             'direction' => 'ascend',
             'order' => 'alpha',
         ],
-        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_add_missing_param_annotation' => false,
         'phpdoc_align' => true,
         'phpdoc_annotation_without_dot' => true,
         'phpdoc_indent' => true,
diff --git a/phive.xml b/phive.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.25" installed="1.25.9" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^2.16" installed="2.16.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^2.16" installed="2.16.2" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="phpdox" version="^0.12" installed="0.12.0" location="./tools/phpdox" copy="true"/>
   <phar name="phploc" version="^4.0" installed="4.0.1" location="./tools/phploc" copy="true"/>
   <phar name="psalm" version="^3.6" installed="3.11.1" location="./tools/psalm" copy="true"/>
diff --git a/src/Util/Printer.php b/src/Util/Printer.php
@@ -15,7 +15,7 @@
 class Printer
 {
     /**
-     * @var closed-resource|resource
+     * @psalm-var closed-resource|resource
      */
     private $stream;
 
diff --git a/src/Util/VersionComparisonOperator.php b/src/Util/VersionComparisonOperator.php
@@ -16,7 +16,7 @@
 final class VersionComparisonOperator
 {
     /**
-     * @var '<'|'lt'|'<='|'le'|'>'|'gt'|'>='|'ge'|'=='|'='|'eq'|'!='|'<>'|'ne'
+     * @psalm-var '<'|'lt'|'<='|'le'|'>'|'gt'|'>='|'ge'|'=='|'='|'eq'|'!='|'<>'|'ne'
      */
     private $operator;
 
diff --git a/tests/_files/3194.php b/tests/_files/3194.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\TestCase;
 
 trait T3194
diff --git a/tests/_files/Author.php b/tests/_files/Author.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 /**
  * An author.
  */
diff --git a/tests/_files/BankAccount.php b/tests/_files/BankAccount.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 class BankAccountException extends RuntimeException
 {
 }
diff --git a/tests/_files/BankAccountTest2.php b/tests/_files/BankAccountTest2.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\TestCase;
 
 class BankAccountTest extends TestCase
diff --git a/tests/_files/Book.php b/tests/_files/Book.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 /**
  * A book.
  */
diff --git a/tests/_files/ClassWithToString.php b/tests/_files/ClassWithToString.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 /**
  * A class with a __toString() method.
  */
diff --git a/tests/_files/ClassWithVariadicArgumentMethod.php b/tests/_files/ClassWithVariadicArgumentMethod.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 /**
  * A class with a method that takes a variadic argument.
  */
diff --git a/tests/_files/CoverageTwoDefaultClassAnnotations.php b/tests/_files/CoverageTwoDefaultClassAnnotations.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 /**
  * @coversDefaultClass \NamespaceOne
  * @coversDefaultClass \AnotherDefault\Name\Space\Does\Not\Work
diff --git a/tests/_files/FinalClass.php b/tests/_files/FinalClass.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 final class FinalClass
 {
     private $value;
diff --git a/tests/_files/IgnoreCodeCoverageClass.php b/tests/_files/IgnoreCodeCoverageClass.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 /**
  * @codeCoverageIgnore
  */
diff --git a/tests/_files/ParseTestMethodAnnotationsMock.php b/tests/_files/ParseTestMethodAnnotationsMock.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 /**
  * @theClassAnnotation
  */
diff --git a/tests/_files/RequirementsClassDocBlockTest.php b/tests/_files/RequirementsClassDocBlockTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 /**
  * @requires PHP 5.3
  * @requires PHPUnit 4.0
diff --git a/tests/_files/RouterTest.php b/tests/_files/RouterTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\TestCase;
 
 final class RouterTest extends TestCase
diff --git a/tests/_files/StopOnErrorTestSuite.php b/tests/_files/StopOnErrorTestSuite.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 class StopOnErrorTestSuite extends \PHPUnit\Framework\TestCase
 {
     public function testIncomplete(): void
diff --git a/tests/_files/TestCaseWithExceptionInHook.php b/tests/_files/TestCaseWithExceptionInHook.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\TestCase;
 
 final class TestCaseWithExceptionInHook extends TestCase
diff --git a/tests/_files/TestIteratorAggregate2.php b/tests/_files/TestIteratorAggregate2.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 class TestIteratorAggregate2 implements IteratorAggregate
 {
     private $traversable;
diff --git a/tests/end-to-end/regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php b/tests/end-to-end/regression/GitHub/2724/SeparateClassRunMethodInNewProcessTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 /**
  * @runClassInSeparateProcess
  */
diff --git a/tests/end-to-end/regression/GitHub/2830/Issue2830Test.php b/tests/end-to-end/regression/GitHub/2830/Issue2830Test.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 class Issue2830Test extends PHPUnit\Framework\TestCase
 {
     /**
diff --git a/tests/end-to-end/regression/GitHub/3379/Issue3379TestListener.php b/tests/end-to-end/regression/GitHub/3379/Issue3379TestListener.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\Test;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestListener;
diff --git a/tests/unit/Framework/MockObject/Builder/InvocationMockerTest.php b/tests/unit/Framework/MockObject/Builder/InvocationMockerTest.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\Constraint\IsEqual;
 use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
 use PHPUnit\Framework\MockObject\IncompatibleReturnValueException;
diff --git a/tests/unit/Framework/MockObject/GeneratorTest.php b/tests/unit/Framework/MockObject/GeneratorTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\MockObject\Generator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/Framework/MockObject/Matcher/ConsecutiveParametersTest.php b/tests/unit/Framework/MockObject/Matcher/ConsecutiveParametersTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\InvalidParameterGroupException;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/Framework/MockObject/MockBuilderTest.php b/tests/unit/Framework/MockObject/MockBuilderTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\MockObject\MockBuilder;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/unit/Framework/MockObject/MockObjectTest.php b/tests/unit/Framework/MockObject/MockObjectTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/Framework/MockObject/ProxyObjectTest.php b/tests/unit/Framework/MockObject/ProxyObjectTest.php
@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tools/php-cs-fixer b/tools/php-cs-fixer

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`class Printer`
`16`	`16`	`{`
`17`	`17`	`/**`
`18`		`- * @var closed-resource\|resource`
	`18`	`+ * @psalm-var closed-resource\|resource`
`19`	`19`	`*/`
`20`	`20`	`private $stream;`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`final class VersionComparisonOperator`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`		`- * @var '<'\|'lt'\|'<='\|'le'\|'>'\|'gt'\|'>='\|'ge'\|'=='\|'='\|'eq'\|'!='\|'<>'\|'ne'`
	`19`	`+ * @psalm-var '<'\|'lt'\|'<='\|'le'\|'>'\|'gt'\|'>='\|'ge'\|'=='\|'='\|'eq'\|'!='\|'<>'\|'ne'`
`20`	`20`	`*/`
`21`	`21`	`private $operator;`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`* For the full copyright and license information, please view the LICENSE`
`8`	`8`	`* file that was distributed with this source code.`
`9`	`9`	`*/`
`10`		`-`
`11`	`10`	`class BankAccountException extends RuntimeException`
`12`	`11`	`{`
`13`	`12`	`}`