Merge branch 'master' of https://github.com/descom-es/php-file-encoding

Author: cesargb

src/Encoding.php

@@ -16,7 +16,7 @@ class Encoding
     public function encodeFile($file, $encoding_to = 'UTF-8', $encodings_detected = 'UTF-8,ISO-8859-1,WINDOWS-1252')
     {
         $encoding_original = $this->detectEncoding($file, $encodings_detected);
-        
+
         if ($encoding_original !== false && $encoding_original != $encoding_to) {
             try {
                 $fileW = $file.'.tmp';
@@ -27,6 +27,7 @@ public function encodeFile($file, $encoding_to = 'UTF-8', $encodings_detected =
                         if (fwrite($handleW, mb_convert_encoding($line, $encoding_to, $encoding_original), 4096) === false) {
                             fclose($handleR);
                             fclose($handleW);
+
                             return false;
                         }
                     }
@@ -49,7 +50,7 @@ public function encodeFile($file, $encoding_to = 'UTF-8', $encodings_detected =
     /**
      * Detect file encoding.
      *
-     * @param string $file              Original file
+     * @param string $file               Original file
      * @param string $encodings_detected Ordered list of encodings
      *
      * @return mixed String encoding or false

tests/FileEncodingTest.php

@@ -27,7 +27,7 @@ public function test_encoding_iso88591_as_UTF8()
 
         $this->assertTrue($encoding->detectEncoding(__DIR__.'/files/iso88591.txt', 'UTF-8,ISO-8859-1,WINDOWS-1252') == 'ISO-8859-1');
         $this->assertTrue($encoding->encodeFile(__DIR__.'/files/iso88591.txt', 'UTF-8', 'UTF-8,ISO-8859-1,WINDOWS-1252'));
-        $this->assertTrue($encoding->checkEncoding(__DIR__.'/files/iso88591.txt','UTF-8'));
+        $this->assertTrue($encoding->checkEncoding(__DIR__.'/files/iso88591.txt', 'UTF-8'));
 
         $this->close();
     }
@@ -38,7 +38,7 @@ public function test_encoding_UTF8_as_UTF8()
         $encoding = new Encoding();
         $this->assertTrue($encoding->detectEncoding('tests/files/utf8.txt', 'UTF-8,ISO-8859-1,WINDOWS-1252') == 'UTF-8');
         $this->assertTrue($result = $encoding->encodeFile('tests/files/utf8.txt'));
-        $this->assertTrue($encoding->checkEncoding('tests/files/utf8.txt','UTF-8'));
+        $this->assertTrue($encoding->checkEncoding('tests/files/utf8.txt', 'UTF-8'));
 
         $this->close();
     }
@@ -49,7 +49,7 @@ public function test_encoding_file_not_exists()
         $encoding = new Encoding();
         $this->assertFalse($encoding->detectEncoding('tests/files/test.txt', 'UTF-8,ISO-8859-1,WINDOWS-1252') == 'UTF-8');
         $this->assertFalse($result = $encoding->encodeFile('tests/files/test.txt'));
-        $this->assertFalse($encoding->checkEncoding('tests/files/test.txt','UTF-8'));
+        $this->assertFalse($encoding->checkEncoding('tests/files/test.txt', 'UTF-8'));
 
         $this->close();
     }