Refactoring library

composer.json

@@ -25,8 +25,8 @@
     "require": {
         "php": ">=5.4.0",
         "monolog/monolog": "~1.10",
-        "symfony/event-dispatcher": "~2.5",
-        "symfony/http-kernel": "~2.5",
+        "symfony/event-dispatcher": "~2.5|~3.0",
+        "symfony/http-kernel": "~2.5|~3.0",
         "black/common": "~2.0.0",
         "cocur/slugify": "~1.0"
     },

spec/Black/Component/Page/Application/DTO/CreateWebPageDTOSpec.php → spec/Page/Application/DTO/CreateWebPageDTOSpec.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace spec\Black\Component\Page\Application\DTO;
+namespace spec\Black\Page\Application\DTO;
 
 use PhpSpec\ObjectBehavior;
 
@@ -23,7 +23,7 @@ public function let()
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType('Black\Component\Page\Application\DTO\CreateWebPageDTO');
+        $this->shouldHaveType('Black\Page\Application\DTO\CreateWebPageDTO');
     }
 
     public function it_should_return_id()
@@ -41,16 +41,6 @@ public function it_should_return_name()
         $this->getName()->shouldReturn($this->name);
     }
 
-    public function it_should_return_context()
-    {
-        $this->getContext()->shouldReturn("http://schema.org");
-    }
-
-    public function it_should_return_type()
-    {
-        $this->getType()->shouldReturn("WebPage");
-    }
-
     public function it_should_serialize()
     {
         $this->serialize()->shouldBeString();

spec/Black/Component/Page/Application/DTO/CreateWebPageTransformerSpec.php → spec/Page/Application/DTO/CreateWebPageTransformerSpec.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace spec\Black\Component\Page\Application\DTO;
+namespace spec\Black\Page\Application\DTO;
 
-use Black\Component\Page\Domain\Model\WebPageId;
+use Black\Page\Domain\Model\WebPageId;
 use PhpSpec\ObjectBehavior;
 
 class CreateWebPageAssemblerSpec extends ObjectBehavior
@@ -13,8 +13,8 @@ class CreateWebPageAssemblerSpec extends ObjectBehavior
 
     public function let()
     {
-        $this->entityClass = 'Black\Component\Page\Domain\Model\WebPage';
-        $this->dtoClass    = 'Black\Component\Page\Application\DTO\CreateWebPageDTO';
+        $this->entityClass = 'Black\Page\Domain\Model\WebPage';
+        $this->dtoClass = 'Black\Page\Application\DTO\CreateWebPageDTO';
 
         $this->beConstructedWith($this->entityClass, $this->dtoClass);
     }

spec/Black/Component/Page/Application/DTO/WebPageDTOSpec.php → spec/Page/Application/DTO/WebPageDTOSpec.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace spec\Black\Component\Page\Application\DTO;
+namespace spec\Black\Page\Application\DTO;
 
 use PhpSpec\ObjectBehavior;
 
@@ -20,19 +20,19 @@ class WebPageDTOSpec extends ObjectBehavior
 
     public function let()
     {
-        $this->id       = 1;
-        $this->author   = 'test';
-        $this->name     = 'test';
+        $this->id = 1;
+        $this->author = 'test';
+        $this->name = 'test';
         $this->headline = 'test';
-        $this->about    = 'test';
-        $this->text     = 'test';
+        $this->about = 'test';
+        $this->text = 'test';
 
         $this->beConstructedWith($this->id, $this->author, $this->name, $this->headline, $this->about, $this->text);
     }
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType('Black\Component\Page\Application\DTO\WebPageDTO');
+        $this->shouldHaveType('Black\Page\Application\DTO\WebPageDTO');
     }
 
     public function it_should_return_id()
@@ -65,16 +65,6 @@ public function it_should_return_text()
         $this->getText()->shouldReturn($this->text);
     }
 
