refactor: Remove ParseApp and tests (#501)

Author: dplewis

src/Parse/ParseApp.php

@@ -61,13 +61,6 @@ final class ParseClient
      */
     private static $enableCurlExceptions;
 
-    /**
-     * The account key.
-     *
-     * @var string
-     */
-    private static $accountKey;
-
     /**
      * The object for managing persistence.
      *
@@ -132,8 +125,7 @@ public static function initialize(
         $app_id,
         $rest_key,
         $master_key,
-        $enableCurlExceptions = true,
-        $account_key = null
+        $enableCurlExceptions = true
     ) {
         if (!ParseObject::hasRegisteredSubclass('_User')) {
             ParseUser::registerSubclass();
@@ -160,7 +152,6 @@ public static function initialize(
         self::$restKey = $rest_key;
         self::$masterKey = $master_key;
         self::$enableCurlExceptions = $enableCurlExceptions;
-        self::$accountKey = $account_key;
         if (!static::$storage) {
             if (session_status() === PHP_SESSION_ACTIVE) {
                 self::setStorage(new ParseSessionStorage());
@@ -484,7 +475,6 @@ private static function createRequestUrl($relativeUrl)
      * @param null   $sessionToken  Session Token.
      * @param null   $data          Data to provide with the request.
      * @param bool   $useMasterKey  Whether to use the Master Key.
-     * @param bool   $appRequest    App request to create or modify a application
      * @param string $contentType   The content type for this request, default is application/json
      * @param bool   $returnHeaders Allow to return response headers
      *
@@ -498,7 +488,6 @@ public static function _request(
         $sessionToken = null,
         $data = null,
         $useMasterKey = false,
-        $appRequest = false,
         $contentType = 'application/json',
         $returnHeaders = false
     ) {
@@ -511,37 +500,29 @@ public static function _request(
 
         // verify the server url and mount path have been set
         self::assertServerInitialized();
+        self::assertParseInitialized();
 
-        if ($appRequest) {
-            // ** 'app' requests are not available in open source parse-server
-            self::assertAppInitialized();
-
-            $httpClient->addRequestHeader('X-Parse-Account-Key', self::$accountKey);
-        } else {
-            self::assertParseInitialized();
-
-            // add appId & client version
-            $httpClient->addRequestHeader('X-Parse-Application-Id', self::$applicationId);
-            $httpClient->addRequestHeader('X-Parse-Client-Version', 'php' . self::VERSION_STRING);
+        // add appId & client version
+        $httpClient->addRequestHeader('X-Parse-Application-Id', self::$applicationId);
+        $httpClient->addRequestHeader('X-Parse-Client-Version', 'php' . self::VERSION_STRING);
 
 
-            if ($sessionToken) {
-                // add our current session token
-                $httpClient->addRequestHeader('X-Parse-Session-Token', $sessionToken);
-            }
+        if ($sessionToken) {
+            // add our current session token
+            $httpClient->addRequestHeader('X-Parse-Session-Token', $sessionToken);
+        }
 
-            if ($useMasterKey) {
-                // pass master key
-                $httpClient->addRequestHeader('X-Parse-Master-Key', self::$masterKey);
-            } elseif (isset(self::$restKey)) {
-                // pass REST key
-                $httpClient->addRequestHeader('X-Parse-REST-API-Key', self::$restKey);
-            }
+        if ($useMasterKey) {
+            // pass master key
+            $httpClient->addRequestHeader('X-Parse-Master-Key', self::$masterKey);
+        } elseif (isset(self::$restKey)) {
+            // pass REST key
+            $httpClient->addRequestHeader('X-Parse-REST-API-Key', self::$restKey);
+        }
 
-            if (self::$forceRevocableSession) {
-                // indicate we are using revocable sessions
-                $httpClient->addRequestHeader('X-Parse-Revocable-Session', '1');
-            }
+        if (self::$forceRevocableSession) {
+            // indicate we are using revocable sessions
+            $httpClient->addRequestHeader('X-Parse-Revocable-Session', '1');
         }
 
         /*
@@ -713,22 +694,6 @@ private static function assertParseInitialized()
         }
     }
 
-    /**
-     * Asserts that the sdk has been initialized with a valid account key
-     *
-     * @throws Exception
-     */
-    private static function assertAppInitialized()
-    {
-        if (self::$accountKey === null || empty(self::$accountKey)) {
-            throw new Exception(
-                'You must call ParseClient::initialize(..., $accountKey) before making any app requests. '.
-                'Your account key must not be null or empty.',
-                109
-            );
-        }
-    }
-
     /**
      * Get remote Parse API url.
      *

src/Parse/ParseClient.php

@@ -72,7 +72,6 @@ public static function startJob($jobName, $data = [])
             null,
             json_encode(ParseClient::_encode($data, false)),
             true,
-            false,
             'application/json',
             true
         );

src/Parse/ParseCloud.php

@@ -229,7 +229,6 @@ private function upload($useMasterKey = false)
             null,
             $this->getData(),
             $useMasterKey,
-            false,
             $mimeType
         );
     }

src/Parse/ParseFile.php

@@ -78,7 +78,6 @@ public static function send($data, $useMasterKey = false)
             null,
             json_encode(ParseClient::_encode($data, true)),
             $useMasterKey,
-            false,
             'application/json',
             true
         );

src/Parse/ParsePush.php

@@ -28,13 +28,6 @@ class Helper
      */
     public static $masterKey  = 'master-key-here';
 
-    /**
-     * Account Key (for parse.com)
-     * @var string
-     */
-    public static $accountKey = 'account-key';
-
-
     public static function setUp()
     {
         ini_set('error_reporting', E_ALL);
@@ -46,7 +39,6 @@ public static function setUp()
             self::$restKey,
             self::$masterKey,
             true,
-            self::$accountKey
         );
         self::setServerURL();
         self::setHttpClient();
@@ -106,7 +98,6 @@ public static function setUpWithoutCURLExceptions()
             self::$restKey,
             self::$masterKey,
             false,
-            self::$accountKey
         );
     }