added query builder

added fall back, if no sql db, for current player
kokspflanze · Nov 1, 2015 · e9215e9 · e9215e9
1 parent 0777cee
commit e9215e9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/src/PServerCMS/Entity/Repository/PlayerHistory.php b/src/PServerCMS/Entity/Repository/PlayerHistory.php
@@ -7,20 +7,29 @@
 
 class PlayerHistory extends EntityRepository
 {
-	/**
-	 * @return integer
-	 */
-	public function getCurrentPlayer( )
+    /**
+     * @return integer
+     */
+    public function getCurrentPlayer()
     {
-		$query = $this->createQueryBuilder('p')
-			->select('p')
-			->orderBy('p.created','desc')
-			->setMaxResults(1)
-			->getQuery();
+        $query = $this->createQueryBuilder('p')
+            ->select('p')
+            ->orderBy('p.created', 'desc')
+            ->setMaxResults(1)
+            ->getQuery();
 
-		/** @var \PServerCMS\Entity\PlayerHistory $result */
-		$result = $query->getOneOrNullResult();
+        /** @var \PServerCMS\Entity\PlayerHistory $result */
+        $result = $query->getOneOrNullResult();
 
-		return is_null($result)?0:$result->getPlayer();
-	}
+        return is_null($result) ? 0 : $result->getPlayer();
+    }
+
+    /**
+     * @return \Doctrine\ORM\QueryBuilder
+     */
+    public function getQueryBuilder()
+    {
+        return $this->createQueryBuilder('p')
+            ->select('p');
+    }
 } 
diff --git a/src/PServerCMS/Service/PlayerHistory.php b/src/PServerCMS/Service/PlayerHistory.php
@@ -27,7 +27,12 @@ public function getCurrentPlayer()
      */
     public function setCurrentPlayer($extraPlayer = 0)
     {
-        $player = $this->getGameBackendService()->getCurrentPlayerNumber();
+        try {
+            $player = $this->getGameBackendService()->getCurrentPlayerNumber();
+        } catch (\Exception $e) {
+            $player = 0;
+        }
+
         if ($player > 0) {
             $player += $extraPlayer;
         }