-    public function it_should_return_context()
-    {
-        $this->getContext()->shouldReturn("http://schema.org");
-    }
-
-    public function it_should_return_type()
-    {
-        $this->getType()->shouldReturn("WebPage");
-    }
-
     public function it_should_serialize()
     {
         $this->serialize()->shouldBeString();

spec/Black/Component/Page/Application/DTO/WebPageTransformerSpec.php → spec/Page/Application/DTO/WebPageTransformerSpec.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace spec\Black\Component\Page\Application\DTO;
+namespace spec\Black\Page\Application\DTO;
 
-use Black\Component\Page\Domain\Model\WebPageId;
+use Black\Page\Domain\Model\WebPageId;
 use PhpSpec\ObjectBehavior;
 
 class WebPageAssemblerSpec extends ObjectBehavior
@@ -13,8 +13,8 @@ class WebPageAssemblerSpec extends ObjectBehavior
 
     public function let()
     {
-        $this->entityClass = 'Black\Component\Page\Domain\Model\WebPage';
-        $this->dtoClass    = 'Black\Component\Page\Application\DTO\WebPageDTO';
+        $this->entityClass = 'Black\Page\Domain\Model\WebPage';
+        $this->dtoClass = 'Black\Page\Application\DTO\WebPageDTO';
 
         $this->beConstructedWith($this->entityClass, $this->dtoClass);
     }

spec/Black/Component/Page/Application/DTO/WriteWebPageDTOSpec.php → spec/Page/Application/DTO/WriteWebPageDTOSpec.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace spec\Black\Component\Page\Application\DTO;
+namespace spec\Black\Page\Application\DTO;
 
 use PhpSpec\ObjectBehavior;
 
@@ -16,17 +16,17 @@ class WriteWebPageDTOSpec extends ObjectBehavior
 
     public function let()
     {
-        $this->id       = 1;
+        $this->id = 1;
         $this->headline = 'test';
-        $this->about    = 'test';
-        $this->text     = 'test';
+        $this->about = 'test';
+        $this->text = 'test';
 
         $this->beConstructedWith($this->id, $this->headline, $this->about, $this->text);
     }
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType('Black\Component\Page\Application\DTO\WriteWebPageDTO');
+        $this->shouldHaveType('Black\Page\Application\DTO\WriteWebPageDTO');
     }
 
     public function it_should_return_id()
@@ -49,16 +49,6 @@ public function it_should_return_text()
         $this->getText()->shouldReturn($this->text);
     }
 
-    public function it_should_return_context()
-    {
-        $this->getContext()->shouldReturn("http://schema.org");
-    }
-
-    public function it_should_return_type()
-    {
-        $this->getType()->shouldReturn("WebPage");
-    }
-
     public function it_should_serialize()
     {
         $this->serialize()->shouldBeString();

spec/Black/Component/Page/Application/DTO/WriteWebPageTransformerSpec.php → spec/Page/Application/DTO/WriteWebPageTransformerSpec.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace spec\Black\Component\Page\Application\DTO;
+namespace spec\Black\Page\Application\DTO;
 
-use Black\Component\Page\Domain\Model\WebPageId;
+use Black\Page\Domain\Model\WebPageId;
 use PhpSpec\ObjectBehavior;
 
 class WriteWebPageAssemblerSpec extends ObjectBehavior
@@ -13,8 +13,8 @@ class WriteWebPageAssemblerSpec extends ObjectBehavior
 
     public function let()
     {
-        $this->entityClass = 'Black\Component\Page\Domain\Model\WebPage';
-        $this->dtoClass    = 'Black\Component\Page\Application\DTO\WriteWebPageDTO';
+        $this->entityClass = 'Black\Page\Domain\Model\WebPage';
+        $this->dtoClass = 'Black\Page\Application\DTO\WriteWebPageDTO';
 
         $this->beConstructedWith($this->entityClass, $this->dtoClass);
     }

spec/Black/Component/Page/Application/Specification/PageIsPublishedSpecificationSpec.php → spec/Page/Application/Specification/PageIsPublishedSpecificationSpec.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace spec\Black\Component\Page\Application\Specification;
+namespace spec\Black\Page\Application\Specification;
 
-use Black\Component\Page\Domain\Model\WebPage;
-use Black\Component\Page\Domain\Model\WebPageId;
+use Black\Page\Domain\Model\WebPage;
+use Black\Page\Domain\Model\WebPageId;
 use PhpSpec\ObjectBehavior;
 
 class PageIsPublishedSpecificationSpec extends ObjectBehavior
@@ -12,13 +12,13 @@ class PageIsPublishedSpecificationSpec extends ObjectBehavior
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType('Black\Component\Page\Application\Specification\PageIsPublishedSpecification');
+        $this->shouldHaveType('Black\Page\Application\Specification\PageIsPublishedSpecification');
     }
 
     public function let()
     {
         $pageId = new WebPageId('12345');
-        $page   = new WebPage($pageId, 'test', 'test');
+        $page = new WebPage($pageId, 'test', 'test', 'test');
 
         $this->page = $page;
     }

