Merge pull request #5 from matrad/master

(upgrade) upgraded zxing library to 3.3.3

Author: dsiddharth2

src/PHPZxing/PHPZxingBase.php

@@ -37,10 +37,13 @@
 class PHPZxingBase  {
 
     // name of the javase.jar file located in /src/bin directory
-    private $_JAVASE_PATH = 'javase-3.2.0.jar';
+    private $_JAVASE_PATH = 'javase-3.3.3.jar';
 
     // name of the core.jar file located in /src/bin directory
-    private $_CORE_PATH = "core-3.2.0.jar";
+    private $_CORE_PATH = "core-3.3.3.jar";
+
+    // name of the jcommander.jar file located in /src/bin directory
+    private $_JCOMMANDER_PATH = "jcommander-1.72.jar";
 
     // location of java in your machine
     private $_JAVA_PATH = "/usr/bin/java";
@@ -57,6 +60,10 @@ public function getCorePAth() {
         return dirname(__DIR__) . DIRECTORY_SEPARATOR  . 'bin' . DIRECTORY_SEPARATOR . $this->_CORE_PATH;
     }
 
+    public function getJcommanderPath() {
+        return dirname(__DIR__) . DIRECTORY_SEPARATOR  . 'bin' . DIRECTORY_SEPARATOR . $this->_JCOMMANDER_PATH;
+    }
+
     /**
      * Set the default java path which we will use for decoding
      */

src/PHPZxing/PHPZxingDecoder.php

@@ -89,7 +89,7 @@ public function __construct($config = array()) {
     private function basePrepare() {
         $command = "";
         $command = $command . $this->getJavaPath() . $this->SPACE . "-cp" . $this->SPACE;
-        $command = $command . $this->getJARPath() . PATH_SEPARATOR . $this->getCorePAth() . $this->SPACE;
+        $command = $command . $this->getJARPath() . PATH_SEPARATOR . $this->getCorePAth() . PATH_SEPARATOR . $this->getJcommanderPath() . $this->SPACE;
         $command = $command . $this->JAVA_DECODER_CLASS . $this->SPACE;
         return $command;        
     }