customd / word-finder

src/ServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 class ServiceProvider extends \Illuminate\Support\ServiceProvider
 {
-    const CONFIG_PATH = __DIR__ . '/../config/word-finder.php';
+    const CONFIG_PATH = __DIR__.'/../config/word-finder.php';
 
     public function boot()
     {
@@ -20,7 +20,7 @@ 
             'word-finder'
         );
 
-        $this->app->bind('word-finder', function () {
+        $this->app->bind('word-finder', function() {
             return new WordFinder(config('word-finder'));
         });
     }

src/Grid.php

Indentation +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@ 
 class Grid
 {
 
-     /**
-     * minimum word length for the puzzle
-     */
+        /**
+         * minimum word length for the puzzle
+         */
     protected int $minWordLen;
 
     /**
@@ -148,7 +148,7 @@ 
     {
         $inc = 1;
         $word->setEnd($word->getStart()+$len-1);
-                 // si mot placé sur 2 lignes on décale à gauche
+                    // si mot placé sur 2 lignes on décale à gauche
         while ($this->columnArray[$word->getEnd()] < $this->columnArray[$word->getStart()]) {
             $word->setStart($word->getStart()-1);
             $word->setEnd($word->getStart()+$len-1);

Spacing +58 added lines, -58 removed lines

@@ -60,7 +60,7 @@ 
 
     protected function setWordsCollection(Collection $wordsCollection): self
     {
-        $this->wordsCollection = $wordsCollection->filter(function ($word) {
+        $this->wordsCollection = $wordsCollection->filter(function($word) {
             return strlen($word) >= $this->minWordLen && strlen($word) <= $this->maxWordLen;
         })->map(fn($word) => strtoupper($word));
 
@@ -72,7 +72,7 @@ 
         $this->cells = array_fill(0, $this->gridSize * $this->gridSize, null);
 
         for ($i = 0; $i < (2 * $this->gridSize * $this->gridSize); $i++) {
-            $this->columnArray[$i]=$this->getColumnDefault($i);
+            $this->columnArray[$i] = $this->getColumnDefault($i);
         }
 
         return $this;
@@ -81,15 +81,15 @@ 
     public function generate(): self
     {
         $blocks = $this->gridSize * $this->gridSize;
-        $i=rand(0, $blocks-1);
+        $i = rand(0, $blocks - 1);
 
-        $complete=0;
+        $complete = 0;
         while ($complete < $blocks) {
             $this->placeWord($i);
             $complete++;
             $i++;
-            if ($i==$blocks) {
-                $i=0;
+            if ($i == $blocks) {
+                $i = 0;
             }
         }
 
@@ -106,7 +106,7 @@ 
             $len = rand($this->minWordLen, $this->gridSize);
         } while (in_array($len, $exclude));
 
-        $available = $this->wordsCollection->filter(function ($word) use ($len) {
+        $available = $this->wordsCollection->filter(function($word) use ($len) {
             return strlen($word) === $len;
         })->count();
 
@@ -118,24 +118,24 @@ 
     protected function addPlacedWord(Word $word, int $increment, int $len): void
     {
         $string = '';
-        $flag=false;
+        $flag = false;
 
-        for ($i=$word->getStart(); $i<=$word->getEnd(); $i+=$increment) {
-            if ($this->cells[$i]=='') {
+        for ($i = $word->getStart(); $i <= $word->getEnd(); $i += $increment) {
+            if ($this->cells[$i] == '') {
                 $string .= '_';
             } else {
                 $string .= $this->cells[$i];
-                $flag=true;
+                $flag = true;
             }
         }
 
-        if (! $flag) {
+        if (!$flag) {
             $word->setLabel($word->getInversed() ? strrev($word->getLabel()) : $word->getLabel());
             $this->addWord($word);
             return;
         }
 
-        if (strpos($string, '_')===false) {
+        if (strpos($string, '_') === false) {
             return;
         }
 
@@ -147,11 +147,11 @@ 
     protected function placeWordHorizontally(Word $word, int $len): void
     {
         $inc = 1;
-        $word->setEnd($word->getStart()+$len-1);
+        $word->setEnd($word->getStart() + $len - 1);
                  // si mot placé sur 2 lignes on décale à gauche
         while ($this->columnArray[$word->getEnd()] < $this->columnArray[$word->getStart()]) {
-            $word->setStart($word->getStart()-1);
-            $word->setEnd($word->getStart()+$len-1);
+            $word->setStart($word->getStart() - 1);
+            $word->setEnd($word->getStart() + $len - 1);
         }
 
         $this->addPlacedWord($word, $inc, $len);
@@ -159,12 +159,12 @@ 
 
     protected function placeWordVertical(Word $word, int $len): void
     {
-        $inc=$this->gridSize;
-        $word->setEnd($word->getStart()+($len*$this->gridSize)-$this->gridSize);
+        $inc = $this->gridSize;
+        $word->setEnd($word->getStart() + ($len * $this->gridSize) - $this->gridSize);
                 // si le mot dépasse la grille en bas, on décale vers le haut
-        while ($word->getEnd()>($this->gridSize*$this->gridSize)-1) {
-            $word->setStart($word->getStart()-$this->gridSize);
-            $word->setEnd($word->getStart()+($len*$this->gridSize)-$this->gridSize);
+        while ($word->getEnd() > ($this->gridSize * $this->gridSize) - 1) {
+            $word->setStart($word->getStart() - $this->gridSize);
+            $word->setEnd($word->getStart() + ($len * $this->gridSize) - $this->gridSize);
         }
 
         $this->addPlacedWord($word, $inc, $len);
@@ -172,34 +172,34 @@ 
 
     protected function placeWordDiagonallyLtr(Word $word, int $len): void
     {
-        $inc=$this->gridSize+1;
-        $word->setEnd($word->getStart()+($len*($this->gridSize+1))-($this->gridSize+1));
+        $inc = $this->gridSize + 1;
+        $word->setEnd($word->getStart() + ($len * ($this->gridSize + 1)) - ($this->gridSize + 1));
                 // si le mot dépasse la grille à droite, on décale à gauche
         while ($this->columnArray[$word->getEnd()] < $this->columnArray[$word->getStart()]) {
-            $word->setStart($word->getStart()-1);
-            $word->setEnd($word->getStart()+($len*($this->gridSize+1))-($this->gridSize+1));
+            $word->setStart($word->getStart() - 1);
+            $word->setEnd($word->getStart() + ($len * ($this->gridSize + 1)) - ($this->gridSize + 1));
         }
                 // si le mot dépasse la grille en bas, on décale vers le haut
-        while ($word->getEnd()>($this->gridSize*$this->gridSize)-1) {
-            $word->setStart($word->getStart()-$this->gridSize);
-            $word->setEnd($word->getStart()+($len*($this->gridSize+1))-($this->gridSize+1));
+        while ($word->getEnd() > ($this->gridSize * $this->gridSize) - 1) {
+            $word->setStart($word->getStart() - $this->gridSize);
+            $word->setEnd($word->getStart() + ($len * ($this->gridSize + 1)) - ($this->gridSize + 1));
         }
         $this->addPlacedWord($word, $inc, $len);
     }
 
     protected function placeWordDiagonallyRtl(Word $word, int $len): void
     {
-        $inc=$this->gridSize-1;
-        $word->setEnd($word->getStart()+(($len-1)*($this->gridSize-1)));
+        $inc = $this->gridSize - 1;
+        $word->setEnd($word->getStart() + (($len - 1) * ($this->gridSize - 1)));
                 // si le mot sort de la grille à gauche, on décale à droite
         while ($this->columnArray[$word->getEnd()] > $this->columnArray[$word->getStart()]) {
-            $word->setStart($word->getStart()+1);
-            $word->setEnd($word->getStart()+(($len-1)*($this->gridSize-1)));
+            $word->setStart($word->getStart() + 1);
+            $word->setEnd($word->getStart() + (($len - 1) * ($this->gridSize - 1)));
         }
                 // si le mot dépasse la grille en bas, on décale vers le haut
-        while ($word->getEnd()>($this->gridSize*$this->gridSize)-1) {
-            $word->setStart($word->getStart()-$this->gridSize);
-            $word->setEnd($word->getStart()+(($len-1)*($this->gridSize-1)));
+        while ($word->getEnd() > ($this->gridSize * $this->gridSize) - 1) {
+            $word->setStart($word->getStart() - $this->gridSize);
+            $word->setEnd($word->getStart() + (($len - 1) * ($this->gridSize - 1)));
         }
         $this->addPlacedWord($word, $inc, $len);
     }
@@ -230,19 +230,19 @@ 
 
     protected function getColumnDefault(int $x): int
     {
-        return ($x % $this->gridSize)+1;
+        return ($x % $this->gridSize) + 1;
     }
 
     protected function markWordUsed($word): void
     {
-        $this->wordsCollection = $this->wordsCollection->reject(function ($current) use ($word) {
+        $this->wordsCollection = $this->wordsCollection->reject(function($current) use ($word) {
             return $current === $word;
         });
     }
 
     protected function getRandomWord(int $len): string
     {
-        $word = $this->wordsCollection->filter(function ($word) use ($len) {
+        $word = $this->wordsCollection->filter(function($word) use ($len) {
             return strlen($word) === $len;
         })->random(1)->first();
 
@@ -254,7 +254,7 @@ 
     protected function getWordLike(string $pattern): ?string
     {
         $pattern = str_replace("_", ".", $pattern);
-        $words = $this->wordsCollection->filter(function ($word) use ($pattern) {
+        $words = $this->wordsCollection->filter(function($word) use ($pattern) {
             return preg_match("/^$pattern\$/i", $word);
         });
 
@@ -275,37 +275,37 @@ 
             return;
         }
 
-        $j=0;
+        $j = 0;
         switch ($word->getOrientation()) {
             case Word::HORIZONTAL:
-                for ($i=$word->getStart(); $j<strlen($word->getLabel()); $i++) {
-                    $this->cells[$i]=substr($word->getLabel(), $j, 1);
+                for ($i = $word->getStart(); $j < strlen($word->getLabel()); $i++) {
+                    $this->cells[$i] = substr($word->getLabel(), $j, 1);
                     $j++;
                 }
                 break;
 
             case Word::VERTICAL:
-                for ($i=$word->getStart(); $j<strlen($word->getLabel()); $i+=$this->gridSize) {
-                    $this->cells[$i]=substr($word->getLabel(), $j, 1);
+                for ($i = $word->getStart(); $j < strlen($word->getLabel()); $i += $this->gridSize) {
+                    $this->cells[$i] = substr($word->getLabel(), $j, 1);
                     $j++;
                 }
                 break;
 
             case Word::DIAGONAL_LEFT_TO_RIGHT:
-                for ($i=$word->getStart(); $j<strlen($word->getLabel()); $i+=$this->gridSize+1) {
-                    $this->cells[$i]=substr($word->getLabel(), $j, 1);
+                for ($i = $word->getStart(); $j < strlen($word->getLabel()); $i += $this->gridSize + 1) {
+                    $this->cells[$i] = substr($word->getLabel(), $j, 1);
                     $j++;
                 }
                 break;
 
             case Word::DIAGONAL_RIGHT_TO_LEFT:
-                for ($i=$word->getStart(); $j<strlen($word->getLabel()); $i+=$this->gridSize-1) {
-                    $this->cells[$i]=substr($word->getLabel(), $j, 1);
+                for ($i = $word->getStart(); $j < strlen($word->getLabel()); $i += $this->gridSize - 1) {
+                    $this->cells[$i] = substr($word->getLabel(), $j, 1);
                     $j++;
                 }
                 break;
         }
-        $this->wordsList[]=$word;
+        $this->wordsList[] = $word;
     }
 
     public function getTextGrid()
@@ -319,18 +319,18 @@ 
         }
         return $r;
 
-        $cpt=0;
+        $cpt = 0;
         foreach ($this->cells as $letter) {
-            if ($letter=='') {
-                $r.=chr(rand(65, 90));
+            if ($letter == '') {
+                $r .= chr(rand(65, 90));
             } else {
-                $r.=$letter;
+                $r .= $letter;
             }
-            $r.=' ';
+            $r .= ' ';
             $cpt++;
-            if ($cpt==$this->gridSize) {
-                $r.="\n";
-                $cpt=0;
+            if ($cpt == $this->gridSize) {
+                $r .= "\n";
+                $cpt = 0;
             }
         }
 
@@ -356,7 +356,7 @@ 
 
     public function getPuzzleWords()
     {
-        return collect($this->wordsList)->map(function (Word $word) {
+        return collect($this->wordsList)->map(function(Word $word) {
             $label = $word->getLabel();
             if ($word->getInversed()) {
                 $label = strrev($label);

src/Word.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
     public function setOrientation(int $orientation): self
     {
-        if (! in_array($orientation, [0,1,2,3])) {
+        if (!in_array($orientation, [0, 1, 2, 3])) {
             throw new RuntimeException("Orientation not valid");
         }
         $this->orientation = $orientation;