III-658: Use String as StringLiteral

cultuurnet · Mar 15, 2016 · 5079619 · 5079619
1 parent a42f949
commit 5079619
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 74 deletions.
diff --git a/src/HasActorIdTrait.php b/src/HasActorIdTrait.php
@@ -8,7 +8,7 @@ trait HasActorIdTrait
 {
 
     /**
-     * @var String
+     * @var StringLiteral
      */
     private $actorId;
 
@@ -24,7 +24,7 @@ private function setActorId(StringLiteral $actorId)
     }
 
     /**
-     * @return String
+     * @return StringLiteral
      */
     public function getActorId()
     {

diff --git a/src/HasAuthoringMetadataTrait.php b/src/HasAuthoringMetadataTrait.php
@@ -12,7 +12,7 @@ trait HasAuthoringMetadataTrait
     protected $time;
 
     /**
-     * @var String
+     * @var StringLiteral
      */
     protected $author;
 

diff --git a/src/HasEventIdTrait.php b/src/HasEventIdTrait.php
@@ -7,7 +7,7 @@
 trait HasEventIdTrait
 {
     /**
-     * @var String
+     * @var StringLiteral
      */
     protected $eventId;
 

diff --git a/test/ActorCreatedJSONDeserializerTest.php b/test/ActorCreatedJSONDeserializerTest.php
@@ -1,13 +1,10 @@
 <?php
-/**
- * @file
- */
 
 namespace CultuurNet\UDB2DomainEvents;
 
 use CultuurNet\Deserializer\MissingValueException;
 use DateTime;
-use ValueObjects\String\String;
+use ValueObjects\String\String as StringLiteral;
 use ValueObjects\Web\Url;
 
 class ActorCreatedJSONDeserializerTest extends \PHPUnit_Framework_TestCase
@@ -30,7 +27,7 @@ public function testRequiresActorId()
         );
 
         $this->deserializer->deserialize(
-            new String('{}')
+            new StringLiteral('{}')
         );
     }
 
@@ -42,7 +39,7 @@ public function testRequiresTime()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "url": "http://foo.bar/event/foo"
@@ -59,7 +56,7 @@ public function testTimeNeedsToBeISO8601Formatted()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "author": "me@example.com",
@@ -78,7 +75,7 @@ public function testRequiresAuthor()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "time": "2015-02-20T20:39:09+0100",
@@ -96,7 +93,7 @@ public function testRequiresUrl()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "author": "me@example.com",
@@ -109,7 +106,7 @@ public function testRequiresUrl()
     public function testReturnsActorCreated()
     {
         $actorCreated = $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "time": "2015-02-20T20:39:09+0100",
@@ -125,12 +122,12 @@ public function testReturnsActorCreated()
         );
 
         $this->assertEquals(
-            new String('foo'),
+            new StringLiteral('foo'),
             $actorCreated->getActorId()
         );
 
         $this->assertEquals(
-            new String('me@example.com'),
+            new StringLiteral('me@example.com'),
             $actorCreated->getAuthor()
         );
 

diff --git a/test/ActorCreatedTest.php b/test/ActorCreatedTest.php
@@ -5,7 +5,7 @@
 
 namespace CultuurNet\UDB2DomainEvents;
 
-use ValueObjects\String\String;
+use ValueObjects\String\String as StringLiteral;
 use ValueObjects\Web\Url;
 
 class ActorCreatedTest extends \PHPUnit_Framework_TestCase
@@ -18,9 +18,9 @@ public function testActorIdCanNotBeEmptyString()
         );
 
         new ActorCreated(
-            new String(''),
+            new StringLiteral(''),
             new \DateTimeImmutable(),
-            new String(''),
+            new StringLiteral(''),
             Url::fromNative('http://foo.bar/event/foo')
         );
     }
@@ -32,9 +32,9 @@ private function createActorCreated(\DateTimeImmutable $time = null)
         }
 
         return new ActorCreated(
-            new String('123'),
+            new StringLiteral('123'),
             $time,
-            new String('me@example.com'),
+            new StringLiteral('me@example.com'),
             Url::fromNative('http://foo.bar/event/foo')
         );
     }
@@ -44,7 +44,7 @@ public function testGetActorId()
         $eventCreated = $this->createActorCreated();
 
         $this->assertEquals(
-            new String('123'),
+            new StringLiteral('123'),
             $eventCreated->getActorId()
         );
     }
@@ -54,7 +54,7 @@ public function testGetAuthor()
         $eventCreated = $this->createActorCreated();
 
         $this->assertEquals(
-            new String('me@example.com'),
+            new StringLiteral('me@example.com'),
             $eventCreated->getAuthor()
         );
     }

diff --git a/test/ActorUpdatedJSONDeserializerTest.php b/test/ActorUpdatedJSONDeserializerTest.php
@@ -1,13 +1,10 @@
 <?php
-/**
- * @file
- */
 
 namespace CultuurNet\UDB2DomainEvents;
 
 use CultuurNet\Deserializer\MissingValueException;
 use DateTime;
