composer.json - Update civicrm/civicrm-cxn-rpc. Fix handleAndRespond().

diff --git a/composer.json b/composer.json
index 2778555b0e67cc05673ef40017154fc6f1cc5e2b..66cf769bbe330190d504a8e2020f2115fbf13295 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -13,14 +13,8 @@
     "psr/log": "1.0.0",
     "symfony/finder": "2.3.*",
     "totten/ca-config": "~13.02",
-    "civicrm/civicrm-cxn-rpc": "dev-master#d3a201efdb09b8781e6205a9582e0ea2dd2a7dd4"
+    "civicrm/civicrm-cxn-rpc": "~0.15.07.07"
   },
-  "repositories": [
-    {
-      "type": "git",
-      "url": "https://github.com/totten/civicrm-cxn-rpc"
-    }
-  ],
   "scripts": {
     "post-install-cmd": [
       "bash tools/scripts/composer/dompdf-cleanup.sh"

diff --git a/composer.lock b/composer.lock
index 0f8bdaa9bab2406f63249d0f193f91d04e30a593..bb2cb1c87650c59e8d39cdac4c0cef8a3000e7d7 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1,18 +1,24 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "be40d4f92aa2bb9fdfe034e64f5ed4b5",
+    "hash": "836deff5048be510d1c6ff0fdf654f2f",
     "packages": [
         {
             "name": "civicrm/civicrm-cxn-rpc",
-            "version": "dev-master",
+            "version": "v0.15.07.07",
             "source": {
                 "type": "git",
-                "url": "https://github.com/totten/civicrm-cxn-rpc",
-                "reference": "d3a201efdb09b8781e6205a9582e0ea2dd2a7dd4"
+                "url": "https://github.com/civicrm/civicrm-cxn-rpc.git",
+                "reference": "e56f4a3e19cbb78b3df83425600f485361d12ca3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/civicrm/civicrm-cxn-rpc/zipball/e56f4a3e19cbb78b3df83425600f485361d12ca3",
+                "reference": "e56f4a3e19cbb78b3df83425600f485361d12ca3",
+                "shasum": ""
             },
             "require": {
                 "phpseclib/phpseclib": "0.3.*",
@@ -27,6 +33,7 @@
                     "Civi\\Cxn\\Rpc\\": "src/"
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -36,8 +43,8 @@
                     "email": "totten@civicrm.org"
                 }
             ],
-            "description": "RPC library for CiviCRM QuickConnect",
-            "time": "2015-03-25 11:25:27"
+            "description": "RPC library for CiviConnect",
+            "time": "2015-07-08 00:58:37"
         },
         {
             "name": "dompdf/dompdf",
@@ -498,9 +505,7 @@
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "civicrm/civicrm-cxn-rpc": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],

diff --git a/extern/cxn.php b/extern/cxn.php
index cc40d1acace7a753a97b87fc72114d3038b8d85f..30e6aa5c5dd2e39d81787632a2750f58995c61c5 100644 (file)
--- a/extern/cxn.php
+++ b/extern/cxn.php
@@ -50,4 +50,4 @@ $apiServer->setRouter(function ($cxn, $entity, $action, $params) {
   return civicrm_api($entity, $action, $params);
 
 });
-$apiServer->handleAndRespond(file_get_contents('php://input'));
+$apiServer->handle(file_get_contents('php://input'))->send();