Merge branch '11.5'

Author: sebastianbergmann

src/Framework/Assert.php

@@ -553,21 +553,21 @@ final public static function assertNotEmpty(mixed $actual, string $message = '')
      *
      * @throws ExpectationFailedException
      */
-    final public static function assertGreaterThan(mixed $expected, mixed $actual, string $message = ''): void
+    final public static function assertGreaterThan(mixed $minimum, mixed $actual, string $message = ''): void
     {
-        self::assertThat($actual, self::greaterThan($expected), $message);
+        self::assertThat($actual, self::greaterThan($minimum), $message);
     }
 
     /**
      * Asserts that a value is greater than or equal to another value.
      *
      * @throws ExpectationFailedException
      */
-    final public static function assertGreaterThanOrEqual(mixed $expected, mixed $actual, string $message = ''): void
+    final public static function assertGreaterThanOrEqual(mixed $minimum, mixed $actual, string $message = ''): void
     {
         self::assertThat(
             $actual,
-            self::greaterThanOrEqual($expected),
+            self::greaterThanOrEqual($minimum),
             $message,
         );
     }
@@ -577,19 +577,19 @@ final public static function assertGreaterThanOrEqual(mixed $expected, mixed $ac
      *
      * @throws ExpectationFailedException
      */
-    final public static function assertLessThan(mixed $expected, mixed $actual, string $message = ''): void
+    final public static function assertLessThan(mixed $maximum, mixed $actual, string $message = ''): void
     {
-        self::assertThat($actual, self::lessThan($expected), $message);
+        self::assertThat($actual, self::lessThan($maximum), $message);
     }
 
     /**
      * Asserts that a value is smaller than or equal to another value.
      *
      * @throws ExpectationFailedException
      */
-    final public static function assertLessThanOrEqual(mixed $expected, mixed $actual, string $message = ''): void
+    final public static function assertLessThanOrEqual(mixed $maximum, mixed $actual, string $message = ''): void
     {
-        self::assertThat($actual, self::lessThanOrEqual($expected), $message);
+        self::assertThat($actual, self::lessThanOrEqual($maximum), $message);
     }
 
     /**

src/Framework/Assert/Functions.php

@@ -576,7 +576,7 @@ function assertNotEmpty(mixed $actual, string $message = ''): void
      *
      * @see Assert::assertGreaterThan
      */
-    function assertGreaterThan(mixed $expected, mixed $actual, string $message = ''): void
+    function assertGreaterThan(mixed $minimum, mixed $actual, string $message = ''): void
     {
         Assert::assertGreaterThan(...func_get_args());
     }
@@ -592,7 +592,7 @@ function assertGreaterThan(mixed $expected, mixed $actual, string $message = '')
      *
      * @see Assert::assertGreaterThanOrEqual
      */
-    function assertGreaterThanOrEqual(mixed $expected, mixed $actual, string $message = ''): void
+    function assertGreaterThanOrEqual(mixed $minimum, mixed $actual, string $message = ''): void
     {
         Assert::assertGreaterThanOrEqual(...func_get_args());
     }
@@ -608,7 +608,7 @@ function assertGreaterThanOrEqual(mixed $expected, mixed $actual, string $messag
      *
      * @see Assert::assertLessThan
      */
-    function assertLessThan(mixed $expected, mixed $actual, string $message = ''): void
+    function assertLessThan(mixed $maximum, mixed $actual, string $message = ''): void
     {
         Assert::assertLessThan(...func_get_args());
     }
@@ -624,7 +624,7 @@ function assertLessThan(mixed $expected, mixed $actual, string $message = ''): v
      *
      * @see Assert::assertLessThanOrEqual
      */
-    function assertLessThanOrEqual(mixed $expected, mixed $actual, string $message = ''): void
+    function assertLessThanOrEqual(mixed $maximum, mixed $actual, string $message = ''): void
     {
         Assert::assertLessThanOrEqual(...func_get_args());
     }