➕ chore: update composer depdencies, update annotations

dnadesign · Jul 14, 2024 · af29a60 · af29a60
1 parent 7324100
commit af29a60
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/build/composer-php-81.json b/build/composer-php-81.json
@@ -9,8 +9,8 @@
   ],
   "require": {
       "php": "^8.1",
+      "silverstripe/admin": "^1.0 || ^2.0",
       "silverstripe/framework": "^4.0 || ^5.0",
-      "silverstripe/siteconfig": "^4.0 || ^5.0",
       "symbiote/silverstripe-gridfieldextensions": "^3.0 || ^4.0"
   },
   "minimum-stability": "dev",

diff --git a/composer.json b/composer.json
@@ -9,8 +9,8 @@
     ],
     "require": {
         "php": "^8.3",
+        "silverstripe/admin": "^1.0 || ^2.0",
         "silverstripe/framework": "^4.0 || ^5.0",
-        "silverstripe/siteconfig": "^4.0 || ^5.0",
         "symbiote/silverstripe-gridfieldextensions": "^3.0 || ^4.0"
     },
     "require-dev": {

diff --git a/src/Concern/MessageFields.php b/src/Concern/MessageFields.php
@@ -9,14 +9,6 @@
 use SilverStripe\Forms\TextField;
 use function array_filter;
 
-/**
- * @property string $Msg
- * @property string $Msgmore
- * @property string $Bupdate
- * @property string $Bignore
- * @property string $Remind
- * @property string $Bnever
- */
 trait MessageFields
 {
     /**

diff --git a/src/Model/Announcement.php b/src/Model/Announcement.php
@@ -17,6 +17,13 @@
 use SilverStripe\Security\PermissionProvider;
 
 /**
+ * @property string $Name
+ * @property string $Msg
+ * @property string $Msgmore
+ * @property string $Bupdate
+ * @property string $Bignore
+ * @property string $Remind
+ * @property string $Bnever
  * @property int $Reminder
  * @property int $ReminderClosed
  * @property bool $Test
@@ -61,7 +68,7 @@ class Announcement extends DataObject implements BrowserUpdateInterface, Permiss
     ];
 
     /**
-     * @var array<mixed>
+     * @var mixed[]
      */
     private static array $defaults = [
         'Msg' => 'Your web browser ({brow_name}) is out of date.',

diff --git a/src/Model/BrowserVersion.php b/src/Model/BrowserVersion.php
@@ -16,8 +16,14 @@
 /**
  * @property string $Browser
  * @property float $Version
- * @method Announcement Announcement()
+ * @property string $Msg
+ * @property string $Msgmore
+ * @property string $Bupdate
+ * @property string $Bignore
+ * @property string $Remind
+ * @property string $Bnever
  * @property int $AnnouncementID
+ * @method Announcement Announcement()
  */
 class BrowserVersion extends DataObject implements BrowserUpdateInterface
 {