code refactoring with PSR2

.gitignore

@@ -1,4 +1,3 @@
-.DS_Store
 /build/
 composer.lock
 /vendor/

src/Chardet.php

@@ -2,13 +2,11 @@
 
 namespace Yupmin\PHPChardet;
 
-use Yupmin\PHPChardet\ChardetCommandBuilder;
-use Yupmin\PHPChardet\ChardetOutputParser;
-
 class Chardet
 {
     /**
-     * @param $filePath
+     * @param string $filePath
+     * @return ChardetContainer
      */
     public function analyze($filePath)
     {

src/ChardetCommandBuilder.php

@@ -2,11 +2,15 @@
 
 namespace Yupmin\PHPChardet;
 
-use Yupmin\PHPChardet\ChardetCommandRunner;
 use Symfony\Component\Filesystem\Filesystem;
 
 class ChardetCommandBuilder
 {
+    /**
+     * @param string $filePath
+     * @return ChardetCommandRunner
+     * @throws \Exception
+     */
     public function buildChardetCommandRunner($filePath)
     {
         $fileSystem = new Filesystem();

src/ChardetCommandRunner.php

@@ -6,11 +6,31 @@
 
 class ChardetCommandRunner
 {
+    /**
+     * @var string
+     */
     protected $filePath;
+
+    /**
+     * @var ProcessBuilder
+     */
     protected $processBuilder;
+
+    /**
+     * @var string
+     */
     protected $command = 'chardet';
+
+    /**
+     * @var array
+     */
     protected $arguments = array();
 
+    /**
+     * @param string $filePath
+     * @param array|null $arguments
+     * @param ProcessBuilder|null $processBuilder
+     */
     public function __construct($filePath, array $arguments = null, $processBuilder = null)
     {
         $this->filePath = $filePath;
@@ -29,6 +49,9 @@ public function __construct($filePath, array $arguments = null, $processBuilder
         }
     }
 
+    /**
+     * @return string
+     */
     public function run()
     {
         $this->processBuilder->add($this->filePath);

src/ChardetContainer.php

@@ -20,15 +20,15 @@ class ChardetContainer
     private $confidence;
 
     /**
-     * @return filepath
+     * @return string
      */
     public function getFilePath()
     {
         return $this->filePath;
     }
 
     /**
-     * @return charset
+     * @return string
      */
     public function getCharset()
     {
@@ -60,7 +60,7 @@ public function setCharset($charset)
     }
 
     /**
-     * @param string $confidence
+     * @param float $confidence
      */
     public function setConfidence($confidence)
     {

src/ChardetContainerBuilder.php

@@ -2,8 +2,6 @@
 
 namespace Yupmin\PHPChardet;
 
-use Yupmin\PHPChardet\ChardetContainer;
-
 class ChardetContainerBuilder
 {
     /**
@@ -41,7 +39,7 @@ public function setCharset($charset)
     }
 
     /**
-     * @param string $confidence
+     * @param float $confidence
      */
     public function setConfidence($confidence)
     {

src/ChardetOutputParser.php

@@ -2,8 +2,6 @@
 
 namespace Yupmin\PHPChardet;
 
-use Yupmin\PHPChardet\ChardetContainerBuilder;
-
 class ChardetOutputParser
 {
     /**
@@ -23,26 +21,33 @@ class ChardetOutputParser
 
     /**
      * @param string $output
+     * @throws \Exception
      */
     public function parse($output)
     {
-/* output case :
-- 2.3.0
-tests/fixtures/subtitle-test1.srt: EUC-KR with confidence 0.99
-tests/fixtures/chardet-output.txt: no result
-- 2.0.1
-tests/fixtures/subtitle-test1.srt: EUC-KR (confidence: 0.99)
-tests/fixtures/chardet-output.txt: None (confidence: 0.00) */
+        /* output case :
+        - 2.3.0
+        tests/fixtures/subtitle-test1.srt: EUC-KR with confidence 0.99
+        tests/fixtures/chardet-output.txt: no result
+        - 2.0.1
+        tests/fixtures/subtitle-test1.srt: EUC-KR (confidence: 0.99)
+        tests/fixtures/chardet-output.txt: None (confidence: 0.00) */
+
         if ((preg_match('/(.+): (.+) .+confidence:? ([^\)]+)/', $output, $matches) === 0)
-            || (isset($matches[2]) && $matches[2] == 'None')) {
+            || (isset($matches[2]) && $matches[2] == 'None')
+        ) {
             throw new \Exception('This file is not analyzed.');
         }
 
         $this->parsedFilePath = $matches[1];
         $this->parsedCharset = strtolower($matches[2]);
-        $this->parsedConfidence = (float) $matches[3];
+        $this->parsedConfidence = (float)$matches[3];
     }
 
+    /**
+     * @return ChardetContainer
+     * @throws \Exception
+     */
     public function getChardetContainer()
     {
         if ($this->parsedFilePath === null || $this->parsedCharset === null || $this->parsedConfidence === null) {

tests/PHPChardet/ChardetCommandBuilderTest.php

@@ -14,7 +14,7 @@ class ChardetCommandBuilderTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->filePath = __DIR__.'/../fixtures/chardet-input.txt';
+        $this->filePath = __DIR__ . '/../fixtures/chardet-input.txt';
     }
 
     /**

tests/PHPChardet/ChardetCommandRunnerTest.php

@@ -18,8 +18,8 @@ class ChardetCommandRunnerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->filePath = __DIR__.'/../fixtures/chardet-input.txt';
-        $this->outputPath = __DIR__.'/../fixtures/chardet-output.txt';
+        $this->filePath = __DIR__ . '/../fixtures/chardet-input.txt';
+        $this->outputPath = __DIR__ . '/../fixtures/chardet-output.txt';
     }
 
     public function testRun()

tests/PHPChardet/ChardetOutputParserTest.php

@@ -10,6 +10,7 @@ public function setUp()
     {
 
     }
+
     /**
      * @expectedException \Exception
      */

tests/bootstrap.php

@@ -6,10 +6,11 @@ function includeIfExists($file)
     }
 }
 
-if ((!$loader = includeIfExists(__DIR__.'/../vendor/autoload.php'))
-    && (!$loader = includeIfExists(__DIR__.'/../../../.composer/autoload.php'))) {
-    die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
-        'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
-        'php composer.phar install'.PHP_EOL);
+if ((!$loader = includeIfExists(__DIR__ . '/../vendor/autoload.php'))
+    && (!$loader = includeIfExists(__DIR__ . '/../../../.composer/autoload.php'))
+) {
+    die('You must set up the project dependencies, run the following commands:' . PHP_EOL .
+        'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
+        'php composer.phar install' . PHP_EOL);
 }
 return $loader;