tfboe / fm-lib

src/Entity/Game.php

Doc Comments +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
   }
 
   /**
-   * @return Player[]|Collection
+   * @return Collection
    */
   public function getPlayersA()
   {
@@ -131,7 +131,7 @@ 
   }
 
   /**
-   * @return Player[]|Collection
+   * @return Collection
    */
   public function getPlayersB()
   {

Indentation +19 added lines, -19 removed lines

@@ -67,9 +67,9 @@ 
    */
   public function __construct()
   {
-    parent::__construct();
-    $this->playersA = new ArrayCollection();
-    $this->playersB = new ArrayCollection();
+	parent::__construct();
+	$this->playersA = new ArrayCollection();
+	$this->playersB = new ArrayCollection();
   }
 //</editor-fold desc="Constructor">
 
@@ -79,7 +79,7 @@ 
    */
   public function getChildren(): Collection
   {
-    return new ArrayCollection();
+	return new ArrayCollection();
   }
 
   /**
@@ -87,7 +87,7 @@ 
    */
   public function getGameNumber(): int
   {
-    return $this->gameNumber;
+	return $this->gameNumber;
   }
 
   /**
@@ -95,7 +95,7 @@ 
    */
   public function getLevel(): int
   {
-    return Level::GAME;
+	return Level::GAME;
   }
 
   /**
@@ -103,7 +103,7 @@ 
    */
   public function getLocalIdentifier()
   {
-    return $this->getGameNumber();
+	return $this->getGameNumber();
   }
 
   /**
@@ -111,7 +111,7 @@ 
    */
   public function getMatch(): Match
   {
-    return $this->match;
+	return $this->match;
   }
 
   /**
@@ -119,7 +119,7 @@ 
    */
   public function getParent(): ?TournamentHierarchyInterface
   {
-    return $this->getMatch();
+	return $this->getMatch();
   }
 
   /**
@@ -127,7 +127,7 @@ 
    */
   public function getPlayersA()
   {
-    return $this->playersA;
+	return $this->playersA;
   }
 
   /**
@@ -135,7 +135,7 @@ 
    */
   public function getPlayersB()
   {
-    return $this->playersB;
+	return $this->playersB;
   }
 
   /**
@@ -144,8 +144,8 @@ 
    */
   public function setGameNumber(int $gameNumber): Game
   {
-    $this->gameNumber = $gameNumber;
-    return $this;
+	$this->gameNumber = $gameNumber;
+	return $this;
   }
 
   /**
@@ -154,12 +154,12 @@ 
    */
   public function setMatch(Match $match): Game
   {
-    if ($this->match !== null) {
-      $this->match->getGames()->remove($this->getGameNumber());
-    }
-    $this->match = $match;
-    $match->getGames()->set($this->getGameNumber(), $this);
-    return $this;
+	if ($this->match !== null) {
+	  $this->match->getGames()->remove($this->getGameNumber());
+	}
+	$this->match = $match;
+	$match->getGames()->set($this->getGameNumber(), $this);
+	return $this;
   }
 //</editor-fold desc="Public Methods">
 }
\ No newline at end of file

src/Service/RankingSystem/EloRanking.php

Doc Comments +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 //<editor-fold desc="Private Methods">
   /**
    * @param RankingSystemChange[] $changes
-   * @param Collection|Player[] $players
+   * @param Collection $players
    * @param TournamentHierarchyEntity $entity
    * @param \Tfboe\FmLib\Entity\RankingSystem $ranking
    */

Indentation +116 added lines, -116 removed lines

@@ -46,7 +46,7 @@ 
    */
   protected function getAdditionalFields(): array
   {
-    return ['playedGames' => 0, 'ratedGames' => 0, 'provisoryRanking' => 1200.0];
+	return ['playedGames' => 0, 'ratedGames' => 0, 'provisoryRanking' => 1200.0];
   }
 
   /**
@@ -54,51 +54,51 @@ 
    */
   protected function getChanges(TournamentHierarchyEntity $entity, RankingSystemList $list): array
   {
-    /** @var Game $game */
-    $game = $entity;
-    $changes = [];
-
-    if (!$game->isPlayed() || $game->getResult() === Result::NOT_YET_FINISHED ||
-      $game->getResult() === Result::NULLED) {
-      //game gets not elo rated
-      $this->addNotRatedChanges($changes, $game->getPlayersA(), $entity, $list->getRankingSystem());
-      $this->addNotRatedChanges($changes, $game->getPlayersB(), $entity, $list->getRankingSystem());
-      return $changes;
-    }
-
-    $entriesA = $this->getEntriesOfPlayers($game->getPlayersA(), $list);
-    $entriesB = $this->getEntriesOfPlayers($game->getPlayersB(), $list);
-
-    $isAProvisory = $this->hasProvisoryEntry($entriesA);
-    $isBProvisory = $this->hasProvisoryEntry($entriesB);
-
-    $averageA = $this->getEloAverage($entriesA);
-    $averageB = $this->getEloAverage($entriesB);
-
-    $expectationA = 1 / (1 + 10 ** (($averageB - $averageA) / self::EXP_DIFF));
-    $expectationB = 1 - $expectationA;
-
-    $resultA = 0.0;
-
-    switch ($game->getResult()) {
-      case Result::TEAM_A_WINS:
-        $resultA = 1.0;
-        break;
-      case Result::DRAW:
-        $resultA = 0.5;
-        break;
-    }
-    $resultB = 1 - $resultA;
-
-    $expectationDiffA = $resultA - $expectationA;
-    $expectationDiffB = $resultB - $expectationB;
-
-
-    $this->computeChanges($changes, $entriesA, $resultA, $expectationDiffA, $game, $averageA, $averageB,
-      $isAProvisory, $isBProvisory);
-    $this->computeChanges($changes, $entriesB, $resultB, $expectationDiffB, $game, $averageB, $averageA,
-      $isBProvisory, $isAProvisory);
-    return $changes;
+	/** @var Game $game */
+	$game = $entity;
+	$changes = [];
+
+	if (!$game->isPlayed() || $game->getResult() === Result::NOT_YET_FINISHED ||
+	  $game->getResult() === Result::NULLED) {
+	  //game gets not elo rated
+	  $this->addNotRatedChanges($changes, $game->getPlayersA(), $entity, $list->getRankingSystem());
+	  $this->addNotRatedChanges($changes, $game->getPlayersB(), $entity, $list->getRankingSystem());
+	  return $changes;
+	}
+
+	$entriesA = $this->getEntriesOfPlayers($game->getPlayersA(), $list);
+	$entriesB = $this->getEntriesOfPlayers($game->getPlayersB(), $list);
+
+	$isAProvisory = $this->hasProvisoryEntry($entriesA);
+	$isBProvisory = $this->hasProvisoryEntry($entriesB);
+
+	$averageA = $this->getEloAverage($entriesA);
+	$averageB = $this->getEloAverage($entriesB);
+
+	$expectationA = 1 / (1 + 10 ** (($averageB - $averageA) / self::EXP_DIFF));
+	$expectationB = 1 - $expectationA;
+
+	$resultA = 0.0;
+
+	switch ($game->getResult()) {
+	  case Result::TEAM_A_WINS:
+		$resultA = 1.0;
+		break;
+	  case Result::DRAW:
+		$resultA = 0.5;
+		break;
+	}
+	$resultB = 1 - $resultA;
+
+	$expectationDiffA = $resultA - $expectationA;
+	$expectationDiffB = $resultB - $expectationB;
+
+
+	$this->computeChanges($changes, $entriesA, $resultA, $expectationDiffA, $game, $averageA, $averageB,
+	  $isAProvisory, $isBProvisory);
+	$this->computeChanges($changes, $entriesB, $resultB, $expectationDiffB, $game, $averageB, $averageA,
+	  $isBProvisory, $isAProvisory);
+	return $changes;
   }
 
   /** @noinspection PhpMissingParentCallCommonInspection */
