Add 'final' wherever it makes sense.

gnutix · Mar 24, 2014 · 33dc5c1 · 33dc5c1
1 parent e1b6123
commit 33dc5c1
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/src/GameDomain/Game/AbstractGame.php b/src/GameDomain/Game/AbstractGame.php
@@ -16,7 +16,7 @@ abstract class AbstractGame
     /**
      * {@inheritDoc}
      */
-    public function __construct(AbstractRulesSet $gameRules)
+    final public function __construct(AbstractRulesSet $gameRules)
     {
         $this->gameRules = $gameRules;
     }

diff --git a/src/GameDomain/Player/Players/PerfectPlayer.php b/src/GameDomain/Player/Players/PerfectPlayer.php
@@ -14,7 +14,7 @@ class PerfectPlayer implements PlayerInterface
     /**
      * {@inheritDoc}
      */
-    public function play(AbstractRulesSet $gameRules, Step $step)
+    final public function play(AbstractRulesSet $gameRules, Step $step)
     {
         return $gameRules->generateValidAnswer($step->getRawValue());
     }

diff --git a/src/GameDomain/Round/AbstractRound.php b/src/GameDomain/Round/AbstractRound.php
@@ -15,7 +15,7 @@ abstract class AbstractRound
     /**
      * @param \LimitIterator $players
      */
-    public function __construct(\LimitIterator $players)
+    final public function __construct(\LimitIterator $players)
     {
         $this->players = $players;
     }

diff --git a/src/GameDomain/Rule/AbstractRule.php b/src/GameDomain/Rule/AbstractRule.php
@@ -16,7 +16,7 @@ abstract class AbstractRule
      *
      * @return bool
      */
-    public function isSatisfiedBy(Answer $playerAnswer, $number)
+    final public function isSatisfiedBy(Answer $playerAnswer, $number)
     {
         try {
             return $playerAnswer->isSameAs($this->generateValidAnswer($number));

diff --git a/src/GameDomain/Rule/AbstractRulesSet.php b/src/GameDomain/Rule/AbstractRulesSet.php
@@ -15,23 +15,18 @@ abstract class AbstractRulesSet extends ArrayCollection
     /**
      * Constructor
      */
-    public function __construct()
+    final public function __construct()
     {
         $this->loadRules();
     }
 
-    /**
-     * Loads the rules
-     */
-    abstract protected function loadRules();
-
     /**
      * @param int $number
      *
      * @return \GameDomain\Round\Step\Answer
      * @throws \DomainException
      */
-    public function generateValidAnswer($number)
+    final public function generateValidAnswer($number)
     {
         foreach ($this->toArray() as $gameRule) {
             try {
@@ -43,4 +38,9 @@ public function generateValidAnswer($number)
 
         throw new \DomainException('No valid answer can be generated from the current rules set.');
     }
+
+    /**
+     * Loads the rules
+     */
+    abstract protected function loadRules();
 }
diff --git a/src/Utils/Collections/InfiniteArrayCollection.php b/src/Utils/Collections/InfiniteArrayCollection.php
@@ -12,7 +12,7 @@ class InfiniteArrayCollection extends ArrayCollection
     /**
      * @return \GameDomain\Player\PlayerInterface[]|\InfiniteIterator
      */
-    public function getInfiniteIterator()
+    final public function getInfiniteIterator()
     {
         $this->first();
 

diff --git a/src/Utils/Domain/AbstractScalarValueObject.php b/src/Utils/Domain/AbstractScalarValueObject.php
@@ -23,7 +23,7 @@ final public function __construct($value)
     /**
      * {@inheritDoc}
      */
-    public function isSameAs($value)
+    final public function isSameAs($value)
     {
         // If the given object is not an AbstractScalarValueObject, we can't compare them
         if (!$this->areObjectsOfSameType($this, $value)) {
@@ -36,15 +36,15 @@ public function isSameAs($value)
     /**
      * {@inheritDoc}
      */
-    public function getRawValue()
+    final public function getRawValue()
     {
         return $this->value;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function __toString()
+    final public function __toString()
     {
         return (string) $this->getRawValue();
     }
@@ -55,7 +55,7 @@ public function __toString()
      * @return bool
      * @throws \InvalidArgumentException
      */
-    protected function guardAgainstNonScalar($value)
+    final protected function guardAgainstNonScalar($value)
     {
         if (!is_scalar($value)) {
             throw new \InvalidArgumentException(
@@ -70,7 +70,7 @@ protected function guardAgainstNonScalar($value)
      *
      * @return bool
      */
-    protected function areObjectsOfSameType($value1, $value2)
+    final protected function areObjectsOfSameType($value1, $value2)
     {
         return is_object($value1) && is_object($value2) && (get_class($value1) === get_class($value2));
     }