Modernized API Code for PHP 7

src/FMAPI/FileMaker/Command/Add.php

@@ -34,7 +34,7 @@ class FileMaker_Command_Add extends FileMaker_Command
      * @var FileMaker_Command_Add_Implementation
      * @access private
      */
-    var $_impl;
+    public $_impl;
 
     /**
      * Add command constructor.
@@ -46,7 +46,7 @@ class FileMaker_Command_Add extends FileMaker_Command
      * use a numerically indexed array for the value of a field, with the numeric keys
      * corresponding to the repetition number to set.
      */
-    function FileMaker_Command_Add($fm, $layout, $values = array())
+    public function __construct($fm, $layout, $values = array())
     {
         $this->_impl = new FileMaker_Command_Add_Implementation($fm, $layout, $values);
     }
@@ -59,28 +59,28 @@ function FileMaker_Command_Add($fm, $layout, $values = array())
      * @param integer $repetition Field repetition number to set,
      *        Defaults to the first repetition.
      */
-    function setField($field, $value, $repetition = 0)
+    public function setField($field, $value, $repetition = 0)
     {
         return $this->_impl->setField($field, $value, $repetition);
     }
 
     /**
      * Sets the new value for a date, time, or timestamp field from a
-     * UNIX timestamp value. 
+     * UNIX timestamp value.
      *
-     * If the field is not a date or time field, then this method returns  
+     * If the field is not a date or time field, then this method returns
      * an Error object. Otherwise, returns TRUE.
      *
-     * If layout data for the target of this command has not already 
+     * If layout data for the target of this command has not already
      * been loaded, calling this method loads layout data so that
      * the type of the field can be checked.
      *
      * @param string $field Name of the field to set.
      * @param string $timestamp Timestamp value.
-     * @param integer $repetition Field repetition number to set. 
+     * @param integer $repetition Field repetition number to set.
      *        Defaults to the first repetition.
      */
-    function setFieldFromTimestamp($field, $timestamp, $repetition = 0)
+    public function setFieldFromTimestamp($field, $timestamp, $repetition = 0)
     {
         return $this->_impl->setFieldFromTimestamp($field, $timestamp, $repetition);
     }

src/FMAPI/FileMaker/Command/CompoundFind.php

@@ -21,9 +21,9 @@
 /**#@-*/
 
 /**
- * Command class that performs multiple find requests, also known as a compound 
- * find set. 
- * Requests are executed in the order specified in the add() method. The found 
+ * Command class that performs multiple find requests, also known as a compound
+ * find set.
+ * Requests are executed in the order specified in the add() method. The found
  * set includes the results of the entire compound find request.
  * Create this command with {@link FileMaker::newCompoundFindCommand()}.
  *
@@ -37,68 +37,68 @@ class FileMaker_Command_CompoundFind extends FileMaker_Command
      * @var FileMaker_Command_CompoundFind_Implementation
      * @access private
      */
-    var $_impl;
+    public $_impl;
 
     /**
      * Compound find set constructor.
      *
      * @ignore
-     * @param FileMaker_Implementation $fm FileMaker_Implementation object the 
+     * @param FileMaker_Implementation $fm FileMaker_Implementation object the
      *        request was created by.
      * @param string $layout Layout to find records in.
      */
-    function FileMaker_Command_CompoundFind($fm, $layout)
+    public function __construct($fm, $layout)
     {
         $this->_impl = new FileMaker_Command_CompoundFind_Implementation($fm, $layout);
     }
-  
-     /**
+
+    /**
      * Adds a Find Request object to this Compound Find command.
      *
-     * @param int $precedence Priority in which the find requests are added to 
+     * @param int $precedence Priority in which the find requests are added to
      *        this compound find set.
-     * @param findrequest $findrequest {@link FileMaker_FindRequest} object 
-     *        to add to this compound find set. 
+     * @param findrequest $findrequest {@link FileMaker_FindRequest} object
+     *        to add to this compound find set.
      */
-    function add($precedence, $findrequest)
+    public function add($precedence, $findrequest)
     {
         $this->_impl->add($precedence, $findrequest);
     }
