From 2ac97b20cd09d51cd4614f148899bac6f7921cd1 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 9 Jan 2019 07:38:21 +1100
Subject: [PATCH] dev/mail#43 Update composer requirement on PSR Log and
 civicrm-cxn-rpc to fix compatability issue with psr/log from Drupal8

---
 composer.json |  4 ++--
 composer.lock | 37 +++++++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/composer.json b/composer.json
index 0988e0cd9953..829f8ae59f82 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
     "symfony/event-dispatcher": "^2.8.44 || ~3.0",
     "symfony/filesystem": "^2.8.44 || ~3.0",
     "symfony/process": "^2.8.44 || ~3.0",
-    "psr/log": "~1.0.0",
+    "psr/log": "~1.1",
     "symfony/finder": "^2.8.44 || ~3.0",
     "tecnickcom/tcpdf" : "6.2.*",
     "totten/ca-config": "~17.05",
@@ -51,7 +51,7 @@
     "marcj/topsort": "~1.1",
     "phpoffice/phpword": "^0.14.0",
     "pear/Validate_Finance_CreditCard": "dev-master",
-    "civicrm/civicrm-cxn-rpc": "~0.17.07.01",
+    "civicrm/civicrm-cxn-rpc": "~0.19.01.08",
     "pear/Auth_SASL": "1.1.0",
     "pear/Net_SMTP": "1.6.*",
     "pear/Net_socket": "1.0.*",
diff --git a/composer.lock b/composer.lock
index 7b5f352c9f7c..b3028039cf7f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,25 +4,25 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "38f5450ab72f881008f5cd10bb588b6f",
+    "content-hash": "3a5a920dad6f16458645ee4b5944716a",
     "packages": [
         {
             "name": "civicrm/civicrm-cxn-rpc",
-            "version": "v0.17.07.01",
+            "version": "v0.19.01.08",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/civicrm-cxn-rpc.git",
-                "reference": "2d934d45e65e907f4b0cabc67979b5f3f2b27135"
+                "reference": "5a142bc4d24b7f8c830f59768b405ec74d582f22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/civicrm-cxn-rpc/zipball/2d934d45e65e907f4b0cabc67979b5f3f2b27135",
-                "reference": "2d934d45e65e907f4b0cabc67979b5f3f2b27135",
+                "url": "https://api.github.com/repos/civicrm/civicrm-cxn-rpc/zipball/5a142bc4d24b7f8c830f59768b405ec74d582f22",
+                "reference": "5a142bc4d24b7f8c830f59768b405ec74d582f22",
                 "shasum": ""
             },
             "require": {
                 "phpseclib/phpseclib": "1.0.*",
-                "psr/log": "~1.0.0"
+                "psr/log": "~1.1"
             },
             "type": "library",
             "autoload": {
@@ -41,7 +41,7 @@
                 }
             ],
             "description": "RPC library for CiviConnect",
-            "time": "2017-07-18T04:02:44+00:00"
+            "time": "2019-01-08T19:20:09+00:00"
         },
         {
             "name": "civicrm/civicrm-setup",
@@ -1106,22 +1106,30 @@
         },
         {
             "name": "psr/log",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=5.3.0"
+            },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
             "autoload": {
-                "psr-0": {
-                    "Psr\\Log\\": ""
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1135,12 +1143,13 @@
                 }
             ],
             "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
             "keywords": [
                 "log",
                 "psr",
                 "psr-3"
             ],
-            "time": "2012-12-21T11:40:51+00:00"
+            "time": "2018-11-20T15:27:04+00:00"
         },
         {
             "name": "psr/simple-cache",