4.0 support

Author: wilr

code/formfields/AddressFinderField.php

@@ -1,11 +1,13 @@
 <?php
 
+use SilverStripe\Forms\TextField;
+
 /**
  * A wrapper for the AddressFinder API.
  *
  * Standard layout is a simple text field with the required javascript events,
- * but as per best practices (http://addressfinder.co.nz/docs/best_practices) 
- * this FormField also provides fallback fields in case the user cannot find 
+ * but as per best practices (http://addressfinder.co.nz/docs/best_practices)
+ * this FormField also provides fallback fields in case the user cannot find
  * their address
  *
  * @package addressfinder
@@ -39,7 +41,7 @@ public function __construct($name, $title = null, $value = null)
         $this->addressField = new TextField("{$name}[Address]", $title);
         $this->manualToggle = new HiddenField("{$name}[ManualAddress]");
         $this->manualFields = new FieldList();
-        
+
 
         for ($i = 1; $i < 4; $i++) {
             $this->manualFields->push(new TextField(
@@ -156,7 +158,7 @@ public function FieldHolder($properties = array())
 
         return parent::FieldHolder($properties);
     }
-    
+
     /**
      * @return FieldList
      */
@@ -203,23 +205,23 @@ public function setValue($value, $record = null)
             $this->addressField->setValue($value);
         }
     }
-    
+
     /**
-     * @param DataObjectInterface
+     * @param SilverStripe\ORM\DataObjectInterface
      */
-    public function saveInto(DataObjectInterface $object)
+    public function saveInto(SilverStripe\ORM\DataObjectInterface $record)
     {
-        $object->{$this->getName()} = $this->addressField->Value();
+        $record->{$this->getName()} = $this->addressField->Value();
 
         foreach ($this->getManualFields() as $field) {
             $fieldName = $this->getNestedFieldName($field);
 
-            $object->{$fieldName} = $field->Value();
+            $record->{$fieldName} = $field->Value();
         }
     }
 
     /**
-     * Returns the actual name of a child field without the prefix of this 
+     * Returns the actual name of a child field without the prefix of this
      * field.
      *
      * @param FormField $field
@@ -230,7 +232,7 @@ protected function getNestedFieldName($field)
     {
         return substr($field->getName(), strlen($this->getName()) + 1, -1);
     }
-    
+
     /**
      * @param string $name
      *
@@ -254,7 +256,7 @@ public function setName($name)
     /**
      * If this field is required then we require at least the first postal line
      * along with the town and postcode. Either this has been manually filled
-     * in or, automatically filled in by 
+     * in or, automatically filled in by
      *
      * @param Validator $validator
      *
@@ -278,7 +280,7 @@ public function validate($validator)
                     'PostalLine1',
                     false
                 );
-            
+
                 return false;
             }
 
@@ -291,7 +293,7 @@ public function validate($validator)
                     "City",
                     false
                 );
-            
+
                 return false;
             }
 
@@ -304,7 +306,7 @@ public function validate($validator)
                     "Postcode",
                     false
                 );
-            
+
                 return false;
             }
         }

composer.json

@@ -2,7 +2,7 @@
     "name": "fullscreeninteractive/silverstripe-addressfinder",
     "type": "silverstripe-module",
     "description": "SilverStripe FormField for AddressFinder.co.nz",
-    "keywords": ["silverstripe","form"],
+    "keywords": ["silverstripe", "form"],
     "homepage": "https://github.com/fullscreeninteractive/silverstripe-addressfinder",
     "license": "BSD-3-Clause",
     "authors": [{
@@ -11,9 +11,9 @@
         "homepage": "http://fullscreen.io"
     }],
     "extra": {
-    	"installer-name": "addressfinder"
+        "installer-name": "addressfinder"
     },
     "require": {
-        "silverstripe/framework": ">=3.1"
+        "silverstripe/framework": "^4.0.*"
     }
-}
+}