-    
-     /**
+
+    /**
      * Adds a sorting rule to this Compound Find command.
      *
      * @param string $fieldname Name of the field to sort by.
-     * @param integer $precedence Integer from 1 to 9, inclusive. A value  
-     *        of 1 sorts records based on this sorting rule first, a value of 
-     *        2 sorts records based on this sorting rule only when two or more 
-     *        records have the same value after the first sorting rule is 
+     * @param integer $precedence Integer from 1 to 9, inclusive. A value
+     *        of 1 sorts records based on this sorting rule first, a value of
+     *        2 sorts records based on this sorting rule only when two or more
+     *        records have the same value after the first sorting rule is
      *        applied, and so on.
-     * @param mixed $order Direction of the sort. Specify the 
-     *        FILEMAKER_SORT_ASCEND constant, the FILEMAKER_SORT_DESCEND 
+     * @param mixed $order Direction of the sort. Specify the
+     *        FILEMAKER_SORT_ASCEND constant, the FILEMAKER_SORT_DESCEND
      *        constant, or the name of a value list specified as a string.
      */
-    function addSortRule($fieldname, $precedence, $order = null)
+    public function addSortRule($fieldname, $precedence, $order = null)
     {
         $this->_impl->addSortRule($fieldname, $precedence, $order);
     }
 
     /**
      * Clears all existing sorting rules from this Compound Find command.
      */
-    function clearSortRules()
+    public function clearSortRules()
     {
         $this->_impl->clearSortRules();
     }
 
-	 /**
+    /**
      * Sets a range to request only part of the result set.
      *
      * @param integer $skip Number of records to skip past. Default is 0.
-     * @param integer $max Maximum number of records to return. 
+     * @param integer $max Maximum number of records to return.
      *        Default is all.
      */
-    function setRange($skip = 0, $max = null)
+    public function setRange($skip = 0, $max = null)
     {
         $this->_impl->setRange($skip, $max);
     }
@@ -108,42 +108,42 @@ function setRange($skip = 0, $max = null)
      *
      * @return array Associative array with two keys: 'skip' for
      * the current skip setting, and 'max' for the current maximum
-     * number of records. If either key does not have a value, the 
+     * number of records. If either key does not have a value, the
      * returned value for that key is NULL.
      */
-    function getRange()
+    public function getRange()
     {
         return $this->_impl->getRange();
     }
-    
+
     /**
-     * Sets a filter to restrict the number of related records to return from 
-     * a portal. 
+     * Sets a filter to restrict the number of related records to return from
+     * a portal.
      *
-     * For more information, see the description for the 
+     * For more information, see the description for the
      * {@link FileMaker_Command_Find::setRelatedSetsFilters()} method.
      *
-     * @param string $relatedsetsfilter Specify either 'layout' or 'none' to 
-     *        control filtering.  
-     * @param string $relatedsetsmax Maximum number of portal records 
+     * @param string $relatedsetsfilter Specify either 'layout' or 'none' to
+     *        control filtering.
+     * @param string $relatedsetsmax Maximum number of portal records
      *        to return.
      */
-    function setRelatedSetsFilters($relatedsetsfilter, $relatedsetsmax = null)
+    public function setRelatedSetsFilters($relatedsetsfilter, $relatedsetsmax = null)
     {
-    	return $this->_impl->setRelatedSetsFilters($relatedsetsfilter, $relatedsetsmax);
+        return $this->_impl->setRelatedSetsFilters($relatedsetsfilter, $relatedsetsmax);
     }
-    
+
     /**
-     * Returns the current settings for the related records filter and  
+     * Returns the current settings for the related records filter and
      * the maximum number of related records to return.
      *
      * @return array Associative array with two keys: 'relatedsetsfilter' for
      * the portal filter setting, and 'relatedsetsmax' for the maximum
-     * number of records. If either key does not have a value, the returned 
+     * number of records. If either key does not have a value, the returned
      * for that key is NULL.
      */
-    function getRelatedSetsFilters()
+    public function getRelatedSetsFilters()
     {
-    	return $this->_impl->getRelatedSetsFilters();
+        return $this->_impl->getRelatedSetsFilters();
     }
 }

src/FMAPI/FileMaker/Command/Delete.php

@@ -34,18 +34,18 @@ class FileMaker_Command_Delete extends FileMaker_Command
      * @var FileMaker_Command_Delete_Implementation
      * @access private
      */
-    var $_impl;
+    public $_impl;
 
     /**
      * Delete command constructor.
      *
      * @ignore
-     * @param FileMaker_Implementation $fm FileMaker_Implementation object the 
+     * @param FileMaker_Implementation $fm FileMaker_Implementation object the
      *        command was created by.
      * @param string $layout Layout to delete record from.
      * @param string $recordId ID of the record to delete.
      */
-    function FileMaker_Command_Delete($fm, $layout, $recordId)
+    public function __construct($fm, $layout, $recordId)
     {
         $this->_impl = new FileMaker_Command_Delete_Implementation($fm, $layout, $recordId);
     }

src/FMAPI/FileMaker/Command/Duplicate.php