@@ -107,7 +107,7 @@ 
    */
   protected function startPoints(): float
   {
-    return 1200.0;
+	return 1200.0;
   }
 //</editor-fold desc="Protected Methods">
 
@@ -120,16 +120,16 @@ 
    * @param \Tfboe\FmLib\Entity\RankingSystem $ranking
    */
   private function addNotRatedChanges(array &$changes, Collection $players, TournamentHierarchyEntity $entity,
-                                      RankingSystem $ranking)
+									  RankingSystem $ranking)
   {
-    foreach ($players as $player) {
-      $change = $this->getOrCreateChange($entity, $ranking, $player);
-      $change->setPointsChange(0.0);
-      $change->setPlayedGames(0);
-      $change->setRatedGames(0);
-      $change->setProvisoryRanking(0.0);
-      $changes[] = $change;
-    }
+	foreach ($players as $player) {
+	  $change = $this->getOrCreateChange($entity, $ranking, $player);
+	  $change->setPointsChange(0.0);
+	  $change->setPlayedGames(0);
+	  $change->setRatedGames(0);
+	  $change->setProvisoryRanking(0.0);
+	  $changes[] = $change;
+	}
   }
 
   /** @noinspection PhpTooManyParametersInspection */ //TODO refactor this method
@@ -145,56 +145,56 @@ 
    * @param bool $opponentHasProvisory
    */
   private function computeChanges(array &$changes, array $entries, float $result, float $expectationDiff, Game $game,
-                                  float $teamAverage, float $opponentAverage, bool $teamHasProvisory,
-                                  bool $opponentHasProvisory)
+								  float $teamAverage, float $opponentAverage, bool $teamHasProvisory,
+								  bool $opponentHasProvisory)
   {
-    foreach ($entries as $entry) {
-      $change = $this->getOrCreateChange($game, $entry->getRankingSystemList()->getRankingSystem(),
-        $entry->getPlayer());
-      $change->setPlayedGames(1);
-      $factor = 2 * $result - 1;
-      if ($entry->getPlayedGames() < self::NUM_PROVISORY_GAMES) {
-        //provisory entry => recalculate
-        if (count($entries) > 1) {
-          $teamMatesAverage = ($teamAverage * count($entries) - $entry->getProvisoryRanking()) /
-            (count($entries) - 1);
-          if ($teamMatesAverage > $opponentAverage + self::MAX_DIFF_TO_OPPONENT_FOR_PROVISORY) {
-            $teamMatesAverage = $opponentAverage + self::MAX_DIFF_TO_OPPONENT_FOR_PROVISORY;
-          }
-          if ($teamMatesAverage < $opponentAverage - self::MAX_DIFF_TO_OPPONENT_FOR_PROVISORY) {
-            $teamMatesAverage = $opponentAverage - self::MAX_DIFF_TO_OPPONENT_FOR_PROVISORY;
-          }
-          $performance = $opponentAverage * (1 + self::PROVISORY_PARTNER_FACTOR) -
-            $teamMatesAverage * self::PROVISORY_PARTNER_FACTOR;
-        } else {
-          $performance = $opponentAverage;
-        }
-        if ($performance < self::START) {
-          $performance = self::START;
-        }
-        $performance += self::EXP_DIFF * $factor;
-        //old average performance = $entry->getProvisoryRating()
-        //=> new average performance = ($entry->getProvisoryRating() * $entry->getRatedGames() + $performance) /
-        //                             ($entry->getRatedGames() + 1)
-        //=> performance change = ($entry->getProvisoryRating() * $entry->getRatedGames() + $performance) /
-        //                        ($entry->getRatedGames() + 1) - $entry->getProvisoryRating()
-        //                      = ($performance - $entry->getProvisoryRating()) / ($entry->getRatedGames() + 1)
-        $change->setProvisoryRanking(($performance - $entry->getProvisoryRanking()) / ($entry->getRatedGames() + 1));
-        $change->setPointsChange(0.0);
-        $change->setRatedGames(1);
-      } else if (!$teamHasProvisory && !$opponentHasProvisory) {
-        //real elo ranking
-        $change->setProvisoryRanking(0.0);
-        $change->setPointsChange(self::K * $expectationDiff);
-        $change->setRatedGames(1);
-      } else {
-        //does not get rated
-        $change->setProvisoryRanking(0.0);
-        $change->setPointsChange(0.0);
-        $change->setRatedGames(0);
-      }
-      $changes[] = $change;
-    }
+	foreach ($entries as $entry) {
+	  $change = $this->getOrCreateChange($game, $entry->getRankingSystemList()->getRankingSystem(),
+		$entry->getPlayer());
+	  $change->setPlayedGames(1);
+	  $factor = 2 * $result - 1;
+	  if ($entry->getPlayedGames() < self::NUM_PROVISORY_GAMES) {
+		//provisory entry => recalculate
+		if (count($entries) > 1) {
+		  $teamMatesAverage = ($teamAverage * count($entries) - $entry->getProvisoryRanking()) /
+			(count($entries) - 1);
+		  if ($teamMatesAverage > $opponentAverage + self::MAX_DIFF_TO_OPPONENT_FOR_PROVISORY) {
+			$teamMatesAverage = $opponentAverage + self::MAX_DIFF_TO_OPPONENT_FOR_PROVISORY;
+		  }
+		  if ($teamMatesAverage < $opponentAverage - self::MAX_DIFF_TO_OPPONENT_FOR_PROVISORY) {
+			$teamMatesAverage = $opponentAverage - self::MAX_DIFF_TO_OPPONENT_FOR_PROVISORY;
+		  }
+		  $performance = $opponentAverage * (1 + self::PROVISORY_PARTNER_FACTOR) -
+			$teamMatesAverage * self::PROVISORY_PARTNER_FACTOR;
+		} else {
+		  $performance = $opponentAverage;
+		}
+		if ($performance < self::START) {
+		  $performance = self::START;
+		}
+		$performance += self::EXP_DIFF * $factor;
+		//old average performance = $entry->getProvisoryRating()
+		//=> new average performance = ($entry->getProvisoryRating() * $entry->getRatedGames() + $performance) /
+		//                             ($entry->getRatedGames() + 1)
+		//=> performance change = ($entry->getProvisoryRating() * $entry->getRatedGames() + $performance) /
+		//                        ($entry->getRatedGames() + 1) - $entry->getProvisoryRating()
+		//                      = ($performance - $entry->getProvisoryRating()) / ($entry->getRatedGames() + 1)
+		$change->setProvisoryRanking(($performance - $entry->getProvisoryRanking()) / ($entry->getRatedGames() + 1));
+		$change->setPointsChange(0.0);
+		$change->setRatedGames(1);
+	  } else if (!$teamHasProvisory && !$opponentHasProvisory) {
+		//real elo ranking
+		$change->setProvisoryRanking(0.0);
+		$change->setPointsChange(self::K * $expectationDiff);
+		$change->setRatedGames(1);
+	  } else {
+		//does not get rated
+		$change->setProvisoryRanking(0.0);
+		$change->setPointsChange(0.0);
+		$change->setRatedGames(0);
+	  }
+	  $changes[] = $change;
+	}
   }
 
   /**
@@ -204,11 +204,11 @@ 
    */
   private function getEloAverage(array $entries): float
   {
-    $sum = 0;
-    foreach ($entries as $entry) {
-      $sum += $entry->getRatedGames() < self::NUM_PROVISORY_GAMES ? $entry->getProvisoryRanking() : $entry->getPoints();
-    }
-    return $sum / count($entries);
+	$sum = 0;
+	foreach ($entries as $entry) {
+	  $sum += $entry->getRatedGames() < self::NUM_PROVISORY_GAMES ? $entry->getProvisoryRanking() : $entry->getPoints();
+	}
+	return $sum / count($entries);
   }
 
   /**
@@ -218,12 +218,12 @@ 
    */
   private function hasProvisoryEntry(array $entries): bool
   {
-    foreach ($entries as $entry) {
-      if ($entry->getPlayedGames() < self::NUM_PROVISORY_GAMES) {
-        return true;
-      }
-    }
-    return false;
+	foreach ($entries as $entry) {
+	  if ($entry->getPlayedGames() < self::NUM_PROVISORY_GAMES) {
+		return true;
+	  }
+	}
+	return false;
   }
 //</editor-fold desc="Private Methods">
 }
