[zendframework/zendframework#5570] CS and test fixes

- Braces, whitespace. - Incorrect variable references in tests caused them to fail; fixing them makes them pass.
zendframework · Mar 3, 2014 · c485258 · c485258
1 parent 1a31a14
commit c485258
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Part.php b/src/Part.php
@@ -80,7 +80,7 @@ public function getEncodedStream($EOL = Mime::LINEEND)
         //stream_filter_remove(); // ??? is that right?
         switch ($this->encoding) {
             case Mime::ENCODING_QUOTEDPRINTABLE:
-                if(array_key_exists(Mime::ENCODING_QUOTEDPRINTABLE, $this->filters)) {
+                if (array_key_exists(Mime::ENCODING_QUOTEDPRINTABLE, $this->filters)) {
                     stream_filter_remove($this->filters[Mime::ENCODING_QUOTEDPRINTABLE]);
                 }
                 $filter = stream_filter_append(
@@ -98,7 +98,7 @@ public function getEncodedStream($EOL = Mime::LINEEND)
                 }
                 break;
             case Mime::ENCODING_BASE64:
-                if(array_key_exists(Mime::ENCODING_BASE64,$this->filters)) {
+                if (array_key_exists(Mime::ENCODING_BASE64,$this->filters)) {
                     stream_filter_remove($this->filters[Mime::ENCODING_BASE64]);
                 }
                 $filter = stream_filter_append(
@@ -130,7 +130,7 @@ public function getContent($EOL = Mime::LINEEND)
     {
         if ($this->isStream) {
             $encodedStream = $this->getEncodedStream($EOL);
-            $encodedStreamContents =  stream_get_contents($encodedStream);
+            $encodedStreamContents = stream_get_contents($encodedStream);
             rewind($encodedStream);
             return $encodedStreamContents;
         }

diff --git a/test/PartTest.php b/test/PartTest.php
@@ -106,6 +106,7 @@ public function testGetRawContentFromPart()
 
     /**
      * @link https://github.com/zendframework/zf2/issues/5428
+     * @group 5428
      */
     public function testContentEncodingWithStreamReadTwiceINaRow()
     {
@@ -117,15 +118,15 @@ public function testContentEncodingWithStreamReadTwiceINaRow()
         $part->encoding = Mime\Mime::ENCODING_BASE64;
         $contentEncodedFirstTime  = $part->getContent();
         $contentEncodedSecondTime = $part->getContent();
-        $this->assertEquals($contentFirstTime, $contentSecondTime);
+        $this->assertEquals($contentEncodedFirstTime, $contentEncodedSecondTime);
         fclose($fp);
 
         $fp = fopen($testfile,'rb');
         $part = new Mime\Part($fp);
         $part->encoding = Mime\Mime::ENCODING_QUOTEDPRINTABLE;
         $contentEncodedFirstTime  = $part->getContent();
         $contentEncodedSecondTime = $part->getContent();
-        $this->assertEquals($contentFirstTime, $contentSecondTime);
+        $this->assertEquals($contentEncodedFirstTime, $contentEncodedSecondTime);
         fclose($fp);
     }
 }