Skip to content

Commit 3724878

Browse files
authored
Merge pull request #1 from descom-es/analysis-zdaZL9
Apply fixes from StyleCI
2 parents cd68823 + 7a2a595 commit 3724878

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

src/FileEncoding.php

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?php
2+
23
namespace Descom\File_Encoding;
34

45
class FileEncoding
56
{
67
/**
78
* Encode file.
89
*
9-
* @param string $fileR Original file
10-
* @param string &$encoding_to Encoding to encode file
11-
* @param string &$encodings_detected Ordered list of encodings
10+
* @param string $fileR Original file
11+
* @param string &$encoding_to Encoding to encode file
12+
* @param string &$encodings_detected Ordered list of encodings
1213
*
1314
* @return bool
1415
*/
@@ -28,24 +29,24 @@ public function encodeFile($file, $encoding_to = 'UTF-8', $encodings_detected =
2829
fclose($handleW);
2930
unlink($file);
3031
rename($fileW, $file);
31-
32-
}
33-
else{
32+
} else {
3433
fclose($handleR);
3534
fclose($handleW);
35+
3636
return false;
3737
}
3838
} catch (Exception $e) {
3939
return false;
4040
}
4141
}
42+
4243
return $this->checkEncoding($file, $encoding_to);
4344
}
4445

4546
/**
4647
* Detect file encoding.
4748
*
48-
* @param string $fileR Original file
49+
* @param string $fileR Original file
4950
* @param string $encodings_detected Ordered list of encodings
5051
*
5152
* @return string File encoding
@@ -59,14 +60,16 @@ public function detectEncoding($fileR, $encodings_detected)
5960
$encoding = mb_detect_encoding($line, $encodings_detected, true);
6061
if ($encoding != $encodings[0]) {
6162
fclose($handleR);
63+
6264
return $encoding;
6365
}
6466
}
6567
fclose($handleR);
68+
6669
return $encodings[0];
67-
}
68-
else
70+
} else {
6971
return '';
72+
}
7073
}
7174

7275
/**
@@ -84,13 +87,14 @@ public function checkEncoding($fileR, $encoding_to)
8487
while ($line = fgets($handleR, 4096)) {
8588
if (!mb_check_encoding($line, $encoding_to)) {
8689
fclose($handleR);
90+
8791
return false;
8892
}
8993
}
9094
fclose($handleR);
91-
}
92-
else
95+
} else {
9396
return false;
97+
}
9498

9599
return true;
96100
}

0 commit comments

Comments
 (0)