\ No newline at end of file

src/Service/RankingSystem/RankingSystemService.php

Doc Comments +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
   }
 
   /**
-   * @param Collection|Player[] $players
+   * @param Collection $players
    * @param RankingSystemList $list
    * @return RankingSystemListEntry[] $entries
    */

Indentation +235 added lines, -235 removed lines

@@ -67,14 +67,14 @@ 
    * @param EntityComparerInterface $entityComparer
    */
   public function __construct(EntityManagerInterface $entityManager, TimeServiceInterface $timeService,
-                              EntityComparerInterface $entityComparer)
+							  EntityComparerInterface $entityComparer)
   {
-    $this->entityManager = $entityManager;
-    $this->timeService = $timeService;
-    $this->entityComparer = $entityComparer;
-    $this->changes = [];
-    $this->deletedChanges = [];
-    $this->updateRankingCalls = [];
+	$this->entityManager = $entityManager;
+	$this->timeService = $timeService;
+	$this->entityComparer = $entityComparer;
+	$this->changes = [];
+	$this->deletedChanges = [];
+	$this->updateRankingCalls = [];
   }
 //</editor-fold desc="Constructor">
 
@@ -84,23 +84,23 @@ 
    */
   public function getEarliestInfluence(RankingSystem $ranking, Tournament $tournament): ?\DateTime
   {
-    return $this->getEarliestEntityInfluence($ranking, $tournament, false);
+	return $this->getEarliestEntityInfluence($ranking, $tournament, false);
   }
 
   /**
    * @inheritdoc
    */
   public function updateRankingForTournament(RankingSystem $ranking, Tournament $tournament,
-                                             ?\DateTime $oldInfluence)
+											 ?\DateTime $oldInfluence)
   {
-    $earliestInfluence = $this->getEarliestInfluence($ranking, $tournament);
-    if ($oldInfluence !== null &&
-      ($earliestInfluence === null || $oldInfluence < $earliestInfluence)) {
-      $earliestInfluence = $oldInfluence;
-    }
-    if ($earliestInfluence !== null) {
-      $this->updateRankingFrom($ranking, $earliestInfluence);
-    }
+	$earliestInfluence = $this->getEarliestInfluence($ranking, $tournament);
+	if ($oldInfluence !== null &&
+	  ($earliestInfluence === null || $oldInfluence < $earliestInfluence)) {
+	  $earliestInfluence = $oldInfluence;
+	}
+	if ($earliestInfluence !== null) {
+	  $this->updateRankingFrom($ranking, $earliestInfluence);
+	}
   }
 
   /**
@@ -108,60 +108,60 @@ 
    */
   public function updateRankingFrom(RankingSystem $ranking, \DateTime $from)
   {
-    // can only be called once per ranking system!!!
-    if (array_key_exists($ranking->getId(), $this->updateRankingCalls)) {
-      throw new PreconditionFailedException();
-    }
-    $this->updateRankingCalls[$ranking->getId()] = $ranking;
-    //find first reusable
-    /** @var RankingSystemList[] $lists */
-    $lists = array_values($ranking->getLists()->toArray());
-
-    $current = null;
-    /** @var RankingSystemList $lastReusable */
-    $lastReusable = null;
-    $toUpdate = [];
-
-    foreach ($lists as $list) {
-      if ($list->isCurrent()) {
-        $current = $list;
-      } else if ($list->getLastEntryTime() >= $from) {
-        $toUpdate[] = $list;
-      } else if ($lastReusable === null || $list->getLastEntryTime() > $lastReusable->getLastEntryTime()) {
-        $lastReusable = $list;
-      }
-    }
-
-    if ($lastReusable === null) {
-      $lastReusable = new RankingSystemList();
-    }
-
-    usort($toUpdate, function (RankingSystemList $list1, RankingSystemList $list2) {
-      return $list1->getLastEntryTime() <=> $list2->getLastEntryTime();
-    });
-
-    $entities = $this->getEntities($ranking, $lastReusable->getLastEntryTime());
-    //sort entities
-    $this->timeService->clearTimes();
-    usort($entities, function ($entity1, $entity2) {
-      return $this->entityComparer->compareEntities($entity1, $entity2);
-    });
-
-    $this->deleteOldChanges($ranking, $entities);
-
-    $nextEntityIndex = 0;
-    foreach ($toUpdate as $list) {
-      $this->recomputeBasedOn($list, $lastReusable, $entities, $nextEntityIndex);
-      $lastReusable = $list;
-    }
-
-    if ($current === null) {
-      $current = new RankingSystemList();
-      $current->setCurrent(true);
-      $this->entityManager->persist($current);
-      $current->setRankingSystem($ranking);
-    }
-    $this->recomputeBasedOn($current, $lastReusable, $entities, $nextEntityIndex);
+	// can only be called once per ranking system!!!
+	if (array_key_exists($ranking->getId(), $this->updateRankingCalls)) {
+	  throw new PreconditionFailedException();
+	}
+	$this->updateRankingCalls[$ranking->getId()] = $ranking;
+	//find first reusable
+	/** @var RankingSystemList[] $lists */
+	$lists = array_values($ranking->getLists()->toArray());
+
+	$current = null;
+	/** @var RankingSystemList $lastReusable */
+	$lastReusable = null;
+	$toUpdate = [];
+
+	foreach ($lists as $list) {
+	  if ($list->isCurrent()) {
+		$current = $list;
+	  } else if ($list->getLastEntryTime() >= $from) {
+		$toUpdate[] = $list;
+	  } else if ($lastReusable === null || $list->getLastEntryTime() > $lastReusable->getLastEntryTime()) {
+		$lastReusable = $list;
+	  }
+	}
+
+	if ($lastReusable === null) {
+	  $lastReusable = new RankingSystemList();
+	}
+
+	usort($toUpdate, function (RankingSystemList $list1, RankingSystemList $list2) {
+	  return $list1->getLastEntryTime() <=> $list2->getLastEntryTime();
+	});
+
+	$entities = $this->getEntities($ranking, $lastReusable->getLastEntryTime());
+	//sort entities
+	$this->timeService->clearTimes();
+	usort($entities, function ($entity1, $entity2) {
+	  return $this->entityComparer->compareEntities($entity1, $entity2);
+	});
+
+	$this->deleteOldChanges($ranking, $entities);
+
+	$nextEntityIndex = 0;
+	foreach ($toUpdate as $list) {
+	  $this->recomputeBasedOn($list, $lastReusable, $entities, $nextEntityIndex);
+	  $lastReusable = $list;
+	}
+
+	if ($current === null) {
+	  $current = new RankingSystemList();
+	  $current->setCurrent(true);
+	  $this->entityManager->persist($current);
+	  $current->setRankingSystem($ranking);
+	}
+	$this->recomputeBasedOn($current, $lastReusable, $entities, $nextEntityIndex);
   }
 //</editor-fold desc="Public Methods">
 
