Revert "Introduce UnorderedParameterSets and ConsecutiveParameterSets rules for improved invocation parameter matching in MockObject"

This reverts commit 6924d57.

Author: sebastianbergmann

src/Framework/MockObject/Exception/NoMoreParameterSetsConfiguredException.php

@@ -48,16 +48,6 @@ public function after(string $id): self;
      */
     public function with(mixed ...$arguments): self;
 
-    /**
-     * @return $this
-     */
-    public function withConsecutiveParameterSets(mixed ...$arguments): self;
-
-    /**
-     * @return $this
-     */
-    public function withParameterSetsInAnyOrder(mixed ...$arguments): self;
-
     /**
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
      *

src/Framework/MockObject/Runtime/Interface/InvocationStubber.php

@@ -139,24 +139,6 @@ public function with(mixed ...$arguments): InvocationStubber
         return $this;
     }
 
-    public function withConsecutiveParameterSets(mixed ...$arguments): InvocationStubber
-    {
-        $this->ensureParametersCanBeConfigured();
-
-        $this->matcher->setParametersRule(new Rule\ConsecutiveParameterSets($arguments));
-
-        return $this;
-    }
-
-    public function withParameterSetsInAnyOrder(mixed ...$arguments): InvocationStubber
-    {
-        $this->ensureParametersCanBeConfigured();
-
-        $this->matcher->setParametersRule(new Rule\UnorderedParameterSets($arguments));
-
-        return $this;
-    }
-
     /**
      * @throws MethodNameNotConfiguredException
      * @throws MethodParametersAlreadyConfiguredException

src/Framework/MockObject/Runtime/InvocationStubberImplementation.php

@@ -9,7 +9,6 @@
  */
 namespace PHPUnit\Framework\MockObject\Rule;
 
-use AllowDynamicProperties;
 use function count;
 use function sprintf;
 use Exception;
@@ -26,15 +25,14 @@
  *
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-#[AllowDynamicProperties] final class Parameters implements ParametersRule
+final class Parameters implements ParametersRule
 {
     /**
      * @var list<Constraint>
      */
     private array $parameters           = [];
     private ?BaseInvocation $invocation = null;
     private null|bool|ExpectationFailedException $parameterVerificationResult;
-    private bool $useAssertionCount      = true;
 
     /**
      * @param array<mixed> $parameters
@@ -149,13 +147,8 @@ private function guardAgainstDuplicateEvaluationOfParameterConstraints(): bool
         return (bool) $this->parameterVerificationResult;
     }
 
-    public function useAssertionCount(bool $useAssertionCount): void
-    {
-        $this->useAssertionCount = $useAssertionCount;
-    }
-
     private function incrementAssertionCount(): void
     {
-        $this->useAssertionCount && Test::currentTestCase()->addToAssertionCount(1);
+        Test::currentTestCase()->addToAssertionCount(1);
     }
 }