rename Parser Notation

src/Contract/NotationInterface.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Ouxsoft\LuckByDice\Contract;
+
+use Ouxsoft\LuckByDice\Cup;
+
+interface NotationInterface
+{
+    public function encode(Cup $cup) : string;
+    public function decode(string $expression) : array;
+}

src/Contract/TurnInterface.php

@@ -3,13 +3,14 @@
 namespace Ouxsoft\LuckByDice\Contract;
 
 use Ouxsoft\LuckByDice\Cup;
+use Ouxsoft\LuckByDice\Notation;
 use Ouxsoft\LuckByDice\Parser;
 
 interface TurnInterface
 {
 
     public function __construct(
-        Parser $parser,
+        Notation $notation,
         Cup $cup,
         string $expression = null
     );

src/Cup.php

@@ -15,7 +15,7 @@
 
 /**
  * Cup
- * A cup contains Collection of dice
+ * A cup contains Collections of dice
  *
  * @package Ouxsoft\LivingMarkup
  */
@@ -51,22 +51,22 @@ public function current(): int
         return $this->container[$this->index];
     }
 
-    public function next()
+    public function next() : void
     {
-        $this->index ++;
+        $this->index++;
     }
 
     public function key()
     {
         return $this->index;
     }
 
-    public function valid()
+    public function valid(): bool
     {
         return isset($this->container[$this->key()]);
     }
 
-    public function rewind()
+    public function rewind() : void
     {
         $this->index = 0;
     }

src/Dice.php

@@ -16,6 +16,7 @@
 
 /**
  * Class Dice
+ * A dice has two or more sides and can be roll
  * @package Ouxsoft\LuckByDice
  */
 class Dice
@@ -42,4 +43,12 @@ public function roll() : int
     {
         return mt_rand(1, $this->sides);
     }
+
+    /**
+     * @return int
+     */
+    public function getSides() : int
+    {
+        return $this->sides;
+    }
 }

src/Factory/ConcreteFactory.php

@@ -13,17 +13,17 @@
 namespace Ouxsoft\LuckByDice\Factory;
 
 use Ouxsoft\LuckByDice\Contract\AbstractFactoryInterface;
-use Ouxsoft\LuckByDice\Parser;
+use Ouxsoft\LuckByDice\Notation;
 use Ouxsoft\LuckByDice\Cup;
 use Ouxsoft\LuckByDice\Luck;
 
 use Pimple\Container;
 
 class ConcreteFactory implements AbstractFactoryInterface
 {
-    public function makeParser(Container &$container): Parser
+    public function makeNotation(Container &$container): Notation
     {
-        return new Parser();
+        return new Notation();
     }
 
     public function makeCup(Container &$container): Cup

src/Factory/ContainerFactory.php

@@ -26,7 +26,7 @@ public static function buildContainer(
     ): Container {
         $container = new Container();
 
-        $container['parser'] = $abstractFactory->makeParser($container);
+        $container['notation'] = $abstractFactory->makeNotation($container);
         $container['cup'] = $abstractFactory->makeCup($container);
         $container['luck'] = $abstractFactory->makeLuck($container);
 

src/Factory/TurnFactory.php

@@ -26,7 +26,7 @@ public static function getInstance(): Turn
         $container = ContainerFactory::buildContainer($abstractFactory);
 
         return new Turn(
-            $container['parser'],
+            $container['notation'],
             $container['cup']
         );
     }

src/Parser.php → src/Notation.php

@@ -10,15 +10,24 @@
 
 namespace Ouxsoft\LuckByDice;
 
-use Ouxsoft\LuckByDice\Contract\ParserInterface;
+use Ouxsoft\LuckByDice\Contract\NotationInterface;
 
-class Parser implements ParserInterface
+class Notation implements NotationInterface
 {
+    /**
+     * @param Cup $cup
+     * @return string
+     */
+    public function encode(Cup $cup) : string
+    {
+
+    }
+
     /**
      * @param $expression
      * @return array
      */
-    public function run($expression): array
+    public function decode(string $expression): array
     {
         $diceGroups = [];
         $diceGroupExpressions = explode(',', strtolower($expression));

src/Turn.php

@@ -25,27 +25,27 @@ class Turn implements TurnInterface
      */
     private $cup;
     /**
-     * @var Parser
+     * @var Notation
      */
-    private $parser;
+    private $notation;
     /**
      * @var int
      */
     private $total;
 
     /**
      * Turn constructor.
-     * @param Parser $parser
+     * @param Notation $notation
      * @param Cup $cup
      * @param string|null $expression
      * @see Turn::setByString()
      */
     public function __construct(
-        Parser $parser,
+        Notation $notation,
         Cup $cup,
         string $expression = null
     ) {
-        $this->parser = $parser;
+        $this->notation = $notation;
         $this->cup = $cup;
 
         if ($expression !== null) {
@@ -59,7 +59,7 @@ public function __construct(
      */
     public function set(string $expression) : void
     {
-        $this->cup = $this->parser->run($expression);
+        $this->cup = $this->notation->decode($expression);
     }
 
     /**

tests/src/Unit/DiceTest.php

@@ -0,0 +1,62 @@
+<?php
+/*
+ * This file is part of the LuckByDice package.
+ *
+ * (c) 2017-2021 Ouxsoft  <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ouxsoft\LivingMarkup\Tests\Unit;
+
+use Laminas\Http\Exception\OutOfRangeException;
+use Ouxsoft\LuckByDice\Dice;
+use PHPUnit\Framework\TestCase;
+use Ouxsoft\LuckByDice\Factory\TurnFactory;
+
+class DiceTest extends TestCase
+{
+    private $dice;
+
+    public function setUp(): void
+    {
+        $this->dice = new Dice(6);
+    }
+
+    public function tearDown(): void
+    {
+        unset($this->dice);
+    }
+
+
+    /**
+     * @covers \Ouxsoft\LuckByDice\Dice::__construct
+     */
+    public function test__construct()
+    {
+        $slides = $this->dice->getSides();
+        $this->assertEquals(6, $slides);
+
+        $this->expectException(\OutOfRangeException::class);
+        $this->dice = new Dice(1);
+    }
+
+    /**
+     * @covers \Ouxsoft\LuckByDice\Dice::roll
+     */
+    public function testRoll()
+    {
+        $outcome = $this->dice->roll();
+        $this->assertIsInt($outcome);
+    }
+
+    /**
+     * @covers \Ouxsoft\LuckByDice\Dice::getSides
+     */
+    public function testGetSides()
+    {
+        $slides = $this->dice->getSides();
+        $this->assertEquals(6, $slides);
+    }
+}