Merge pull request #4 from heyday/cam/ss4-upgrade

SS4 Upgrade

LICENSE

@@ -0,0 +1,19 @@
+The MIT License (MIT)
+Copyright © 2020 Wunderman Thompson New Zealand
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the “Software”), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,6 +1,6 @@
 # SilverStripe Facebook Image
 
-This version supports SilverStripe 3, see the 0.0 branch for a SilverStripe 2.4 compatible version.
+This version supports SilverStripe 4, see the 0.1 release for a SilverStripe 3 compatible version and the 0.0 release for a SilverStripe 2.4 compatible version.
 
 Provides an Image Field for use when sharing pages on facebook.
 

_config/config.yml

@@ -1,7 +1,7 @@
-SiteConfig:
+SilverStripe\SiteConfig\SiteConfig:
   extensions:
-    - SiteConfigFacebookImageExtension
+    - WT\FacebookImage\SiteConfigFacebookImageExtension
 
 Page:
   extensions:
-    - PageFacebookImageExtension
+    - WT\FacebookImage\PageFacebookImageExtension

code/PageFacebookImageExtension.php

@@ -1,14 +1,40 @@
 <?php
 
+namespace WT\FacebookImage;
+
+use SilverStripe\AssetAdmin\Forms\UploadField;
+use SilverStripe\Assets\Image;
+use SilverStripe\Control\Controller;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\ORM\DataExtension;
+use SilverStripe\SiteConfig\SiteConfig;
+
 class PageFacebookImageExtension extends DataExtension
 {
-    private static $has_one = array(
-        'FacebookImage' => 'Image'
-    );
+    /**
+     * @var array
+     */
+    private static $has_one = [
+        'FacebookImage' => Image::class,
+    ];
+
+    /**
+     * @var array
+     */
+    private static $owns = [
+        'FacebookImage',
+    ];
 
+    /**
+     * @param FieldList $fields
+     */
     public function updateCMSFields(FieldList $fields)
     {
-        $fields->addFieldToTab('Root.Facebook', $uf = new UploadField('FacebookImage', 'Facebook image for facebook share'));
+        $fields->addFieldToTab(
+            'Root.Facebook',
+            $uf = new UploadField('FacebookImage', 'Facebook image for facebook share')
+        );
+
         $uf->setFolderName('FacebookImages/');
     }
 
@@ -17,7 +43,9 @@ public function updateCMSFields(FieldList $fields)
      */
     public function FacebookImageWithFallback()
     {
-        return $this->owner->FacebookImageID ? $this->owner->FacebookImage() : SiteConfig::current_site_config()->FacebookImage();
+        return $this->owner->FacebookImageID
+            ? $this->owner->FacebookImage()
+            : SiteConfig::current_site_config()->FacebookImage();
     }
 
     /**
@@ -27,4 +55,4 @@ public function FacebookMetaTags()
     {
         return Controller::curr()->renderWith('FacebookMetaTags');
     }
-}
+}

code/SiteConfigFacebookImageExtension.php

@@ -1,15 +1,39 @@
 <?php
 
+namespace WT\FacebookImage;
+
+use SilverStripe\AssetAdmin\Forms\UploadField;
+use SilverStripe\Assets\Image;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\ORM\DataExtension;
+
 class SiteConfigFacebookImageExtension extends DataExtension
 {
-    private static $has_one = array(
-        'FacebookImage' => 'Image'
-    );
+    /**
+     * @var array
+     */
+    private static $has_one = [
+        'FacebookImage' => Image::class,
+    ];
 
+    /**
+     * @var array
+     */
+    private static $owns = [
+        'FacebookImage',
+    ];
+
+    /**
+     * @param FieldList $fields
+     */
     public function updateCMSFields(FieldList $fields)
     {
-        $fields->addFieldToTab('Root.Facebook', $uf = new UploadField('FacebookImage', 'Default Facebook image for facebook share'));
+        $fields->addFieldToTab(
+            'Root.Facebook',
+            $uf = new UploadField('FacebookImage', 'Default Facebook image for facebook share'),
+        );
+
         $uf->setFolderName('FacebookImages/');
     }
 
-} 
+} 

composer.json

@@ -2,13 +2,15 @@
 	"name": "heyday/silverstripe-facebookimage",
 	"type": "silverstripe-module",
 	"description": "Provides an Image Field for use when sharing pages on facebook",
+	"type": "silverstripe-vendormodule",
 	"authors": [
 		{
 			"name": "Glenn Bautista",
 			"email": "[email protected]"
 		}
 	],
 	"require": {
-		"composer/installers": "~1.0"
+		"composer/installers": "~1.0",
+		"silverstripe/framework": "^4.0.0"
 	}
 }