Enforce PSR-4 (PHPMailer#1159)

UbuntuEvangelist · Sep 14, 2017 · 9e05e79 · 9e05e79
1 parent 8550acd
commit 9e05e79
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 2 deletions.
diff --git a/.php_cs b/.php_cs
@@ -20,7 +20,6 @@ return PhpCsFixer\Config::create()
         'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_order' => true,
         'phpdoc_summary' => false,
-        'psr4' => false,
         'semicolon_after_instruction' => true,
         'simplified_null_return' => true,
     ])

diff --git a/src/PHPMailer.php b/src/PHPMailer.php
@@ -2383,7 +2383,7 @@ protected function generateId()
         }
 
         //We don't care about messing up base64 format here, just want a random string
-        return str_replace(['=','+','/'], '', base64_encode(hash('sha256', $bytes, true)));
+        return str_replace(['=', '+', '/'], '', base64_encode(hash('sha256', $bytes, true)));
     }
 
     /**

diff --git a/test/phpmailerLangTest.php → test/PHPMailerLangTest.php b/test/phpmailerLangTest.php → test/PHPMailerLangTest.php
diff --git a/test/phpmailerTest.php → test/PHPMailerTest.php b/test/phpmailerTest.php → test/PHPMailerTest.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -2383,7 +2383,7 @@ protected function generateId() @@
             }
             //We don't care about messing up base64 format here, just want a random string
-            return str_replace(['=','+','/'], '', base64_encode(hash('sha256', $bytes, true)));
+            return str_replace(['=', '+', '/'], '', base64_encode(hash('sha256', $bytes, true)));
         }
         /**
@@ Expand Down @@