Updated composer to v1.2.3 and swiftmailer to v5.4.4

Geeklog-Core · Dec 4, 2016 · 5ea16f7 · 5ea16f7
1 parent 7b736c7
commit 5ea16f7
Show file tree

Hide file tree

Showing 18 changed files with 105 additions and 92 deletions.
diff --git a/system/composer.lock b/system/composer.lock
diff --git a/system/composer.phar b/system/composer.phar
diff --git a/system/vendor/autoload.php b/system/vendor/autoload.php
@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInite72621cdbb7ab1eae4754470aabe0609::getLoader();
diff --git a/system/vendor/composer/autoload_files.php b/system/vendor/composer/autoload_files.php
@@ -6,6 +6,6 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
     'ef836782e1b8d747e78815386b148139' => $vendorDir . '/htmlawed/htmlawed/htmLawed.php',
+    '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
 );
diff --git a/system/vendor/composer/autoload_static.php b/system/vendor/composer/autoload_static.php
@@ -7,8 +7,8 @@
 class ComposerStaticInite72621cdbb7ab1eae4754470aabe0609
 {
     public static $files = array (
-        '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
         'ef836782e1b8d747e78815386b148139' => __DIR__ . '/..' . '/htmlawed/htmlawed/htmLawed.php',
+        '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
     );
 
     public static $prefixLengthsPsr4 = array (

diff --git a/system/vendor/composer/installed.json b/system/vendor/composer/installed.json
@@ -1,59 +1,4 @@
 [
-    {
-        "name": "swiftmailer/swiftmailer",
-        "version": "v5.4.3",
-        "version_normalized": "5.4.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/swiftmailer/swiftmailer.git",
-            "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
-            "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "mockery/mockery": "~0.9.1"
-        },
-        "time": "2016-07-08 11:51:25",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "5.4-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "lib/swift_required.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Chris Corbyn"
-            },
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            }
-        ],
-        "description": "Swiftmailer, free feature-rich PHP mailer",
-        "homepage": "http://swiftmailer.org",
-        "keywords": [
-            "email",
-            "mail",
-            "mailer"
-        ]
-    },
     {
         "name": "pear/pear_exception",
         "version": "v1.0.0",
@@ -472,5 +417,60 @@
             "strip",
             "tags"
         ]
+    },
+    {
+        "name": "swiftmailer/swiftmailer",
+        "version": "v5.4.4",
+        "version_normalized": "5.4.4.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/swiftmailer/swiftmailer.git",
+            "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/545ce9136690cea74f98f86fbb9c92dd9ab1a756",
+            "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "mockery/mockery": "~0.9.1"
+        },
+        "time": "2016-11-24 01:01:23",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "5.4-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "lib/swift_required.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Chris Corbyn"
+            },
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            }
+        ],
+        "description": "Swiftmailer, free feature-rich PHP mailer",
+        "homepage": "http://swiftmailer.org",
+        "keywords": [
+            "email",
+            "mail",
+            "mailer"
+        ]
     }
 ]
diff --git a/system/vendor/swiftmailer/swiftmailer/CHANGES b/system/vendor/swiftmailer/swiftmailer/CHANGES
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+5.4.4 (2016-11-23)
+------------------
+
+ * reverted escaping command-line args to mail (PHP mail() function already does it)
+
 5.4.3 (2016-07-08)
 ------------------
 
@@ -23,7 +28,7 @@ Changelog
  * added return-path header to the ignoredHeaders list of DKIMSigner
  * fixed crlf for subject using mail
  * fixed add soft line break only when necessary
- * fixed escaping command-line args to Sendmail
+ * fixed escaping command-line args to mail
 
 5.4.1 (2015-06-06)
 ------------------

diff --git a/system/vendor/swiftmailer/swiftmailer/VERSION b/system/vendor/swiftmailer/swiftmailer/VERSION
@@ -1 +1 @@
-Swift-5.4.3
+Swift-5.4.4
diff --git a/system/vendor/swiftmailer/swiftmailer/doc/messages.rst b/system/vendor/swiftmailer/swiftmailer/doc/messages.rst
@@ -1038,13 +1038,14 @@ priority will not change the way your email is sent -- it is purely an
 indicative setting for the recipient.
 
 The priority of a message is an indication to the recipient what significance
-it has. Swift Mailer allows you to set the priority by calling the ``setPriority`` method. This method takes an integer value between 1 and 5:
+it has. Swift Mailer allows you to set the priority by calling the
+``setPriority`` method. This method takes an integer value between 1 and 5:
 
-* Highest
-* High
-* Normal
-* Low
-* Lowest
+* `Swift_Mime_SimpleMessage::PRIORITY_HIGHEST`: 1
+* `Swift_Mime_SimpleMessage::PRIORITY_HIGH`: 2
+* `Swift_Mime_SimpleMessage::PRIORITY_NORMAL`: 3
+* `Swift_Mime_SimpleMessage::PRIORITY_LOW`: 4
+* `Swift_Mime_SimpleMessage::PRIORITY_LOWEST`: 5
 
 To set the message priority:
 
@@ -1055,3 +1056,6 @@ To set the message priority:
 
     // Indicate "High" priority
     $message->setPriority(2);
