Merge branch '3' into 4.0

silverstripe · Jan 8, 2025 · 083e4c2 · 083e4c2
2 parents 9a1e43f + 49797c8
commit 083e4c2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Model/Subsite.php b/src/Model/Subsite.php
@@ -313,7 +313,7 @@ public static function getSubsiteIDForDomain($host = null, $checkPermissions = t
      * @param class-string<T> $className
      * @param string $filter
      * @param string $sort
-     * @param string $join
+     * @param string $join Deprecated, use leftJoin($table, $joinClause) instead
      * @param string $limit
      * @return DataList<T>
      */
@@ -922,9 +922,11 @@ public function activate()
     /**
      * @param array $permissionCodes
      * @return DataList<Member>
+     * @deprecated 3.4.0 Will be removed without equivalent functionality
      */
     public function getMembersByPermission($permissionCodes = ['ADMIN'])
     {
+        Deprecation::noticeWithNoReplacment('3.4.0');
         if (!is_array($permissionCodes)) {
             user_error('Permissions must be passed to Subsite::getMembersByPermission as an array', E_USER_ERROR);
         }