abc-api/abcParser
1
0
Fork 0
Code Issues Pull Requests Releases Activity

start to add ability to merge tunes

Browse Source 
started refactoring tune builders to use string type hint instead of StringAtom
This commit is contained in:
Richard Morgan
2018-05-06 10:01:16 -04:00
parent 655a04a501
commit 82dc3de079
34 changed files with 505 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Domain/Modules/Interpreter/Builder.php
View File

@@ -2,6 +2,7 @@
namespace XaiCorp\AbcParser\Domain\Modules\Interpreter;
use Enzyme\Axiom\Atoms\StringAtom;
use Webpatser\Uuid\Uuid;
use XaiCorp\AbcParser\Domain\Atoms\EmailAtom;
use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
use XaiCorp\AbcParser\Domain\Core\Author;
@@ -9,10 +10,11 @@ use XaiCorp\AbcParser\Domain\Core\Composer;
use XaiCorp\AbcParser\Domain\Core\Setting;
use XaiCorp\AbcParser\Domain\Core\Transcriber;
use XaiCorp\AbcParser\Domain\Core\Tune;
use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
use XaiCorp\AbcParser\Domain\Core\TuneCollection;
use XaiCorp\AbcParser\Models\Laravel5\TuneSetting;
//use XaiCorp\AbcParser\Models\Laravel5\TuneSetting;
class Builder
class Builder implements TuneBuilder
{
/**
* @var Tune
@@ -50,7 +52,7 @@ class Builder
$this->tune->addSetting($this->setting);
}
public function getTune()
public function getTune(Uuid $identity = null): \XaiCorp\AbcParser\Domain\Core\Tune
{
return $this->tune;
}
@@ -64,7 +66,7 @@ class Builder
}
/**
* @return $this
* @return TuneBuilder
*/
public function handleEndOfMusic()
{
@@ -82,26 +84,26 @@ class Builder
}
/**
* @param UnsignedIntegerAtom $index
* @return $this
* @param UnsignedIntegerAtom $param
* @return TuneBuilder
*/
public function setIndex(UnsignedIntegerAtom $index)
public function setIndex(UnsignedIntegerAtom $param): \XaiCorp\AbcParser\Domain\Core\TuneBuilder
{
$this->tune->setIndex($index);
$this->tune->setIndex($param);
return $this;
}
public function appendMusic(StringAtom $musicLine)
public function appendMusic(StringAtom $param): \XaiCorp\AbcParser\Domain\Core\TuneBuilder
{
$this->setting->addMusicLine($musicLine->getValue());
$this->setting->addMusicLine($param->getValue());
return $this;
}
public function addTitle(StringAtom $title)
public function addTitle(string $title): \XaiCorp\AbcParser\Domain\Core\TuneBuilder
{
$this->tune->addTitle($title->getValue());
$this->tune->addTitle($title);
return $this;
}
@@ -120,9 +122,9 @@ class Builder
return $this;
}
public function addAuthor(StringAtom $name)
public function addAuthor(string $name): \XaiCorp\AbcParser\Domain\Core\TuneBuilder
{
$author = new Author($name, new EmailAtom(''));
$author = Author::create($name, new EmailAtom(''));
$this->tune->addAuthor($author);
return $this;