Merge pull request #1 from DivineOmega/analysis-8mDnjb

Apply fixes from StyleCI

Author: DivineOmega

src/Pluralizer.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace DivineOmega\WordInfo;
 
 use Doctrine\Common\Inflector\Inflector;
@@ -14,7 +15,7 @@ class Pluralizer
         'education',
         'love',
         'pokemon',
-        'mathematics'
+        'mathematics',
     ];
 
     private $word;
@@ -30,8 +31,8 @@ public function pluralize()
             return new Word($this->word);
         }
 
-        foreach($this->irregular as $singular => $plural) {
-            if ($singular==$this->word) {
+        foreach ($this->irregular as $singular => $plural) {
+            if ($singular == $this->word) {
                 return new Word($plural);
             }
         }
@@ -47,11 +48,11 @@ public function singularize()
             return new Word($this->word);
         }
 
-        foreach($this->irregular as $singular => $plural) {
-            if ($plural==$this->word) {
+        foreach ($this->irregular as $singular => $plural) {
+            if ($plural == $this->word) {
                 return new Word($singular);
             }
-        }        
+        }
 
         $singular = Inflector::singularize((string) $this->word);
 
@@ -60,6 +61,6 @@ public function singularize()
 
     private function isUncountable()
     {
-        return (in_array($this->word, $this->uncountable));
+        return in_array($this->word, $this->uncountable);
     }
-}
+}

src/Word.php

@@ -1,12 +1,12 @@
 <?php
+
 namespace DivineOmega\WordInfo;
 
-use rapidweb\RWFileCache\RWFileCache;
-use Snipe\BanBuilder\CensorWords;
 use DaveChild\TextStatistics\Syllables;
+use rapidweb\RWFileCache\RWFileCache;
 
