CRM-20561 - net-smtp-fix.sh - Cleanup code style

civicrm · Jul 1, 2017 · 8505353 · 8505353
1 parent e28d453
commit 8505353
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 66 deletions.
diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
     "symfony/finder": "2.3.*",
     "tecnickcom/tcpdf" : "6.2.*",
     "totten/ca-config": "~17.05",
-    "civicrm/civicrm-cxn-rpc": "~0.16.12.05"
-    "pear/Auth_SASL": "1.1.0"
+    "civicrm/civicrm-cxn-rpc": "~0.16.12.05",
+    "pear/Auth_SASL": "1.1.0",
     "pear/Net_SMTP": "1.6.*",
     "pear/Net_socket": "1.0.*"
   },

diff --git a/composer.lock b/composer.lock
diff --git a/tools/scripts/composer/net-smtp-fix.sh b/tools/scripts/composer/net-smtp-fix.sh
@@ -27,16 +27,16 @@ function safe_delete() {
 ##############################################################################
 # Add in CiviCRM custom error message for CRM-8744.
 if ! grep -q 'CRM-8744' vendor/pear/net_smtp/Net/SMTP.php; then
-patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-patch.txt
+  patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-patch.txt
 fi
 if ! grep -q '@STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT' vendor/pear/net_smtp/Net/SMTP.php; then
-patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-tls-patch.txt
+  patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-tls-patch.txt
 fi
 if ! grep -q 'function __construct' vendor/pear/net_smtp/Net/SMTP.php; then
-patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-php7-patch.txt
+  patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-php7-patch.txt
 fi
 if grep -q '&Auth_SASL::factory' vendor/pear/net_smtp/Net/SMTP.php; then
-patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-ref-patch.txt
+  patch vendor/pear/net_smtp/Net/SMTP.php < tools/scripts/composer/patches/net-smtp-ref-patch.txt
 fi
 
 safe_delete vendor/pear/net_smtp/{examples,phpdoc.sh,tests}