@@ -173,15 +173,15 @@ 
    */
   protected final function getAverage(array $entries): float
   {
-    $sum = 0.0;
-    foreach ($entries as $entry) {
-      $sum += $entry->getPoints();
-    }
-    if (count($entries) === 0) {
-      return 0.0;
-    } else {
-      return $sum / count($entries);
-    }
+	$sum = 0.0;
+	foreach ($entries as $entry) {
+	  $sum += $entry->getPoints();
+	}
+	if (count($entries) === 0) {
+	  return 0.0;
+	} else {
+	  return $sum / count($entries);
+	}
   }
 
   /**
@@ -193,8 +193,8 @@ 
    */
   protected final function getEntities(RankingSystem $ranking, \DateTime $from): array
   {
-    $query = $this->getEntitiesQueryBuilder($ranking, $from);
-    return $query->getQuery()->getResult();
+	$query = $this->getEntitiesQueryBuilder($ranking, $from);
+	return $query->getQuery()->getResult();
   }
 
   /**
@@ -202,7 +202,7 @@ 
    */
   protected final function getEntityManager(): EntityManagerInterface
   {
-    return $this->entityManager;
+	return $this->entityManager;
   }
 
   /**
@@ -212,11 +212,11 @@ 
    */
   protected final function getEntriesOfPlayers(Collection $players, RankingSystemList $list): array
   {
-    $result = [];
-    foreach ($players as $player) {
-      $result[] = $this->getOrCreateRankingSystemListEntry($list, $player);
-    }
-    return $result;
+	$result = [];
+	foreach ($players as $player) {
+	  $result[] = $this->getOrCreateRankingSystemListEntry($list, $player);
+	}
+	return $result;
   }
 
   /** @noinspection PhpDocMissingThrowsInspection */ //PropertyNotExistingException
