Merge branch '6.0' into 6

silverstripe · Feb 24, 2025 · c502abe · c502abe
2 parents 90d280e + e9d95b9
commit c502abe
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/src/Dev/SapphireTest.php b/src/Dev/SapphireTest.php
@@ -180,6 +180,11 @@ abstract class SapphireTest extends TestCase implements TestOnly
 
     protected FixtureFactory|bool $fixtureFactory;
 
+    /**
+     * The original value of ini 'max_execution_time' before any code or tests change it
+     */
+    private int $origMaxExecutionTime;
+
     /**
      * @return TempDatabase
      */
@@ -341,6 +346,8 @@ protected function setUp(): void
         Email::config()->remove('send_all_emails_from');
         Email::config()->remove('cc_all_emails_to');
         Email::config()->remove('bcc_all_emails_to');
+
+        $this->origMaxExecutionTime = ini_get('max_execution_time');
     }
 
      /**
@@ -612,6 +619,10 @@ protected function tearDown(): void
             restore_error_handler();
             $this->oldErrorHandler = null;
         }
+
+        // Reset max_execution_time in case some code or a unit test changed it,
+        // either via ini_set() or set_time_limit()
+        ini_set('max_execution_time', $this->origMaxExecutionTime);
     }
 
     /**

diff --git a/src/Security/SudoMode/SudoModeServiceInterface.php b/src/Security/SudoMode/SudoModeServiceInterface.php
@@ -24,6 +24,11 @@ public function check(Session $session): bool;
      */
     public function activate(Session $session): bool;
 
+    /**
+     * De-register sudo mode permission in the provided session.
+     */
+    public function deactivate(Session $session): void;
+
     /**
      * How long the sudo mode activation lasts for in minutes.
      */

diff --git a/tests/php/Control/Middleware/AllowedHostsMiddlewareTest.php b/tests/php/Control/Middleware/AllowedHostsMiddlewareTest.php
@@ -9,12 +9,13 @@
 use SilverStripe\Core\Environment;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Control\Middleware\AllowedHostsMiddleware;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class AllowedHostsMiddlewareTest extends SapphireTest
 {
     protected $usesDatabase = false;
 
-    public function provideProcess(): array
+    public static function provideProcess(): array
     {
         return [
             'cli allow all' => [
@@ -75,9 +76,7 @@ public function provideProcess(): array
         ];
     }
 
-    /**
-     * @dataProvider provideProcess
-     */
+    #[DataProvider('provideProcess')]
     public function testProcess(string|array $allowedHosts, bool $isCli, bool $allowed): void
     {
         $reflectionEnvironment = new ReflectionClass(Environment::class);

diff --git a/tests/php/Core/KernelTest.php b/tests/php/Core/KernelTest.php
@@ -20,6 +20,7 @@
 use SilverStripe\ORM\DB;
 use ReflectionObject;
 use SilverStripe\Core\Tests\KernelTest\TestFlushable;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class KernelTest extends SapphireTest
 {
@@ -131,7 +132,7 @@ public function testImplementorsAreCalled()
         $kernel->boot();
     }
 
-    public function provideAllowedHostsWarning(): array
+    public static function provideAllowedHostsWarning(): array
     {
         $scenarios = [
             [
@@ -158,9 +159,7 @@ public function provideAllowedHostsWarning(): array
         return $scenarios;
     }
 
-    /**
-     * @dataProvider provideAllowedHostsWarning
-     */
+    #[DataProvider('provideAllowedHostsWarning')]
     public function testAllowedHostsWarning(array $config, bool $isCli, bool $shouldLog): void
     {
         // Prepare mock to check if a warning is logged or not

diff --git a/tests/php/Forms/FormFieldTest.php b/tests/php/Forms/FormFieldTest.php
@@ -96,6 +96,7 @@
 use SilverStripe\Forms\SegmentField;
 use SilverStripe\Core\Validation\FieldValidation\TimeFieldValidator;
 use SilverStripe\Core\Validation\FieldValidation\DatetimeFieldValidator;
+use SilverStripe\Forms\SudoModePasswordField;
 
 class FormFieldTest extends SapphireTest
 {
@@ -936,6 +937,9 @@ public function testFieldValidatorConfig(): void
                 CompositeFieldValidator::class,
             ],
             SingleLookupField::class => [],
+            SudoModePasswordField::class => [
+                StringFieldValidator::class,
+            ],
             Tab::class => [
                 CompositeFieldValidator::class,
             ],