thecodingmachine / swift-twig-mail-template

src/SwiftTwigMailTemplate.php

Spacing +34 added lines, -34 removed lines

@@ -104,12 +104,12 @@ 
      *
      * @return \Swift_Message
      */
-    public function renderMail(array $data = []) :\Swift_Message
+    public function renderMail(array $data = [ ]) :\Swift_Message
     {
         $mail = new \Swift_Message();
 
         $twigEnvironment = clone $this->twigEnvironment;
-        $function = new \Twig_SimpleFunction('embedImage', function ($imgPath) use ($mail) {
+        $function = new \Twig_SimpleFunction('embedImage', function($imgPath) use ($mail) {
             return $mail->embed(\Swift_Image::fromPath($imgPath));
         });
         $twigEnvironment->addFunction($function);
@@ -289,17 +289,17 @@ 
      * @param string $keep The list of tags to keep
      * @param string $expand The list of tags to remove completely, along their content
      */
-    private function removeHtml(string $s , string $keep = '' , string $expand = 'script|style|noframes|select|option') :string
+    private function removeHtml(string $s, string $keep = '', string $expand = 'script|style|noframes|select|option') :string
     {
         /**///prep the string
-        $s = ' ' . $s;
+        $s = ' '.$s;
 
         /**///initialize keep tag logic
-        if(strlen($keep) > 0){
-            $k = explode('|',$keep);
-            for($i=0;$i<count($k);$i++){
-                $s = str_replace('<' . $k[$i],'[{(' . $k[$i],$s);
-                $s = str_replace('</' . $k[$i],'[{(/' . $k[$i],$s);
+        if (strlen($keep) > 0) {
+            $k = explode('|', $keep);
+            for ($i = 0; $i < count($k); $i++) {
+                $s = str_replace('<'.$k[ $i ], '[{('.$k[ $i ], $s);
+                $s = str_replace('</'.$k[ $i ], '[{(/'.$k[ $i ], $s);
             }
         }
         $pos = array();
@@ -307,43 +307,43 @@ 
 
         //begin removal
         /**///remove comment blocks
-        while(stripos($s,'<!--') > 0){
-            $pos[1] = stripos($s,'<!--');
-            $pos[2] = stripos($s,'-->', $pos[1]);
-            $len[1] = $pos[2] - $pos[1] + 3;
-            $x = substr($s,$pos[1],$len[1]);
-            $s = str_replace($x,'',$s);
+        while (stripos($s, '<!--') > 0) {
+            $pos[ 1 ] = stripos($s, '<!--');
+            $pos[ 2 ] = stripos($s, '-->', $pos[ 1 ]);
+            $len[ 1 ] = $pos[ 2 ] - $pos[ 1 ] + 3;
+            $x = substr($s, $pos[ 1 ], $len[ 1 ]);
+            $s = str_replace($x, '', $s);
         }
 
         /**///remove tags with content between them
-        if(strlen($expand) > 0){
-            $e = explode('|',$expand);
-            for($i=0;$i<count($e);$i++){
-                while(stripos($s,'<' . $e[$i]) > 0){
-                    $len[1] = strlen('<' . $e[$i]);
-                    $pos[1] = stripos($s,'<' . $e[$i]);
-                    $pos[2] = stripos($s,$e[$i] . '>', $pos[1] + $len[1]);
-                    $len[2] = $pos[2] - $pos[1] + $len[1];
-                    $x = substr($s,$pos[1],$len[2]);
-                    $s = str_replace($x,'',$s);
+        if (strlen($expand) > 0) {
+            $e = explode('|', $expand);
+            for ($i = 0; $i < count($e); $i++) {
+                while (stripos($s, '<'.$e[ $i ]) > 0) {
+                    $len[ 1 ] = strlen('<'.$e[ $i ]);
+                    $pos[ 1 ] = stripos($s, '<'.$e[ $i ]);
+                    $pos[ 2 ] = stripos($s, $e[ $i ].'>', $pos[ 1 ] + $len[ 1 ]);
+                    $len[ 2 ] = $pos[ 2 ] - $pos[ 1 ] + $len[ 1 ];
+                    $x = substr($s, $pos[ 1 ], $len[ 2 ]);
+                    $s = str_replace($x, '', $s);
                 }
             }
         }
 
         /**///remove remaining tags
-        while(stripos($s,'<') > 0){
-            $pos[1] = stripos($s,'<');
-            $pos[2] = stripos($s,'>', $pos[1]);
-            $len[1] = $pos[2] - $pos[1] + 1;
-            $x = substr($s,$pos[1],$len[1]);
-            $s = str_replace($x,'',$s);
+        while (stripos($s, '<') > 0) {
+            $pos[ 1 ] = stripos($s, '<');
+            $pos[ 2 ] = stripos($s, '>', $pos[ 1 ]);
+            $len[ 1 ] = $pos[ 2 ] - $pos[ 1 ] + 1;
+            $x = substr($s, $pos[ 1 ], $len[ 1 ]);
+            $s = str_replace($x, '', $s);
         }
 
         /**///finalize keep tag
         if (isset($k)) {
-            for($i=0;$i<count($k);$i++){
-                $s = str_replace('[{(' . $k[$i],'<' . $k[$i],$s);
-                $s = str_replace('[{(/' . $k[$i],'</' . $k[$i],$s);
+            for ($i = 0; $i < count($k); $i++) {
+                $s = str_replace('[{('.$k[ $i ], '<'.$k[ $i ], $s);
+                $s = str_replace('[{(/'.$k[ $i ], '</'.$k[ $i ], $s);
             }
         }