@@ -228,49 +228,49 @@ 
    * @return RankingSystemChange the found or newly created ranking system change
    */
   protected final function getOrCreateChange(TournamentHierarchyEntity $entity, RankingSystem $ranking,
-                                             Player $player)
+											 Player $player)
   {
-    $key1 = $entity->getId();
-    $key2 = $ranking->getId();
-    $key3 = $player->getPlayerId();
-    if (!array_key_exists($key1, $this->changes) || !array_key_exists($key2, $this->changes[$key1]) ||
-      !array_key_exists($key3, $this->changes[$key1][$key2])) {
-      /** @var RankingSystemChange[] $changes */
-      $changes = $this->entityManager->getRepository(RankingSystemChange::class)->findBy(
-        ['hierarchyEntity' => $entity]);
-      $this->changes[$key1] = [];
-      foreach ($changes as $change) {
-
-        $newKey2 = $change->getRankingSystem()->getId();
-        $newKey3 = $change->getPlayer()->getPlayerId();
-        if (!array_key_exists($key1, $this->deletedChanges) || !array_key_exists($key2, $this->deletedChanges[$key1]) ||
-          !array_key_exists($key3, $this->deletedChanges[$key1][$key2])) {
-          if (!array_key_exists($newKey2, $this->changes)) {
-            $this->changes[$key1][$newKey2] = [];
-          }
-          $this->changes[$key1][$newKey2][$newKey3] = $change;
-        }
-      }
-    }
-    if (!array_key_exists($key2, $this->changes[$key1]) || !array_key_exists($key3, $this->changes[$key1][$key2])) {
-      //create new change
-      $change = new RankingSystemChange(array_keys($this->getAdditionalFields()));
-      foreach ($this->getAdditionalFields() as $field => $value) {
-        // PropertyNotExistingException => we know for sure that the property exists (see 2 lines above)
-        /** @noinspection PhpUnhandledExceptionInspection */
-        $change->setProperty($field, 0);
-      }
-      $change->setHierarchyEntity($entity);
-      $change->setRankingSystem($ranking);
-      $change->setPlayer($player);
-      $this->entityManager->persist($change);
-      $this->changes[$key1][$key2][$key3] = $change;
-      if (array_key_exists($key1, $this->deletedChanges) && array_key_exists($key2, $this->deletedChanges[$key1]) &&
-        array_key_exists($key3, $this->deletedChanges[$key1][$key2])) {
-        unset($this->deletedChanges[$key1][$key2][$key3]);
-      }
-    }
-    return $this->changes[$key1][$key2][$key3];
+	$key1 = $entity->getId();
+	$key2 = $ranking->getId();
+	$key3 = $player->getPlayerId();
+	if (!array_key_exists($key1, $this->changes) || !array_key_exists($key2, $this->changes[$key1]) ||
+	  !array_key_exists($key3, $this->changes[$key1][$key2])) {
+	  /** @var RankingSystemChange[] $changes */
+	  $changes = $this->entityManager->getRepository(RankingSystemChange::class)->findBy(
+		['hierarchyEntity' => $entity]);
+	  $this->changes[$key1] = [];
+	  foreach ($changes as $change) {
+
+		$newKey2 = $change->getRankingSystem()->getId();
+		$newKey3 = $change->getPlayer()->getPlayerId();
+		if (!array_key_exists($key1, $this->deletedChanges) || !array_key_exists($key2, $this->deletedChanges[$key1]) ||
+		  !array_key_exists($key3, $this->deletedChanges[$key1][$key2])) {
+		  if (!array_key_exists($newKey2, $this->changes)) {
+			$this->changes[$key1][$newKey2] = [];
+		  }
+		  $this->changes[$key1][$newKey2][$newKey3] = $change;
+		}
+	  }
+	}
+	if (!array_key_exists($key2, $this->changes[$key1]) || !array_key_exists($key3, $this->changes[$key1][$key2])) {
+	  //create new change
+	  $change = new RankingSystemChange(array_keys($this->getAdditionalFields()));
+	  foreach ($this->getAdditionalFields() as $field => $value) {
+		// PropertyNotExistingException => we know for sure that the property exists (see 2 lines above)
+		/** @noinspection PhpUnhandledExceptionInspection */
+		$change->setProperty($field, 0);
+	  }
+	  $change->setHierarchyEntity($entity);
+	  $change->setRankingSystem($ranking);
+	  $change->setPlayer($player);
+	  $this->entityManager->persist($change);
+	  $this->changes[$key1][$key2][$key3] = $change;
+	  if (array_key_exists($key1, $this->deletedChanges) && array_key_exists($key2, $this->deletedChanges[$key1]) &&
+		array_key_exists($key3, $this->deletedChanges[$key1][$key2])) {
+		unset($this->deletedChanges[$key1][$key2][$key3]);
+	  }
+	}
+	return $this->changes[$key1][$key2][$key3];
   }
 
   /** @noinspection PhpDocMissingThrowsInspection */ //PropertyNotExistingException
@@ -280,22 +280,22 @@ 
    * @return RankingSystemListEntry the found or the new entry
    */
   protected final function getOrCreateRankingSystemListEntry(RankingSystemList $list,
-                                                             Player $player): RankingSystemListEntry
+															 Player $player): RankingSystemListEntry
   {
-    $playerId = $player->getPlayerId();
-    if (!$list->getEntries()->containsKey($playerId)) {
-      $entry = new RankingSystemListEntry(array_keys($this->getAdditionalFields()));
-      $entry->setPoints($this->startPoints());
-      $entry->setPlayer($player);
-      $entry->setRankingSystemList($list);
-      foreach ($this->getAdditionalFields() as $field => $value) {
-        // PropertyNotExistingException => we know for sure that the property exists (see 2 lines above)
-        /** @noinspection PhpUnhandledExceptionInspection */
-        $entry->setProperty($field, $value);
-      }
-      $this->entityManager->persist($entry);
-    }
-    return $list->getEntries()->get($playerId);
+	$playerId = $player->getPlayerId();
+	if (!$list->getEntries()->containsKey($playerId)) {
+	  $entry = new RankingSystemListEntry(array_keys($this->getAdditionalFields()));
+	  $entry->setPoints($this->startPoints());
+	  $entry->setPlayer($player);
+	  $entry->setRankingSystemList($list);
+	  foreach ($this->getAdditionalFields() as $field => $value) {
+		// PropertyNotExistingException => we know for sure that the property exists (see 2 lines above)
+		/** @noinspection PhpUnhandledExceptionInspection */
+		$entry->setProperty($field, $value);
+	  }
+	  $this->entityManager->persist($entry);
+	}
+	return $list->getEntries()->get($playerId);
   }
 //</editor-fold desc="Protected Final Methods">
 
@@ -323,7 +323,7 @@ 
    * @return QueryBuilder
    */
   protected abstract function getEntitiesQueryBuilder(RankingSystem $ranking,
-                                                      \DateTime $from): QueryBuilder;
+													  \DateTime $from): QueryBuilder;
 
   /**
    * Gets the level of the ranking system service (see Level Enum)
@@ -337,7 +337,7 @@ 
    */
   protected function startPoints(): float
   {
-    return 0.0;
+	return 0.0;
   }
 //</editor-fold desc="Protected Methods">
 
@@ -350,38 +350,38 @@ 
    */
   private function cloneInto(RankingSystemList $list, RankingSystemList $base)
   {
-    /*//first remove all entries from list
+	/*//first remove all entries from list
     foreach($list->getEntries()->toArray() as $entry)
     {
       $list->getEntries()->removeElement($entry);
       $this->entityManager->remove($entry);
     }*/
 
-    $clonedPlayers = [];
-
-    foreach ($base->getEntries() as $entry) {
-      $playerId = $entry->getPlayer()->getPlayerId();
-      $clonedPlayers[$playerId] = true;
-      if (!$list->getEntries()->containsKey($playerId)) {
-        //create new entry
-        $clone = new RankingSystemListEntry([]);
-        $clone->cloneSubClassDataFrom($entry);
-        $this->entityManager->persist($clone);
-        $clone->setPlayer($entry->getPlayer());
-        $clone->setRankingSystemList($list);
-      }
-      $foundEntry = $list->getEntries()[$playerId];
-      $foundEntry->setNumberRankedEntities($entry->getNumberRankedEntities());
-      $foundEntry->setPoints($entry->getPoints());
-    }
-
-    //remove all unused entries from list
-    foreach ($list->getEntries()->toArray() as $playerId => $entry) {
-      if (!array_key_exists($playerId, $clonedPlayers)) {
-        $list->getEntries()->removeElement($entry);
-        $this->entityManager->remove($entry);
-      }
-    }
+	$clonedPlayers = [];
+
+	foreach ($base->getEntries() as $entry) {
+	  $playerId = $entry->getPlayer()->getPlayerId();
+	  $clonedPlayers[$playerId] = true;
+	  if (!$list->getEntries()->containsKey($playerId)) {
+		//create new entry
+		$clone = new RankingSystemListEntry([]);
+		$clone->cloneSubClassDataFrom($entry);
+		$this->entityManager->persist($clone);
+		$clone->setPlayer($entry->getPlayer());
+		$clone->setRankingSystemList($list);
+	  }
+	  $foundEntry = $list->getEntries()[$playerId];
+	  $foundEntry->setNumberRankedEntities($entry->getNumberRankedEntities());
+	  $foundEntry->setPoints($entry->getPoints());
+	}
+
+	//remove all unused entries from list
+	foreach ($list->getEntries()->toArray() as $playerId => $entry) {
+	  if (!array_key_exists($playerId, $clonedPlayers)) {
+		$list->getEntries()->removeElement($entry);
+		$this->entityManager->remove($entry);
+	  }
+	}
   }
 
 
