Merge pull request #7 from wilr/pulls/4.0-support

Pulls/4.0 support
Graphiques-Digitale · Sep 29, 2017 · 483a576 · 483a576
2 parents f921286 + ec9fc75
commit 483a576
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/_config/app.yml b/_config/app.yml
@@ -1,4 +1,4 @@
-SiteConfig:
+SilverStripe\SiteConfig\SiteConfig:
   # Charset
   CharsetStatus: true
   Charset: 'UTF-8'

diff --git a/_config/config.yml b/_config/config.yml
@@ -5,14 +5,14 @@ Ater:
     - 'cms/*'
 ---
 
-SiteConfig:
+SilverStripe\SiteConfig\SiteConfig:
   extensions:
     - 'SEO_Metadata_SiteConfig_DataExtension'
 
-SiteTree:
+SilverStripe\CMS\Model\SiteTree:
   extensions:
     - 'SEO_Metadata_SiteTree_DataExtension'
 
-LeftAndMain:
+SilverStripe\Admin\LeftAndMain:
   extra_requirements_css:
     - 'silverstripe-seo-metadata/css/LeftAndMain.css'
diff --git a/code/SEO_Metadata_SiteConfig_DataExtension.php b/code/SEO_Metadata_SiteConfig_DataExtension.php
@@ -8,6 +8,13 @@
  * @version 1.0.0
  */
 
+use SilverStripe\ORM\DataExtension;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\TabSet;
+use SilverStripe\Forms\LabelField;
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\Forms\TextField;
+
 /**
  * Class SEO_Metadata_SiteConfig_DataExtension
  *

diff --git a/code/SEO_Metadata_SiteTree_DataExtension.php b/code/SEO_Metadata_SiteTree_DataExtension.php
@@ -8,6 +8,15 @@
  * @version 1.0.0
  */
 
+use SilverStripe\ORM\DataExtension;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\ReadonlyField;
+use SilverStripe\Forms\TextField;
+use SilverStripe\Forms\TextareaField;
+use SilverStripe\Forms\LiteralField;
+use SilverStripe\SiteConfig\SiteConfig;
+use SilverStripe\CMS\Model\SiteTree;
+
 /**
  * Class SEO_Metadata_SiteTree_DataExtension
  */
@@ -28,6 +37,10 @@ class SEO_Metadata_SiteTree_DataExtension extends DataExtension
         'ExtraMeta' => 'HTMLText', // redundant, but included for backwards-compatibility
     );
 
+    private static $casting = [
+        'Metadata' => 'HTMLText'
+    ];
+
 
     /* Overload Methods
     ------------------------------------------------------------------------------*/

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "issues": "https://github.com/Graphiques-Digitale/silverstripe-seo-metadata/issues"
   },
   "require": {
-    "silverstripe/cms": "~3"
+    "silverstripe/cms": "^4@dev"
   },
   "extra": {
     "installer-name": "silverstripe-seo-metadata",