Merge pull request #3 from generationtux/OP-434-version-file-exists

OP-434 Use file_exists in version check
generationtux · Dec 13, 2016 · d32cc5a · d32cc5a
2 parents 420b7c8 + c6006e4
commit d32cc5a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/HealthVersion.php b/src/HealthVersion.php
@@ -5,15 +5,13 @@
 class HealthVersion
 {
 
-    protected $version;
-
     protected $customPath;
 
     /**
      * HealthVersion constructor.
      * @param string $customPath
      */
-    public function __construct($customPath = __DIR__.'commit.txt')
+    public function __construct($customPath = __DIR__.'/commit.txt')
     {
         $this->customPath = $customPath;
     }
@@ -25,12 +23,10 @@ public function __construct($customPath = __DIR__.'commit.txt')
      */
     public function checkVersion($inputHash)
     {
-        $this->version = $inputHash;
-
-        if(!is_file($this->customPath)){
+        if (file_exists($this->customPath)) {
+            return (file_get_contents($this->customPath) == $inputHash);
+        } else {
             return false;
         }
-
-        return (file_get_contents($this->customPath) == $this->version);
     }
 }
diff --git a/tests/HealthVersionTest.php b/tests/HealthVersionTest.php
@@ -17,7 +17,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->correctPathHealthVersion = new HealthVersion("tests/committest.txt");
+        $this->correctPathHealthVersion = new HealthVersion('tests/commit.txt');
         $this->badPathHealthVersion = new HealthVersion("badpath.txt");
     }
 

diff --git a/tests/committest.txt → tests/commit.txt b/tests/committest.txt → tests/commit.txt