Merge pull request #617 from creative-commoners/pulls/4/php84

API Explicity mark nullable parameters for PHP 8.4
silverstripe · Dec 2, 2024 · b0cc4d8 · b0cc4d8
2 parents 90dfa79 + cd91d2f
commit b0cc4d8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/Extensions/FileSubsites.php b/src/Extensions/FileSubsites.php
@@ -49,7 +49,7 @@ public function alternateTreeTitle()
      * @param SQLSelect $query
      * @param DataQuery|null $dataQuery
      */
-    protected function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
+    protected function augmentSQL(SQLSelect $query, ?DataQuery $dataQuery = null)
     {
         if (Subsite::$disable_subsite_filter) {
             return;

diff --git a/src/Extensions/GroupSubsites.php b/src/Extensions/GroupSubsites.php
@@ -148,7 +148,7 @@ protected function updateTreeTitle(&$title)
      * @param SQLSelect $query
      * @param DataQuery|null $dataQuery
      */
-    protected function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
+    protected function augmentSQL(SQLSelect $query, ?DataQuery $dataQuery = null)
     {
         if (Subsite::$disable_subsite_filter) {
             return;

diff --git a/src/Extensions/LeftAndMainSubsites.php b/src/Extensions/LeftAndMainSubsites.php
@@ -228,7 +228,7 @@ public function shouldChangeSubsite($adminClass, $recordSubsiteID, $currentSubsi
      *
      * @param Member $member
      */
-    protected function canAccess(Member $member = null)
+    protected function canAccess(?Member $member = null)
     {
         if (!$member) {
             $member = Security::getCurrentUser();
@@ -256,7 +256,7 @@ protected function canAccess(Member $member = null)
      *
      * @param Member $member
      */
-    public function alternateAccessCheck(Member $member = null)
+    public function alternateAccessCheck(?Member $member = null)
     {
         return $this->canAccess($member);
     }

diff --git a/src/Extensions/SiteConfigSubsites.php b/src/Extensions/SiteConfigSubsites.php
@@ -29,7 +29,7 @@ class SiteConfigSubsites extends Extension
      * @param SQLSelect $query
      * @param DataQuery|null $dataQuery
      */
-    protected function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
+    protected function augmentSQL(SQLSelect $query, ?DataQuery $dataQuery = null)
     {
         if (Subsite::$disable_subsite_filter) {
             return;

diff --git a/src/Extensions/SiteTreeSubsites.php b/src/Extensions/SiteTreeSubsites.php
@@ -72,7 +72,7 @@ public function isMainSite()
      * @param SQLSelect $query
      * @param DataQuery $dataQuery
      */
-    protected function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
+    protected function augmentSQL(SQLSelect $query, ?DataQuery $dataQuery = null)
     {
         if (Subsite::$disable_subsite_filter) {
             return;