@@ -391,21 +391,21 @@ 
    */
   private function deleteOldChanges(RankingSystem $ranking, array $entities)
   {
-    //delete old changes
-    $queryBuilder = $this->entityManager->createQueryBuilder();
-    /** @var RankingSystemChange[] $changes */
-    $changes = $queryBuilder
-      ->from(RankingSystemChange::class, 'c')
-      ->select('c')
-      ->where($queryBuilder->expr()->eq('c.rankingSystem', $ranking))
-      ->where($queryBuilder->expr()->in('c.hierarchyEntity', ':entities'))
-      ->setParameter('entities', $entities)
-      ->getQuery()->getResult();
-    foreach ($changes as $change) {
-      $this->deletedChanges[$change->getHierarchyEntity()->getId()][$ranking
-        ->getId()][$change->getPlayer()->getPlayerId()] = $change;
-      $this->entityManager->remove($change);
-    }
+	//delete old changes
+	$queryBuilder = $this->entityManager->createQueryBuilder();
+	/** @var RankingSystemChange[] $changes */
+	$changes = $queryBuilder
+	  ->from(RankingSystemChange::class, 'c')
+	  ->select('c')
+	  ->where($queryBuilder->expr()->eq('c.rankingSystem', $ranking))
+	  ->where($queryBuilder->expr()->in('c.hierarchyEntity', ':entities'))
+	  ->setParameter('entities', $entities)
+	  ->getQuery()->getResult();
+	foreach ($changes as $change) {
+	  $this->deletedChanges[$change->getHierarchyEntity()->getId()][$ranking
+		->getId()][$change->getPlayer()->getPlayerId()] = $change;
+	  $this->entityManager->remove($change);
+	}
   }
 
   /**
@@ -417,26 +417,26 @@ 
    *                        successors do not have the ranking in its ranking systems
    */
   private function getEarliestEntityInfluence(RankingSystem $ranking, TournamentHierarchyInterface $entity,
-                                              bool $parentIsRanked): ?\DateTime
+											  bool $parentIsRanked): ?\DateTime
   {
-    $this->timeService->clearTimes();
-    $entityIsRanked = $parentIsRanked || $entity->getRankingSystems()->containsKey($ranking->getId());
-    if ($entity->getLevel() === $this->getLevel()) {
-      if ($entityIsRanked) {
-        return $this->timeService->getTime($entity);
-      } else {
-        return null;
-      }
-    }
-    $result = null;
-
-    foreach ($entity->getChildren() as $child) {
-      $earliest = $this->getEarliestEntityInfluence($ranking, $child, $entityIsRanked);
-      if ($result === null || ($earliest !== null && $earliest < $result)) {
-        $result = $earliest;
-      }
-    }
-    return $result;
+	$this->timeService->clearTimes();
+	$entityIsRanked = $parentIsRanked || $entity->getRankingSystems()->containsKey($ranking->getId());
+	if ($entity->getLevel() === $this->getLevel()) {
+	  if ($entityIsRanked) {
+		return $this->timeService->getTime($entity);
+	  } else {
+		return null;
+	  }
+	}
+	$result = null;
+
+	foreach ($entity->getChildren() as $child) {
+	  $earliest = $this->getEarliestEntityInfluence($ranking, $child, $entityIsRanked);
+	  if ($result === null || ($earliest !== null && $earliest < $result)) {
+		$result = $earliest;
+	  }
+	}
+	return $result;
   }
 
   /** @noinspection PhpDocMissingThrowsInspection */ //PropertyNotExistingException
@@ -450,35 +450,35 @@ 
    * @param int $nextEntityIndex the first index in the entities list to consider
    */
   private function recomputeBasedOn(RankingSystemList $list, RankingSystemList $base, array $entities,
-                                    int &$nextEntityIndex)
+									int &$nextEntityIndex)
   {
-    $this->cloneInto($list, $base);
-    for ($i = $nextEntityIndex; $i < count($entities); $i++) {
-      $time = $this->timeService->getTime($entities[$i]);
-      if (!$list->isCurrent() && $time > $list->getLastEntryTime()) {
-        $nextEntityIndex = $i;
-        return;
-      }
-      $changes = $this->getChanges($entities[$nextEntityIndex], $list);
-      foreach ($changes as $change) {
-        $entry = $this->getOrCreateRankingSystemListEntry($list, $change->getPlayer());
-        $entry->setNumberRankedEntities($entry->getNumberRankedEntities() + 1);
-        $pointsAfterwards = $entry->getPoints() + $change->getPointsChange();
-        $entry->setPoints($pointsAfterwards);
-        $change->setPointsAfterwards($pointsAfterwards);
-        //apply further changes
-        foreach ($this->getAdditionalFields() as $field => $value) {
-          // PropertyNotExistingException => entry and field have exactly the static properties from getAdditionalFields
-          /** @noinspection PhpUnhandledExceptionInspection */
-          $entry->setProperty($field, $entry->getProperty($field) + $change->getProperty($field));
-        }
-        if ($time > $list->getLastEntryTime()) {
-          $list->setLastEntryTime($time);
-        }
-        $this->entityManager->persist($change);
-      }
-    }
-    $nextEntityIndex = count($entities);
+	$this->cloneInto($list, $base);
+	for ($i = $nextEntityIndex; $i < count($entities); $i++) {
+	  $time = $this->timeService->getTime($entities[$i]);
+	  if (!$list->isCurrent() && $time > $list->getLastEntryTime()) {
+		$nextEntityIndex = $i;
+		return;
+	  }
+	  $changes = $this->getChanges($entities[$nextEntityIndex], $list);
+	  foreach ($changes as $change) {
+		$entry = $this->getOrCreateRankingSystemListEntry($list, $change->getPlayer());
+		$entry->setNumberRankedEntities($entry->getNumberRankedEntities() + 1);
+		$pointsAfterwards = $entry->getPoints() + $change->getPointsChange();
+		$entry->setPoints($pointsAfterwards);
+		$change->setPointsAfterwards($pointsAfterwards);
+		//apply further changes
+		foreach ($this->getAdditionalFields() as $field => $value) {
+		  // PropertyNotExistingException => entry and field have exactly the static properties from getAdditionalFields
+		  /** @noinspection PhpUnhandledExceptionInspection */
+		  $entry->setProperty($field, $entry->getProperty($field) + $change->getProperty($field));
+		}
+		if ($time > $list->getLastEntryTime()) {
+		  $list->setLastEntryTime($time);
+		}
+		$this->entityManager->persist($change);
+	  }
+	}
+	$nextEntityIndex = count($entities);
   }
 //</editor-fold desc="Private Methods">
 }
