Added DocumentTest

Author: DonCallisto

.travis.yml

@@ -16,16 +16,18 @@ matrix:
 before_install:
   - sh -c 'if [ "${SYMFONY_VERSION}" != "" ]; then composer require --no-update symfony/symfony=${SYMFONY_VERSION}; fi;';
 
+before_script:
+  - echo "extension=mongodb.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+
 install:
   - travis_retry composer self-update
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev --no-interaction
 
 script:
-  - vendor/bin/phpunit
   - mkdir -p build/logs
   - php vendor/bin/phpunit -c phpunit.xml.dist
 
 after_success:
-  - travis_retry php vendor/bin/coveralls
+  - php vendor/bin/coveralls

Grid/Source/Document.php

@@ -15,9 +15,11 @@
 namespace APY\DataGridBundle\Grid\Source;
 
 use APY\DataGridBundle\Grid\Column\Column;
+use APY\DataGridBundle\Grid\Helper\ColumnsIterator;
 use APY\DataGridBundle\Grid\Row;
 use APY\DataGridBundle\Grid\Rows;
 use Doctrine\ODM\MongoDB\Query\Builder as QueryBuilder;
+use MongoDB\BSON\Regex;
 
 class Document extends Source
 {
@@ -84,7 +86,7 @@ public function initialise($container)
     {
         $this->manager = $container->get('doctrine.odm.mongodb.document_manager');
         $this->odmMetadata = $this->manager->getClassMetadata($this->documentName);
-        $this->class = $this->odmMetadata->getReflectionClass()->name;
+        $this->class = $this->odmMetadata->getReflectionClass()->getName();
 
         $mapping = $container->get('grid.mapping.manager');
         $mapping->addDriver($this, -1);
@@ -127,24 +129,22 @@ protected function normalizeOperator($operator)
     protected function normalizeValue($operator, $value)
     {
         switch ($operator) {
-            case Column::OPERATOR_EQ:
-                return $value;
             case Column::OPERATOR_NEQ:
-                return new \MongoRegex('/^(?!' . $value . '$).*$/i');
+                return new Regex('^(?!' . $value . '$).*$', 'i');
             case Column::OPERATOR_LIKE:
-                return new \MongoRegex('/' . $value . '/i');
+                return new Regex($value, 'i');
             case Column::OPERATOR_NLIKE:
-                return new \MongoRegex('/^((?!' . $value . ').)*$/i');
+                return new Regex('^((?!' . $value . ').)*$', 'i');
             case Column::OPERATOR_RLIKE:
-                return new \MongoRegex('/^' . $value . '/i');
+                return new Regex('^' . $value, 'i');
             case Column::OPERATOR_LLIKE:
-                return new \MongoRegex('/' . $value . '$/i');
+                return new Regex($value . '$', 'i');
             case Column::OPERATOR_SLIKE:
-                return new \MongoRegex('/' . $value . '/');
+                return new Regex($value, '');
             case Column::OPERATOR_RSLIKE:
-                return new \MongoRegex('/^' . $value . '/');
+                return new Regex('^' . $value, '');
             case Column::OPERATOR_LSLIKE:
-                return new \MongoRegex('/' . $value . '$/');
+                return new Regex($value . '$', '');
             case Column::OPERATOR_ISNULL:
                 return false;
             case Column::OPERATOR_ISNOTNULL:
@@ -181,7 +181,7 @@ protected function getQueryBuilder()
     }
 
     /**
-     * @param \APY\DataGridBundle\Grid\Column\Column[] $columns
+     * @param ColumnsIterator $columns
      * @param int                                      $page             Page Number
      * @param int                                      $limit            Rows Per Page
      * @param int                                      $gridDataJunction Grid data junction
@@ -192,14 +192,13 @@ public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gr
     {
         $this->query = $this->getQueryBuilder();
 
+        $validColumns = [];
         foreach ($columns as $column) {
 
             //checks if exists '.' notation on referenced columns and build query if it's filtered
             $subColumn = explode('.', $column->getId());
             if (count($subColumn) > 1 && isset($this->referencedMappings[$subColumn[0]])) {
                 $this->addReferencedColumnn($subColumn, $column);
-                //must remove this referenced subColumn from processing
-                $columns->offsetUnset($columns->key());
 
                 continue;
             }
@@ -228,6 +227,8 @@ public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gr
                     }
                 }
             }
+
+            $validColumns[] = $column;
         }
 
         if ($page > 0) {
@@ -250,6 +251,8 @@ public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gr
         //execute and get results
         $result = new Rows();
 
+        // I really don't know if Cursor is the right type returned (I mean, every single type).
+        // As I didn't find out this information, I'm gonna test it with Cursor returned only.
         $cursor = $this->query->getQuery()->execute();
 
         $this->count = $cursor->count();
@@ -258,7 +261,7 @@ public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gr
             $row = new Row();
             $properties = $this->getClassProperties($resource);
 
-            foreach ($columns as $column) {
+            foreach ($validColumns as $column) {
                 if (isset($properties[strtolower($column->getId())])) {
                     $row->setField($column->getId(), $properties[strtolower($column->getId())]);
                 }
@@ -296,6 +299,7 @@ protected function addReferencedColumnn(array $subColumn, Column $column)
                 $cursor = $helperQuery->getQuery()->execute();
 
                 foreach ($cursor as $resource) {
+                    // Is this case possible? I don't think so
                     if ($cursor->count() > 0) {
                         $this->query->select($subColumn[0]);
                     }
@@ -362,6 +366,12 @@ protected function getClassProperties($obj)
         return $result;
     }
 
+    /**
+     * @param string $class
+     * @param string $group
+     *
+     * @return array
+     */
     public function getFieldsMetadata($class, $group = 'default')
     {
         $result = [];
@@ -501,6 +511,11 @@ public function populateSelectFilters($columns, $loop = false)
         }
     }
 
+    /**
+     * @param array $ids
+     *
+     * @throws \Exception
+     */
     public function delete(array $ids)
     {
         $repository = $this->getRepository();
@@ -518,11 +533,17 @@ public function delete(array $ids)
         $this->manager->flush();
     }
 
+    /**
+     * @return \Doctrine\ODM\MongoDB\DocumentRepository
+     */
     public function getRepository()
     {
         return $this->manager->getRepository($this->documentName);
     }
 
+    /**
+     * @return string
+     */
     public function getHash()
     {
         return $this->documentName;

Grid/Source/Source.php

@@ -13,6 +13,7 @@
 namespace APY\DataGridBundle\Grid\Source;
 
 use APY\DataGridBundle\Grid\Column\Column;
+use APY\DataGridBundle\Grid\Helper\ColumnsIterator;
 use APY\DataGridBundle\Grid\Mapping\Driver\DriverInterface;
 use APY\DataGridBundle\Grid\Row;
 use APY\DataGridBundle\Grid\Rows;
@@ -77,13 +78,14 @@ public function manipulateRow(\Closure $callback = null)
      *
      * @abstract
      *
-     * @param \APY\DataGridBundle\Grid\Column\Column[] $columns
+     * @param ColumnsIterator $columns
      * @param int                                      $page             Page Number
      * @param int                                      $limit            Rows Per Page
      * @param int                                      $gridDataJunction Grid data junction
      *
      * @return \APY\DataGridBundle\Grid\Rows
      */
+    // @todo: typehint?
     abstract public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gridDataJunction = Column::DATA_CONJUNCTION);
 
     /**