spec/Black/Component/Page/Domain/Model/WebPageIdSpec.php → spec/Page/Domain/Model/WebPageIdSpec.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace spec\Black\Component\Page\Domain\Model;
+namespace spec\Black\Page\Domain\Model;
 
-use Black\Component\Page\Domain\Model\WebPageId;
+use Black\Page\Domain\Model\WebPageId;
 use PhpSpec\ObjectBehavior;
 
 class WebPageIdSpec extends ObjectBehavior
@@ -14,7 +14,7 @@ public function let()
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType('Black\Component\Page\Domain\Model\WebPageId');
+        $this->shouldHaveType('Black\Page\Domain\Model\WebPageId');
     }
 
     public function it_should_have_a_value()

spec/Black/Component/Page/Domain/Model/WebPageSpec.php → spec/Page/Domain/Model/WebPageSpec.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace spec\Black\Component\Page\Domain\Model;
+namespace spec\Black\Page\Domain\Model;
 
-use Black\Component\Page\Domain\Model\WebPage;
-use Black\Component\Page\Domain\Model\WebPageId;
+use Black\Page\Domain\Model\WebPage;
+use Black\Page\Domain\Model\WebPageId;
 use PhpSpec\ObjectBehavior;
 
 class WebPageSpec extends ObjectBehavior
@@ -31,18 +31,19 @@ class WebPageSpec extends ObjectBehavior
     public function let()
     {
         $pageId = new WebPageId('12345');
-        $page   = new WebPage($pageId, 'test', 'test', 'test');
+        $page = new WebPage($pageId, 'test', 'test', 'test');
 
         $this->webPageId = $page->getWebPageId();
-        $this->name      = $page->getName();
-        $this->author    = $page->getAuthor();
+        $this->name = $page->getName();
+        $this->author = $page->getAuthor();
+        $this->slug = $page->getSlug();
 
-        $this->beConstructedWith($this->webPageId, $this->name, $this->author);
+        $this->beConstructedWith($this->webPageId, $this->name, $this->author, $this->slug);
     }
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType('Black\Component\Page\Domain\Model\WebPage');
+        $this->shouldHaveType('Black\Page\Domain\Model\WebPage');
     }
 
     public function it_should_have_a_dateCreated()
@@ -63,8 +64,8 @@ public function it_should_not_be_published()
     public function it_should_be_write()
     {
         $this->headline = "headline";
-        $this->about    = "about";
-        $this->text     = "text";
+        $this->about = "about";
+        $this->text = "text";
 
         $this->write($this->headline, $this->about, $this->text);
 
@@ -76,8 +77,8 @@ public function it_should_be_write()
     public function it_should_be_edited()
     {
         $this->headline = "headline 2";
-        $this->about    = "about 2";
-        $this->text     = "text 2";
+        $this->about = "about 2";
+        $this->text = "text 2";
 
         $this->write($this->headline, $this->about, $this->text);