Merge pull request parse-community#169 from Pmovil/master

Missing PSR4 update on CONTRIBUTING.md

Author: gfosco

CONTRIBUTING.md

@@ -20,7 +20,7 @@ App just for testing, and deploy some cloud code to it.
 * Use the Parse CLI to create a Cloud Code folder for the new app.
 * Copy tests/cloudcode/cloud/main.js into the newly created cloud/ folder.
 * Run "parse deploy" in your cloud folder.
-* Paste your App ID, REST API Key, and Master Key in tests/ParseTestHelper.php
+* Paste your App ID, REST API Key, and Master Key in tests/Parse/Helper.php
 
 You should now be able to execute, from project root folder:
 

src/Parse/ParseClient.php

@@ -64,6 +64,20 @@ final class ParseClient
      */
     private static $forceRevocableSession = false;
 
+    /**
+     * Number of seconds to wait while trying to connect. Use 0 to wait indefinitely.
+     *
+     * @var int
+     */
+    private static $connectionTimeout;
+
+    /**
+     * Maximum number of seconds of request/response operation.
+     *
+     * @var int
+     */
+    private static $timeout;
+
     /**
      * Constant for version string to include with requests.
      *
@@ -280,6 +294,14 @@ public static function _request($method, $relativeUrl, $sessionToken = null,
             curl_setopt($rest, CURLOPT_CUSTOMREQUEST, $method);
         }
         curl_setopt($rest, CURLOPT_HTTPHEADER, $headers);
+
+        if (!is_null(self::$connectionTimeout)) {
+            curl_setopt($rest, CURLOPT_CONNECTTIMEOUT, self::$connectionTimeout);
+        }
+        if (!is_null(self::$timeout)) {
+            curl_setopt($rest, CURLOPT_TIMEOUT, self::$timeout);
+        }
+
         $response = curl_exec($rest);
         $status = curl_getinfo($rest, CURLINFO_HTTP_CODE);
         $contentType = curl_getinfo($rest, CURLINFO_CONTENT_TYPE);
@@ -439,4 +461,24 @@ public static function enableRevocableSessions()
     {
         self::$forceRevocableSession = true;
     }
+
+    /**
+     * Sets number of seconds to wait while trying to connect. Use 0 to wait indefinitely, null to default behaviour.
+     * 
+     * @param int|null $connectionTimeout
+     */
+    public static function setConnectionTimeout($connectionTimeout)
+    {
+        self::$connectionTimeout = $connectionTimeout;
+    }
+
+    /**
+     * Sets maximum number of seconds of request/response operation. Use 0 to wait indefinitely, null to default behaviour.
+     * 
+     * @param int|null $timeout
+     */
+    public static function setTimeout($timeout)
+    {
+        self::$timeout = $timeout;
+    }
 }

src/Parse/ParsePush.php

@@ -41,15 +41,13 @@ public static function send($data, $useMasterKey = false)
         }
         if (isset($data['where'])) {
             if ($data['where'] instanceof ParseQuery) {
-                
-                $where_options   = $data['where']->_getOptions();
+                $where_options = $data['where']->_getOptions();
 
                 if (!isset($query_where['where'])) {
                     $data['where'] = '{}';
                 } else {
                     $data['where'] = $data['where']->_getOptions()['where'];
                 }
-
             } else {
                 throw new Exception(
                     'Where parameter for Parse Push must be of type ParseQuery'