Merge branch '7.0'

sebastianbergmann · Feb 13, 2018 · 458cb3b · 458cb3b
2 parents 16161ef + 9c69283
commit 458cb3b
Show file tree

Hide file tree

Showing 37 changed files with 0 additions and 73 deletions.
diff --git a/src/Framework/Constraint/ArrayHasKey.php b/src/Framework/Constraint/ArrayHasKey.php
@@ -38,7 +38,6 @@ public function __construct($key)
     /**
      * Returns a string representation of the constraint.
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string
@@ -77,7 +76,6 @@ protected function matches($other): bool
      *
      * @param mixed $other evaluated value or object
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/Constraint/ArraySubset.php b/src/Framework/Constraint/ArraySubset.php
@@ -58,7 +58,6 @@ public function __construct($subset, $strict = false)
      *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return mixed
      */
@@ -96,7 +95,6 @@ public function evaluate($other, $description = '', $returnResult = false)
     /**
      * Returns a string representation of the constraint.
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string
@@ -114,7 +112,6 @@ public function toString(): string
      *
      * @param mixed $other evaluated value or object
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/Constraint/Attribute.php b/src/Framework/Constraint/Attribute.php
@@ -45,7 +45,6 @@ public function __construct(Constraint $constraint, $attributeName)
      * @param bool   $returnResult Whether to return a result or throw an exception
      *
      * @throws ExpectationFailedException
-     * @throws \Exception
      * @throws \PHPUnit\Framework\Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *

diff --git a/src/Framework/Constraint/Composite.php b/src/Framework/Constraint/Composite.php
@@ -44,7 +44,6 @@ public function __construct(Constraint $innerConstraint)
      *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return mixed
      */

diff --git a/src/Framework/Constraint/ExceptionCode.php b/src/Framework/Constraint/ExceptionCode.php
@@ -55,7 +55,6 @@ protected function matches($other): bool
      *
      * @param mixed $other evaluated value or object
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/Constraint/GreaterThan.php b/src/Framework/Constraint/GreaterThan.php
@@ -33,7 +33,6 @@ public function __construct($value)
     /**
      * Returns a string representation of the constraint.
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/Constraint/IsEqual.php b/src/Framework/Constraint/IsEqual.php
@@ -131,7 +131,6 @@ public function evaluate($other, $description = '', $returnResult = false)
      * Returns a string representation of the constraint.
      *
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return string
      */

diff --git a/src/Framework/Constraint/IsIdentical.php b/src/Framework/Constraint/IsIdentical.php
@@ -61,7 +61,6 @@ public function __construct($value)
      *
      * @throws ExpectationFailedException
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return mixed
      */
@@ -110,7 +109,6 @@ public function evaluate($other, $description = '', $returnResult = false)
      * Returns a string representation of the constraint.
      *
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return string
      */
@@ -133,7 +131,6 @@ public function toString(): string
      * @param mixed $other evaluated value or object
      *
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return string
      */