\ No newline at end of file

config-example/jwt.php

Indentation +20 added lines, -20 removed lines

@@ -47,7 +47,7 @@ 
 
   'keys' => [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Public Key
     |--------------------------------------------------------------------------
@@ -58,9 +58,9 @@ 
     |
     */
 
-    'public' => env('JWT_PUBLIC_KEY'),
+	'public' => env('JWT_PUBLIC_KEY'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Private Key
     |--------------------------------------------------------------------------
@@ -71,9 +71,9 @@ 
     |
     */
 
-    'private' => env('JWT_PRIVATE_KEY'),
+	'private' => env('JWT_PRIVATE_KEY'),
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Passphrase
     |--------------------------------------------------------------------------
@@ -82,7 +82,7 @@ 
     |
     */
 
-    'passphrase' => env('JWT_PASSPHRASE'),
+	'passphrase' => env('JWT_PASSPHRASE'),
 
   ],
 
@@ -148,12 +148,12 @@ 
   */
 
   'required_claims' => [
-    'iss',
-    'iat',
-    'exp',
-    'nbf',
-    'sub',
-    'jti',
+	'iss',
+	'iat',
+	'exp',
+	'nbf',
+	'sub',
+	'jti',
   ],
 
   /*
@@ -170,8 +170,8 @@ 
   */
 
   'persistent_claims' => [
-    // 'foo',
-    // 'bar',
+	// 'foo',
+	// 'bar',
   ],
 
   /*
@@ -212,7 +212,7 @@ 
 
   'providers' => [
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | JWT Provider
     |--------------------------------------------------------------------------
@@ -221,9 +221,9 @@ 
     |
     */
 
-    'jwt' => Tymon\JWTAuth\Providers\JWT\Namshi::class,
+	'jwt' => Tymon\JWTAuth\Providers\JWT\Namshi::class,
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Authentication Provider
     |--------------------------------------------------------------------------
@@ -232,9 +232,9 @@ 
     |
     */
 
-    'auth' => Tymon\JWTAuth\Providers\Auth\Illuminate::class,
+	'auth' => Tymon\JWTAuth\Providers\Auth\Illuminate::class,
 
-    /*
+	/*
     |--------------------------------------------------------------------------
     | Storage Provider
     |--------------------------------------------------------------------------
@@ -243,7 +243,7 @@ 
     |
     */
 
-    'storage' => Tymon\JWTAuth\Providers\Storage\Illuminate::class,
+	'storage' => Tymon\JWTAuth\Providers\Storage\Illuminate::class,
 
   ],
 

config-example/database.php

Indentation +11 added lines, -11 removed lines

@@ -29,16 +29,16 @@
   |
   */
   'connections' => [
-    'mysql' => [
-      'driver' => 'mysql',
-      'host' => env('DB_HOST', 'localhost'),
-      'database' => env('DB_DATABASE'),
-      'username' => env('DB_USERNAME'),
-      'password' => env('DB_PASSWORD'),
-      'charset' => 'utf8',
-      'collation' => 'utf8_unicode_ci',
-      'prefix' => '',
-      'strict' => false,
-    ]
+	'mysql' => [
+	  'driver' => 'mysql',
+	  'host' => env('DB_HOST', 'localhost'),
+	  'database' => env('DB_DATABASE'),
+	  'username' => env('DB_USERNAME'),
+	  'password' => env('DB_PASSWORD'),
+	  'charset' => 'utf8',
+	  'collation' => 'utf8_unicode_ci',
+	  'prefix' => '',
+	  'strict' => false,
+	]
   ],
 ];
\ No newline at end of file

config-example/auth.php

Indentation +11 added lines, -11 removed lines

@@ -3,22 +3,22 @@
 
 return [
   'defaults' => [
-    'guard' => env('AUTH_GUARD', 'api'),
-    'passwords' => 'users',
+	'guard' => env('AUTH_GUARD', 'api'),
+	'passwords' => 'users',
   ],
   'guards' => [
-    'api' => [
-      'driver' => 'jwt-auth',
-      'provider' => 'users'
-    ],
+	'api' => [
+	  'driver' => 'jwt-auth',
+	  'provider' => 'users'
+	],
 
-    // ...
+	// ...
   ],
 
   'providers' => [
-    'users' => [
-      'driver' => 'doctrine',
-      'model' => \Tfboe\FmLib\Entity\User::class
-    ],
+	'users' => [
+	  'driver' => 'doctrine',
+	  'model' => \Tfboe\FmLib\Entity\User::class
+	],
   ],
 ];
\ No newline at end of file

config-example/doctrine.php

Indentation +43 added lines, -43 removed lines

