Changeset 468 for trunk/lib/PayPal.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/PayPal.inc.php (modified) (14 diffs)

trunk/lib/PayPal.inc.php

@@ -33 +33 @@
 
     // General object parameters.
-    var $_params = array(
+    private $_params = array(
         'paypal_url' => 'https://www.paypal.com/cgi-bin/webscr',
         'test_mode' => false,
@@ -39 +39 @@
 
     // Options used for specific buttons and links.
-    var $_default_button_options = array();
+    private $_default_button_options = array();
 
     // Array of buttons created by newButton().
-    var $_buttons = array();
+    private $_buttons = array();
 
     // Store the response from the last IPN.
-    var $_ipn_response;
+    private $_ipn_response;
 
     /**
@@ -52 +52 @@
      * @param   bool    $test_mode  Use PayPal sandbox for testing.
      */
-    function PayPal($test_mode=false)
+    public function __construct($test_mode=false)
     {
         if ($test_mode) {
@@ -95 +95 @@
      * @return  bool    True on success, false on failure.
      */
-    function setButtonDefaults($type, $options)
+    public function setButtonDefaults($type, $options)
     {
         $app =& App::getInstance();
@@ -127 +127 @@
      * @return  bool    True on success, false on failure.
      */
-    function newButton($type, $name, $options=null)
+    public function newButton($type, $name, $options=null)
     {
         $app =& App::getInstance();
@@ -162 +162 @@
      * @return  mixed   Link of button, or false on failure.
      */
-    function getLink($name)
+    public function getLink($name)
     {
         $app =& App::getInstance();
@@ -196 +196 @@
      * @param   string  $name   Name of button for which to generate link.
      */
-    function printLink($name)
+    public function printLink($name)
     {
         echo $this->getLink($name);
@@ -208 +208 @@
      * @param   string  $name   Name of button to print.
      */
-    function printButton($name)
+    public function printButton($name)
     {
         ?>
@@ -234 +234 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
         $app =& App::getInstance();
@@ -253 +253 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
         $app =& App::getInstance();
@@ -272 +272 @@
      * @return  bool    True if valid, false if invalid.
      */
-    function incomingIPNRequest()
+    public function incomingIPNRequest()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST'
@@ -290 +290 @@
      * @return  bool    True on success, false on failure.
      */
-    function processIPN()
+    public function processIPN()
     {
         $app =& App::getInstance();
@@ -351 +351 @@
      * @return  bool    True if response contains VERIFIED, false otherwise.
      */
-    function verifiedIPN()
+    public function verifiedIPN()
     {
         $app =& App::getInstance();
@@ -380 +380 @@
 } // End of class.
 
-?>