Add support for Silverstripe 5

silverstripe-terraformers · Feb 14, 2023 · 8a905fe · 8a905fe
1 parent 2bae9f6
commit 8a905fe
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 75 deletions.
diff --git a/composer.json b/composer.json
@@ -16,22 +16,19 @@
         },
         {
             "name": "Chris Penny",
-            "email": "cpenny@silverstripe.com"
+            "email": "chris.penny@gmail.com"
         }
     ],
     "support": {
         "issues": "http://github.com/ichaber/silverstripe-swiftype/issues"
     },
     "require": {
-        "php": "^7.4 || ^8.0",
-        "silverstripe/vendor-plugin": "^1.6",
-        "silverstripe/framework": "^4",
-        "silverstripe/cms": "^4",
-        "guzzlehttp/guzzle": "^7",
-        "guzzlehttp/psr7": "^2"
+        "php": "^8.1",
+        "silverstripe/cms": "^5",
+        "guzzlehttp/guzzle": "^7.5"
     },
     "require-dev": {
-        "silverstripe/recipe-testing": "^2"
+        "silverstripe/recipe-testing": "^3"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Extensions/SwiftypeSiteConfigFieldsExtension.php b/src/Extensions/SwiftypeSiteConfigFieldsExtension.php
@@ -20,10 +20,7 @@
  */
 class SwiftypeSiteConfigFieldsExtension extends DataExtension
 {
-    /**
-     * @var array $db
-     */
-    private static $db = [
+    private static array $db = [
         'SwiftypeEnabled' => 'Boolean',
         'SwiftypeAccessKey' => 'Varchar(255)',
         'SwiftypeAPIKey' => 'Varchar(255)',

diff --git a/src/Extensions/SwiftypeSiteTreeCrawlerExtension.php b/src/Extensions/SwiftypeSiteTreeCrawlerExtension.php
@@ -18,10 +18,8 @@ class SwiftypeSiteTreeCrawlerExtension extends SiteTreeExtension
      * Urls to crawl
      *
      * array keyed by getOwnerKey
-     *
-     * @var array
      */
-    private $urlsToCrawl = [];
+    private array $urlsToCrawl = [];
 
     public function setUrlsToCrawl(array $urls)
     {

diff --git a/src/MetaTags/SwiftypeMetaTag.php b/src/MetaTags/SwiftypeMetaTag.php
@@ -15,20 +15,11 @@ abstract class SwiftypeMetaTag implements SwiftypeMetaTagInterface
 {
     use Configurable;
 
-    /**
-     * @var string|null
-     */
-    protected $name;
+    protected ?string $name;
 
-    /**
-     * @var string|null
-     */
-    protected $fieldName;
+    protected ?string $fieldName;
 
-    /**
-     * @var string|null
-     */
-    protected $fieldType;
+    protected ?string $fieldType;
 
     public function getMetaTagString(DataObject $dataObject): ?string
     {

diff --git a/src/MetaTags/SwiftypeMetaTagDescription.php b/src/MetaTags/SwiftypeMetaTagDescription.php
@@ -4,18 +4,9 @@
 
 class SwiftypeMetaTagDescription extends SwiftypeMetaTag
 {
-    /**
-     * @var string
-     */
-    protected $name = 'description';
+    protected ?string $name = 'description';
 
-    /**
-     * @var string
-     */
-    protected $fieldName = 'MetaDescription';
+    protected ?string $fieldName = 'MetaDescription';
 
-    /**
-     * @var string
-     */
-    protected $fieldType = 'text';
+    protected ?string $fieldType = 'text';
 }
diff --git a/src/MetaTags/SwiftypeMetaTagPublishedAt.php b/src/MetaTags/SwiftypeMetaTagPublishedAt.php
@@ -4,18 +4,9 @@
 
 class SwiftypeMetaTagPublishedAt extends SwiftypeMetaTag
 {
-    /**
-     * @var string
-     */
-    protected $name = 'published_at';
+    protected ?string $name = 'published_at';
 
-    /**
-     * @var string
-     */
-    protected $fieldName = 'LastEdited';
+    protected ?string $fieldName = 'LastEdited';
 
-    /**
-     * @var string
-     */
-    protected $fieldType = 'date';
+    protected ?string $fieldType = 'date';
 }
diff --git a/src/MetaTags/SwiftypeMetaTagTitle.php b/src/MetaTags/SwiftypeMetaTagTitle.php
@@ -4,18 +4,9 @@
 
 class SwiftypeMetaTagTitle extends SwiftypeMetaTag
 {
-    /**
-     * @var string
-     */
-    protected $name = 'title';
+    protected ?string $name = 'title';
 
-    /**
-     * @var string
-     */
-    protected $fieldName = 'Title';
+    protected ?string $fieldName = 'Title';
 
-    /**
-     * @var string
-     */
-    protected $fieldType = 'string';
+    protected ?string $fieldType = 'string';
 }
diff --git a/src/MetaTags/SwiftypeMetaTagURL.php b/src/MetaTags/SwiftypeMetaTagURL.php
@@ -4,18 +4,9 @@
 
 class SwiftypeMetaTagURL extends SwiftypeMetaTag
 {
-    /**
-     * @var string
-     */
-    protected $name = 'url';
+    protected ?string $name = 'url';
 
-    /**
-     * @var string|null
-     */
-    protected $fieldName = 'Link';
+    protected ?string $fieldName = 'Link';
 
-    /**
-     * @var string
-     */
-    protected $fieldType = 'enum';
+    protected ?string $fieldType = 'enum';
 }