-use ValueObjects\String\String;
+use ValueObjects\String\String as StringLiteral;
 use ValueObjects\Web\Url;
 
 class ActorUpdatedJSONDeserializerTest extends \PHPUnit_Framework_TestCase
@@ -30,7 +27,7 @@ public function testRequiresActorId()
         );
 
         $this->deserializer->deserialize(
-            new String('{}')
+            new StringLiteral('{}')
         );
     }
 
@@ -42,7 +39,7 @@ public function testRequiresTime()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "url": "http://foo.bar/event/foo"
@@ -59,7 +56,7 @@ public function testTimeNeedsToBeISO8601Formatted()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "author": "me@example.com",
@@ -78,7 +75,7 @@ public function testRequiresAuthor()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "time": "2015-02-20T20:39:09+0100",
@@ -96,7 +93,7 @@ public function testRequiresUrl()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "author": "me@example.com",
@@ -109,7 +106,7 @@ public function testRequiresUrl()
     public function testReturnsActorUpdated()
     {
         $actorUpdated = $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "actorId": "foo",
                     "time": "2015-02-20T20:39:09+0100",
@@ -125,12 +122,12 @@ public function testReturnsActorUpdated()
         );
 
         $this->assertEquals(
-            new String('foo'),
+            new StringLiteral('foo'),
             $actorUpdated->getactorId()
         );
 
         $this->assertEquals(
-            new String('me@example.com'),
+            new StringLiteral('me@example.com'),
             $actorUpdated->getAuthor()
         );
 

diff --git a/test/ActorUpdatedTest.php b/test/ActorUpdatedTest.php
@@ -5,7 +5,7 @@
 
 namespace CultuurNet\UDB2DomainEvents;
 
-use ValueObjects\String\String;
+use ValueObjects\String\String as StringLiteral;
 use ValueObjects\Web\Url;
 
 class ActorUpdatedTest extends \PHPUnit_Framework_TestCase
@@ -18,9 +18,9 @@ public function testActorIdCanNotBeEmptyString()
         );
 
         new ActorUpdated(
-            new String(''),
+            new StringLiteral(''),
             new \DateTimeImmutable(),
-            new String(''),
+            new StringLiteral(''),
             Url::fromNative('http://foo.bar/event/foo')
         );
     }
@@ -32,9 +32,9 @@ private function createActorUpdated(\DateTimeImmutable $time = null)
         }
 
         return new ActorUpdated(
-            new String('123'),
+            new StringLiteral('123'),
             $time,
-            new String('me@example.com'),
+            new StringLiteral('me@example.com'),
             Url::fromNative('http://foo.bar/event/foo')
         );
     }
@@ -44,7 +44,7 @@ public function testGetActorId()
         $actorUpdated = $this->createActorUpdated();
 
         $this->assertEquals(
-            new String('123'),
+            new StringLiteral('123'),
             $actorUpdated->getActorId()
         );
     }
@@ -54,7 +54,7 @@ public function testGetAuthor()
         $actorUpdated = $this->createActorUpdated();
 
         $this->assertEquals(
-            new String('me@example.com'),
+            new StringLiteral('me@example.com'),
             $actorUpdated->getAuthor()
         );
     }

diff --git a/test/EventCreatedJSONDeserializerTest.php b/test/EventCreatedJSONDeserializerTest.php
@@ -7,7 +7,7 @@
 
 use CultuurNet\Deserializer\MissingValueException;
 use DateTime;
-use ValueObjects\String\String;
+use ValueObjects\String\String as StringLiteral;
 use ValueObjects\Web\Url;
 
 class EventCreatedJSONDeserializerTest extends \PHPUnit_Framework_TestCase
@@ -30,7 +30,7 @@ public function testRequiresEventId()
         );
 
         $this->deserializer->deserialize(
-            new String('{}')
+            new StringLiteral('{}')
         );
     }
 
@@ -42,7 +42,7 @@ public function testRequiresTime()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "eventId": "foo",
                     "url": "http://foo.bar/event/foo"
@@ -59,7 +59,7 @@ public function testTimeNeedsToBeISO8601Formatted()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "eventId": "foo",
                     "author": "me@example.com",
@@ -78,7 +78,7 @@ public function testRequiresAuthor()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "eventId": "foo",
                     "time": "2015-02-20T20:39:09+0100",
@@ -96,7 +96,7 @@ public function testRequiresUrl()
         );
 
         $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "eventId": "foo",
                     "author": "me@example.com",
@@ -109,7 +109,7 @@ public function testRequiresUrl()
     public function testReturnsEventCreated()
     {
         $eventCreated = $this->deserializer->deserialize(
-            new String(
+            new StringLiteral(
                 '{
                     "eventId": "foo",
                     "time": "2015-02-20T20:39:09+0100",
@@ -125,12 +125,12 @@ public function testReturnsEventCreated()
         );
 
         $this->assertEquals(
-            new String('foo'),
+            new StringLiteral('foo'),
             $eventCreated->getEventId()
         );
 
         $this->assertEquals(
-            new String('me@example.com'),
+            new StringLiteral('me@example.com'),
             $eventCreated->getAuthor()
         );