@@ -22,23 +22,23 @@ 
   |
   */
   'managers' => [
-    'default' => [
-      'dev' => env('APP_DEBUG'),
-      'meta' => env('DOCTRINE_METADATA', 'annotations'),
-      'connection' => env('DB_CONNECTION', 'mysql'),
-      'namespaces' => [
-        'Tfboe\FmLib\Entity'
-      ],
-      'paths' => [
-        base_path('vendor/tfboe/fm-lib/src/Entity'),
-      ],
-      'repository' => Doctrine\ORM\EntityRepository::class,
-      'proxies' => [
-        'namespace' => false,
-        'path' => storage_path('proxies'),
-        'auto_generate' => env('DOCTRINE_PROXY_AUTOGENERATE', false)
-      ],
-      /*
+	'default' => [
+	  'dev' => env('APP_DEBUG'),
+	  'meta' => env('DOCTRINE_METADATA', 'annotations'),
+	  'connection' => env('DB_CONNECTION', 'mysql'),
+	  'namespaces' => [
+		'Tfboe\FmLib\Entity'
+	  ],
+	  'paths' => [
+		base_path('vendor/tfboe/fm-lib/src/Entity'),
+	  ],
+	  'repository' => Doctrine\ORM\EntityRepository::class,
+	  'proxies' => [
+		'namespace' => false,
+		'path' => storage_path('proxies'),
+		'auto_generate' => env('DOCTRINE_PROXY_AUTOGENERATE', false)
+	  ],
+	  /*
       |--------------------------------------------------------------------------
       | Doctrine events
       |--------------------------------------------------------------------------
@@ -47,12 +47,12 @@ 
       | e.g. Doctrine\ORM\Events::onFlush
       |
       */
-      'events' => [
-        'listeners' => [],
-        'subscribers' => []
-      ],
-      'filters' => [],
-      /*
+	  'events' => [
+		'listeners' => [],
+		'subscribers' => []
+	  ],
+	  'filters' => [],
+	  /*
       |--------------------------------------------------------------------------
       | Doctrine mapping types
       |--------------------------------------------------------------------------
@@ -75,10 +75,10 @@ 
       | http://symfony.com/doc/current/cookbook/doctrine/dbal.html#registering-custom-mapping-types-in-the-schematool
       |--------------------------------------------------------------------------
       */
-      'mapping_types' => [
-        //'enum' => 'string'
-      ]
-    ]
+	  'mapping_types' => [
+		//'enum' => 'string'
+	  ]
+	]
   ],
   /*
   |--------------------------------------------------------------------------
@@ -92,16 +92,16 @@ 
   |
   */
   'extensions' => [
-    //LaravelDoctrine\ORM\Extensions\TablePrefix\TablePrefixExtension::class,
-    LaravelDoctrine\Extensions\Timestamps\TimestampableExtension::class,
-    //LaravelDoctrine\Extensions\SoftDeletes\SoftDeleteableExtension::class,
-    //LaravelDoctrine\Extensions\Sluggable\SluggableExtension::class,
-    //LaravelDoctrine\Extensions\Sortable\SortableExtension::class,
-    //LaravelDoctrine\Extensions\Tree\TreeExtension::class,
-    //LaravelDoctrine\Extensions\Loggable\LoggableExtension::class,
-    //LaravelDoctrine\Extensions\Blameable\BlameableExtension::class,
-    //LaravelDoctrine\Extensions\IpTraceable\IpTraceableExtension::class,
-    //LaravelDoctrine\Extensions\Translatable\TranslatableExtension::class
+	//LaravelDoctrine\ORM\Extensions\TablePrefix\TablePrefixExtension::class,
+	LaravelDoctrine\Extensions\Timestamps\TimestampableExtension::class,
+	//LaravelDoctrine\Extensions\SoftDeletes\SoftDeleteableExtension::class,
+	//LaravelDoctrine\Extensions\Sluggable\SluggableExtension::class,
+	//LaravelDoctrine\Extensions\Sortable\SortableExtension::class,
+	//LaravelDoctrine\Extensions\Tree\TreeExtension::class,
+	//LaravelDoctrine\Extensions\Loggable\LoggableExtension::class,
+	//LaravelDoctrine\Extensions\Blameable\BlameableExtension::class,
+	//LaravelDoctrine\Extensions\IpTraceable\IpTraceableExtension::class,
+	//LaravelDoctrine\Extensions\Translatable\TranslatableExtension::class
   ],
   /*
   |--------------------------------------------------------------------------
@@ -112,7 +112,7 @@ 
   |--------------------------------------------------------------------------
   */
   'custom_types' => [
-    'json' => LaravelDoctrine\ORM\Types\Json::class
+	'json' => LaravelDoctrine\ORM\Types\Json::class
   ],
   /*
   |--------------------------------------------------------------------------
@@ -157,9 +157,9 @@ 
   |
   */
   'cache' => [
-    'default' => env('DOCTRINE_CACHE', 'array'),
-    'namespace' => null,
-    'second_level' => false,
+	'default' => env('DOCTRINE_CACHE', 'array'),
+	'namespace' => null,
+	'second_level' => false,
   ],
   /*
   |--------------------------------------------------------------------------
@@ -172,7 +172,7 @@ 
   |
   */
   'gedmo' => [
-    'all_mappings' => false
+	'all_mappings' => false
   ],
   /*
    |--------------------------------------------------------------------------
@@ -193,6 +193,6 @@ 
    |
    */
   'notifications' => [
-    'channel' => 'database'
+	'channel' => 'database'
   ]
 ];

config-example/cache.php

Indentation +22 added lines, -22 removed lines

@@ -13,28 +13,28 @@
   |
   */
   'stores' => [
-    'array' => [
-      'driver' => 'array'
-    ],
-    'apc' => [
-      'driver' => 'apc',
-    ],
-    'file' => [
-      'driver' => 'file',
-      'path' => storage_path('framework/cache'),
-    ],
-    'memcached' => [
-      'driver' => 'memcached',
-      'servers' => [
-        [
-          'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
-        ],
-      ],
-    ],
-    'redis' => [
-      'driver' => 'redis',
-      'connection' => 'default',
-    ],
+	'array' => [
+	  'driver' => 'array'
+	],
+	'apc' => [
+	  'driver' => 'apc',
+	],
+	'file' => [
+	  'driver' => 'file',
+	  'path' => storage_path('framework/cache'),
+	],
+	'memcached' => [
+	  'driver' => 'memcached',
+	  'servers' => [
+		[
+		  'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
+		],
+	  ],
+	],
+	'redis' => [
+	  'driver' => 'redis',
+	  'connection' => 'default',
+	],
   ],
 
   'default' => env('CACHE_DRIVER'),

src/routes.php

Indentation +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
    *                               too short
    */
   $router->post('register', [
-    'as' => 'register', 'uses' => 'UserController@register'
+	'as' => 'register', 'uses' => 'UserController@register'
   ]);
 
   /**
@@ -39,22 +39,22 @@ 
    *                               too short
    */
   $router->post('login', [
-    'as' => 'login', 'uses' => 'UserController@login'
+	'as' => 'login', 'uses' => 'UserController@login'
   ]);
 
   $router->group(['middleware' => 'auth:api'], function () use ($router) {
-    /**
-     * @api {get} /userId Get User ID
-     * @apiUse AuthenticatedRequest
-     * @apiVersion 0.1.0
-     * @apiDescription Gets the user id of the currently logged in user
-     * @apiName GetUserId
-     * @apiGroup User
-     *
-     * @apiSuccess {string} id the id of the user
-     */
-    $router->get('userId', [
-      'as' => 'userId', 'uses' => 'UserController@userId'
-    ]);
+	/**
+	 * @api {get} /userId Get User ID
+	 * @apiUse AuthenticatedRequest
+	 * @apiVersion 0.1.0
+	 * @apiDescription Gets the user id of the currently logged in user
+	 * @apiName GetUserId
+	 * @apiGroup User
+	 *
+	 * @apiSuccess {string} id the id of the user
+	 */
+	$router->get('userId', [
+	  'as' => 'userId', 'uses' => 'UserController@userId'
+	]);
   });
 });
\ No newline at end of file