@@ -34,18 +34,18 @@ class FileMaker_Command_Duplicate extends FileMaker_Command
      * @var FileMaker_Command_Duplicate_Implementation
      * @access private
      */
-    var $_impl;
+    public $_impl;
 
     /**
      * Duplicate command constructor.
      *
      * @ignore
-     * @param FileMaker_Implementation $fm FileMaker_Implementation object the 
+     * @param FileMaker_Implementation $fm FileMaker_Implementation object the
      *        command was created by.
      * @param string $layout Layout the record to duplicate is in.
      * @param string $recordId ID of the record to duplicate.
      */
-    function FileMaker_Command_Duplicate($fm, $layout, $recordId)
+    public function __construct($fm, $layout, $recordId)
     {
         $this->_impl = new FileMaker_Command_Duplicate_Implementation($fm, $layout, $recordId);
     }

src/FMAPI/FileMaker/Command/Edit.php

@@ -34,22 +34,22 @@ class FileMaker_Command_Edit extends FileMaker_Command
      * @var FileMaker_Command_Edit_Implementation
      * @access private
      */
-    var $_impl;
+    public $_impl;
 
     /**
      * Edit command constructor.
      *
      * @ignore
-     * @param FileMaker_Implementation $fm FileMaker_Implementation object the 
+     * @param FileMaker_Implementation $fm FileMaker_Implementation object the
      *        command was created by.
      * @param string $layout Layout the record is part of.
      * @param string $recordId ID of the record to edit.
-     * @param array $values Associative array of field name => value pairs. 
-     *        To set field repetitions, use a numerically indexed array for 
-     *        the value of a field, with the numeric keys corresponding to the 
+     * @param array $values Associative array of field name => value pairs.
+     *        To set field repetitions, use a numerically indexed array for
+     *        the value of a field, with the numeric keys corresponding to the
      *        repetition number to set.
      */
-    function FileMaker_Command_Edit($fm, $layout, $recordId, $updatedValues = array())
+    public function __construct($fm, $layout, $recordId, $updatedValues = array())
     {
         $this->_impl = new FileMaker_Command_Edit_Implementation($fm, $layout, $recordId, $updatedValues);
     }
@@ -62,46 +62,46 @@ function FileMaker_Command_Edit($fm, $layout, $recordId, $updatedValues = array(
      * @param integer $repetition Field repetition number to set,
      *        Defaults to the first repetition.
      */
-    function setField($field, $value, $repetition = 0)
+    public function setField($field, $value, $repetition = 0)
     {
         return $this->_impl->setField($field, $value, $repetition);
     }
 
     /**
      * Sets the new value for a date, time, or timestamp field from a
-     * UNIX timestamp value. 
+     * UNIX timestamp value.
      *
-     * If the field is not a date or time field, then this method returns 
+     * If the field is not a date or time field, then this method returns
      * an Error object. Otherwise, returns TRUE.
      *
-     * If layout data for the target of this command has not already 
+     * If layout data for the target of this command has not already
      * been loaded, calling this method loads layout data so that
      * the type of the field can be checked.
      *
      * @param string $field Name of the field to set.
      * @param string $timestamp Timestamp value.
-     * @param integer $repetition Field repetition number to set. 
+     * @param integer $repetition Field repetition number to set.
      *        Defaults to the first repetition.
      */
-    function setFieldFromTimestamp($field, $timestamp, $repetition = 0)
+    public function setFieldFromTimestamp($field, $timestamp, $repetition = 0)
     {
         return $this->_impl->setFieldFromTimestamp($field, $timestamp, $repetition);
     }
 
     /**
      * Sets the modification ID for this command.
      *
-     * Before you edit a record, you can use the 
-     * {@link FileMaker_Record::getModificationId()} method to get the record's 
-     * modification ID. By specifying a modification ID when you execute an 
-     * Edit command, you can make sure that you are editing the current version 
-     * of a record. If the modification ID value you specify does not match the 
-     * current modification ID value in the database, the Edit command is not 
-     * allowed and an error code is returned. 
-     * 
+     * Before you edit a record, you can use the
+     * {@link FileMaker_Record::getModificationId()} method to get the record's
+     * modification ID. By specifying a modification ID when you execute an
+     * Edit command, you can make sure that you are editing the current version
+     * of a record. If the modification ID value you specify does not match the
+     * current modification ID value in the database, the Edit command is not
+     * allowed and an error code is returned.
+     *
      * @param integer $modificationId Modification ID.
      */
-    function setModificationId($modificationId)
+    public function setModificationId($modificationId)
     {
         $this->_impl->setModificationId($modificationId);
     }