-class Word {
-
+class Word
+{
     private $word;
     private $cache;
 
@@ -23,7 +23,7 @@ public function __toString()
 
     private function setupCache()
     {
-        $this->cache = new RWFileCache;
+        $this->cache = new RWFileCache();
         $this->cache->changeConfig(['cacheDirectory' => '/tmp/php-word-info-cache/']);
     }
 
@@ -46,22 +46,22 @@ public function rhymes($halfRhymes = false)
 
         $rhymes = [];
 
-        foreach($responseItems as $responseItem) {
+        foreach ($responseItems as $responseItem) {
             if ($halfRhymes) {
                 if ($responseItem->score < 300) {
-                    $rhymes[] = new Word($responseItem->word);
+                    $rhymes[] = new self($responseItem->word);
                 }
             } else {
-              if($responseItem->score == 300) {
-                $rhymes[] = new Word($responseItem->word);
-              }
+                if ($responseItem->score == 300) {
+                    $rhymes[] = new self($responseItem->word);
+                }
             }
         }
 
         sort($rhymes);
 
         $this->cache->set($cacheKey, $rhymes);
-        
+
         return $rhymes;
     }
 
@@ -105,11 +105,11 @@ public function portmanteaus()
 
         $portmanteaus = [];
 
-        foreach($responseItems as $responseItem) {
-            $responseItemPortmanteaus = array_map(function($portmanteauString) {
+        foreach ($responseItems as $responseItem) {
+            $responseItemPortmanteaus = array_map(function ($portmanteauString) {
                 return new Word($portmanteauString);
             }, explode(',', $responseItem->combined));
-            
+
             $portmanteaus = array_merge($portmanteaus, $responseItemPortmanteaus);
         }
 
@@ -119,5 +119,4 @@ public function portmanteaus()
 
         return $portmanteaus;
     }
-
-}
+}

tests/Unit/WordTest.php

@@ -1,17 +1,17 @@
 <?php
 
-use PHPUnit\Framework\TestCase;
 use DivineOmega\WordInfo\Word;
+use PHPUnit\Framework\TestCase;
 
 final class WordTest extends TestCase
 {
     public function testRhymes()
     {
         $rhymes = (new Word('cat'))->rhymes();
 
-        $expected = ['aristocrat', 'at', 'bat', 'caveat', 'chat', 'democrat', 'diplomat', 
-                    'fat', 'flat', 'habitat', 'hat', 'mat', 'pat', 'rat', 'sat', 'spat', 
-                    'stat', 'tat', 'that', 'thermostat', 'vat'];
+        $expected = ['aristocrat', 'at', 'bat', 'caveat', 'chat', 'democrat', 'diplomat',
+                    'fat', 'flat', 'habitat', 'hat', 'mat', 'pat', 'rat', 'sat', 'spat',
+                    'stat', 'tat', 'that', 'thermostat', 'vat', ];
 
         $this->assertEquals($expected, $rhymes);
     }
@@ -20,9 +20,9 @@ public function testHalfRhymes()
     {
         $rhymes = (new Word('violet'))->halfRhymes();
 
-        $expected = ['cyclist', 'finalist', 'hybridised', 'iodised', 'ionised', 'lionised', 
-                    'motorcyclist', 'nihilist', 'piloted', 'pirated', 'playacted', 'revivalist', 
-                    'rioted', 'scientist', 'semifinalist', 'survivalist'];
+        $expected = ['cyclist', 'finalist', 'hybridised', 'iodised', 'ionised', 'lionised',
+                    'motorcyclist', 'nihilist', 'piloted', 'pirated', 'playacted', 'revivalist',
+                    'rioted', 'scientist', 'semifinalist', 'survivalist', ];
 
         $this->assertEquals($expected, $rhymes);
     }
@@ -95,20 +95,20 @@ public function testPortmanteaus1()
     {
         $portmanteaus = (new Word('computer'))->portmanteaus();
 
-        $expected = ['computarena', 'computarise', 'computarisen', 'computarises', 'computarising', 'computaristocratic', 'computaroma', 
-                    'computarose', 'computaround', 'computarousal', 'computarouse', 'computaroused', 'computarousing', 'computarrange', 
+        $expected = ['computarena', 'computarise', 'computarisen', 'computarises', 'computarising', 'computaristocratic', 'computaroma',
+                    'computarose', 'computaround', 'computarousal', 'computarouse', 'computaroused', 'computarousing', 'computarrange',
                     'computarranged', 'computarrangement', 'computarrangements', 'computarranging', 'computarray', 'computarrears', 'computarrest',
-                    'computarrested', 'computarresting', 'computarrests', 'computarrhythmias', 'computarrival', 'computarrivals', 'computarrive', 
-                    'computarrived', 'computarrives', 'computarriving', 'computerena', 'computeriginal', 'computeriginality', 'computeriginally', 
-                    'computeriginals', 'computeriginate', 'computeriginated', 'computeriginates', 'computeriginating', 'computerine', 'computerise', 
-                    'computerisen', 'computerises', 'computerising', 'computeristocratic', 'computermination', 'computeroma', 'computerose', 
-                    'computeround', 'computerousal', 'computerouse', 'computeroused', 'computerousing', 'computerrain', 'computerrestrial', 
-                    'computerrific', 'computerrrange', 'computerrranged', 'computerrrangement', 'computerrrangements', 'computerrranging', 
-                    'computerrray', 'computerrrears', 'computerrrest', 'computerrrested', 'computerrresting', 'computerrrests', 'computerrrhythmias', 
-                    'computerrrival', 'computerrrivals', 'computerrrive', 'computerrrived', 'computerrrives', 'computerrriving', 'computerus', 
-                    'computeryrannical', 'computoriginal', 'computoriginality', 'computoriginally', 'computoriginals', 'computoriginate', 
-                    'computoriginated', 'computoriginates', 'computoriginating', 'computyrannical', 'incomputer', 'outcomputer', 'silicaomputer', 
-                    'silicomputer', 'welcomputer'];
+                    'computarrested', 'computarresting', 'computarrests', 'computarrhythmias', 'computarrival', 'computarrivals', 'computarrive',
+                    'computarrived', 'computarrives', 'computarriving', 'computerena', 'computeriginal', 'computeriginality', 'computeriginally',
+                    'computeriginals', 'computeriginate', 'computeriginated', 'computeriginates', 'computeriginating', 'computerine', 'computerise',
+                    'computerisen', 'computerises', 'computerising', 'computeristocratic', 'computermination', 'computeroma', 'computerose',
+                    'computeround', 'computerousal', 'computerouse', 'computeroused', 'computerousing', 'computerrain', 'computerrestrial',
+                    'computerrific', 'computerrrange', 'computerrranged', 'computerrrangement', 'computerrrangements', 'computerrranging',
+                    'computerrray', 'computerrrears', 'computerrrest', 'computerrrested', 'computerrresting', 'computerrrests', 'computerrrhythmias',
+                    'computerrrival', 'computerrrivals', 'computerrrive', 'computerrrived', 'computerrrives', 'computerrriving', 'computerus',
+                    'computeryrannical', 'computoriginal', 'computoriginality', 'computoriginally', 'computoriginals', 'computoriginate',
+                    'computoriginated', 'computoriginates', 'computoriginating', 'computyrannical', 'incomputer', 'outcomputer', 'silicaomputer',
+                    'silicomputer', 'welcomputer', ];
 
         $this->assertEquals($expected, $portmanteaus);
     }
@@ -117,42 +117,42 @@ public function testPortmanteaus2()
     {
         $portmanteaus = (new Word('cheese'))->portmanteaus();
 
-        $expected = ['chease', 'cheased', 'cheasel', 'cheasement', 'cheasements', 'cheases', 'cheasier', 'cheasiest', 'cheasily', 'cheasing', 
-                    'cheasy', 'cheasygoing', 'chies', 'chiheese', 'chiis', 'chization', 'chys'];
+        $expected = ['chease', 'cheased', 'cheasel', 'cheasement', 'cheasements', 'cheases', 'cheasier', 'cheasiest', 'cheasily', 'cheasing',
+                    'cheasy', 'cheasygoing', 'chies', 'chiheese', 'chiis', 'chization', 'chys', ];
 
         $this->assertEquals($expected, $portmanteaus);
     }
 
     private function getSingularToPluralData()
     {
         return [
-            'cat' => 'cats',
-            'mitten' => 'mittens',
-            'sausage' => 'sausages',
-            'child' => 'children',
-            'goose' => 'geese',
-            'person' => 'people',
-            'woman' => 'women',
-            'man' => 'men',
-            'audio' => 'audio',
-            'education' => 'education',
-            'rice' => 'rice',
-            'love' => 'love',
-            'pokemon' => 'pokemon',
-            'sheep' => 'sheep',
-            'sex' => 'sexes',
-            'mouse' => 'mice',
+            'cat'         => 'cats',
+            'mitten'      => 'mittens',
+            'sausage'     => 'sausages',
+            'child'       => 'children',
+            'goose'       => 'geese',
+            'person'      => 'people',
+            'woman'       => 'women',
+            'man'         => 'men',
+            'audio'       => 'audio',
+            'education'   => 'education',
+            'rice'        => 'rice',
+            'love'        => 'love',
+            'pokemon'     => 'pokemon',
+            'sheep'       => 'sheep',
+            'sex'         => 'sexes',
+            'mouse'       => 'mice',
             'mathematics' => 'mathematics',
             'information' => 'information',
-            'tooth' => 'teeth'
+            'tooth'       => 'teeth',
         ];
     }
 
     public function testPluralise()
     {
         $data = $this->getSingularToPluralData();
 
-        foreach($data as $singular => $plural) {
+        foreach ($data as $singular => $plural) {
             $word = new Word($singular);
             $this->assertEquals($plural, $word->plural());
         }
@@ -162,10 +162,9 @@ public function testSingularise()
     {
         $data = $this->getSingularToPluralData();
 
-        foreach($data as $singular => $plural) {
+        foreach ($data as $singular => $plural) {
             $word = new Word($plural);
             $this->assertEquals($singular, $word->singular());
         }
     }
-
-}
+}