fixed some unit tests

Author: fabpot

tests/unit/Swift/Signers/SMimeSignerTest.php

@@ -62,15 +62,14 @@ public function testSingedMessage()
 
 Here is the message itself
 --$boundary
-Content-Type: application/pkcs7-signature; name="smime\.p7s"
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime\.p7s"
 
 (?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
 
 --$boundary--
 OEL;
-
         $this->assertValidVerify($expectedBody, $messageStream);
         unset($messageStream);
     }
@@ -93,7 +92,7 @@ public function testSingedMessageBinary()
         $entityString = $messageStream->getContent();
         $headers = self::getHeadersOfMessage($entityString);
 
-        if ('application/pkcs7-mime; smime-type=signed-data;' !== substr($headers['content-type'], 0, 47)) {
+        if (!preg_match('#^application/(x\-)?pkcs7-mime; smime-type=signed\-data;#', $headers['content-type'])) {
             $this->fail('Content-type does not match.');
 
             return false;
@@ -161,7 +160,7 @@ public function testSingedMessageWithAttachments()
 --\\1--
 
 --$boundary
-Content-Type: application/pkcs7-signature; name="smime\\.p7s"
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\\.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime\\.p7s"
 
@@ -194,7 +193,7 @@ public function testEncryptedMessage()
         $entityString = $messageStream->getContent();
         $headers = self::getHeadersOfMessage($entityString);
 
-        if ('application/pkcs7-mime; smime-type=enveloped-data;' !== substr($headers['content-type'], 0, 50)) {
+        if (!preg_match('#^application/(x\-)?pkcs7-mime; smime-type=enveloped\-data;#', $headers['content-type'])) {
             $this->fail('Content-type does not match.');
 
             return false;
@@ -232,7 +231,7 @@ public function testEncryptedMessageWithMultipleCerts()
         $entityString = $messageStream->getContent();
         $headers = self::getHeadersOfMessage($entityString);
 
-        if ('application/pkcs7-mime; smime-type=enveloped-data;' !== substr($headers['content-type'], 0, 50)) {
+        if (!preg_match('#^application/(x\-)?pkcs7-mime; smime-type=enveloped\-data;#', $headers['content-type'])) {
             $this->fail('Content-type does not match.');
 
             return false;
@@ -278,7 +277,7 @@ public function testSignThenEncryptedMessage()
         $entityString = $messageStream->getContent();
         $headers = self::getHeadersOfMessage($entityString);
 
-        if ('application/pkcs7-mime; smime-type=enveloped-data;' !== substr($headers['content-type'], 0, 50)) {
+        if (!preg_match('#^application/(x\-)?pkcs7-mime; smime-type=enveloped\-data;#', $headers['content-type'])) {
             $this->fail('Content-type does not match.');
 
             return false;
@@ -308,7 +307,7 @@ public function testSignThenEncryptedMessage()
 
 Here is the message itself
 --$boundary
-Content-Type: application/pkcs7-signature; name="smime\.p7s"
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime\.p7s"
 
@@ -356,14 +355,14 @@ public function testEncryptThenSignMessage()
 --$boundary
 (?P<encrypted_message>MIME-Version: 1\.0
 Content-Disposition: attachment; filename="smime\.p7m"
-Content-Type: application/pkcs7-mime; smime-type=enveloped-data; name="smime\.p7m"
+Content-Type: application/(x\-)?pkcs7-mime; smime-type=enveloped-data; name="smime\.p7m"
 Content-Transfer-Encoding: base64
 
 (?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
 
 
 )--$boundary
-Content-Type: application/pkcs7-signature; name="smime\.p7s"
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime\.p7s"