+
+    // Or use the constant to be more explicit
+    $message->setPriority(Swift_Mime_SimpleMessage::PRIORITY_HIGH);
diff --git a/system/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php b/system/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
@@ -92,7 +92,7 @@ public function addPart($body, $contentType = null, $charset = null)
     }
 
     /**
-     * Attach a new signature handler to the message.
+     * Detach a signature handler from a message.
      *
      * @param Swift_Signer $signer
      *
@@ -281,11 +281,11 @@ public function __clone()
     {
         parent::__clone();
         foreach ($this->bodySigners as $key => $bodySigner) {
-            $this->bodySigners[$key] = clone($bodySigner);
+            $this->bodySigners[$key] = clone $bodySigner;
         }
 
         foreach ($this->headerSigners as $key => $headerSigner) {
-            $this->headerSigners[$key] = clone($headerSigner);
+            $this->headerSigners[$key] = clone $headerSigner;
         }
     }
 }
diff --git a/system/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/system/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
@@ -30,11 +30,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
     private $_fieldName;
 
     /**
-     * Creates a new SimpleHeader with $name.
-     *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Mime_Grammar       $grammar
+     * @param string $name
      */
     public function __construct($name)
     {

diff --git a/system/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/system/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
@@ -15,6 +15,12 @@
  */
 class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime_Message
 {
+    const PRIORITY_HIGHEST = 1;
+    const PRIORITY_HIGH = 2;
+    const PRIORITY_NORMAL = 3;
+    const PRIORITY_LOW = 4;
+    const PRIORITY_LOWEST = 5;
+
     /**
      * Create a new SimpleMessage with $headers, $encoder and $cache.
      *
@@ -452,11 +458,11 @@ public function getBcc()
     public function setPriority($priority)
     {
         $priorityMap = array(
-            1 => 'Highest',
-            2 => 'High',
-            3 => 'Normal',
-            4 => 'Low',
-            5 => 'Lowest',
+            self::PRIORITY_HIGHEST => 'Highest',
+            self::PRIORITY_HIGH => 'High',
+            self::PRIORITY_NORMAL => 'Normal',
+            self::PRIORITY_LOW => 'Low',
+            self::PRIORITY_LOWEST => 'Lowest',
             );
         $pMapKeys = array_keys($priorityMap);
         if ($priority > max($pMapKeys)) {

diff --git a/...or/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/...or/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -124,6 +124,7 @@ public function filter($buffer, $_minReplaces = -1)
 
         $newBuffer = array();
         $buf_size = count($buffer);
+        $last_size = 0;
         for ($i = 0; $i < $buf_size; ++$i) {
             $search_pos = $this->_tree;
             $last_found = PHP_INT_MAX;

diff --git a/...ndor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/...ndor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -46,7 +46,7 @@ public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $passw
         }
 
         if (!function_exists('bcmul')) {
-            throw new LogicException('The BCMatch functions must be enabled to use the NTLM authenticator.');
+            throw new LogicException('The BCMath functions must be enabled to use the NTLM authenticator.');
         }
 
         try {

diff --git a/system/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php b/system/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
@@ -249,7 +249,8 @@ private function _getReversePath(Swift_Mime_Message $message)
     private function _formatExtraParams($extraParams, $reversePath)
     {
         if (false !== strpos($extraParams, '-f%s')) {
-            $extraParams = empty($reversePath) ? str_replace('-f%s', '', $extraParams) : sprintf($extraParams, escapeshellarg($reversePath));
+            // no need to escape $reversePath) as mail() already does it
+            $extraParams = empty($reversePath) ? str_replace('-f%s', '', $extraParams) : sprintf($extraParams, $reversePath);
         }
 
         return !empty($extraParams) ? $extraParams : null;

diff --git a/system/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MessageTest.php b/system/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MessageTest.php
@@ -123,7 +123,7 @@ protected function _recursiveArrayCloningCheck($array1, $array2, $array1_clone)
                 $arr2_value = $array2[$key];
                 $arr1_clone_value = $array1_clone[$key];
 
-                return $this->_recursiveArrayCloningCheck($obj1_value, $obj2_value, $obj1_clone_value);
+                return $this->_recursiveArrayCloningCheck($arr1_value, $arr2_value, $arr1_clone_value);
             }
         }
     }

diff --git a/system/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php b/system/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
@@ -652,7 +652,7 @@ public function testPriorityIsSetInHeader()
             $this->_createHeaderSet(array('X-Priority' => $prio)),
             $this->_createEncoder(), $this->_createCache()
             );
-        $message->setPriority(5);
+        $message->setPriority($message::PRIORITY_LOWEST);
     }
 
     public function testPriorityHeaderIsAddedIfNoneSet()
@@ -667,7 +667,7 @@ public function testPriorityHeaderIsAddedIfNoneSet()
         $message = $this->_createMessage($headers, $this->_createEncoder(),
             $this->_createCache()
             );
-        $message->setPriority(4);
+        $message->setPriority($message::PRIORITY_LOW);
     }
 
     public function testReadReceiptAddressReadFromHeader()
@@ -802,7 +802,7 @@ public function testFluidInterface()
             ->setTo(array('chris@site.tld', 'mark@site.tld'))
             ->setCc('john@somewhere.tld')
             ->setBcc(array('one@site', 'two@site' => 'Two'))
-            ->setPriority(4)
+            ->setPriority($message::PRIORITY_LOW)
             ->setReadReceiptTo('a@b')
             ->attach($child)
             ->detach($child)

diff --git a/system/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php b/system/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php
@@ -100,7 +100,7 @@ public function testTransportSettingUsingReturnPathForExtraParams()
              );
         $invoker->shouldReceive('mail')
                 ->once()
-                ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), '-f\'foo@bar\'');
+                ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), '-ffoo@bar');
 
         $transport->send($message);
     }
@@ -153,7 +153,7 @@ public function testTransportSettingSettingExtraParamsWithF()
             ->andReturn(null);
         $invoker->shouldReceive('mail')
             ->once()
-            ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), '-x\'foo\' -f\'foo@bar\'');
+            ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), '-x\'foo\' -ffoo@bar');
 
         $transport->send($message);
     }