Merge branch '5' into 6

src/Core/Manifest/ModuleResourceLoader.php

@@ -19,7 +19,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
      * For other files, return original value
      *
      * @param string $resource
-     * @return string
+     * @return string|null
      */
     public function resolvePath($resource)
     {
@@ -38,7 +38,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
      * Resolves resource specifier to the given url.
      *
      * @param string $resource
-     * @return string
+     * @return string|null
      */
     public function resolveURL($resource)
     {
@@ -59,7 +59,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
      * Template wrapper for resolvePath
      *
      * @param string $resource
-     * @return string
+     * @return string|null
      */
     public static function resourcePath($resource)
     {
@@ -70,7 +70,7 @@ class ModuleResourceLoader implements TemplateGlobalProvider
      * Template wrapper for resolveURL
      *
      * @param string $resource
-     * @return string
+     * @return string|null
      */
     public static function resourceURL($resource)
     {

src/Dev/SapphireTest.php

@@ -251,6 +251,14 @@ abstract class SapphireTest extends TestCase implements TestOnly
         return $this->requireDefaultRecordsFrom;
     }
 
+    /**
+     * Called after the database is created, but before fixtures are loaded.
+     */
+    public function onBeforeLoadFixtures(): void
+    {
+        // no-op - this method is intended to be overridden by subclasses.
+    }
+
     /**
      * Setup  the test.
      * Always sets up in order:

src/Dev/State/FixtureTestState.php

@@ -63,6 +63,7 @@ class FixtureTestState implements TestState
                     $instance->augmentDefaultRecords();
                 }
             }
+            $test->onBeforeLoadFixtures();
             $this->loadFixtures($test);
         }
 

src/Security/Member.php

@@ -391,7 +391,7 @@ class Member extends DataObject
     /**
      * Returns the default {@link PasswordValidator}
      *
-     * @return PasswordValidator
+     * @return PasswordValidator|null
      */
     public static function password_validator()
     {
@@ -576,8 +576,7 @@ class Member extends DataObject
      * @param string $hash The hash key
      * @param bool $login Should the member be logged in?
      *
-     * @return Member the matching member, if valid
-     * @return Member
+     * @return Member|null the matching member, if valid or null
      */
     public static function member_from_autologinhash($hash, $login = false)
     {
@@ -597,7 +596,7 @@ class Member extends DataObject
      * Find a member record with the given TempIDHash value
      *
      * @param string $tempid
-     * @return Member
+     * @return Member|null the matching member, if valid or null
      */
     public static function member_from_tempid($tempid)
     {