Merge branch '4' into 5.0

# Conflicts: # src/Model/Blog.php # yarn.lock
silverstripe · Dec 10, 2024 · 5ffa74f · 5ffa74f
2 parents ce73457 + dbd9d79
commit 5ffa74f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Model/Blog.php b/src/Model/Blog.php
@@ -142,6 +142,9 @@ class Blog extends Page implements PermissionProvider
 
     private static $class_description = 'Adds a blog to your website.';
 
+    /**
+     * @deprecated 4.4.0 Will be renamed to cms_icon_class
+     */
     private static $icon_class = 'font-icon-p-posts';
 
     /**

diff --git a/src/Model/BlogPost.php b/src/Model/BlogPost.php
@@ -53,6 +53,7 @@ class BlogPost extends Page
 
     /**
      * @var string
+     * @deprecated 4.4.0 Will be renamed to cms_icon_class
      */
     private static $icon_class = 'font-icon-p-post';
 

diff --git a/yarn.lock b/yarn.lock
@@ -2172,9 +2172,9 @@ cosmiconfig@^9.0.0:
     parse-json "^5.2.0"
 
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82"
-  integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,6 +142,9 @@ class Blog extends Page implements PermissionProvider @@
         private static $class_description = 'Adds a blog to your website.';
+        /**
+         * @deprecated 4.4.0 Will be renamed to cms_icon_class
+         */
         private static $icon_class = 'font-icon-p-posts';
         /**
@@ Expand Down @@