Merge pull request 'Verse retrieval fix' (#30) from main into 2.1

Reviewed-on: #30

src/Controller/ReferenceController.php

@@ -46,7 +46,7 @@ class ReferenceController extends AbstractController
             $bible = self::$emi->getRepository(Bible::class)->findBy(['book' => $book, 'chapter' => $chapter, 'verse' => $passage]);
             $label = "{$bible[0]->getLabel()}\n{$bible[0]->getChapter()}:{$passage}";
         } elseif ($passage === false) {
-            $bible = self::$emi->getRepository(Bible::class)->findBy(['book' => $book, 'chapter' => $chapter]);
+            $bible = self::$emi->getRepository(Bible::class)->findBy(['book' => $book, 'chapter' => $chapter], ['verse' => 'ASC']);
             $label = "{$bible[0]->getLabel()}\n{$bible[0]->getChapter()}";
 
             $passage = null;

src/Repository/BibleRepository.php

@@ -26,6 +26,7 @@ class BibleRepository extends ServiceEntityRepository
             ->setParameter('chapter', $bible->getChapter())
             ->setParameter('verseStart', $passage[0])
             ->setParameter('verseEnd', $passage[1])
+            ->orderBy('b.verse', 'ASC')
             ->getQuery()
             ->getResult();
     }

src/Service/DatabaseTransferService.php

@@ -74,10 +74,10 @@ class DatabaseTransferService
 
     public function transferUserTable(): int
     {
-        $sql = "SELECT * FROM user";
+        $sql = "SELECT * FROM app_user";
         $stmt = $this->srcDB->prepare($sql);
         $stmt->execute();
-        $insQuery = "INSERT INTO user (id, email, roles, password, name, meta_data, home_church_rss) ".
+        $insQuery = "INSERT INTO app_user (id, email, roles, password, name, meta_data, home_church_rss) ".
             "VALUES ".
             "(:id, :email, :roles, :password, :name, :meta_data, :home_church)";
         $destStmt = $this->destDB->prepare($insQuery);