Merge pull request #611 from distributive/search-improvements

Fixed decklist search crashing when a faction is specified

Author: plural

app/Resources/views/Search/form.html.twig

@@ -11,13 +11,15 @@
                     <option value="jinteki"{{ faction_j|default('') }}>Jinteki</option>
                     <option value="nbn"{{ faction_n|default('') }}>NBN</option>
                     <option value="weyland-consortium"{{ faction_w|default('') }}>Weyland</option>
+                    <option value="neutral-corp"{{ faction_w|default('') }}>Neutral Corp</option>
                     <option value="runner"{{ faction_R|default('') }}>any Runner</option>
                     <option value="anarch"{{ faction_a|default('') }}>Anarch</option>
                     <option value="criminal"{{ faction_c|default('') }}>Criminal</option>
                     <option value="shaper"{{ faction_s|default('') }}>Shaper</option>
                     <option value="adam"{{ faction_d|default('') }}>Adam</option>
                     <option value="apex"{{ faction_p|default('') }}>Apex</option>
                     <option value="sunny-lebeau"{{ faction_u|default('') }}>Sunny Lebeau</option>
+                    <option value="neutral-runner"{{ faction_w|default('') }}>Neutral Corp</option>
                 </select>
             </div>
             <div class="form-group">

src/AppBundle/Controller/DecklistsController.php

@@ -259,9 +259,8 @@ private function searchForm(Request $request, EntityManagerInterface $entityMana
                 $params['faction_C'] = ' selected="selected"';
             } elseif ($faction_code == 'runner') {
                 $params['faction_R'] = ' selected="selected"';
-
             } else {
-                $params['faction_' . CardsData::$faction_letters[$faction_code]] = ' selected="selected"';
+                $params['faction_' . $faction_code] = ' selected="selected"';
             }
         }
 

src/AppBundle/Service/CardsData.php

@@ -22,27 +22,27 @@ class CardsData
     public static $faction_shortcuts = [
         'neutral' => ['neutral-runner', 'neutral-corp'],
         '-'       => ['neutral-runner', 'neutral-corp'],
-        'nc'      => 'neutral-corp',
-        'nr'      => 'neutral-runner',
+        'nc'      => ['neutral-corp'],
+        'nr'      => ['neutral-runner'],
 
-        'h'       => 'haas-bioroid',
-        'hb'      => 'haas-bioroid',
-        'j'       => 'jinteki',
-        'n'       => 'nbn',
-        'w'       => 'weyland-consortium',
-        'weyland' => 'weyland-consortium',
+        'h'       => ['haas-bioroid'],
+        'hb'      => ['haas-bioroid'],
+        'j'       => ['jinteki'],
+        'n'       => ['nbn'],
+        'w'       => ['weyland-consortium'],
+        'weyland' => ['weyland-consortium'],
 
-        'a'       => 'anarch',
-        'c'       => 'criminal',
-        's'       => 'shaper',
+        'a'       => ['anarch'],
+        'c'       => ['criminal'],
+        's'       => ['shaper'],
 
         'mini'    => ['apex', 'adam', 'sunny-lebeau'],
-        'p'       => 'apex',
-        'ap'       => 'apex',
-        'd'       => 'adam',
-        'ad'       => 'adam',
-        'u'       => 'sunny-lebeau',
-        'su'       => 'sunny-lebeau',
+        'p'       => ['apex'],
+        'ap'      => ['apex'],
+        'd'       => ['adam'],
+        'ad'      => ['adam'],
+        'u'       => ['sunny-lebeau'],
+        'su'      => ['sunny-lebeau'],
     ];
 
     /** @var EntityManagerInterface $entityManager */
@@ -936,11 +936,7 @@ public function validateConditions(array &$conditions)
                 $factions = [];
                 for ($j = 2; $j < count($l); ++$j) {
                     if (array_key_exists($l[$j], self::$faction_shortcuts)) {
-                        if (is_array(self::$faction_shortcuts[$l[$j]])) {
-                            array_push($factions, ...self::$faction_shortcuts[$l[$j]]);
-                        } else {
-                            array_push($factions, self::$faction_shortcuts[$l[$j]]);
-                        }
+                        array_push($factions, ...self::$faction_shortcuts[$l[$j]]);
                     } else {
                         array_push($factions, $l[$j]);
                     }