Merge branch 'cs/zendframework/zendframework#6129-is_null-removal' in…

…to develop Close zendframework/zendframework#6129 Forward Port zendframework/zendframework#6129
zendframework · Apr 13, 2014 · d9be15a · d9be15a
5 parents f467066 + ec7ea9f + 18ac29e + 1d789f3 + 52bf8bd
commit d9be15a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/test/Writer/DeletedTest.php b/test/Writer/DeletedTest.php
@@ -39,7 +39,7 @@ public function testSetReferenceThrowsExceptionOnInvalidParameter()
     public function testGetReferenceReturnsNullIfNotSet()
     {
         $entry = new Writer\Deleted;
-        $this->assertTrue(is_null($entry->getReference()));
+        $this->assertTrue(null === $entry->getReference());
     }
 
     public function testSetWhenDefaultsToCurrentTime()
@@ -101,7 +101,7 @@ public function testSetWhenThrowsExceptionOnInvalidParameter()
     public function testGetWhenReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Deleted;
-        $this->assertTrue(is_null($entry->getWhen()));
+        $this->assertTrue(null === $entry->getWhen());
     }
 
     public function testAddsByNameFromArray()

diff --git a/test/Writer/EntryTest.php b/test/Writer/EntryTest.php
@@ -304,25 +304,25 @@ public function testSetDateModifiedThrowsExceptionOnInvalidParameter()
     public function testGetDateCreatedReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getDateCreated()));
+        $this->assertTrue(null === $entry->getDateCreated());
     }
 
     public function testGetDateModifiedReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getDateModified()));
+        $this->assertTrue(null === $entry->getDateModified());
     }
 
     public function testGetCopyrightReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getCopyright()));
+        $this->assertTrue(null === $entry->getCopyright());
     }
 
     public function testGetContentReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getContent()));
+        $this->assertTrue(null === $entry->getContent());
     }
 
     public function testSetsDescription()
@@ -345,7 +345,7 @@ public function testSetDescriptionThrowsExceptionOnInvalidParameter()
     public function testGetDescriptionReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getDescription()));
+        $this->assertTrue(null === $entry->getDescription());
     }
 
     public function testSetsId()
@@ -368,7 +368,7 @@ public function testSetIdThrowsExceptionOnInvalidParameter()
     public function testGetIdReturnsNullIfNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getId()));
+        $this->assertTrue(null === $entry->getId());
     }
 
     public function testSetsLink()
@@ -401,13 +401,13 @@ public function testSetLinkThrowsExceptionOnInvalidUri()
     public function testGetLinkReturnsNullIfNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getLink()));
+        $this->assertTrue(null === $entry->getLink());
     }
 
     public function testGetLinksReturnsNullIfNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getLinks()));
+        $this->assertTrue(null === $entry->getLinks());
     }
 
     public function testSetsCommentLink()
@@ -440,7 +440,7 @@ public function testSetCommentLinkThrowsExceptionOnInvalidUri()
     public function testGetCommentLinkReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getCommentLink()));
+        $this->assertTrue(null === $entry->getCommentLink());
     }
 
     public function testSetsCommentFeedLink()
@@ -490,7 +490,7 @@ public function testSetCommentFeedLinkThrowsExceptionOnInvalidType()
     public function testGetCommentFeedLinkReturnsNullIfNoneSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getCommentFeedLinks()));
+        $this->assertTrue(null === $entry->getCommentFeedLinks());
     }
 
     public function testSetsTitle()
@@ -513,7 +513,7 @@ public function testSetTitleThrowsExceptionOnInvalidParameter()
     public function testGetTitleReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getTitle()));
+        $this->assertTrue(null === $entry->getTitle());
     }
 
     public function testSetsCommentCount()
@@ -598,7 +598,7 @@ public function testSetCommentCountThrowsExceptionOnInvalidNonIntegerParameter()
     public function testGetCommentCountReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getCommentCount()));
+        $this->assertTrue(null === $entry->getCommentCount());
     }
 
     /**

diff --git a/test/Writer/FeedTest.php b/test/Writer/FeedTest.php
@@ -242,13 +242,13 @@ public function testSetDateModifiedThrowsExceptionOnInvalidParameter()
     public function testGetDateCreatedReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getDateCreated()));
+        $this->assertTrue(null === $writer->getDateCreated());
     }
 
     public function testGetDateModifiedReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getDateModified()));
+        $this->assertTrue(null === $writer->getDateModified());
     }
 
     public function testSetLastBuildDateDefaultsToCurrentTime()
@@ -310,13 +310,13 @@ public function testSetLastBuildDateThrowsExceptionOnInvalidParameter()
     public function testGetLastBuildDateReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getLastBuildDate()));
+        $this->assertTrue(null === $writer->getLastBuildDate());
     }
 
     public function testGetCopyrightReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getCopyright()));
+        $this->assertTrue(null === $writer->getCopyright());
     }
 
     public function testSetsDescription()
@@ -339,7 +339,7 @@ public function testSetDescriptionThrowsExceptionOnInvalidParameter()
     public function testGetDescriptionReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getDescription()));
+        $this->assertTrue(null === $writer->getDescription());
     }
 
     public function testSetsId()
@@ -394,7 +394,7 @@ public function testSetIdThrowsExceptionOnInvalidUri()
     public function testGetIdReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getId()));
+        $this->assertTrue(null === $writer->getId());
     }
 
     public function testSetsLanguage()
@@ -417,7 +417,7 @@ public function testSetLanguageThrowsExceptionOnInvalidParameter()
     public function testGetLanguageReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getLanguage()));
+        $this->assertTrue(null === $writer->getLanguage());
     }
 
     public function testSetsLink()
@@ -450,7 +450,7 @@ public function testSetLinkThrowsExceptionOnInvalidUri()
     public function testGetLinkReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getLink()));
+        $this->assertTrue(null === $writer->getLink());
     }
 
     public function testSetsEncoding()
@@ -496,7 +496,7 @@ public function testSetTitleThrowsExceptionOnInvalidParameter()
     public function testGetTitleReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getTitle()));
+        $this->assertTrue(null === $writer->getTitle());
     }
 
     public function testSetsGeneratorName()
@@ -632,7 +632,7 @@ public function testSetsGeneratorThrowsExceptionOnInvalidUri_Deprecated()
     public function testGetGeneratorReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getGenerator()));
+        $this->assertTrue(null === $writer->getGenerator());
     }
 
     public function testSetsFeedLink()
@@ -665,7 +665,7 @@ public function testSetsFeedLinkThrowsExceptionOnInvalidUri()
     public function testGetFeedLinksReturnsNullIfNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getFeedLinks()));
+        $this->assertTrue(null === $writer->getFeedLinks());
     }
 
     public function testSetsBaseUrl()
@@ -688,7 +688,7 @@ public function testSetsBaseUrlThrowsExceptionOnInvalidUri()
     public function testGetBaseUrlReturnsNullIfNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getBaseUrl()));
+        $this->assertTrue(null === $writer->getBaseUrl());
     }
 
     public function testAddsHubUrl()
@@ -718,7 +718,7 @@ public function testAddingHubUrlThrowsExceptionOnInvalidUri()
     public function testAddingHubUrlReturnsNullIfNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getHubs()));
+        $this->assertTrue(null === $writer->getHubs());
     }
 
     public function testCreatesNewEntryDataContainer()
@@ -876,7 +876,7 @@ public function testSetsImageDescription()
     public function testGetCategoriesReturnsNullIfNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getCategories()));
+        $this->assertTrue(null === $writer->getCategories());
     }
 
     public function testAddsAndOrdersEntriesByDateIfRequested()