Changeset 468 for trunk/lib/Google_API.inc.php

Timestamp:

Feb 20, 2014 3:03:59 AM (10 years ago)

Author:

anonymous

Message:

Completed integrating ^{/branches/eli_branch into} /trunk. Changes include:

• Removed closing ?> from end of files
• Upgrade old-style contructor methods to use construct() instead.
• Class properties and methods defined as public, private, static or protected
• Ensure code runs under E_ALL with only mysql_* deprecated warnings
• Search for the '@' symbol anywhere it might be used to supress runtime errors, then replace with proper error recovery.
• Run the php cli -l option to check files for syntax errors.
• Bring tests up-to-date with latest version and methods of PHPUnit

Location:

trunk

Files:

• . (modified) (1 prop)
• lib/Google_API.inc.php (modified) (8 diffs)

trunk/lib/Google_API.inc.php

@@ -53 +53 @@
      * @access private
      */
-    var $_licenseKey = '';
+    private $_licenseKey = '';
 
     /**
@@ -59 +59 @@
      * @access private
      */
-    var $_soapClient = NULL;
+    private $_soapClient = NULL;
 
     /**
@@ -67 +67 @@
      * @access public
      */
-    function Google_API($licenseKey)
+    public function __construct($licenseKey)
     {
         $this->_licenseKey = $licenseKey;
@@ -82 +82 @@
      * @access public
      */
-    function getCachedPage($url)
+    public function getCachedPage($url)
     {
         $result = $this->_performAPICall(
@@ -104 +104 @@
      * @access public
      */
-    function getSpellingSuggestion($phrase)
+    public function getSpellingSuggestion($phrase)
     {
         return $this->_performAPICall(
@@ -122 +122 @@
      * @access public
      */
-    function search($parameters = array())
+    public function search($parameters = array())
     {
         if (!isset($parameters['query'])) {
@@ -150 +150 @@
      * @access private
      */
-    function _performAPICall($apiCall, $parameters)
+    private function _performAPICall($apiCall, $parameters)
     {
         $app =& App::getInstance();
@@ -167 +167 @@
     }
 }
-?>
-
-