Merge pull request #75 from yooper/fixed_pr_issues

Fixed pr issues

Author: yooper

composer.json

@@ -23,7 +23,7 @@
         "php": ">=7.4",
         "yooper/stop-words": "~1",
         "symfony/console": ">= 4.4",
-        "wamania/php-stemmer": "~1",
+        "wamania/php-stemmer": "^1.0 || ^2.0 || ^3.0",
         "yooper/nicknames": "~1"
     },
     "require-dev": {

src/Stemmers/SnowballStemmer.php

@@ -4,6 +4,8 @@
 namespace TextAnalysis\Stemmers;
 
 use TextAnalysis\Interfaces\IStemmer;
+use Wamania\Snowball\StemmerFactory;
+
 
 /**
  * A wrapper around PHP native snowball implementation
@@ -18,17 +20,27 @@ class SnowballStemmer implements IStemmer
      * @var \Wamania\Snowball\Stem
      */
     protected $stemmer;
-    
-    public function __construct($stemmerType = 'English') 
+
+    /**
+     * @throws \Wamania\Snowball\NotFoundException
+     */
+    public function __construct(string $stemmerType = 'English')
     {
-        $className = self::BASE_NAMESPACE.$stemmerType;
-        if(!class_exists($className)) { 
-            throw new \RuntimeException("Class {$stemmerType} does not exist");
+        $version = (int)\Composer\InstalledVersions::getVersion('wamania/php-stemmer')[0];
+        if($version === 1){
+            $className = self::BASE_NAMESPACE.$stemmerType;
+            if(!class_exists($className)) {
+                throw new \RuntimeException("Class {$stemmerType} does not exist");
+            }
+            $this->stemmer = new $className();
+        }
+        // support version 2 and above
+        else {
+            $this->stemmer = StemmerFactory::create (strtolower($stemmerType));
         }
-        $this->stemmer = new $className();
     }
-    
-    public function stem($token) 
+
+    public function stem($token) : string
     {
         return $this->stemmer->stem($token);
     }

tests/TextAnalysis/Comparisons/CosineSimilarityComparisonTest.php

@@ -16,7 +16,7 @@ public function testIdentical()
         $text1 = ["hiking" , "camping", "swimming"];
         $text2 = ["hiking" , "camping", "swimming"];        
         $compare = new CosineSimilarityComparison();
-        $this->assertEquals(1.0, $compare->similarity($text1, $text2));
+        $this->assertEquals(1.0, round($compare->similarity($text1, $text2), 1));
 
     }
 

tests/TextAnalysis/Sentiment/VaderTest.php

@@ -44,7 +44,7 @@ public function testBoostExclamationPoints()
         $this->assertEquals(0, $vader->boostExclamationPoints(['empty']));
         $this->assertEquals(0.292, $vader->boostExclamationPoints(array_fill(0,1,'!')));
         $this->assertEquals(0.584, $vader->boostExclamationPoints(array_fill(0,2,'!')));
-        $this->assertEquals(0.876, $vader->boostExclamationPoints(array_fill(0,3,'!')));
+        $this->assertEquals(0.876, round($vader->boostExclamationPoints(array_fill(0,3,'!')), 5));
         $this->assertEquals(1.168, $vader->boostExclamationPoints(array_fill(0,4,'!')));        
         $this->assertEquals(1.168, $vader->boostExclamationPoints(array_fill(0,5,'!')));               
     }