diff --git a/src/Framework/Constraint/IsInstanceOf.php b/src/Framework/Constraint/IsInstanceOf.php
@@ -70,7 +70,6 @@ protected function matches($other): bool
      *
      * @param mixed $other evaluated value or object
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/Constraint/IsJson.php b/src/Framework/Constraint/IsJson.php
@@ -54,7 +54,6 @@ protected function matches($other): bool
      *
      * @param mixed $other evaluated value or object
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/Constraint/JsonMatches.php b/src/Framework/Constraint/JsonMatches.php
@@ -85,7 +85,6 @@ protected function matches($other): bool
      * @throws ExpectationFailedException
      * @throws \PHPUnit\Framework\Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     protected function fail($other, $description, ComparisonFailure $comparisonFailure = null): void
     {

diff --git a/src/Framework/Constraint/LessThan.php b/src/Framework/Constraint/LessThan.php
@@ -33,7 +33,6 @@ public function __construct($value)
     /**
      * Returns a string representation of the constraint.
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/Constraint/LogicalAnd.php b/src/Framework/Constraint/LogicalAnd.php
@@ -67,7 +67,6 @@ public function setConstraints(array $constraints): void
      *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return mixed
      */

diff --git a/src/Framework/Constraint/LogicalNot.php b/src/Framework/Constraint/LogicalNot.php
@@ -109,7 +109,6 @@ public static function negate($string): string
      *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return mixed
      */
@@ -164,7 +163,6 @@ public function count(): int
      *
      * @param mixed $other evaluated value or object
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/Constraint/LogicalOr.php b/src/Framework/Constraint/LogicalOr.php
@@ -64,7 +64,6 @@ public function setConstraints(array $constraints): void
      *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return mixed
      */

diff --git a/src/Framework/Constraint/LogicalXor.php b/src/Framework/Constraint/LogicalXor.php
@@ -64,7 +64,6 @@ public function setConstraints(array $constraints): void
      *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return mixed
      */

diff --git a/src/Framework/Constraint/TraversableContains.php b/src/Framework/Constraint/TraversableContains.php
@@ -51,7 +51,6 @@ public function __construct($value, bool $checkForObjectIdentity = true, bool $c
     /**
      * Returns a string representation of the constraint.
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string
@@ -112,7 +111,6 @@ protected function matches($other): bool
      *
      * @param mixed $other evaluated value or object
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/Constraint/TraversableContainsOnly.php b/src/Framework/Constraint/TraversableContainsOnly.php
@@ -61,7 +61,6 @@ public function __construct(string $type, bool $isNativeType = true)
      *
      * @throws ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return mixed
      */

diff --git a/src/Framework/IncompleteTestCase.php b/src/Framework/IncompleteTestCase.php
@@ -66,7 +66,6 @@ public function getMessage(): string
     /**
      * Returns a string representation of the test case.
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/SkippedTestCase.php b/src/Framework/SkippedTestCase.php
@@ -66,7 +66,6 @@ public function getMessage(): string
     /**
      * Returns a string representation of the test case.
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      *
      * @return string

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -308,7 +308,6 @@ protected function tearDown()/* The :void return type declaration that should be
      * Returns a string representation of the test case.
      *
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     public function toString(): string
     {
@@ -348,7 +347,6 @@ public function getAnnotations(): array
 
     /**
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     public function getName(bool $withDataSet = true): ?string
     {
@@ -363,7 +361,6 @@ public function getName(bool $withDataSet = true): ?string
      * Returns the size of the test.
      *
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     public function getSize(): int
     {
@@ -375,7 +372,6 @@ public function getSize(): int
 
     /**
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     public function hasSize(): bool
     {
@@ -384,7 +380,6 @@ public function hasSize(): bool
 
     /**
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     public function isSmall(): bool
     {
@@ -393,7 +388,6 @@ public function isSmall(): bool
 
     /**
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     public function isMedium(): bool
     {
@@ -402,7 +396,6 @@ public function isMedium(): bool
 
     /**
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     public function isLarge(): bool
     {
@@ -553,7 +546,6 @@ public function hasFailed(): bool
      * @throws SebastianBergmann\CodeCoverage\RuntimeException
      * @throws SebastianBergmann\CodeCoverage\UnintentionallyCoveredCodeException
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     public function run(TestResult $result = null): TestResult
     {
@@ -1875,7 +1867,6 @@ private function snapshotGlobalState(): void
     /**
      * @throws RiskyTestError
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      * @throws \InvalidArgumentException
      */
     private function restoreGlobalState(): void
@@ -1956,7 +1947,6 @@ private function createGlobalStateSnapshot(bool $backupGlobals): Snapshot
     /**
      * @throws RiskyTestError
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      * @throws \InvalidArgumentException
      */
     private function compareGlobalStateSnapshots(Snapshot $before, Snapshot $after): void
@@ -2045,7 +2035,6 @@ private function shouldInvocationMockerBeReset(MockObject $mock): bool
      * @throws SebastianBergmann\ObjectEnumerator\InvalidArgumentException
      * @throws SebastianBergmann\ObjectReflector\InvalidArgumentException
      * @throws SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     private function registerMockObjectsFromTestArguments(array $testArguments, array &$visited = []): void
     {

diff --git a/src/Framework/TestResult.php b/src/Framework/TestResult.php
@@ -401,7 +401,6 @@ public function startTest(Test $test): void
      * @param Test  $test
      * @param float $time
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
     public function endTest(Test $test, $time): void
@@ -615,7 +614,6 @@ public function getCollectCodeCoverageInformation(): bool
      * @throws OriginalCoveredCodeNotExecutedException
      * @throws OriginalMissingCoversAnnotationException
      * @throws UnintentionallyCoveredCodeException
-     * @throws \Exception
      * @throws \ReflectionException
      * @throws \SebastianBergmann\CodeCoverage\InvalidArgumentException
      * @throws \SebastianBergmann\CodeCoverage\RuntimeException

diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -678,7 +678,6 @@ public function setGroupDetails(array $groups): void
      * Runs the tests and collects their result in a TestResult.
      *
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     public function run(TestResult $result = null): TestResult
     {

diff --git a/src/Runner/PhptTestCase.php b/src/Runner/PhptTestCase.php
@@ -105,7 +105,6 @@ public function count(): int
      * @throws \SebastianBergmann\CodeCoverage\RuntimeException
      * @throws \SebastianBergmann\CodeCoverage\UnintentionallyCoveredCodeException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return TestResult
      */
@@ -315,7 +314,6 @@ private function assertPhptExpectation(array $sections, $output): void
      * @param array      $settings
      *
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      *
      * @return bool
      */

diff --git a/src/Util/Log/JUnit.php b/src/Util/Log/JUnit.php
@@ -317,7 +317,6 @@ public function endTestSuite(TestSuite $suite): void
      *
      * @param Test $test
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
     public function startTest(Test $test): void

diff --git a/src/Util/PHP/AbstractPhpProcess.php b/src/Util/PHP/AbstractPhpProcess.php
@@ -185,7 +185,6 @@ public static function factory(): self
      * @param Test       $test
      * @param TestResult $result
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
     public function runTestJob($job, Test $test, TestResult $result): void
@@ -273,7 +272,6 @@ protected function settingsToParameters(array $settings): string
      * @param string     $stderr
      *
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @throws \Exception
      */
     private function processChildResult(Test $test, TestResult $result, $stdout, $stderr): void
     {

diff --git a/src/Util/TestDox/ResultPrinter.php b/src/Util/TestDox/ResultPrinter.php
@@ -248,7 +248,6 @@ public function endTestSuite(TestSuite $suite): void
      *
      * @param Test $test
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
     public function startTest(Test $test): void

diff --git a/src/Util/TestDox/XmlResultPrinter.php b/src/Util/TestDox/XmlResultPrinter.php
@@ -173,7 +173,6 @@ public function startTest(Test $test): void
      * @param Test  $test
      * @param float $time
      *
-     * @throws \Exception
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      */
     public function endTest(Test $test, float $time): void