Merge pull request #418 from localheinz/fix/null

Fix: Return null if nothing was found by Mapper\Module

Author: Ocramius

module/ZfModule/src/ZfModule/Mapper/Module.php

@@ -146,7 +146,8 @@ public function findBy($key, $value)
         $select = $this->getSelect();
         $select->where([$key => $value]);
 
-        $entity = $this->select($select)->current();
+        $entity = $this->select($select)->current() ?: null;
+
         $this->getEventManager()->trigger('find', $this, ['entity' => $entity]);
 
         return $entity;

module/ZfModule/src/ZfModule/Service/Module.php

@@ -131,7 +131,7 @@ public function currentUserModules()
                 return false;
             }
 
-            if (false === $this->moduleMapper->findByUrl($repository->html_url)) {
+            if (!$this->moduleMapper->findByUrl($repository->html_url)) {
                 return false;
             }
 

module/ZfModule/test/ZfModuleTest/Integration/Controller/IndexControllerTest.php

@@ -927,7 +927,7 @@ public function testRemoveActionThrowsUnexpectedValueExceptionWhenRepositoryNotP
             ->expects($this->once())
             ->method('findByUrl')
             ->with($this->equalTo($unregisteredModule->html_url))
-            ->willReturn(false)
+            ->willReturn(null)
         ;
 
         $this->getApplicationServiceLocator()

module/ZfModule/test/ZfModuleTest/Integration/Mapper/ModuleTest.php

@@ -94,6 +94,11 @@ public function testFindByLikeFindsInProperty($property)
         $this->assertCount(1, $resultSet);
     }
 
+    public function testFindByReturnsNullIfNothingWasFound()
+    {
+        $this->assertNull($this->mapper->findBy('name', 'foo'));
+    }
+
     /**
      * @return array
      */

module/ZfModule/test/ZfModuleTest/Service/ModuleTest.php

@@ -221,7 +221,7 @@ public function testListUserModulesDoesNotListModulesFromApiNotFoundInDatabase()
             ->expects($this->once())
             ->method('findByUrl')
             ->with($this->equalTo($repository->html_url))
-            ->willReturn(false)
+            ->willReturn(null)
         ;
 
         $currentUserService = $this->getMockBuilder(Api\CurrentUser::class)->getMock();
@@ -381,7 +381,7 @@ public function testRegisterInsertsModule()
             ->expects($this->once())
             ->method('findByUrl')
             ->with($this->equalTo($repository->html_url))
-            ->willReturn(false)
+            ->willReturn(null)
         ;
 
         $moduleMapper