From 06a7df94c6afb7449664865d52f7ebfe2d3ce978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:29:13 +0100 Subject: [PATCH 01/13] Fix: Reduce visibility --- module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index 7b585e7f..3f474fa9 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -7,7 +7,7 @@ class ModuleTest extends PHPUnit_Framework_TestCase { - protected $module; + private $module; public function setUp() { From 65bb87d1e5bc998161c5f26a44624994744db941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:29:59 +0100 Subject: [PATCH 02/13] Fix: Import --- module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index 3f474fa9..8f8abff8 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -3,15 +3,18 @@ namespace ZfModuleTest\Entity; use PHPUnit_Framework_TestCase; -use ZfModule\Entity\Module; +use ZfModule\Entity; class ModuleTest extends PHPUnit_Framework_TestCase { + /** + * @var Entity\Module + */ private $module; public function setUp() { - $this->module = new Module(); + $this->module = new Entity\Module(); } public function testModuleConstruction() From 46d795a9a0e754b89074f517238a798ca326de56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:30:17 +0100 Subject: [PATCH 03/13] Fix: Remove useless test --- module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index 8f8abff8..4538851c 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -17,11 +17,6 @@ public function setUp() $this->module = new Entity\Module(); } - public function testModuleConstruction() - { - $this->assertInstanceOf('ZfModule\Entity\Module', $this->module); - } - public function testSetOwner() { $this->module->setOwner('johndoe'); From 588720edd298d8ebeb37dfdb08f40ae2c5b7ff86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:32:09 +0100 Subject: [PATCH 04/13] Fix: DRY --- .../test/ZfModuleTest/Entity/ModuleTest.php | 48 ++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index 4538851c..8fe3a9cb 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -19,57 +19,73 @@ public function setUp() public function testSetOwner() { - $this->module->setOwner('johndoe'); + $owner = 'johndoe'; - $this->assertEquals('johndoe', $this->module->getOwner()); + $this->module->setOwner($owner); + + $this->assertEquals($owner, $this->module->getOwner()); } public function testSetId() { - $this->module->setId(99); + $id = 99; + + $this->module->setId($id); - $this->assertEquals(99, $this->module->getId()); + $this->assertEquals($id, $this->module->getId()); } public function testSetUrl() { - $this->module->setUrl('http://example.com'); + $url = 'http://example.com'; - $this->assertEquals('http://example.com', $this->module->getUrl()); + $this->module->setUrl($url); + + $this->assertEquals($url, $this->module->getUrl()); } public function testSetName() { - $this->module->setName('Super Great Happy Good Time Module'); + $name = 'Super Great Happy Good Time Module'; + + $this->module->setName($name); - $this->assertEquals('Super Great Happy Good Time Module', $this->module->getName()); + $this->assertEquals($name, $this->module->getName()); } public function testSetDescription() { - $this->module->setDescription('Lorem ipsum dolor sit amet'); + $description = 'Lorem ipsum dolor sit amet'; - $this->assertEquals('Lorem ipsum dolor sit amet', $this->module->getDescription()); + $this->module->setDescription($description); + + $this->assertEquals($description, $this->module->getDescription()); } public function testSetCreatedAt() { - $this->module->setCreatedAt('2013-02-28 13:05:00'); + $createdAt = '2013-02-28 13:05:00'; + + $this->module->setCreatedAt($createdAt); - $this->assertEquals('2013-02-28 13:05:00', $this->module->getCreatedAt()); + $this->assertEquals($createdAt, $this->module->getCreatedAt()); } public function testSetUpdatedAt() { - $this->module->setUpdatedAt('2013-02-28 13:05:00'); + $updatedAt = '2013-02-28 13:05:00'; - $this->assertEquals('2013-02-28 13:05:00', $this->module->getUpdatedAt()); + $this->module->setUpdatedAt($updatedAt); + + $this->assertEquals($updatedAt, $this->module->getUpdatedAt()); } public function testSetPhotoUrl() { - $this->module->setPhotoUrl('http://www.example.com/photo.jpg'); + $photoUrl = 'http://www.example.com/photo.jpg'; + + $this->module->setPhotoUrl($photoUrl); - $this->assertEquals('http://www.example.com/photo.jpg', $this->module->getPhotoUrl()); + $this->assertEquals($photoUrl, $this->module->getPhotoUrl()); } } From 94789cb09b7d87cd8c6f3eae8e4b1b6a20979bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:33:08 +0100 Subject: [PATCH 05/13] Enhancement: Compare strict --- .../test/ZfModuleTest/Entity/ModuleTest.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index 8fe3a9cb..e54f7612 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -23,7 +23,7 @@ public function testSetOwner() $this->module->setOwner($owner); - $this->assertEquals($owner, $this->module->getOwner()); + $this->assertSame($owner, $this->module->getOwner()); } public function testSetId() @@ -32,7 +32,7 @@ public function testSetId() $this->module->setId($id); - $this->assertEquals($id, $this->module->getId()); + $this->assertSame($id, $this->module->getId()); } public function testSetUrl() @@ -41,7 +41,7 @@ public function testSetUrl() $this->module->setUrl($url); - $this->assertEquals($url, $this->module->getUrl()); + $this->assertSame($url, $this->module->getUrl()); } public function testSetName() @@ -50,7 +50,7 @@ public function testSetName() $this->module->setName($name); - $this->assertEquals($name, $this->module->getName()); + $this->assertSame($name, $this->module->getName()); } public function testSetDescription() @@ -59,7 +59,7 @@ public function testSetDescription() $this->module->setDescription($description); - $this->assertEquals($description, $this->module->getDescription()); + $this->assertSame($description, $this->module->getDescription()); } public function testSetCreatedAt() @@ -68,7 +68,7 @@ public function testSetCreatedAt() $this->module->setCreatedAt($createdAt); - $this->assertEquals($createdAt, $this->module->getCreatedAt()); + $this->assertSame($createdAt, $this->module->getCreatedAt()); } public function testSetUpdatedAt() @@ -77,7 +77,7 @@ public function testSetUpdatedAt() $this->module->setUpdatedAt($updatedAt); - $this->assertEquals($updatedAt, $this->module->getUpdatedAt()); + $this->assertSame($updatedAt, $this->module->getUpdatedAt()); } public function testSetPhotoUrl() @@ -86,6 +86,6 @@ public function testSetPhotoUrl() $this->module->setPhotoUrl($photoUrl); - $this->assertEquals($photoUrl, $this->module->getPhotoUrl()); + $this->assertSame($photoUrl, $this->module->getPhotoUrl()); } } From e043a36d4eea645ce77c7c4f74a2f37fb66ea279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:37:03 +0100 Subject: [PATCH 06/13] Enhancement: Cover getCreatedAtDateTime() --- module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index e54f7612..afbb4e97 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -2,6 +2,7 @@ namespace ZfModuleTest\Entity; +use DateTime; use PHPUnit_Framework_TestCase; use ZfModule\Entity; @@ -65,10 +66,12 @@ public function testSetDescription() public function testSetCreatedAt() { $createdAt = '2013-02-28 13:05:00'; + $dateTime = new DateTime($createdAt); $this->module->setCreatedAt($createdAt); $this->assertSame($createdAt, $this->module->getCreatedAt()); + $this->assertEquals($dateTime, $this->module->getCreateAtDateTime()); } public function testSetUpdatedAt() From 0af235acb225b59d3ca445d1bcd89b2586b2d58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:37:37 +0100 Subject: [PATCH 07/13] Enhancement: Reduce visibility --- module/ZfModule/src/ZfModule/Entity/Module.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/ZfModule/src/ZfModule/Entity/Module.php b/module/ZfModule/src/ZfModule/Entity/Module.php index e401820e..ed0a7859 100644 --- a/module/ZfModule/src/ZfModule/Entity/Module.php +++ b/module/ZfModule/src/ZfModule/Entity/Module.php @@ -7,42 +7,42 @@ class Module implements ModuleInterface /** * @var id */ - protected $id = null; + private $id = null; /** * @var string */ - protected $name = null; + private $name = null; /** * @var string */ - protected $description = null; + private $description = null; /** * @var string */ - protected $url = null; + private $url = null; /** * @var int */ - protected $createdAt = null; + private $createdAt = null; /** * @var int */ - protected $updatedAt = null; + private $updatedAt = null; /** * @var string */ - protected $owner = null; + private $owner = null; /** * @var string */ - protected $photoUrl = null; + private $photoUrl = null; public function getPhotoUrl() { From 474c05404e091fb4eddb1dca523e6b0fbaa34448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:40:29 +0100 Subject: [PATCH 08/13] Enhancement: Assert defaults --- .../test/ZfModuleTest/Entity/ModuleTest.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index afbb4e97..a306e4cd 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -18,6 +18,19 @@ public function setUp() $this->module = new Entity\Module(); } + public function testDefaults() + { + $this->assertNull($this->module->getId()); + $this->assertNull($this->module->getName()); + $this->assertNull($this->module->getDescription()); + $this->assertNull($this->module->getOwner()); + $this->assertNull($this->module->getPhotoUrl()); + $this->assertNull($this->module->getUrl()); + $this->assertEquals(new DateTime(), $this->module->getCreateAtDateTime()); + $this->assertNull($this->module->getCreatedAt()); + $this->assertNull($this->module->getUpdatedAt()); + } + public function testSetOwner() { $owner = 'johndoe'; From ed5b8accfe5f2b063803bd031e60ba942da4747b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:41:02 +0100 Subject: [PATCH 09/13] Fix: No need to set to null --- module/ZfModule/src/ZfModule/Entity/Module.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/ZfModule/src/ZfModule/Entity/Module.php b/module/ZfModule/src/ZfModule/Entity/Module.php index ed0a7859..2b912c8b 100644 --- a/module/ZfModule/src/ZfModule/Entity/Module.php +++ b/module/ZfModule/src/ZfModule/Entity/Module.php @@ -7,42 +7,42 @@ class Module implements ModuleInterface /** * @var id */ - private $id = null; + private $id; /** * @var string */ - private $name = null; + private $name; /** * @var string */ - private $description = null; + private $description; /** * @var string */ - private $url = null; + private $url; /** * @var int */ - private $createdAt = null; + private $createdAt; /** * @var int */ - private $updatedAt = null; + private $updatedAt; /** * @var string */ - private $owner = null; + private $owner; /** * @var string */ - private $photoUrl = null; + private $photoUrl; public function getPhotoUrl() { From 88e887adad67b6bea986430561ea3d1ce4591317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:41:33 +0100 Subject: [PATCH 10/13] Fix: Doc-block --- module/ZfModule/src/ZfModule/Entity/Module.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/ZfModule/src/ZfModule/Entity/Module.php b/module/ZfModule/src/ZfModule/Entity/Module.php index 2b912c8b..1d9bc9fd 100644 --- a/module/ZfModule/src/ZfModule/Entity/Module.php +++ b/module/ZfModule/src/ZfModule/Entity/Module.php @@ -5,7 +5,7 @@ class Module implements ModuleInterface { /** - * @var id + * @var int */ private $id; @@ -25,12 +25,12 @@ class Module implements ModuleInterface private $url; /** - * @var int + * @var string */ private $createdAt; /** - * @var int + * @var string */ private $updatedAt; From bbea410416798fe147eaaf9fec119b78c65e1d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:46:02 +0100 Subject: [PATCH 11/13] Enhancement: Assert fluent interface --- .../ZfModule/test/ZfModuleTest/Entity/ModuleTest.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index a306e4cd..0cc84280 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -31,6 +31,18 @@ public function testDefaults() $this->assertNull($this->module->getUpdatedAt()); } + public function testFluentInterface() + { + $this->assertSame($this->module, $this->module->setId(9000)); + $this->assertSame($this->module, $this->module->setName('foo')); + $this->assertSame($this->module, $this->module->setDescription('bar')); + $this->assertSame($this->module, $this->module->setOwner('John Doe')); + $this->assertSame($this->module, $this->module->setPhotoUrl('http://www.example.com/photo.jpg')); + $this->assertSame($this->module, $this->module->setUrl('http://www.example.com')); + $this->assertSame($this->module, $this->module->setCreatedAt('2013-02-28 13:05:00')); + $this->assertSame($this->module, $this->module->setUpdatedAt('2013-02-28 13:05:00')); + } + public function testSetOwner() { $owner = 'johndoe'; From 731595018e59227d36f7f0fc782c8b14ad6c7fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:47:07 +0100 Subject: [PATCH 12/13] Fix: Spelling error in method name --- module/ZfModule/src/ZfModule/Entity/Module.php | 8 +++++--- module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/module/ZfModule/src/ZfModule/Entity/Module.php b/module/ZfModule/src/ZfModule/Entity/Module.php index 1d9bc9fd..bf7c8e12 100644 --- a/module/ZfModule/src/ZfModule/Entity/Module.php +++ b/module/ZfModule/src/ZfModule/Entity/Module.php @@ -2,6 +2,8 @@ namespace ZfModule\Entity; +use DateTime; + class Module implements ModuleInterface { /** @@ -86,11 +88,11 @@ public function getCreatedAt() } /** - * @return \DateTime + * @return DateTime */ - public function getCreateAtDateTime() + public function getCreatedAtDateTime() { - return new \DateTime($this->getCreatedAt()); + return new DateTime($this->getCreatedAt()); } public function setCreatedAt($createdAt) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index 0cc84280..4756072e 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -26,7 +26,7 @@ public function testDefaults() $this->assertNull($this->module->getOwner()); $this->assertNull($this->module->getPhotoUrl()); $this->assertNull($this->module->getUrl()); - $this->assertEquals(new DateTime(), $this->module->getCreateAtDateTime()); + $this->assertEquals(new DateTime(), $this->module->getCreatedAtDateTime()); $this->assertNull($this->module->getCreatedAt()); $this->assertNull($this->module->getUpdatedAt()); } @@ -96,7 +96,7 @@ public function testSetCreatedAt() $this->module->setCreatedAt($createdAt); $this->assertSame($createdAt, $this->module->getCreatedAt()); - $this->assertEquals($dateTime, $this->module->getCreateAtDateTime()); + $this->assertEquals($dateTime, $this->module->getCreatedAtDateTime()); } public function testSetUpdatedAt() From 11f7c243b9b6a6c6dbdf30c0e68f72835996c37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Feb 2015 20:48:49 +0100 Subject: [PATCH 13/13] Fix: Inline variable again --- module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php index 4756072e..f81f6950 100644 --- a/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php +++ b/module/ZfModule/test/ZfModuleTest/Entity/ModuleTest.php @@ -91,12 +91,11 @@ public function testSetDescription() public function testSetCreatedAt() { $createdAt = '2013-02-28 13:05:00'; - $dateTime = new DateTime($createdAt); $this->module->setCreatedAt($createdAt); $this->assertSame($createdAt, $this->module->getCreatedAt()); - $this->assertEquals($dateTime, $this->module->getCreatedAtDateTime()); + $this->assertEquals(new DateTime($createdAt), $this->module->getCreatedAtDateTime()); } public function testSetUpdatedAt()