Merge 500f1b3 into cea089d

zfc-datagrid · Aug 29, 2017 · 8a88446 · 8a88446
2 parents cea089d + 500f1b3
commit 8a88446
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
 
         "zendframework/zend-mvc": "~2.7|~3.0",
         "zendframework/zend-modulemanager": "~2.5",
-        "zendframework/zend-session": "~2.5",
+        "zendframework/zend-session": "^2.7.4",
         "zendframework/zend-view": "~2.5",
         "zendframework/zend-http": "~2.5",
         "zendframework/zend-paginator": "~2.5",

diff --git a/composer.lock b/composer.lock
diff --git a/...Datagrid/Column/DataPopulation/Object.php → ...grid/Column/DataPopulation/DataObject.php b/...Datagrid/Column/DataPopulation/Object.php → ...grid/Column/DataPopulation/DataObject.php
@@ -7,7 +7,7 @@
 /**
  * Get the data from an external object.
  */
-class Object implements DataPopulationInterface
+class DataObject implements DataPopulationInterface
 {
     /**
      * @var ObjectAwareInterface

diff --git a/src/ZfcDatagrid/Column/ExternalData.php b/src/ZfcDatagrid/Column/ExternalData.php
@@ -24,8 +24,8 @@ public function __construct($uniqueId = 'external')
      */
     public function setDataPopulation(DataPopulation\DataPopulationInterface $dataPopulation)
     {
-        if ($dataPopulation instanceof DataPopulation\Object && $dataPopulation->getObject() === null) {
-            throw new \Exception('object is missing in DataPopulation\Object!');
+        if ($dataPopulation instanceof DataPopulation\DataObject && $dataPopulation->getObject() === null) {
+            throw new \Exception('object is missing in DataPopulation\DataObject!');
         }
 
         $this->dataPopulation = $dataPopulation;
@@ -50,10 +50,6 @@ public function getDataPopulation()
      */
     public function hasDataPopulation()
     {
-        if ($this->dataPopulation !== null) {
-            return true;
-        }
-
-        return false;
+        return null !== $this->dataPopulation;
     }
 }
diff --git a/src/ZfcDatagrid/Filter.php b/src/ZfcDatagrid/Filter.php
@@ -388,7 +388,7 @@ public static function isApply($currentValue, $expectedValue, $operator = self::
                 break;
 
             case self::BETWEEN:
-                if (count($expectedValue) >= 2) {
+                if (is_array($expectedValue) && count($expectedValue) >= 2) {
                     if ($currentValue >= $expectedValue[0] && $currentValue <= $expectedValue[1]) {
                         return true;
                     }

diff --git a/...Test/Column/DataPopulation/ObjectTest.php → .../Column/DataPopulation/DataObjectTest.php b/...Test/Column/DataPopulation/ObjectTest.php → .../Column/DataPopulation/DataObjectTest.php
@@ -2,13 +2,13 @@
 namespace ZfcDatagridTest\Column\DataPopulation;
 
 use PHPUnit\Framework\TestCase;
-use ZfcDatagrid\Column\DataPopulation\Object;
+use ZfcDatagrid\Column\DataPopulation\DataObject;
 
 /**
  * @group Column
- * @covers \ZfcDatagrid\Column\DataPopulation\Object
+ * @covers \ZfcDatagrid\Column\DataPopulation\DataObject
  */
-class ObjectTest extends TestCase
+class DataObjectTest extends TestCase
 {
     public function testObject()
     {
@@ -17,7 +17,7 @@ public function testObject()
             ->method('toString')
             ->will($this->returnValue('myReturn'));
 
-        $object = new Object();
+        $object = new DataObject();
 
         $object->setObject($mock);
         $this->assertSame($mock, $object->getObject());
@@ -33,7 +33,7 @@ public function testParameters()
         ->method('toString')
         ->will($this->returnValue('myReturn'));
 
-        $object = new Object();
+        $object = new DataObject();
         $object->setObject($mock);
 
         $this->assertCount(0, $object->getObjectParametersColumn());

diff --git a/tests/ZfcDatagridTest/Column/ExternalDataTest.php b/tests/ZfcDatagridTest/Column/ExternalDataTest.php
@@ -35,14 +35,14 @@ public function testSetGetData()
     {
         $col = new Column\ExternalData('myData');
 
-        $object = new DataPopulation\Object();
+        $object = new DataPopulation\DataObject();
         $object->setObject(new DataPopulation\Object\Gravatar());
         $this->assertEquals(false, $col->hasDataPopulation());
 
         $col->setDataPopulation($object);
 
         $this->assertEquals(true, $col->hasDataPopulation());
-        $this->assertInstanceOf(\ZfcDatagrid\Column\DataPopulation\Object::class, $col->getDataPopulation());
+        $this->assertInstanceOf(\ZfcDatagrid\Column\DataPopulation\DataObject::class, $col->getDataPopulation());
     }
 
     /**
@@ -52,7 +52,7 @@ public function testException()
     {
         $col = new Column\ExternalData('myData');
 
-        $object = new DataPopulation\Object();
+        $object = new DataPopulation\DataObject();
         $col->setDataPopulation($object);
     }
 }
diff --git a/tests/ZfcDatagridTest/PrepareDataTest.php b/tests/ZfcDatagridTest/PrepareDataTest.php
@@ -2,7 +2,7 @@
 namespace ZfcDatagridTest;
 
 use PHPUnit\Framework\TestCase;
-use ZfcDatagrid\Column\DataPopulation\Object;
+use ZfcDatagrid\Column\DataPopulation\DataObject;
 use ZfcDatagrid\Column\Type;
 use ZfcDatagrid\PrepareData;
 
@@ -390,7 +390,7 @@ public function testPrepareDataPopulation()
             ->method('toString')
             ->will($this->returnValue('myReturn'));
 
-        $object = new Object();
+        $object = new DataObject();
         $object->setObject($mock);
         $object->addObjectParameterColumn('email', $this->col1);