Update patch URL and remove patch content as per standard now

diff --git a/composer.json b/composer.json
index 8bb5d61f1380f6bea00b5ebbc5cd7383fb6b11b0..22db3a163983a11a6ca04f4d50892c67ed985fb4 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -243,7 +243,7 @@
         "Add tests for binary data round trip": "https://github.com/php-cache/integration-tests/commit/89cd7068e83aa776774bfc44f6bcba858c085616.patch"
       },
       "pear/net_smtp": {
-        "Add in CiviCRM custom error message for CRM-8744": "tools/scripts/composer/patches/net-smtp-patch.patch"
+        "Add in CiviCRM custom error message for CRM-8744": "https://raw.githubusercontent.com/civicrm/civicrm-core/a6a0ff13d2a155ad962529595dceaef728116f96/tools/scripts/composer/patches/net-smtp-patch.patch"
       },
       "phpoffice/common": {
         "Fix handling of libxml_disable_entity_loader": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/phpoffice-common-xml-entity-fix.patch"

diff --git a/composer.lock b/composer.lock
index a82aa24850f0e1b2b677f6cb893b8c971e945182..1443ab232447399f0ce1fa45cb2254c7d065eb0c 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f545c6e46af52039ade0c29ca8fe41e5",
+    "content-hash": "705221f636824b774ef9fb35f3bfc987",
     "packages": [
         {
             "name": "cache/integration-tests",
@@ -34,6 +34,13 @@
                 "tedivm/stash": "dev-master"
             },
             "type": "library",
+            "extra": {
+                "patches_applied": {
+                    "Allow adding tests": "https://github.com/php-cache/integration-tests/commit/05f97174c09364dc10c084a38ba0cfd5124f4cec.patch",
+                    "Support PHPUnit 6+": "https://github.com/php-cache/integration-tests/commit/1ec7362962185df91d3d749bc3fa7e7b99cb9fc7.patch",
+                    "Add tests for binary data round trip": "https://github.com/php-cache/integration-tests/commit/89cd7068e83aa776774bfc44f6bcba858c085616.patch"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Cache\\IntegrationTests\\": "src/"
@@ -1011,7 +1018,7 @@
             "type": "library",
             "extra": {
                 "patches_applied": {
-                    "Add in CiviCRM custom error message for CRM-8744": "tools/scripts/composer/patches/net-smtp-patch.patch"
+                    "Add in CiviCRM custom error message for CRM-8744": "https://raw.githubusercontent.com/civicrm/civicrm-core/a6a0ff13d2a155ad962529595dceaef728116f96/tools/scripts/composer/patches/net-smtp-patch.patch"
                 }
             },
             "autoload": {
@@ -2410,9 +2417,7 @@
             "version": "3.0.0+php53",
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/tplaner/When/archive/c1ec099f421bff354cc5c929f83b94031423fc80.zip",
-                "reference": null,
-                "shasum": null
+                "url": "https://github.com/tplaner/When/archive/c1ec099f421bff354cc5c929f83b94031423fc80.zip"
             },
             "require": {
                 "php": ">=5.3.0"

diff --git a/tools/scripts/composer/patches/net-smtp-patch.patch b/tools/scripts/composer/patches/net-smtp-patch.patch
deleted file mode 100644 (file)
index 3a77c36..0000000
--- a/tools/scripts/composer/patches/net-smtp-patch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Net/SMTP.php       2019-12-01 10:40:31.000000000 +1100
-+++ Net/SMTP.php       2020-02-08 14:36:53.758318869 +1100
-@@ -376,7 +376,9 @@
-             return true;
-         }
- 
--        return PEAR::raiseError('Invalid response code received from server', $this->code);
-+        // CRM-8744
-+        $errorMessage = 'Invalid response code received from SMTP server while sending email.  This is often caused by a misconfiguration in Outbound Email settings. Please verify the settings at Administer CiviCRM >> Global Settings >> Outbound Email (SMTP).';
-+        return PEAR::raiseError($errorMessage, $this->code, PEAR_ERROR_RETURN);
-     }
- 
-     /**