From 67e643ccec279c227b8f67a996dff1c62a842e7f Mon Sep 17 00:00:00 2001
From: Oliver <kokspflanze@users.noreply.github.com>
Date: Fri, 21 Oct 2016 10:41:58 +0200
Subject: [PATCH] ZF3 support

* zf3 support (#241)

* Update Renderer.php

* Update PrepareData.php

* - unittests update, removed deprecated method `getMock` (#238)

- also removed deprecated method setExpectedException
- run cs fix
- update composer for cs-fix

* - run cs fix
- update composer doctrine
- datagrid should now work with zf2 and zf3

* added unit tests for nightly

* dropped PHP 5.5 (#242)

* dropped PHP 5.5

* travis allow_failures fix

* doctrine-orm-module composer update (#246)

* composer.json
phpunit changed to min 5.6
doctrine/doctrine-orm-module min 1.1.0
changed autoloader to PSR-4

* cs fixxes

* PHP 7.1 in travis (#247)

* added PHP 7.1 in travis for tests

* coverage check only with PHP 7.0
---
 .travis.yml                                   |   7 +-
 composer.json                                 |  30 +-
 src/ZfcDatagrid/Action/Mass.php               |  23 +-
 src/ZfcDatagrid/Column/AbstractColumn.php     | 146 ++++------
 src/ZfcDatagrid/Column/Action.php             |   6 +-
 .../Column/Action/AbstractAction.php          |  74 +++--
 src/ZfcDatagrid/Column/Action/Button.php      |  10 +-
 src/ZfcDatagrid/Column/Action/Checkbox.php    |   5 +-
 src/ZfcDatagrid/Column/Action/Icon.php        |  19 +-
 .../DataPopulationInterface.php               |   6 +-
 .../Column/DataPopulation/Object.php          |  16 +-
 .../Column/DataPopulation/Object/Gravatar.php |  17 +-
 .../DataPopulation/ObjectAwareInterface.php   |   5 +-
 .../Column/DataPopulation/StaticValue.php     |   8 +-
 src/ZfcDatagrid/Column/ExternalData.php       |   9 +-
 .../Column/Formatter/AbstractFormatter.php    |  12 +-
 src/ZfcDatagrid/Column/Formatter/Email.php    |   5 +-
 src/ZfcDatagrid/Column/Formatter/FileSize.php |   7 +-
 .../Column/Formatter/GenerateLink.php         |  21 +-
 src/ZfcDatagrid/Column/Formatter/HtmlTag.php  |  42 +--
 src/ZfcDatagrid/Column/Formatter/Image.php    |  19 +-
 src/ZfcDatagrid/Column/Formatter/Link.php     |   3 +-
 src/ZfcDatagrid/Column/Select.php             |  26 +-
 .../Column/Style/AbstractColor.php            |  76 +++--
 .../Column/Style/AbstractStyle.php            |  22 +-
 src/ZfcDatagrid/Column/Style/Align.php        |   8 +-
 .../Column/Style/BackgroundColor.php          |   3 +-
 src/ZfcDatagrid/Column/Style/Bold.php         |   1 +
 src/ZfcDatagrid/Column/Style/CSSClass.php     |   5 +-
 src/ZfcDatagrid/Column/Style/Color.php        |   3 +-
 src/ZfcDatagrid/Column/Style/Html.php         |   1 +
 src/ZfcDatagrid/Column/Style/Italic.php       |   1 +
 .../Column/Style/Strikethrough.php            |   1 +
 src/ZfcDatagrid/Column/Type/AbstractType.php  |  15 +-
 src/ZfcDatagrid/Column/Type/DateTime.php      |  14 +-
 src/ZfcDatagrid/Column/Type/Image.php         |  12 +-
 src/ZfcDatagrid/Column/Type/Number.php        |  22 +-
 src/ZfcDatagrid/Column/Type/PhpArray.php      |  13 +-
 src/ZfcDatagrid/Column/Type/PhpString.php     |   1 +
 src/ZfcDatagrid/Column/Type/TypeInterface.php |   3 +-
 .../DataSource/AbstractDataSource.php         |  27 +-
 .../DataSource/DataSourceInterface.php        |  11 +-
 src/ZfcDatagrid/DataSource/Doctrine2.php      |  19 +-
 .../DataSource/Doctrine2/Filter.php           |  34 +--
 .../DataSource/Doctrine2/Paginator.php        |  25 +-
 .../DataSource/Doctrine2/PaginatorFast.php    |  27 +-
 .../DataSource/Doctrine2Collection.php        |  15 +-
 src/ZfcDatagrid/DataSource/PhpArray.php       |  44 +--
 .../DataSource/PhpArray/Filter.php            |  14 +-
 src/ZfcDatagrid/DataSource/ZendSelect.php     |  18 +-
 .../DataSource/ZendSelect/Filter.php          |  38 ++-
 src/ZfcDatagrid/Datagrid.php                  | 270 ++++++++----------
 src/ZfcDatagrid/Filter.php                    | 137 +++++----
 src/ZfcDatagrid/Library/ImageResize.php       |  18 +-
 src/ZfcDatagrid/Module.php                    |   6 +-
 src/ZfcDatagrid/PrepareData.php               |  23 +-
 src/ZfcDatagrid/Renderer/AbstractExport.php   |  23 +-
 src/ZfcDatagrid/Renderer/AbstractRenderer.php | 130 ++++-----
 .../Renderer/BootstrapTable/Renderer.php      |  19 +-
 .../BootstrapTable/View/Helper/TableRow.php   |  53 ++--
 .../View/Helper/TableRowFactory.php           |  24 +-
 src/ZfcDatagrid/Renderer/Csv/Renderer.php     |  26 +-
 src/ZfcDatagrid/Renderer/JqGrid/Renderer.php  |  30 +-
 .../Renderer/JqGrid/View/Helper/Columns.php   |  59 ++--
 .../JqGrid/View/Helper/ColumnsFactory.php     |  24 +-
 .../Renderer/PHPExcel/Renderer.php            |  64 ++---
 .../Renderer/PrintHtml/Renderer.php           |   2 +-
 .../Renderer/RendererInterface.php            |  13 +-
 src/ZfcDatagrid/Renderer/TCPDF/Renderer.php   |  87 +++---
 .../Renderer/ZendTable/Renderer.php           |  53 ++--
 src/ZfcDatagrid/Service/AbstractDatagrid.php  |  42 ++-
 src/ZfcDatagrid/Service/DatagridFactory.php   |  33 ++-
 src/ZfcDatagrid/Service/DatagridManager.php   |  12 +-
 .../Service/DatagridManagerFactory.php        |   6 +-
 .../Service/ZendDbAdapterFactory.php          |  21 +-
 .../Service/DatagridFactoryTest.php           |   2 +-
 76 files changed, 1058 insertions(+), 1108 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9749e69e..f671d8af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,15 @@ language: php
 sudo: false
 
 php:
-  - 5.5
   - 5.6
   - 7
+  - 7.1
   - hhvm
+  - nightly
+
+matrix:
+  allow_failures:
+  - php: nightly
 
 env:
   matrix:
diff --git a/composer.json b/composer.json
index 03fcd160..52283f0a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,25 +24,22 @@
     }],
 
     "require": {
-        "php": "~5.5|~7.0",
+        "php": "~5.6|~7.0",
         
-        "zendframework/zend-mvc": "~2.7",
+        "zendframework/zend-mvc": "~2.7|~3.0",
         "zendframework/zend-modulemanager": "~2.5",
         "zendframework/zend-session": "~2.5",
         "zendframework/zend-view": "~2.5",
         "zendframework/zend-http": "~2.5",
         "zendframework/zend-paginator": "~2.5",
         "zendframework/zend-cache": "~2.5",
-        "zendframework/zend-servicemanager": "~2.7"
+        "zendframework/zend-servicemanager": "~2.7|~3.0"
     },
     
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.2",
+        "phpunit/phpunit": "^5.6.1",
         "friendsofphp/php-cs-fixer": "^1.11",
-        
-        "doctrine/orm": ">=2.5,<2.7",
-        "doctrine/dbal": ">=2.5,<2.7",
-        "doctrine/doctrine-orm-module": "^0.9",
+        "doctrine/doctrine-orm-module": "^1.1.0",
         
         "zendframework/zend-console": "~2.5",
         "zendframework/zend-db": "~2.5",
@@ -53,10 +50,7 @@
     
     "suggest" : {
         "ext-intl": "*",
-        
-        "doctrine/orm": ">=2.5,<2.7",
-        "doctrine/dbal": ">=2.5,<2.7",
-        "doctrine/doctrine-orm-module": "^0.9",
+        "doctrine/doctrine-orm-module": "for doctrine support",
         
         "phpoffice/phpexcel": "^1.8",
         "tecnickcom/tcpdf": "^6.2",
@@ -64,11 +58,15 @@
         "zendframework/zend-text": "~2.5",
         "zendframework/zend-json": "to support date ranges"
     },
-    
+
     "autoload": {
-        "psr-0": {
-            "ZfcDatagrid\\": "src/",
-            "ZfcDatagridTest\\": "tests/"
+        "psr-4": {
+            "ZfcDatagrid\\": "src/ZfcDatagrid"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ZfcDatagridTest\\": "tests/ZfcDatagridTest"
         }
     }
 }
diff --git a/src/ZfcDatagrid/Action/Mass.php b/src/ZfcDatagrid/Action/Mass.php
index 2b06117c..47ed72e5 100644
--- a/src/ZfcDatagrid/Action/Mass.php
+++ b/src/ZfcDatagrid/Action/Mass.php
@@ -1,31 +1,28 @@
 <?php
+
 namespace ZfcDatagrid\Action;
 
 class Mass
 {
     /**
-     *
      * @var string
      */
     private $title = '';
 
     /**
-     *
      * @var string
      */
     private $link = '';
 
     /**
-     *
-     * @var boolean
+     * @var bool
      */
     private $confirm = false;
 
     /**
-     *
-     * @param string  $title
-     * @param string  $link
-     * @param boolean $confirm
+     * @param string $title
+     * @param string $link
+     * @param bool   $confirm
      */
     public function __construct($title = '', $link = '', $confirm = false)
     {
@@ -35,7 +32,6 @@ public function __construct($title = '', $link = '', $confirm = false)
     }
 
     /**
-     *
      * @param string $title
      */
     public function setTitle($title)
@@ -44,7 +40,6 @@ public function setTitle($title)
     }
 
     /**
-     *
      * @return string
      */
     public function getTitle()
@@ -53,7 +48,6 @@ public function getTitle()
     }
 
     /**
-     *
      * @param string $link
      */
     public function setLink($link)
@@ -62,7 +56,6 @@ public function setLink($link)
     }
 
     /**
-     *
      * @return string
      */
     public function getLink()
@@ -71,8 +64,7 @@ public function getLink()
     }
 
     /**
-     *
-     * @param boolean $mode
+     * @param bool $mode
      */
     public function setConfirm($mode = true)
     {
@@ -80,8 +72,7 @@ public function setConfirm($mode = true)
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function getConfirm()
     {
diff --git a/src/ZfcDatagrid/Column/AbstractColumn.php b/src/ZfcDatagrid/Column/AbstractColumn.php
index 02ae49db..68d3cd6c 100644
--- a/src/ZfcDatagrid/Column/AbstractColumn.php
+++ b/src/ZfcDatagrid/Column/AbstractColumn.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column;
 
 use ZfcDatagrid\Column\Formatter\AbstractFormatter;
@@ -11,7 +12,6 @@ abstract class AbstractColumn
     protected $uniqueId;
 
     /**
-     *
      * @var Type\AbstractType
      */
     protected $type = null;
@@ -35,7 +35,6 @@ abstract class AbstractColumn
     protected $filterDefaultOperation = null;
 
     /**
-     *
      * @var null array
      */
     protected $filterSelectOptions;
@@ -62,7 +61,6 @@ abstract class AbstractColumn
     protected $formatters = [];
 
     /**
-     *
      * @param $name
      */
     public function setLabel($name)
@@ -71,7 +69,7 @@ public function setLabel($name)
     }
 
     /**
-     * Get the label
+     * Get the label.
      *
      * @return string null
      */
@@ -81,7 +79,6 @@ public function getLabel()
     }
 
     /**
-     *
      * @param $id
      */
     public function setUniqueId($id)
@@ -90,7 +87,6 @@ public function setUniqueId($id)
     }
 
     /**
-     *
      * @return mixed
      */
     public function getUniqueId()
@@ -101,7 +97,7 @@ public function getUniqueId()
     /**
      * Set the width in "percent"
      * It will be calculated to 100% dependend on what is displayed
-     * If it's a different output mode like Excel it's dependend on the papersize/orientation
+     * If it's a different output mode like Excel it's dependend on the papersize/orientation.
      *
      * @param number $percent
      */
@@ -111,7 +107,7 @@ public function setWidth($percent)
     }
 
     /**
-     * Get the width
+     * Get the width.
      *
      * @return number
      */
@@ -121,9 +117,9 @@ public function getWidth()
     }
 
     /**
-     * Hide or show the column
+     * Hide or show the column.
      *
-     * @param boolean $mode
+     * @param bool $mode
      */
     public function setHidden($mode = true)
     {
@@ -133,7 +129,7 @@ public function setHidden($mode = true)
     /**
      * Is this column hidden?
      *
-     * @return boolean
+     * @return bool
      */
     public function isHidden()
     {
@@ -141,9 +137,9 @@ public function isHidden()
     }
 
     /**
-     * Set this column as primaryKey column
+     * Set this column as primaryKey column.
      *
-     * @param boolean $mode
+     * @param bool $mode
      */
     public function setIdentity($mode = true)
     {
@@ -156,7 +152,7 @@ public function setIdentity($mode = true)
     /**
      * Is this a primaryKey column?
      *
-     * @return boolean
+     * @return bool
      */
     public function isIdentity()
     {
@@ -164,7 +160,7 @@ public function isIdentity()
     }
 
     /**
-     * Set the column type
+     * Set the column type.
      *
      * @param Type\AbstractType $type
      */
@@ -179,7 +175,6 @@ public function setType(Type\AbstractType $type)
     }
 
     /**
-     *
      * @return Type\AbstractType
      */
     public function getType()
@@ -192,7 +187,7 @@ public function getType()
     }
 
     /**
-     * Set styles
+     * Set styles.
      *
      * @param array $styles
      */
@@ -206,7 +201,6 @@ public function setStyles(array $styles)
     }
 
     /**
-     *
      * @param Style\AbstractStyle $style
      */
     public function addStyle(Style\AbstractStyle $style)
@@ -215,7 +209,6 @@ public function addStyle(Style\AbstractStyle $style)
     }
 
     /**
-     *
      * @return Style\AbstractStyle[]
      */
     public function getStyles()
@@ -224,8 +217,7 @@ public function getStyles()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasStyles()
     {
@@ -239,17 +231,17 @@ public function hasStyles()
     /**
      * Is the user allowed to do sort on this column?
      *
-     * @param boolean $mode
+     * @param bool $mode
      */
     public function setUserSortDisabled($mode = true)
     {
-        $this->userSortEnabled = (bool) ! $mode;
+        $this->userSortEnabled = (bool) !$mode;
     }
 
     /**
      * Is user sort enabled?
      *
-     * @return boolean
+     * @return bool
      */
     public function isUserSortEnabled()
     {
@@ -258,21 +250,21 @@ public function isUserSortEnabled()
 
     /**
      * The data will get sorted by this column (by default)
-     * If will be changed by the user per request (POST,GET....)
+     * If will be changed by the user per request (POST,GET....).
      *
-     * @param integer $priority
-     * @param string  $direction
+     * @param int    $priority
+     * @param string $direction
      */
     public function setSortDefault($priority = 1, $direction = 'ASC')
     {
         $this->sortDefault = [
-            'priority'      => $priority,
+            'priority' => $priority,
             'sortDirection' => $direction,
         ];
     }
 
     /**
-     * Get the sort defaults
+     * Get the sort defaults.
      *
      * @return array
      */
@@ -284,7 +276,7 @@ public function getSortDefault()
     /**
      * Does this column has sort defaults?
      *
-     * @return boolean
+     * @return bool
      */
     public function hasSortDefault()
     {
@@ -296,7 +288,7 @@ public function hasSortDefault()
     }
 
     /**
-     * Set that the data is getting sorted by this columns
+     * Set that the data is getting sorted by this columns.
      *
      * @param string $direction
      */
@@ -306,8 +298,7 @@ public function setSortActive($direction = 'ASC')
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function isSortActive()
     {
@@ -319,7 +310,6 @@ public function isSortActive()
     }
 
     /**
-     *
      * @return string
      */
     public function getSortActiveDirection()
@@ -328,19 +318,18 @@ public function getSortActiveDirection()
     }
 
     /**
-     *
-     * @param boolean $mode
+     * @param bool $mode
      */
     public function setUserFilterDisabled($mode = true)
     {
-        $this->userFilterEnabled = (bool) ! $mode;
+        $this->userFilterEnabled = (bool) !$mode;
     }
 
     /**
      * Set the default filterung value (used as long no user filtering getting applied)
      * Examples
      * $grid->setFilterDefaultValue('something');
-     * $grid->setFilterDefaultValue('>20');
+     * $grid->setFilterDefaultValue('>20');.
      *
      * OPERATORS are ALLOWED (like for the user)
      *
@@ -354,7 +343,6 @@ public function setFilterDefaultValue($value = null)
     }
 
     /**
-     *
      * @return string
      */
     public function getFilterDefaultValue()
@@ -363,8 +351,7 @@ public function getFilterDefaultValue()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasFilterDefaultValue()
     {
@@ -376,7 +363,6 @@ public function hasFilterDefaultValue()
     }
 
     /**
-     *
      * @param string $operation
      */
     public function setFilterDefaultOperation($operation = Filter::LIKE)
@@ -385,7 +371,6 @@ public function setFilterDefaultOperation($operation = Filter::LIKE)
     }
 
     /**
-     *
      * @return string
      */
     public function getFilterDefaultOperation()
@@ -398,9 +383,8 @@ public function getFilterDefaultOperation()
     }
 
     /**
-     *
-     * @param array   $options
-     * @param boolean $noSelect
+     * @param array $options
+     * @param bool  $noSelect
      */
     public function setFilterSelectOptions(array $options = null, $noSelect = true)
     {
@@ -416,7 +400,7 @@ public function setFilterSelectOptions(array $options = null, $noSelect = true)
     }
 
     /**
-     * Unset the filter select options (normal search)
+     * Unset the filter select options (normal search).
      */
     public function unsetFilterSelectOptions()
     {
@@ -424,7 +408,6 @@ public function unsetFilterSelectOptions()
     }
 
     /**
-     *
      * @return array null
      */
     public function getFilterSelectOptions()
@@ -433,8 +416,7 @@ public function getFilterSelectOptions()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasFilterSelectOptions()
     {
@@ -446,18 +428,16 @@ public function hasFilterSelectOptions()
     }
 
     /**
-     *
      * @param mixed $value
      */
     public function setFilterActive($value = '')
     {
-        $this->filterActive      = (bool) true;
+        $this->filterActive = (bool) true;
         $this->filterActiveValue = $value;
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function isFilterActive()
     {
@@ -465,7 +445,6 @@ public function isFilterActive()
     }
 
     /**
-     *
      * @return string
      */
     public function getFilterActiveValue()
@@ -474,8 +453,7 @@ public function getFilterActiveValue()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function isUserFilterEnabled()
     {
@@ -483,9 +461,9 @@ public function isUserFilterEnabled()
     }
 
     /**
-     * Enable data translation
+     * Enable data translation.
      *
-     * @param boolean $mode
+     * @param bool $mode
      */
     public function setTranslationEnabled($mode = true)
     {
@@ -495,7 +473,7 @@ public function setTranslationEnabled($mode = true)
     /**
      * Is data translation enabled?
      *
-     * @return boolean
+     * @return bool
      */
     public function isTranslationEnabled()
     {
@@ -503,14 +481,14 @@ public function isTranslationEnabled()
     }
 
     /**
-     * Replace the column values with the applied values
+     * Replace the column values with the applied values.
      *
-     * @param array   $values
-     * @param boolean $notReplacedGetEmpty
+     * @param array $values
+     * @param bool  $notReplacedGetEmpty
      */
     public function setReplaceValues(array $values, $notReplacedGetEmpty = true)
     {
-        $this->replaceValues       = $values;
+        $this->replaceValues = $values;
         $this->notReplacedGetEmpty = (bool) $notReplacedGetEmpty;
 
         $this->setFilterDefaultOperation(Filter::EQUAL);
@@ -518,8 +496,7 @@ public function setReplaceValues(array $values, $notReplacedGetEmpty = true)
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasReplaceValues()
     {
@@ -527,7 +504,6 @@ public function hasReplaceValues()
     }
 
     /**
-     *
      * @return array
      */
     public function getReplaceValues()
@@ -536,8 +512,7 @@ public function getReplaceValues()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function notReplacedGetEmpty()
     {
@@ -545,7 +520,7 @@ public function notReplacedGetEmpty()
     }
 
     /**
-     * Set parameter for a specific renderer (currently only supported for jqGrid)
+     * Set parameter for a specific renderer (currently only supported for jqGrid).
      *
      * @param string $name
      * @param mixed  $value
@@ -553,24 +528,24 @@ public function notReplacedGetEmpty()
      */
     public function setRendererParameter($name, $value, $rendererType = 'jqGrid')
     {
-        if (! isset($this->rendererParameter[$rendererType])) {
+        if (!isset($this->rendererParameter[$rendererType])) {
             $this->rendererParameter[$rendererType] = [];
         }
 
-        $parameters        = $this->rendererParameter[$rendererType];
+        $parameters = $this->rendererParameter[$rendererType];
         $parameters[$name] = $value;
 
         $this->rendererParameter[$rendererType] = $parameters;
     }
 
     /**
+     * @param string $rendererName
      *
-     * @param  string $rendererName
      * @return array
      */
     public function getRendererParameters($rendererName = 'jqGrid')
     {
-        if (! isset($this->rendererParameter[$rendererName])) {
+        if (!isset($this->rendererParameter[$rendererName])) {
             $this->rendererParameter[$rendererName] = [];
         }
 
@@ -578,7 +553,7 @@ public function getRendererParameters($rendererName = 'jqGrid')
     }
 
     /**
-     * Set a template formatter and overwrite other formatter
+     * Set a template formatter and overwrite other formatter.
      *
      * @param AbstractFormatter[] $formatters
      */
@@ -588,9 +563,10 @@ public function setFormatters(array $formatters)
     }
 
     /**
-     * Set a template formatter and overwrite other formatter
+     * Set a template formatter and overwrite other formatter.
      *
      * @param AbstractFormatter $formatter
+     *
      * @deprecated please use setFormatters
      */
     public function setFormatter(AbstractFormatter $formatter)
@@ -601,7 +577,7 @@ public function setFormatter(AbstractFormatter $formatter)
     }
 
     /**
-     * add a template formatter in the list
+     * add a template formatter in the list.
      *
      * @param AbstractFormatter $formatter
      */
@@ -611,7 +587,7 @@ public function addFormatter(AbstractFormatter $formatter)
     }
 
     /**
-     * return a list of different formatter
+     * return a list of different formatter.
      *
      * @return AbstractFormatter[]
      */
@@ -621,9 +597,10 @@ public function getFormatters()
     }
 
     /**
-     * return a list of different formatter
+     * return a list of different formatter.
      *
      * @return AbstractFormatter[]
+     *
      * @deprecated please use getFormatters
      */
     public function getFormatter()
@@ -634,8 +611,7 @@ public function getFormatter()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasFormatters()
     {
@@ -654,17 +630,15 @@ public function hasFormatter()
     }
 
     /**
-     *
-     * @param boolean $mode
+     * @param bool $mode
      */
     public function setRowClickDisabled($mode = true)
     {
-        $this->rowClickEnabled = (bool) ! $mode;
+        $this->rowClickEnabled = (bool) !$mode;
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function isRowClickEnabled()
     {
diff --git a/src/ZfcDatagrid/Column/Action.php b/src/ZfcDatagrid/Column/Action.php
index 4f8e4b9a..95afd6b1 100644
--- a/src/ZfcDatagrid/Column/Action.php
+++ b/src/ZfcDatagrid/Column/Action.php
@@ -1,12 +1,12 @@
 <?php
+
 namespace ZfcDatagrid\Column;
 
 /**
  * Action Column
- * IMPORTANT: Will only be shown on HTML renderer
+ * IMPORTANT: Will only be shown on HTML renderer.
  *
  * So Attributes for HTML are valid...
- *
  */
 class Action extends AbstractColumn
 {
@@ -14,7 +14,6 @@ class Action extends AbstractColumn
     private $actions = [];
 
     /**
-     *
      * @param string $uniqueId
      */
     public function __construct($uniqueId = 'action')
@@ -37,7 +36,6 @@ public function addAction(Action\AbstractAction $action)
     }
 
     /**
-     *
      * @return Action\AbstractAction[]
      */
     public function getActions()
diff --git a/src/ZfcDatagrid/Column/Action/AbstractAction.php b/src/ZfcDatagrid/Column/Action/AbstractAction.php
index 2e59fe5e..11d240fb 100644
--- a/src/ZfcDatagrid/Column/Action/AbstractAction.php
+++ b/src/ZfcDatagrid/Column/Action/AbstractAction.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Action;
 
 use ZfcDatagrid\Column;
@@ -10,25 +11,21 @@ abstract class AbstractAction
     const ROW_ID_PLACEHOLDER = ':rowId:';
 
     /**
-     *
      * @var \ZfcDatagrid\Column\AbstractColumn[]
      */
     protected $linkColumnPlaceholders = [];
 
     /**
-     *
      * @var array
      */
     protected $htmlAttributes = [];
 
     /**
-     *
      * @var string
      */
     protected $showOnValueOperator = 'OR';
 
     /**
-     *
      * @var array
      */
     protected $showOnValues = [];
@@ -39,7 +36,7 @@ public function __construct()
     }
 
     /**
-     * Set the link
+     * Set the link.
      *
      * @param string $href
      */
@@ -49,7 +46,6 @@ public function setLink($href)
     }
 
     /**
-     *
      * @return string
      */
     public function getLink()
@@ -60,7 +56,8 @@ public function getLink()
     /**
      * This is needed public for rowClickAction...
      *
-     * @param  array  $row
+     * @param array $row
+     *
      * @return string
      */
     public function getLinkReplaced(array $row)
@@ -77,7 +74,7 @@ public function getLinkReplaced(array $row)
         }
 
         foreach ($this->getLinkColumnPlaceholders() as $col) {
-            $link = str_replace(':' . $col->getUniqueId() . ':', $row[$col->getUniqueId()], $link);
+            $link = str_replace(':'.$col->getUniqueId().':', $row[$col->getUniqueId()], $link);
         }
 
         return $link;
@@ -85,20 +82,20 @@ public function getLinkReplaced(array $row)
 
     /**
      * Get the column row value placeholder
-     * $action->setLink('/myLink/something/id/'.$action->getRowIdPlaceholder().'/something/'.$action->getColumnRowPlaceholder($myCol));
+     * $action->setLink('/myLink/something/id/'.$action->getRowIdPlaceholder().'/something/'.$action->getColumnRowPlaceholder($myCol));.
+     *
+     * @param AbstractColumn $col
      *
-     * @param  AbstractColumn $col
      * @return string
      */
     public function getColumnValuePlaceholder(AbstractColumn $col)
     {
         $this->linkColumnPlaceholders[] = $col;
 
-        return ':' . $col->getUniqueId() . ':';
+        return ':'.$col->getUniqueId().':';
     }
 
     /**
-     *
      * @return \ZfcDatagrid\Column\AbstractColumn[]
      */
     public function getLinkColumnPlaceholders()
@@ -109,7 +106,7 @@ public function getLinkColumnPlaceholders()
     /**
      * Returns the rowId placeholder
      * Can be used e.g.
-     * $action->setLink('/myLink/something/id/'.$action->getRowIdPlaceholder());
+     * $action->setLink('/myLink/something/id/'.$action->getRowIdPlaceholder());.
      *
      * @return string
      */
@@ -119,7 +116,7 @@ public function getRowIdPlaceholder()
     }
 
     /**
-     * Set a HTML attributes
+     * Set a HTML attributes.
      *
      * @param string $name
      * @param string $value
@@ -130,9 +127,10 @@ public function setAttribute($name, $value)
     }
 
     /**
-     * Get a HTML attribute
+     * Get a HTML attribute.
+     *
+     * @param string $name
      *
-     * @param  string $name
      * @return string
      */
     public function getAttribute($name)
@@ -145,7 +143,7 @@ public function getAttribute($name)
     }
 
     /**
-     * Removes an HTML attribute
+     * Removes an HTML attribute.
      *
      * @param string $name
      */
@@ -157,7 +155,7 @@ public function removeAttribute($name)
     }
 
     /**
-     * Get all HTML attributes
+     * Get all HTML attributes.
      *
      * @return array
      */
@@ -167,9 +165,10 @@ public function getAttributes()
     }
 
     /**
-     * Get the string version of the attributes
+     * Get the string version of the attributes.
+     *
+     * @param array $row
      *
-     * @param  array  $row
      * @return string
      */
     protected function getAttributesString(array $row)
@@ -179,14 +178,14 @@ protected function getAttributesString(array $row)
             if ('href' === $attrKey) {
                 $attrValue = $this->getLinkReplaced($row);
             }
-            $attributes[] = $attrKey . '="' . $attrValue . '"';
+            $attributes[] = $attrKey.'="'.$attrValue.'"';
         }
 
         return implode(' ', $attributes);
     }
 
     /**
-     * Set the title attribute
+     * Set the title attribute.
      *
      * @param string $name
      */
@@ -196,7 +195,7 @@ public function setTitle($name)
     }
 
     /**
-     * Get the title attribute
+     * Get the title attribute.
      *
      * @return string
      */
@@ -206,7 +205,7 @@ public function getTitle()
     }
 
     /**
-     * Add a css class
+     * Add a css class.
      *
      * @param string $className
      */
@@ -222,14 +221,14 @@ public function addClass($className)
     }
 
     /**
-     * Display the values with AND or OR (if multiple showOnValues are defined)
+     * Display the values with AND or OR (if multiple showOnValues are defined).
      *
      * @param string $operator
      */
     public function setShowOnValueOperator($operator = 'OR')
     {
         if ($operator != 'AND' && $operator != 'OR') {
-            throw new \InvalidArgumentException('not allowed operator: "' . $operator . '" (AND / OR is allowed)');
+            throw new \InvalidArgumentException('not allowed operator: "'.$operator.'" (AND / OR is allowed)');
         }
 
         $this->showOnValueOperator = (string) $operator;
@@ -237,7 +236,7 @@ public function setShowOnValueOperator($operator = 'OR')
 
     /**
      * Get the show on value operator, e.g.
-     * OR, AND
+     * OR, AND.
      *
      * @return string
      */
@@ -247,7 +246,7 @@ public function getShowOnValueOperator()
     }
 
     /**
-     * Show this action only on the values defined
+     * Show this action only on the values defined.
      *
      * @param Column\AbstractColumn $col
      * @param string                $value
@@ -256,14 +255,13 @@ public function getShowOnValueOperator()
     public function addShowOnValue(Column\AbstractColumn $col, $value = null, $comparison = Filter::EQUAL)
     {
         $this->showOnValues[] = [
-            'column'     => $col,
-            'value'      => $value,
+            'column' => $col,
+            'value' => $value,
             'comparison' => $comparison,
         ];
     }
 
     /**
-     *
      * @return array
      */
     public function getShowOnValues()
@@ -272,8 +270,7 @@ public function getShowOnValues()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasShowOnValues()
     {
@@ -287,8 +284,9 @@ public function hasShowOnValues()
     /**
      * Display this action on this row?
      *
-     * @param  array   $row
-     * @return boolean
+     * @param array $row
+     *
+     * @return bool
      */
     public function isDisplayed(array $row)
     {
@@ -328,19 +326,19 @@ public function isDisplayed(array $row)
     }
 
     /**
-     * Get the HTML from the type
+     * Get the HTML from the type.
      *
      * @return string
      */
     abstract protected function getHtmlType();
 
     /**
+     * @param array $row
      *
-     * @param  array  $row
      * @return string
      */
     public function toHtml(array $row)
     {
-        return '<a ' . $this->getAttributesString($row) . '>' . $this->getHtmlType() . '</a>';
+        return '<a '.$this->getAttributesString($row).'>'.$this->getHtmlType().'</a>';
     }
 }
diff --git a/src/ZfcDatagrid/Column/Action/Button.php b/src/ZfcDatagrid/Column/Action/Button.php
index 7f8dbcdb..e8678d82 100644
--- a/src/ZfcDatagrid/Column/Action/Button.php
+++ b/src/ZfcDatagrid/Column/Action/Button.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Action;
 
 use ZfcDatagrid\Column\AbstractColumn;
@@ -16,7 +17,6 @@ public function __construct()
     }
 
     /**
-     *
      * @param string|AbstractColumn $name
      */
     public function setLabel($name)
@@ -25,7 +25,6 @@ public function setLabel($name)
     }
 
     /**
-     *
      * @return string|AbstractColumn
      */
     public function getLabel()
@@ -34,8 +33,9 @@ public function getLabel()
     }
 
     /**
-     *
      * @return string
+     *
+     * @throws \Exception
      */
     protected function getHtmlType()
     {
@@ -43,8 +43,8 @@ protected function getHtmlType()
     }
 
     /**
+     * @param array $row
      *
-     * @param  array  $row
      * @return string
      */
     public function toHtml(array $row)
@@ -58,6 +58,6 @@ public function toHtml(array $row)
             $label = $row[$label->getUniqueId()];
         }
 
-        return '<a ' . $this->getAttributesString($row) . '>' . $label . '</a>';
+        return '<a '.$this->getAttributesString($row).'>'.$label.'</a>';
     }
 }
diff --git a/src/ZfcDatagrid/Column/Action/Checkbox.php b/src/ZfcDatagrid/Column/Action/Checkbox.php
index 61450254..0f1471b2 100644
--- a/src/ZfcDatagrid/Column/Action/Checkbox.php
+++ b/src/ZfcDatagrid/Column/Action/Checkbox.php
@@ -1,8 +1,8 @@
 <?php
+
 namespace ZfcDatagrid\Column\Action;
 
 /**
- *
  * @todo Checkbox for multi row actions...
  */
 class Checkbox extends AbstractAction
@@ -17,7 +17,6 @@ public function __construct($name = 'rowSelections')
     }
 
     /**
-     *
      * @return string
      */
     protected function getHtmlType()
@@ -33,6 +32,6 @@ public function toHtml(array $row)
         $this->removeAttribute('name');
         $this->removeAttribute('value');
 
-        return '<input type="checkbox" name="' . $this->name . '" value="' . $row['idConcated'] . '" ' . $this->getAttributesString($row) . ' />';
+        return '<input type="checkbox" name="'.$this->name.'" value="'.$row['idConcated'].'" '.$this->getAttributesString($row).' />';
     }
 }
diff --git a/src/ZfcDatagrid/Column/Action/Icon.php b/src/ZfcDatagrid/Column/Action/Icon.php
index a293ced1..f445beb3 100644
--- a/src/ZfcDatagrid/Column/Action/Icon.php
+++ b/src/ZfcDatagrid/Column/Action/Icon.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Action;
 
 class Icon extends AbstractAction
@@ -9,7 +10,7 @@ class Icon extends AbstractAction
 
     /**
      * Set the icon class (CSS)
-     * - used for HTML if provided, overwise the iconLink is used
+     * - used for HTML if provided, overwise the iconLink is used.
      *
      * @param string $name
      */
@@ -19,7 +20,6 @@ public function setIconClass($name)
     }
 
     /**
-     *
      * @return string
      */
     public function getIconClass()
@@ -28,8 +28,7 @@ public function getIconClass()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasIconClass()
     {
@@ -41,7 +40,7 @@ public function hasIconClass()
     }
 
     /**
-     * Set the icon link (is used, if no icon class is provided)
+     * Set the icon link (is used, if no icon class is provided).
      *
      * @param string $httpLink
      */
@@ -51,7 +50,7 @@ public function setIconLink($httpLink)
     }
 
     /**
-     * Get the icon link
+     * Get the icon link.
      *
      * @return string
      */
@@ -61,8 +60,7 @@ public function getIconLink()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasIconLink()
     {
@@ -74,17 +72,16 @@ public function hasIconLink()
     }
 
     /**
-     *
      * @return string
      */
     protected function getHtmlType()
     {
         if ($this->hasIconClass() === true) {
             // a css class is provided, so use it
-            return '<i class="' . $this->getIconClass() . '"></i>';
+            return '<i class="'.$this->getIconClass().'"></i>';
         } elseif ($this->hasIconLink() === true) {
             // no css class -> use the icon link instead
-            return '<img src="' . $this->getIconLink() . '" />';
+            return '<img src="'.$this->getIconLink().'" />';
         }
 
         throw new \InvalidArgumentException('Either a link or a class for the icon is required');
diff --git a/src/ZfcDatagrid/Column/DataPopulation/DataPopulationInterface.php b/src/ZfcDatagrid/Column/DataPopulation/DataPopulationInterface.php
index a9caac90..7bf9faf0 100644
--- a/src/ZfcDatagrid/Column/DataPopulation/DataPopulationInterface.php
+++ b/src/ZfcDatagrid/Column/DataPopulation/DataPopulationInterface.php
@@ -1,17 +1,18 @@
 <?php
+
 namespace ZfcDatagrid\Column\DataPopulation;
 
 interface DataPopulationInterface
 {
     /**
-     * Return the result
+     * Return the result.
      *
      * @return string
      */
     public function toString();
 
     /**
-     * Directy set a parameter for the object
+     * Directy set a parameter for the object.
      *
      * @param string $name
      * @param mixed  $value
@@ -19,7 +20,6 @@ public function toString();
     public function setObjectParameter($name, $value);
 
     /**
-     *
      * @return array
      */
     public function getObjectParametersColumn();
diff --git a/src/ZfcDatagrid/Column/DataPopulation/Object.php b/src/ZfcDatagrid/Column/DataPopulation/Object.php
index df510765..56c34682 100644
--- a/src/ZfcDatagrid/Column/DataPopulation/Object.php
+++ b/src/ZfcDatagrid/Column/DataPopulation/Object.php
@@ -1,28 +1,27 @@
 <?php
+
 namespace ZfcDatagrid\Column\DataPopulation;
 
 use ZfcDatagrid\Column;
 
 /**
- * Get the data from an external object
+ * Get the data from an external object.
  */
 class Object implements DataPopulationInterface
 {
     /**
-     *
      * @var ObjectAwareInterface
      */
     private $object;
 
     /**
-     *
      * @var array
      */
     private $objectParameters = [];
 
     /**
+     * @param ObjectAwareInterface $object
      *
-     * @param  ObjectAwareInterface $object
      * @throws \Exception
      */
     public function setObject(ObjectAwareInterface $object)
@@ -31,7 +30,6 @@ public function setObject(ObjectAwareInterface $object)
     }
 
     /**
-     *
      * @return ObjectAwareInterface
      */
     public function getObject()
@@ -40,7 +38,7 @@ public function getObject()
     }
 
     /**
-     * Apply a dynamic parameter based on row/column value
+     * Apply a dynamic parameter based on row/column value.
      *
      * @param string                $objectParameterName
      * @param Column\AbstractColumn $column
@@ -49,12 +47,11 @@ public function addObjectParameterColumn($objectParameterName, Column\AbstractCo
     {
         $this->objectParameters[] = [
             'objectParameterName' => $objectParameterName,
-            'column'              => $column,
+            'column' => $column,
         ];
     }
 
     /**
-     *
      * @return array
      */
     public function getObjectParametersColumn()
@@ -63,7 +60,7 @@ public function getObjectParametersColumn()
     }
 
     /**
-     * Directly apply a "static" parameter
+     * Directly apply a "static" parameter.
      *
      * @param string $name
      * @param mixed  $value
@@ -74,7 +71,6 @@ public function setObjectParameter($name, $value)
     }
 
     /**
-     *
      * @return string
      */
     public function toString()
diff --git a/src/ZfcDatagrid/Column/DataPopulation/Object/Gravatar.php b/src/ZfcDatagrid/Column/DataPopulation/Object/Gravatar.php
index a9313117..855b661e 100644
--- a/src/ZfcDatagrid/Column/DataPopulation/Object/Gravatar.php
+++ b/src/ZfcDatagrid/Column/DataPopulation/Object/Gravatar.php
@@ -1,17 +1,18 @@
 <?php
+
 namespace ZfcDatagrid\Column\DataPopulation\Object;
 
 use ZfcDatagrid\Column\DataPopulation\ObjectAwareInterface;
 
 class Gravatar implements ObjectAwareInterface
 {
-    /** @var  string */
+    /** @var string */
     protected $email;
 
     /**
+     * @param string $name
+     * @param mixed  $value
      *
-     * @param  string     $name
-     * @param  mixed      $value
      * @throws \Exception
      */
     private function setParameter($name, $value)
@@ -23,13 +24,14 @@ private function setParameter($name, $value)
                 break;
 
             default:
-                throw new \InvalidArgumentException('Not allowed parameter: ' . $name);
+                throw new \InvalidArgumentException('Not allowed parameter: '.$name);
                 break;
         }
     }
 
     /**
-     * (non-PHPdoc)
+     * (non-PHPdoc).
+     *
      * @see \ZfcDatagrid\Column\DataPopulation\ObjectAwareInterface::setParameterFromColumn()
      */
     public function setParameterFromColumn($name, $value)
@@ -38,7 +40,8 @@ public function setParameterFromColumn($name, $value)
     }
 
     /**
-     * (non-PHPdoc)
+     * (non-PHPdoc).
+     *
      * @see \ZfcDatagrid\Column\DataPopulation\ObjectAwareInterface::toString()
      */
     public function toString()
@@ -48,6 +51,6 @@ public function toString()
             $hash = md5($this->email);
         }
 
-        return 'http://www.gravatar.com/avatar/' . $hash;
+        return 'http://www.gravatar.com/avatar/'.$hash;
     }
 }
diff --git a/src/ZfcDatagrid/Column/DataPopulation/ObjectAwareInterface.php b/src/ZfcDatagrid/Column/DataPopulation/ObjectAwareInterface.php
index a60a8006..95e585be 100644
--- a/src/ZfcDatagrid/Column/DataPopulation/ObjectAwareInterface.php
+++ b/src/ZfcDatagrid/Column/DataPopulation/ObjectAwareInterface.php
@@ -1,10 +1,11 @@
 <?php
+
 namespace ZfcDatagrid\Column\DataPopulation;
 
 interface ObjectAwareInterface
 {
     /**
-     * Set a parameter based on the row column value
+     * Set a parameter based on the row column value.
      *
      * @param string $name
      * @param mixed  $value
@@ -12,7 +13,7 @@ interface ObjectAwareInterface
     public function setParameterFromColumn($name, $value);
 
     /**
-     * Return the result based on the parameters
+     * Return the result based on the parameters.
      *
      * @return string
      */
diff --git a/src/ZfcDatagrid/Column/DataPopulation/StaticValue.php b/src/ZfcDatagrid/Column/DataPopulation/StaticValue.php
index 723bc84c..fa246b2e 100644
--- a/src/ZfcDatagrid/Column/DataPopulation/StaticValue.php
+++ b/src/ZfcDatagrid/Column/DataPopulation/StaticValue.php
@@ -1,9 +1,10 @@
 <?php
+
 namespace ZfcDatagrid\Column\DataPopulation;
 
 class StaticValue implements DataPopulationInterface
 {
-    /** @var  mixed */
+    /** @var mixed */
     private $value;
 
     /**
@@ -31,8 +32,9 @@ public function getValue()
     }
 
     /**
-     * @param  string     $name
-     * @param  mixed      $value
+     * @param string $name
+     * @param mixed  $value
+     *
      * @throws \Exception
      */
     public function setObjectParameter($name, $value)
diff --git a/src/ZfcDatagrid/Column/ExternalData.php b/src/ZfcDatagrid/Column/ExternalData.php
index f1c2f280..35ec25a4 100644
--- a/src/ZfcDatagrid/Column/ExternalData.php
+++ b/src/ZfcDatagrid/Column/ExternalData.php
@@ -1,10 +1,10 @@
 <?php
+
 namespace ZfcDatagrid\Column;
 
 class ExternalData extends AbstractColumn
 {
     /**
-     *
      * @var DataPopulation\DataPopulationInterface
      */
     protected $dataPopulation;
@@ -18,8 +18,8 @@ public function __construct($uniqueId = 'external')
     }
 
     /**
+     * @param DataPopulation\DataPopulationInterface $dataPopulation
      *
-     * @param  DataPopulation\DataPopulationInterface $dataPopulation
      * @throws \Exception
      */
     public function setDataPopulation(DataPopulation\DataPopulationInterface $dataPopulation)
@@ -32,8 +32,8 @@ public function setDataPopulation(DataPopulation\DataPopulationInterface $dataPo
     }
 
     /**
-     *
      * @return DataPopulation\DataPopulationInterface
+     *
      * @throws \InvalidArgumentException
      */
     public function getDataPopulation()
@@ -46,8 +46,7 @@ public function getDataPopulation()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasDataPopulation()
     {
diff --git a/src/ZfcDatagrid/Column/Formatter/AbstractFormatter.php b/src/ZfcDatagrid/Column/Formatter/AbstractFormatter.php
index 15e85cd3..abb4b699 100644
--- a/src/ZfcDatagrid/Column/Formatter/AbstractFormatter.php
+++ b/src/ZfcDatagrid/Column/Formatter/AbstractFormatter.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Formatter;
 
 use ZfcDatagrid\Column\AbstractColumn;
@@ -23,7 +24,6 @@ public function setRowData(array $data)
     }
 
     /**
-     *
      * @return array
      */
     public function getRowData()
@@ -32,7 +32,6 @@ public function getRowData()
     }
 
     /**
-     *
      * @param string $name
      */
     public function setRendererName($name = null)
@@ -41,7 +40,6 @@ public function setRendererName($name = null)
     }
 
     /**
-     *
      * @return string null
      */
     public function getRendererName()
@@ -50,7 +48,6 @@ public function getRendererName()
     }
 
     /**
-     *
      * @param array $validRendrerers
      */
     public function setValidRendererNames(array $validRendrerers)
@@ -59,7 +56,6 @@ public function setValidRendererNames(array $validRendrerers)
     }
 
     /**
-     *
      * @return array
      */
     public function getValidRendererNames()
@@ -68,8 +64,7 @@ public function getValidRendererNames()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function isApply()
     {
@@ -81,8 +76,8 @@ public function isApply()
     }
 
     /**
+     * @param AbstractColumn $column
      *
-     * @param  AbstractColumn $column
      * @return string
      */
     public function format(AbstractColumn $column)
@@ -96,7 +91,6 @@ public function format(AbstractColumn $column)
     }
 
     /**
-     *
      * @param AbstractColumn $column
      *
      * @return string
diff --git a/src/ZfcDatagrid/Column/Formatter/Email.php b/src/ZfcDatagrid/Column/Formatter/Email.php
index 9004a44a..988f97fc 100644
--- a/src/ZfcDatagrid/Column/Formatter/Email.php
+++ b/src/ZfcDatagrid/Column/Formatter/Email.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Formatter;
 
 use ZfcDatagrid\Column\AbstractColumn;
@@ -12,14 +13,14 @@ class Email extends AbstractFormatter
     ];
 
     /**
+     * @param AbstractColumn $column
      *
-     * @param  AbstractColumn $column
      * @return string
      */
     public function getFormattedValue(AbstractColumn $column)
     {
         $row = $this->getRowData();
 
-        return '<a href="mailto:' . $row[$column->getUniqueId()] . '">' . $row[$column->getUniqueId()] . '</a>';
+        return '<a href="mailto:'.$row[$column->getUniqueId()].'">'.$row[$column->getUniqueId()].'</a>';
     }
 }
diff --git a/src/ZfcDatagrid/Column/Formatter/FileSize.php b/src/ZfcDatagrid/Column/Formatter/FileSize.php
index 1fcddf6d..0d151097 100644
--- a/src/ZfcDatagrid/Column/Formatter/FileSize.php
+++ b/src/ZfcDatagrid/Column/Formatter/FileSize.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Formatter;
 
 use ZfcDatagrid\Column\AbstractColumn;
@@ -34,13 +35,13 @@ public function isApply()
     }
 
     /**
-     * The value should be in bytes
+     * The value should be in bytes.
      *
      * @see \ZfcDatagrid\Column\Formatter\AbstractFormatter::getFormattedValue()
      */
     public function getFormattedValue(AbstractColumn $column)
     {
-        $row   = $this->getRowData();
+        $row = $this->getRowData();
         $value = $row[$column->getUniqueId()];
 
         if ('' == $value) {
@@ -50,7 +51,7 @@ public function getFormattedValue(AbstractColumn $column)
         $index = 0;
         while ($value >= 1024 && $index < count(self::$prefixes)) {
             $value = $value / 1024;
-            $index ++;
+            ++$index;
         }
 
         return sprintf('%1.2f %sB', $value, self::$prefixes[$index]);
diff --git a/src/ZfcDatagrid/Column/Formatter/GenerateLink.php b/src/ZfcDatagrid/Column/Formatter/GenerateLink.php
index 90438303..de8ea402 100644
--- a/src/ZfcDatagrid/Column/Formatter/GenerateLink.php
+++ b/src/ZfcDatagrid/Column/Formatter/GenerateLink.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Formatter;
 
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -13,13 +14,13 @@ class GenerateLink extends AbstractFormatter
         'bootstrapTable',
     ];
 
-    /** @var  string */
+    /** @var string */
     protected $route;
-    /** @var  array */
+    /** @var array */
     protected $routeParams;
-    /** @var  string|null */
+    /** @var string|null */
     protected $routeKey;
-    /** @var  \Zend\View\Renderer\PhpRenderer */
+    /** @var \Zend\View\Renderer\PhpRenderer */
     protected $viewRenderer;
 
     /**
@@ -30,7 +31,7 @@ class GenerateLink extends AbstractFormatter
      */
     public function __construct($viewRenderer, $route, $key = null, $params = [])
     {
-        /**
+        /*
          * old fallback that should be removed in 2.0
          * TODO remove in 2.0
          */
@@ -45,12 +46,13 @@ public function __construct($viewRenderer, $route, $key = null, $params = [])
     }
 
     /**
-     * @param  AbstractColumn $column
+     * @param AbstractColumn $column
+     *
      * @return string
      */
     public function getFormattedValue(AbstractColumn $column)
     {
-        $row   = $this->getRowData();
+        $row = $this->getRowData();
         $value = $row[$column->getUniqueId()];
 
         $routeKey = !is_null($this->getRouteKey()) ?
@@ -58,7 +60,7 @@ public function getFormattedValue(AbstractColumn $column)
             :
             $column->getUniqueId();
 
-        $params            = $this->getRouteParams();
+        $params = $this->getRouteParams();
         $params[$routeKey] = $value;
 
         $url = (string) $this->getViewRenderer()->url($this->getRoute(), $params);
@@ -75,7 +77,8 @@ public function getViewRenderer()
     }
 
     /**
-     * @param  \Zend\View\Renderer\PhpRenderer $viewRenderer
+     * @param \Zend\View\Renderer\PhpRenderer $viewRenderer
+     *
      * @return self
      */
     public function setViewRenderer($viewRenderer)
diff --git a/src/ZfcDatagrid/Column/Formatter/HtmlTag.php b/src/ZfcDatagrid/Column/Formatter/HtmlTag.php
index 463a0d16..d34c392a 100644
--- a/src/ZfcDatagrid/Column/Formatter/HtmlTag.php
+++ b/src/ZfcDatagrid/Column/Formatter/HtmlTag.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Formatter;
 
 use ZfcDatagrid\Column\AbstractColumn;
@@ -21,13 +22,11 @@ class HtmlTag extends AbstractFormatter
     protected $name = 'span';
 
     /**
-     *
      * @var AbstractColumn[]
      */
     protected $linkColumnPlaceholders = [];
 
     /**
-     *
      * @var array
      */
     protected $attributes = [];
@@ -49,7 +48,7 @@ public function getName()
     }
 
     /**
-     * Set a HTML attributes
+     * Set a HTML attributes.
      *
      * @param string $name
      * @param string $value
@@ -60,9 +59,10 @@ public function setAttribute($name, $value)
     }
 
     /**
-     * Get a HTML attribute
+     * Get a HTML attribute.
+     *
+     * @param string $name
      *
-     * @param  string $name
      * @return string
      */
     public function getAttribute($name)
@@ -75,7 +75,7 @@ public function getAttribute($name)
     }
 
     /**
-     * Removes an HTML attribute
+     * Removes an HTML attribute.
      *
      * @param string $name
      */
@@ -87,7 +87,7 @@ public function removeAttribute($name)
     }
 
     /**
-     * Get all HTML attributes
+     * Get all HTML attributes.
      *
      * @return array
      */
@@ -97,7 +97,7 @@ public function getAttributes()
     }
 
     /**
-     * Set the link
+     * Set the link.
      *
      * @param string $href
      */
@@ -107,7 +107,6 @@ public function setLink($href)
     }
 
     /**
-     *
      * @return string
      */
     public function getLink()
@@ -117,20 +116,20 @@ public function getLink()
 
     /**
      * Get the column row value placeholder
-     * $fmt->setLink('/myLink/something/'.$fmt->getColumnValuePlaceholder($myCol));
+     * $fmt->setLink('/myLink/something/'.$fmt->getColumnValuePlaceholder($myCol));.
+     *
+     * @param AbstractColumn $col
      *
-     * @param  AbstractColumn $col
      * @return string
      */
     public function getColumnValuePlaceholder(AbstractColumn $col)
     {
         $this->linkColumnPlaceholders[] = $col;
 
-        return ':' . $col->getUniqueId() . ':';
+        return ':'.$col->getUniqueId().':';
     }
 
     /**
-     *
      * @return AbstractColumn[]
      */
     public function getLinkColumnPlaceholders()
@@ -139,7 +138,7 @@ public function getLinkColumnPlaceholders()
     }
 
     /**
-     * Returns the rowId placeholder
+     * Returns the rowId placeholder.
      *
      * @return string
      */
@@ -149,7 +148,8 @@ public function getRowIdPlaceholder()
     }
 
     /**
-     * @param  AbstractColumn $col
+     * @param AbstractColumn $col
+     *
      * @return string
      */
     public function getFormattedValue(AbstractColumn $col)
@@ -160,9 +160,10 @@ public function getFormattedValue(AbstractColumn $col)
     }
 
     /**
-     * Get the string version of the attributes
+     * Get the string version of the attributes.
+     *
+     * @param AbstractColumn $col
      *
-     * @param  AbstractColumn $col
      * @return string
      */
     protected function getAttributesString(AbstractColumn $col)
@@ -172,7 +173,7 @@ protected function getAttributesString(AbstractColumn $col)
             if ('href' === $attrKey) {
                 $attrValue = $this->getLinkReplaced($col);
             }
-            $attributes[] = $attrKey . '="' . $attrValue . '"';
+            $attributes[] = $attrKey.'="'.$attrValue.'"';
         }
 
         return implode(' ', $attributes);
@@ -181,7 +182,8 @@ protected function getAttributesString(AbstractColumn $col)
     /**
      * This is needed public for rowClickAction...
      *
-     * @param  AbstractColumn $col
+     * @param AbstractColumn $col
+     *
      * @return string
      */
     protected function getLinkReplaced(AbstractColumn $col)
@@ -203,7 +205,7 @@ protected function getLinkReplaced(AbstractColumn $col)
         }
 
         foreach ($this->getLinkColumnPlaceholders() as $col) {
-            $link = str_replace(':' . $col->getUniqueId() . ':', rawurlencode($row[$col->getUniqueId()]), $link);
+            $link = str_replace(':'.$col->getUniqueId().':', rawurlencode($row[$col->getUniqueId()]), $link);
         }
 
         return $link;
diff --git a/src/ZfcDatagrid/Column/Formatter/Image.php b/src/ZfcDatagrid/Column/Formatter/Image.php
index 5c2ab409..646fbba6 100644
--- a/src/ZfcDatagrid/Column/Formatter/Image.php
+++ b/src/ZfcDatagrid/Column/Formatter/Image.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Formatter;
 
 use ZfcDatagrid\Column\AbstractColumn;
@@ -38,7 +39,8 @@ public function getLinkAttributes()
     }
 
     /**
-     * Get the prefix
+     * Get the prefix.
+     *
      * @return string
      */
     public function getPrefix()
@@ -47,7 +49,8 @@ public function getPrefix()
     }
 
     /**
-     * Set the prefix of the image path and the prefix of the link
+     * Set the prefix of the image path and the prefix of the link.
+     *
      * @param string $prefix
      */
     public function setPrefix($prefix)
@@ -57,8 +60,8 @@ public function setPrefix($prefix)
 
     public function getFormattedValue(AbstractColumn $column)
     {
-        $row    = $this->getRowData();
-        $value  = $row[$column->getUniqueId()];
+        $row = $this->getRowData();
+        $value = $row[$column->getUniqueId()];
         $prefix = $this->getPrefix();
 
         if (is_array($value)) {
@@ -70,20 +73,20 @@ public function getFormattedValue(AbstractColumn $column)
                 $original = $thumb;
             }
         } else {
-            $thumb    = $value;
+            $thumb = $value;
             $original = $value;
         }
 
         $linkAttributes = [];
         foreach ($this->getLinkAttributes() as $key => $value) {
-            $linkAttributes[] = $key . '="' . $value . '"';
+            $linkAttributes[] = $key.'="'.$value.'"';
         }
 
         $attributes = [];
         foreach ($this->getAttributes() as $key => $value) {
-            $attributes[] = $key . '="' . $value . '"';
+            $attributes[] = $key.'="'.$value.'"';
         }
 
-        return '<a href="' . $prefix . $original . '" ' . implode(' ', $linkAttributes) . '><img src="' . $prefix . $thumb . '" ' . implode(' ', $attributes) . ' /></a>';
+        return '<a href="'.$prefix.$original.'" '.implode(' ', $linkAttributes).'><img src="'.$prefix.$thumb.'" '.implode(' ', $attributes).' /></a>';
     }
 }
diff --git a/src/ZfcDatagrid/Column/Formatter/Link.php b/src/ZfcDatagrid/Column/Formatter/Link.php
index 674729fb..f7e7dc3b 100644
--- a/src/ZfcDatagrid/Column/Formatter/Link.php
+++ b/src/ZfcDatagrid/Column/Formatter/Link.php
@@ -1,10 +1,10 @@
 <?php
+
 namespace ZfcDatagrid\Column\Formatter;
 
 class Link extends HtmlTag
 {
     /**
-     *
      * @var array
      */
     protected $attributes = [
@@ -12,7 +12,6 @@ class Link extends HtmlTag
     ];
 
     /**
-     *
      * @var string
      */
     protected $name = 'a';
diff --git a/src/ZfcDatagrid/Column/Select.php b/src/ZfcDatagrid/Column/Select.php
index 7d3160c0..39c2ebd1 100644
--- a/src/ZfcDatagrid/Column/Select.php
+++ b/src/ZfcDatagrid/Column/Select.php
@@ -1,17 +1,18 @@
 <?php
+
 namespace ZfcDatagrid\Column;
 
 class Select extends AbstractColumn
 {
-    /** @var  string */
+    /** @var string */
     protected $selectPart1;
 
-    /** @var string|object|null  */
+    /** @var string|object|null */
     protected $selectPart2 = null;
 
     /**
      * Specific column function filter e.g.
-     * WHERE MONTH(%s)
+     * WHERE MONTH(%s).
      *
      * @var string
      */
@@ -24,21 +25,22 @@ class Select extends AbstractColumn
      * $column = new Column('title')
      * Just the title from an array -> UNIQUE will be just the first parameter
      * $column = new Column('(SELECT GROUP_CONCAT....)', 'someAlias')
-     * Use the subselect -> UNIQUE will be the second parameter
+     * Use the subselect -> UNIQUE will be the second parameter.
+     *
+     * @param string|object $columnOrIndexOrObject
+     * @param string        $tableOrAliasOrUniqueId
      *
-     * @param  string|object $columnOrIndexOrObject
-     * @param  string        $tableOrAliasOrUniqueId
      * @throws \Exception
      */
     public function __construct($columnOrIndexOrObject, $tableOrAliasOrUniqueId = null)
     {
-        if ($tableOrAliasOrUniqueId !== null && ! is_string($tableOrAliasOrUniqueId)) {
+        if ($tableOrAliasOrUniqueId !== null && !is_string($tableOrAliasOrUniqueId)) {
             throw new \Exception('Variable $tableOrAliasOrUniqueId must be null or a string');
         }
 
         if (is_string($columnOrIndexOrObject) && $tableOrAliasOrUniqueId !== null) {
             // $column = new Column('id', 'user')
-            $this->setUniqueId($tableOrAliasOrUniqueId . '_' . $columnOrIndexOrObject);
+            $this->setUniqueId($tableOrAliasOrUniqueId.'_'.$columnOrIndexOrObject);
             $this->setSelect($tableOrAliasOrUniqueId, $columnOrIndexOrObject);
         } elseif (is_string($columnOrIndexOrObject)) {
             // $column = new Column('title')
@@ -54,7 +56,6 @@ public function __construct($columnOrIndexOrObject, $tableOrAliasOrUniqueId = nu
     }
 
     /**
-     *
      * @params string $part1
      * @params string|object|null $part2
      */
@@ -65,7 +66,6 @@ public function setSelect($part1, $part2 = null)
     }
 
     /**
-     *
      * @return string
      */
     public function getSelectPart1()
@@ -74,7 +74,6 @@ public function getSelectPart1()
     }
 
     /**
-     *
      * @return string|object|null
      */
     public function getSelectPart2()
@@ -83,7 +82,6 @@ public function getSelectPart2()
     }
 
     /**
-     *
      * @param string $filterSelectExpression
      */
     public function setFilterSelectExpression($filterSelectExpression)
@@ -92,7 +90,6 @@ public function setFilterSelectExpression($filterSelectExpression)
     }
 
     /**
-     *
      * @return string
      */
     public function getFilterSelectExpression()
@@ -101,8 +98,7 @@ public function getFilterSelectExpression()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasFilterSelectExpression()
     {
diff --git a/src/ZfcDatagrid/Column/Style/AbstractColor.php b/src/ZfcDatagrid/Column/Style/AbstractColor.php
index cad1648d..99831ac5 100644
--- a/src/ZfcDatagrid/Column/Style/AbstractColor.php
+++ b/src/ZfcDatagrid/Column/Style/AbstractColor.php
@@ -1,13 +1,14 @@
 <?php
+
 namespace ZfcDatagrid\Column\Style;
 
 /**
- * Abstract color class for font and backgroundColor
+ * Abstract color class for font and backgroundColor.
  */
 class AbstractColor extends AbstractStyle
 {
     /**
-     * Array values are RGB (red, green,blue)
+     * Array values are RGB (red, green,blue).
      *
      * @var array
      */
@@ -18,7 +19,6 @@ class AbstractColor extends AbstractStyle
     ];
 
     /**
-     *
      * @var array
      */
     public static $GREEN = [
@@ -28,7 +28,6 @@ class AbstractColor extends AbstractStyle
     ];
 
     /**
-     *
      * @var array
      */
     public static $BLUE = [
@@ -44,14 +43,14 @@ class AbstractColor extends AbstractStyle
     protected $blue;
 
     /**
-     * Set red green blue
+     * Set red green blue.
      *
-     * @param mixed   $redOrStaticOrArray
-     *                                    0-255
-     * @param integer $green
-     *                                    0-255
-     * @param integer $blue
-     *                                    0-255
+     * @param mixed $redOrStaticOrArray
+     *                                  0-255
+     * @param int   $green
+     *                                  0-255
+     * @param int   $blue
+     *                                  0-255
      */
     public function __construct($redOrStaticOrArray, $green = null, $blue = null)
     {
@@ -61,31 +60,30 @@ public function __construct($redOrStaticOrArray, $green = null, $blue = null)
             $red = $redOrStaticOrArray;
         }
 
-        $this->red   = (int) $red;
+        $this->red = (int) $red;
         $this->green = (int) $green;
-        $this->blue  = (int) $blue;
+        $this->blue = (int) $blue;
     }
 
     /**
-     * Set the RGB
+     * Set the RGB.
      *
-     * @param int     $red
-     *                       integer 0-255
-     * @param integer $green
-     *                       0-255
-     * @param integer $blue
-     *                       0-255
+     * @param int $red
+     *                   integer 0-255
+     * @param int $green
+     *                   0-255
+     * @param int $blue
+     *                   0-255
      */
     public function setRgb($red, $green, $blue)
     {
-        $this->red   = (int) $red;
+        $this->red = (int) $red;
         $this->green = (int) $green;
-        $this->blue  = (int) $blue;
+        $this->blue = (int) $blue;
     }
 
     /**
-     *
-     * @param integer $red
+     * @param int $red
      */
     public function setRed($red)
     {
@@ -93,8 +91,7 @@ public function setRed($red)
     }
 
     /**
-     *
-     * @return integer
+     * @return int
      */
     public function getRed()
     {
@@ -102,8 +99,7 @@ public function getRed()
     }
 
     /**
-     *
-     * @param integer $green
+     * @param int $green
      */
     public function setGreen($green)
     {
@@ -111,8 +107,7 @@ public function setGreen($green)
     }
 
     /**
-     *
-     * @return integer
+     * @return int
      */
     public function getGreen()
     {
@@ -120,8 +115,7 @@ public function getGreen()
     }
 
     /**
-     *
-     * @param integer $blue
+     * @param int $blue
      */
     public function setBlue($blue)
     {
@@ -129,8 +123,7 @@ public function setBlue($blue)
     }
 
     /**
-     *
-     * @return integer
+     * @return int
      */
     public function getBlue()
     {
@@ -138,20 +131,19 @@ public function getBlue()
     }
 
     /**
-     *
      * @return array
      */
     public function getRgbArray()
     {
         return [
-            'red'   => $this->getRed(),
+            'red' => $this->getRed(),
             'green' => $this->getGreen(),
-            'blue'  => $this->getBlue(),
+            'blue' => $this->getBlue(),
         ];
     }
 
     /**
-     * Convert RGB dec to hex as a string
+     * Convert RGB dec to hex as a string.
      *
      * @return string
      */
@@ -159,17 +151,17 @@ public function getRgbHexString()
     {
         $red = dechex($this->getRed());
         if (strlen($red) === 1) {
-            $red = '0' . $red;
+            $red = '0'.$red;
         }
         $green = dechex($this->getGreen());
         if (strlen($green) === 1) {
-            $green = '0' . $green;
+            $green = '0'.$green;
         }
         $blue = dechex($this->getBlue());
         if (strlen($blue) === 1) {
-            $blue = '0' . $blue;
+            $blue = '0'.$blue;
         }
 
-        return $red . $green . $blue;
+        return $red.$green.$blue;
     }
 }
diff --git a/src/ZfcDatagrid/Column/Style/AbstractStyle.php b/src/ZfcDatagrid/Column/Style/AbstractStyle.php
index 11bac4be..2ed7b78e 100644
--- a/src/ZfcDatagrid/Column/Style/AbstractStyle.php
+++ b/src/ZfcDatagrid/Column/Style/AbstractStyle.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Style;
 
 use ZfcDatagrid\Column\AbstractColumn;
@@ -9,20 +10,19 @@ abstract class AbstractStyle
     protected $byValueOperator = 'OR';
 
     /**
-     *
      * @var array
      */
     private $byValues = [];
 
     /**
-     * Display the values with AND or OR (if multiple showOnValues are defined)
+     * Display the values with AND or OR (if multiple showOnValues are defined).
      *
      * @param string $operator
      */
     public function setByValueOperator($operator = 'OR')
     {
         if ($operator != 'AND' && $operator != 'OR') {
-            throw new \InvalidArgumentException('not allowed operator: "' . $operator . '" (AND / OR is allowed)');
+            throw new \InvalidArgumentException('not allowed operator: "'.$operator.'" (AND / OR is allowed)');
         }
 
         $this->byValueOperator = (string) $operator;
@@ -30,7 +30,7 @@ public function setByValueOperator($operator = 'OR')
 
     /**
      * Get the show on value operator, e.g.
-     * OR, AND
+     * OR, AND.
      *
      * @return string
      */
@@ -40,7 +40,7 @@ public function getByValueOperator()
     }
 
     /**
-     * Set the style value based and not general
+     * Set the style value based and not general.
      *
      * @param AbstractColumn $column
      * @param mixed          $value
@@ -49,14 +49,13 @@ public function getByValueOperator()
     public function addByValue(AbstractColumn $column, $value, $operator = Filter::EQUAL)
     {
         $this->byValues[] = [
-            'column'   => $column,
-            'value'    => $value,
+            'column' => $column,
+            'value' => $value,
             'operator' => $operator,
         ];
     }
 
     /**
-     *
      * @return array
      */
     public function getByValues()
@@ -65,8 +64,7 @@ public function getByValues()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasByValues()
     {
@@ -78,9 +76,9 @@ public function hasByValues()
     }
 
     /**
+     * @param array $row
      *
-     * @param  array   $row
-     * @return boolean
+     * @return bool
      */
     public function isApply(array $row)
     {
diff --git a/src/ZfcDatagrid/Column/Style/Align.php b/src/ZfcDatagrid/Column/Style/Align.php
index 3162f422..72419426 100644
--- a/src/ZfcDatagrid/Column/Style/Align.php
+++ b/src/ZfcDatagrid/Column/Style/Align.php
@@ -1,34 +1,30 @@
 <?php
+
 namespace ZfcDatagrid\Column\Style;
 
 class Align extends AbstractStyle
 {
     /**
-     *
      * @var string
      */
     public static $LEFT = 'left';
 
     /**
-     *
      * @var string
      */
     public static $RIGHT = 'right';
 
     /**
-     *
      * @var string
      */
     public static $CENTER = 'center';
 
     /**
-     *
      * @var string
      */
     public static $JUSTIFY = 'justify';
 
     /**
-     *
      * @var string
      */
     protected $alignment;
@@ -46,7 +42,6 @@ public function __construct($alignment = null)
     }
 
     /**
-     *
      * @param string $alignment
      */
     public function setAlignment($alignment)
@@ -55,7 +50,6 @@ public function setAlignment($alignment)
     }
 
     /**
-     *
      * @return string
      */
     public function getAlignment()
diff --git a/src/ZfcDatagrid/Column/Style/BackgroundColor.php b/src/ZfcDatagrid/Column/Style/BackgroundColor.php
index 41d804c7..12ca48d3 100644
--- a/src/ZfcDatagrid/Column/Style/BackgroundColor.php
+++ b/src/ZfcDatagrid/Column/Style/BackgroundColor.php
@@ -1,8 +1,9 @@
 <?php
+
 namespace ZfcDatagrid\Column\Style;
 
 /**
- * Background color of a column/row
+ * Background color of a column/row.
  */
 class BackgroundColor extends AbstractColor
 {
diff --git a/src/ZfcDatagrid/Column/Style/Bold.php b/src/ZfcDatagrid/Column/Style/Bold.php
index a5de42f4..9fe40ac5 100644
--- a/src/ZfcDatagrid/Column/Style/Bold.php
+++ b/src/ZfcDatagrid/Column/Style/Bold.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Style;
 
 class Bold extends AbstractStyle
diff --git a/src/ZfcDatagrid/Column/Style/CSSClass.php b/src/ZfcDatagrid/Column/Style/CSSClass.php
index 8f866935..72bde84b 100644
--- a/src/ZfcDatagrid/Column/Style/CSSClass.php
+++ b/src/ZfcDatagrid/Column/Style/CSSClass.php
@@ -1,8 +1,9 @@
 <?php
+
 namespace ZfcDatagrid\Column\Style;
 
 /**
- * Css class for the row/cell
+ * Css class for the row/cell.
  */
 class CSSClass extends AbstractStyle
 {
@@ -13,7 +14,7 @@ class CSSClass extends AbstractStyle
      */
     public function __construct($class)
     {
-        $this->class  = $class;
+        $this->class = $class;
     }
 
     /**
diff --git a/src/ZfcDatagrid/Column/Style/Color.php b/src/ZfcDatagrid/Column/Style/Color.php
index 76802484..22318eb8 100644
--- a/src/ZfcDatagrid/Column/Style/Color.php
+++ b/src/ZfcDatagrid/Column/Style/Color.php
@@ -1,8 +1,7 @@
 <?php
 /**
  * Set font-color for a column
- * general or based on a value
- *
+ * general or based on a value.
  */
 namespace ZfcDatagrid\Column\Style;
 
diff --git a/src/ZfcDatagrid/Column/Style/Html.php b/src/ZfcDatagrid/Column/Style/Html.php
index 64d08f19..6e1bc693 100644
--- a/src/ZfcDatagrid/Column/Style/Html.php
+++ b/src/ZfcDatagrid/Column/Style/Html.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Style;
 
 class Html extends AbstractStyle
diff --git a/src/ZfcDatagrid/Column/Style/Italic.php b/src/ZfcDatagrid/Column/Style/Italic.php
index 17f581f6..f50c8a7c 100644
--- a/src/ZfcDatagrid/Column/Style/Italic.php
+++ b/src/ZfcDatagrid/Column/Style/Italic.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Style;
 
 class Italic extends AbstractStyle
diff --git a/src/ZfcDatagrid/Column/Style/Strikethrough.php b/src/ZfcDatagrid/Column/Style/Strikethrough.php
index 5b115549..8354d5fe 100644
--- a/src/ZfcDatagrid/Column/Style/Strikethrough.php
+++ b/src/ZfcDatagrid/Column/Style/Strikethrough.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Style;
 
 class Strikethrough extends AbstractStyle
diff --git a/src/ZfcDatagrid/Column/Type/AbstractType.php b/src/ZfcDatagrid/Column/Type/AbstractType.php
index fb1c03c6..31c0fd06 100644
--- a/src/ZfcDatagrid/Column/Type/AbstractType.php
+++ b/src/ZfcDatagrid/Column/Type/AbstractType.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Type;
 
 use ZfcDatagrid\Filter;
@@ -6,7 +7,7 @@
 abstract class AbstractType implements TypeInterface
 {
     /**
-     * the default filter operation
+     * the default filter operation.
      *
      * @return string
      */
@@ -16,9 +17,10 @@ public function getFilterDefaultOperation()
     }
 
     /**
-     * Convert the user value to a general value, which will be filtered
+     * Convert the user value to a general value, which will be filtered.
+     *
+     * @param string $val
      *
-     * @param  string $val
      * @return string
      */
     public function getFilterValue($val)
@@ -27,9 +29,10 @@ public function getFilterValue($val)
     }
 
     /**
-     * Convert the value from the source to the value, which the user will see
+     * Convert the value from the source to the value, which the user will see.
+     *
+     * @param string $val
      *
-     * @param  string $val
      * @return string
      */
     public function getUserValue($val)
@@ -38,7 +41,7 @@ public function getUserValue($val)
     }
 
     /**
-     * Get the type name
+     * Get the type name.
      *
      * @return string
      */
diff --git a/src/ZfcDatagrid/Column/Type/DateTime.php b/src/ZfcDatagrid/Column/Type/DateTime.php
index a1ef8a47..2d614e4b 100644
--- a/src/ZfcDatagrid/Column/Type/DateTime.php
+++ b/src/ZfcDatagrid/Column/Type/DateTime.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Type;
 
 use DateTime as PhpDateTime;
@@ -41,7 +42,6 @@ class DateTime extends AbstractType
     protected $outputPattern;
 
     /**
-     *
      * @param string $sourceDateTimeFormat
      *                                     PHP DateTime format
      * @param int    $outputDateType
@@ -69,7 +69,8 @@ public function getTypeName()
     }
 
     /**
-     * Set Daterange Filter enabled true/false
+     * Set Daterange Filter enabled true/false.
+     *
      * @param bool $val
      */
     public function setDaterangePickerEnabled($val = true)
@@ -78,7 +79,7 @@ public function setDaterangePickerEnabled($val = true)
     }
 
     /**
-     * Check if the Daterange Filter is enabled
+     * Check if the Daterange Filter is enabled.
      */
     public function isDaterangePickerEnabled()
     {
@@ -174,8 +175,8 @@ public function getFilterDefaultOperation()
     }
 
     /**
+     * @param string $val
      *
-     * @param  string $val
      * @return string
      */
     public function getFilterValue($val)
@@ -191,9 +192,10 @@ public function getFilterValue($val)
     }
 
     /**
-     * Convert the value from the source to the value, which the user will see in the column
+     * Convert the value from the source to the value, which the user will see in the column.
+     *
+     * @param mixed $val
      *
-     * @param  mixed  $val
      * @return string
      */
     public function getUserValue($val)
diff --git a/src/ZfcDatagrid/Column/Type/Image.php b/src/ZfcDatagrid/Column/Type/Image.php
index eb27a1ac..65b37690 100644
--- a/src/ZfcDatagrid/Column/Type/Image.php
+++ b/src/ZfcDatagrid/Column/Type/Image.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Image type
+ * Image type.
  */
 namespace ZfcDatagrid\Column\Type;
 
@@ -9,13 +9,11 @@
 class Image extends AbstractType
 {
     /**
-     *
      * @var string
      */
     protected $resizeType = 'fixed';
 
     /**
-     *
      * @var float
      */
     protected $resizeHeight = 20.5;
@@ -29,9 +27,10 @@ public function getTypeName()
     }
 
     /**
-     * Set the resize type for TCPDF export
+     * Set the resize type for TCPDF export.
+     *
+     * @param string $type
      *
-     * @param  string                   $type
      * @throws InvalidArgumentException
      */
     public function setResizeType($type)
@@ -44,7 +43,6 @@ public function setResizeType($type)
     }
 
     /**
-     *
      * @return string
      */
     public function getResizeType()
@@ -53,7 +51,6 @@ public function getResizeType()
     }
 
     /**
-     *
      * @param float $height
      */
     public function setResizeHeight($height)
@@ -62,7 +59,6 @@ public function setResizeHeight($height)
     }
 
     /**
-     *
      * @return float
      */
     public function getResizeHeight()
diff --git a/src/ZfcDatagrid/Column/Type/Number.php b/src/ZfcDatagrid/Column/Type/Number.php
index 88f85e00..d58da923 100644
--- a/src/ZfcDatagrid/Column/Type/Number.php
+++ b/src/ZfcDatagrid/Column/Type/Number.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Type;
 
 use Locale;
@@ -17,14 +18,14 @@ class Number extends AbstractType
     /**
      * NumberFormat style to use.
      *
-     * @var integer
+     * @var int
      */
     protected $formatStyle;
 
     /**
      * NumberFormat type to use.
      *
-     * @var integer
+     * @var int
      */
     protected $formatType;
 
@@ -83,9 +84,10 @@ public function getLocale()
     }
 
     /**
-     * Set an attribute
+     * Set an attribute.
      *
      * @link http://www.php.net/manual/en/numberformatter.setattribute.php
+     *
      * @param
      *            attr int <p>
      *            Attribute specifier - one of the
@@ -100,7 +102,7 @@ public function addAttribute($attr, $value)
     {
         $this->attributes[] = [
             'attribute' => $attr,
-            'value'     => $value,
+            'value' => $value,
         ];
     }
 
@@ -145,7 +147,6 @@ public function getFilterDefaultOperation()
     }
 
     /**
-     *
      * @return NumberFormatter
      */
     protected function getFormatter()
@@ -162,8 +163,8 @@ protected function getFormatter()
     }
 
     /**
+     * @param string $val
      *
-     * @param  string $val
      * @return string
      */
     public function getFilterValue($val)
@@ -174,7 +175,7 @@ public function getFilterValue($val)
             $val = substr($val, strlen($this->getPrefix()));
         }
         if (strlen($this->getSuffix()) > 0 && strpos($val, $this->getSuffix()) > 0) {
-            $val = substr($val, 0, - strlen($this->getSuffix()));
+            $val = substr($val, 0, -strlen($this->getSuffix()));
         }
 
         try {
@@ -191,9 +192,10 @@ public function getFilterValue($val)
     }
 
     /**
-     * Convert the value from the source to the value, which the user will see
+     * Convert the value from the source to the value, which the user will see.
+     *
+     * @param string $val
      *
-     * @param  string $val
      * @return string
      */
     public function getUserValue($val)
@@ -202,6 +204,6 @@ public function getUserValue($val)
 
         $formattedValue = $formatter->format($val, $this->getFormatType());
 
-        return (string) $this->getPrefix() . $formattedValue . $this->getSuffix();
+        return (string) $this->getPrefix().$formattedValue.$this->getSuffix();
     }
 }
diff --git a/src/ZfcDatagrid/Column/Type/PhpArray.php b/src/ZfcDatagrid/Column/Type/PhpArray.php
index 7db7650c..c57eb115 100644
--- a/src/ZfcDatagrid/Column/Type/PhpArray.php
+++ b/src/ZfcDatagrid/Column/Type/PhpArray.php
@@ -1,17 +1,17 @@
 <?php
+
 namespace ZfcDatagrid\Column\Type;
 
 class PhpArray extends AbstractType
 {
     /**
-     * Separator of the string to be used to explode the array
+     * Separator of the string to be used to explode the array.
      *
      * @var string
      */
     protected $separator;
 
     /**
-     *
      * @param string $separator
      */
     public function __construct($separator = ',')
@@ -20,7 +20,7 @@ public function __construct($separator = ',')
     }
 
     /**
-     * Set separator of the string to be used to explode the array
+     * Set separator of the string to be used to explode the array.
      *
      * @param string $separator
      */
@@ -45,14 +45,15 @@ public function getTypeName()
     }
 
     /**
-     * Convert a value into an array
+     * Convert a value into an array.
+     *
+     * @param mixed $value
      *
-     * @param  mixed $value
      * @return array
      */
     public function getUserValue($value)
     {
-        if (! is_array($value)) {
+        if (!is_array($value)) {
             if ('' == $value) {
                 $value = [];
             } else {
diff --git a/src/ZfcDatagrid/Column/Type/PhpString.php b/src/ZfcDatagrid/Column/Type/PhpString.php
index b795d3dd..1dba86c8 100644
--- a/src/ZfcDatagrid/Column/Type/PhpString.php
+++ b/src/ZfcDatagrid/Column/Type/PhpString.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Column\Type;
 
 class PhpString extends AbstractType
diff --git a/src/ZfcDatagrid/Column/Type/TypeInterface.php b/src/ZfcDatagrid/Column/Type/TypeInterface.php
index cebd8b26..390d4f78 100644
--- a/src/ZfcDatagrid/Column/Type/TypeInterface.php
+++ b/src/ZfcDatagrid/Column/Type/TypeInterface.php
@@ -1,10 +1,11 @@
 <?php
+
 namespace ZfcDatagrid\Column\Type;
 
 interface TypeInterface
 {
     /**
-     * Get the type name
+     * Get the type name.
      *
      * @return string
      */
diff --git a/src/ZfcDatagrid/DataSource/AbstractDataSource.php b/src/ZfcDatagrid/DataSource/AbstractDataSource.php
index 874ecd83..6d7d590f 100644
--- a/src/ZfcDatagrid/DataSource/AbstractDataSource.php
+++ b/src/ZfcDatagrid/DataSource/AbstractDataSource.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource;
 
 use Zend\Paginator\Adapter\AdapterInterface as PaginatorAdapterInterface;
@@ -8,25 +9,22 @@
 abstract class AbstractDataSource implements DataSourceInterface
 {
     /**
-     *
      * @var array
      */
     protected $columns = [];
 
     /**
-     *
      * @var array
      */
     protected $sortConditions = [];
 
     /**
-     *
      * @var array
      */
     protected $filters = [];
 
     /**
-     * The data result
+     * The data result.
      *
      * @var \Zend\Paginator\Adapter\AdapterInterface
      */
@@ -39,7 +37,8 @@ abstract class AbstractDataSource implements DataSourceInterface
      * - Doctrine2: Doctrine\ORM\QueryBuilder
      * - ...
      *
-     * @param  mixed      $data
+     * @param mixed $data
+     *
      * @throws \Exception
      */
     public function __construct($data)
@@ -49,7 +48,7 @@ public function __construct($data)
     }
 
     /**
-     * Set the columns
+     * Set the columns.
      *
      * @param array $columns
      */
@@ -59,7 +58,6 @@ public function setColumns(array $columns)
     }
 
     /**
-     *
      * @return Column\AbstractColumn[]
      */
     public function getColumns()
@@ -68,7 +66,7 @@ public function getColumns()
     }
 
     /**
-     * Set sort conditions
+     * Set sort conditions.
      *
      * @param Column\AbstractColumn $column
      * @param string                $sortDirection
@@ -76,7 +74,7 @@ public function getColumns()
     public function addSortCondition(Column\AbstractColumn $column, $sortDirection = 'ASC')
     {
         $this->sortConditions[] = [
-            'column'        => $column,
+            'column' => $column,
             'sortDirection' => $sortDirection,
         ];
     }
@@ -90,7 +88,6 @@ public function setSortConditions(array $sortConditions)
     }
 
     /**
-     *
      * @return array
      */
     public function getSortConditions()
@@ -99,7 +96,7 @@ public function getSortConditions()
     }
 
     /**
-     * Add a filter rule
+     * Add a filter rule.
      *
      * @param Filter $filter
      */
@@ -109,7 +106,6 @@ public function addFilter(Filter $filter)
     }
 
     /**
-     *
      * @param array $filters
      */
     public function setFilters(array $filters)
@@ -118,7 +114,6 @@ public function setFilters(array $filters)
     }
 
     /**
-     *
      * @return \ZfcDatagrid\Filter[]
      */
     public function getFilters()
@@ -135,7 +130,6 @@ public function setPaginatorAdapter(PaginatorAdapterInterface $paginator)
     }
 
     /**
-     *
      * @return \Zend\Paginator\Adapter\AdapterInterface
      */
     public function getPaginatorAdapter()
@@ -144,7 +138,8 @@ public function getPaginatorAdapter()
     }
 
     /**
-     * Get the data back from construct
+     * Get the data back from construct.
+     *
      * @return mixed
      */
     abstract public function getData();
@@ -152,7 +147,7 @@ abstract public function getData();
     /**
      * Execute the query and set the paginator
      * - with sort statements
-     * - with filters statements
+     * - with filters statements.
      */
     abstract public function execute();
 }
diff --git a/src/ZfcDatagrid/DataSource/DataSourceInterface.php b/src/ZfcDatagrid/DataSource/DataSourceInterface.php
index 6a4c9b99..b622a10a 100644
--- a/src/ZfcDatagrid/DataSource/DataSourceInterface.php
+++ b/src/ZfcDatagrid/DataSource/DataSourceInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource;
 
 use ZfcDatagrid\Column;
@@ -18,7 +19,7 @@ interface DataSourceInterface
     public function __construct($data);
 
     /**
-     * Get the data back from construct
+     * Get the data back from construct.
      *
      * @return mixed
      */
@@ -27,19 +28,19 @@ public function getData();
     /**
      * Execute the query and set the paginator
      * - with sort statements
-     * - with filters statements
+     * - with filters statements.
      */
     public function execute();
 
     /**
-     * Set the columns
+     * Set the columns.
      *
      * @param array $columns
      */
     public function setColumns(array $columns);
 
     /**
-     * Set sort conditions
+     * Set sort conditions.
      *
      * @param Column\AbstractColumn $column
      * @param string                $sortDirection
@@ -47,13 +48,11 @@ public function setColumns(array $columns);
     public function addSortCondition(Column\AbstractColumn $column, $sortDirection = 'ASC');
 
     /**
-     *
      * @param Filter $filters
      */
     public function addFilter(Filter $filter);
 
     /**
-     *
      * @return \Zend\Paginator\Adapter\AdapterInterface
      */
     public function getPaginatorAdapter();
diff --git a/src/ZfcDatagrid/DataSource/Doctrine2.php b/src/ZfcDatagrid/DataSource/Doctrine2.php
index 938276be..3699253b 100644
--- a/src/ZfcDatagrid/DataSource/Doctrine2.php
+++ b/src/ZfcDatagrid/DataSource/Doctrine2.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource;
 
 use Doctrine\ORM;
@@ -10,13 +11,12 @@
 class Doctrine2 extends AbstractDataSource
 {
     /**
-     *
      * @var ORM\QueryBuilder
      */
     private $qb;
 
     /**
-     * Data source
+     * Data source.
      *
      * @param mixed $data
      */
@@ -29,12 +29,11 @@ public function __construct($data)
             if (is_object($data)) {
                 $return = get_class($return);
             }
-            throw new \InvalidArgumentException("Unknown data input..." . $return);
+            throw new \InvalidArgumentException('Unknown data input...'.$return);
         }
     }
 
     /**
-     *
      * @return ORM\QueryBuilder
      */
     public function getData()
@@ -60,9 +59,9 @@ public function execute()
 
             $colString = $col->getSelectPart1();
             if ($col->getSelectPart2() != '') {
-                $colString .= '.' . $col->getSelectPart2();
+                $colString .= '.'.$col->getSelectPart2();
             }
-            $colString .= ' ' . $col->getUniqueId();
+            $colString .= ' '.$col->getUniqueId();
 
             $selectColumns[] = $colString;
         }
@@ -81,18 +80,18 @@ public function execute()
                 $col = $sortCondition['column'];
 
                 if (!$col instanceof Column\Select) {
-                    throw new \Exception('This column cannot be sorted: ' . $col->getUniqueId());
+                    throw new \Exception('This column cannot be sorted: '.$col->getUniqueId());
                 }
 
                 /* @var $col \ZfcDatagrid\Column\Select */
                 $colString = $col->getSelectPart1();
                 if ($col->getSelectPart2() != '') {
-                    $colString .= '.' . $col->getSelectPart2();
+                    $colString .= '.'.$col->getSelectPart2();
                 }
 
                 if ($col->getType() instanceof Type\Number) {
-                    $qb->addSelect('ABS(' . $colString . ') sortColumn' . $key);
-                    $qb->add('orderBy', new Expr\OrderBy('sortColumn' . $key, $sortCondition['sortDirection']), true);
+                    $qb->addSelect('ABS('.$colString.') sortColumn'.$key);
+                    $qb->add('orderBy', new Expr\OrderBy('sortColumn'.$key, $sortCondition['sortDirection']), true);
                 } else {
                     $qb->add('orderBy', new Expr\OrderBy($col->getUniqueId(), $sortCondition['sortDirection']), true);
                 }
diff --git a/src/ZfcDatagrid/DataSource/Doctrine2/Filter.php b/src/ZfcDatagrid/DataSource/Doctrine2/Filter.php
index c7b9d796..be07d2d5 100644
--- a/src/ZfcDatagrid/DataSource/Doctrine2/Filter.php
+++ b/src/ZfcDatagrid/DataSource/Doctrine2/Filter.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource\Doctrine2;
 
 use Doctrine\ORM\Query\Expr;
@@ -9,7 +10,6 @@
 class Filter
 {
     /**
-     *
      * @var QueryBuilder
      */
     private $qb;
@@ -23,7 +23,6 @@ public function __construct(QueryBuilder $qb)
     }
 
     /**
-     *
      * @return \Doctrine\ORM\QueryBuilder
      */
     public function getQueryBuilder()
@@ -32,22 +31,23 @@ public function getQueryBuilder()
     }
 
     /**
-     * @param  DatagridFilter $filter
+     * @param DatagridFilter $filter
+     *
      * @throws \Exception
      */
     public function applyFilter(DatagridFilter $filter)
     {
-        $qb   = $this->getQueryBuilder();
+        $qb = $this->getQueryBuilder();
         $expr = new Expr();
 
-        $col    = $filter->getColumn();
+        $col = $filter->getColumn();
         if (!$col instanceof Column\Select) {
-            throw new \Exception('This column cannot be filtered: ' . $col->getUniqueId());
+            throw new \Exception('This column cannot be filtered: '.$col->getUniqueId());
         }
 
         $colString = $col->getSelectPart1();
         if ($col->getSelectPart2() != '') {
-            $colString .= '.' . $col->getSelectPart2();
+            $colString .= '.'.$col->getSelectPart2();
         }
         if ($col instanceof Column\Select && $col->hasFilterSelectExpression()) {
             $colString = sprintf($col->getFilterSelectExpression(), $colString);
@@ -56,38 +56,38 @@ public function applyFilter(DatagridFilter $filter)
 
         $wheres = [];
         foreach ($values as $key => $value) {
-            $valueParameterName = ':' . str_replace('.', '', $col->getUniqueId() . $key);
+            $valueParameterName = ':'.str_replace('.', '', $col->getUniqueId().$key);
 
             switch ($filter->getOperator()) {
 
                 case DatagridFilter::LIKE:
                     $wheres[] = $expr->like($colString, $valueParameterName);
-                    $qb->setParameter($valueParameterName, '%' . $value . '%');
+                    $qb->setParameter($valueParameterName, '%'.$value.'%');
                     break;
 
                 case DatagridFilter::LIKE_LEFT:
                     $wheres[] = $expr->like($colString, $valueParameterName);
-                    $qb->setParameter($valueParameterName, '%' . $value);
+                    $qb->setParameter($valueParameterName, '%'.$value);
                     break;
 
                 case DatagridFilter::LIKE_RIGHT:
                     $wheres[] = $expr->like($colString, $valueParameterName);
-                    $qb->setParameter($valueParameterName, $value . '%');
+                    $qb->setParameter($valueParameterName, $value.'%');
                     break;
 
                 case DatagridFilter::NOT_LIKE:
                     $wheres[] = $expr->notLike($colString, $valueParameterName);
-                    $qb->setParameter($valueParameterName, '%' . $value . '%');
+                    $qb->setParameter($valueParameterName, '%'.$value.'%');
                     break;
 
                 case DatagridFilter::NOT_LIKE_LEFT:
                     $wheres[] = $expr->notLike($colString, $valueParameterName);
-                    $qb->setParameter($valueParameterName, '%' . $value);
+                    $qb->setParameter($valueParameterName, '%'.$value);
                     break;
 
                 case DatagridFilter::NOT_LIKE_RIGHT:
                     $wheres[] = $expr->notLike($colString, $valueParameterName);
-                    $qb->setParameter($valueParameterName, $value . '%');
+                    $qb->setParameter($valueParameterName, $value.'%');
                     break;
 
                 case DatagridFilter::EQUAL:
@@ -121,8 +121,8 @@ public function applyFilter(DatagridFilter $filter)
                     break;
 
                 case DatagridFilter::BETWEEN:
-                    $minParameterName = ':' . str_replace('.', '', $colString . '0');
-                    $maxParameterName = ':' . str_replace('.', '', $colString . '1');
+                    $minParameterName = ':'.str_replace('.', '', $colString.'0');
+                    $maxParameterName = ':'.str_replace('.', '', $colString.'1');
 
                     $wheres[] = $expr->between($colString, $minParameterName, $maxParameterName);
 
@@ -131,7 +131,7 @@ public function applyFilter(DatagridFilter $filter)
                     break 2;
 
                 default:
-                    throw new \InvalidArgumentException('This operator is currently not supported: ' . $filter->getOperator());
+                    throw new \InvalidArgumentException('This operator is currently not supported: '.$filter->getOperator());
                     break;
             }
         }
diff --git a/src/ZfcDatagrid/DataSource/Doctrine2/Paginator.php b/src/ZfcDatagrid/DataSource/Doctrine2/Paginator.php
index c8e57035..80c92c55 100644
--- a/src/ZfcDatagrid/DataSource/Doctrine2/Paginator.php
+++ b/src/ZfcDatagrid/DataSource/Doctrine2/Paginator.php
@@ -1,8 +1,7 @@
 <?php
 /**
  * This is just a proxy to detect if we can use the "fast" Pagination
- * or if we use the "safe" variant by Doctrine2
- *
+ * or if we use the "safe" variant by Doctrine2.
  */
 namespace ZfcDatagrid\DataSource\Doctrine2;
 
@@ -14,26 +13,23 @@
 class Paginator implements AdapterInterface
 {
     /**
-     *
      * @var QueryBuilder
      */
     protected $qb = null;
 
     /**
-     * Total item count
+     * Total item count.
      *
-     * @var integer
+     * @var int
      */
     protected $rowCount = null;
 
     /**
-     *
      * @var \Doctrine\ORM\Tools\Pagination\Paginator
      */
     private $paginator;
 
     /**
-     *
      * @param QueryBuilder $qb
      */
     public function __construct(QueryBuilder $qb)
@@ -42,7 +38,6 @@ public function __construct(QueryBuilder $qb)
     }
 
     /**
-     *
      * @return \Doctrine\ORM\QueryBuilder
      */
     public function getQueryBuilder()
@@ -51,13 +46,13 @@ public function getQueryBuilder()
     }
 
     /**
-     * Test which pagination solution to use
+     * Test which pagination solution to use.
      *
-     * @return boolean
+     * @return bool
      */
     private function useCustomPaginator()
     {
-        $qb    = $this->getQueryBuilder();
+        $qb = $this->getQueryBuilder();
         $parts = $qb->getDQLParts();
 
         if ($parts['having'] !== null || true === $parts['distinct']) {
@@ -70,7 +65,6 @@ private function useCustomPaginator()
     }
 
     /**
-     *
      * @return \Doctrine\ORM\Tools\Pagination\Paginator
      */
     private function getPaginator()
@@ -92,8 +86,9 @@ private function getPaginator()
     /**
      * Returns an array of items for a page.
      *
-     * @param  integer $offset
-     * @param  integer $itemCountPerPage
+     * @param int $offset
+     * @param int $itemCountPerPage
+     *
      * @return array
      */
     public function getItems($offset, $itemCountPerPage)
@@ -113,7 +108,7 @@ public function getItems($offset, $itemCountPerPage)
     /**
      * Returns the total number of rows in the result set.
      *
-     * @return integer
+     * @return int
      */
     public function count()
     {
diff --git a/src/ZfcDatagrid/DataSource/Doctrine2/PaginatorFast.php b/src/ZfcDatagrid/DataSource/Doctrine2/PaginatorFast.php
index 52c718cb..3127b0ca 100644
--- a/src/ZfcDatagrid/DataSource/Doctrine2/PaginatorFast.php
+++ b/src/ZfcDatagrid/DataSource/Doctrine2/PaginatorFast.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource\Doctrine2;
 
 use Doctrine\ORM\QueryBuilder;
@@ -7,20 +8,18 @@
 class PaginatorFast implements AdapterInterface
 {
     /**
-     *
      * @var QueryBuilder
      */
     protected $qb = null;
 
     /**
-     * Total item count
+     * Total item count.
      *
-     * @var integer
+     * @var int
      */
     protected $rowCount = null;
 
     /**
-     *
      * @param QueryBuilder $qb
      */
     public function __construct(QueryBuilder $qb)
@@ -29,7 +28,6 @@ public function __construct(QueryBuilder $qb)
     }
 
     /**
-     *
      * @return \Doctrine\ORM\QueryBuilder
      */
     public function getQueryBuilder()
@@ -40,8 +38,9 @@ public function getQueryBuilder()
     /**
      * Returns an array of items for a page.
      *
-     * @param  integer $offset
-     * @param  integer $itemCountPerPage
+     * @param int $offset
+     * @param int $itemCountPerPage
+     *
      * @return array
      */
     public function getItems($offset, $itemCountPerPage)
@@ -59,7 +58,7 @@ public function getItems($offset, $itemCountPerPage)
      *
      * @see https://github.com/zendframework/zf1/blob/master/library/Zend/Paginator/Adapter/DbSelect.php#L198
      *
-     * @return integer
+     * @return int
      */
     public function count()
     {
@@ -68,9 +67,9 @@ public function count()
         }
 
         $qbOriginal = $this->getQueryBuilder();
-        $qb         = clone $qbOriginal;
+        $qb = clone $qbOriginal;
 
-        $dqlParts   = $qb->getDQLParts();
+        $dqlParts = $qb->getDQLParts();
         $groupParts = $dqlParts['groupBy'];
 
         /*
@@ -90,9 +89,9 @@ public function count()
             // more than one group part...tricky!
             // @todo finde something better...
             $qb->resetDQLPart('groupBy');
-            $qb->select('CONCAT(' . implode(',', $groupParts) . ') as uniqueParts');
+            $qb->select('CONCAT('.implode(',', $groupParts).') as uniqueParts');
 
-            $items  = [];
+            $items = [];
             $result = $qb->getQuery()->getResult();
             foreach ($result as $row) {
                 $items[] = $row['uniqueParts'];
@@ -104,7 +103,7 @@ public function count()
             $groupPart = $groupParts[0];
 
             $qb->resetDQLPart('groupBy');
-            $qb->select('COUNT(DISTINCT ' . $groupPart . ')');
+            $qb->select('COUNT(DISTINCT '.$groupPart.')');
 
             $this->rowCount = $qb->getQuery()->getSingleScalarResult();
         } else {
@@ -116,7 +115,7 @@ public function count()
                 $qb->select('COUNT_ONE() AS rowCount');
             } else {
                 $fromPart = $dqlParts['from'];
-                $qb->select('COUNT(' . $fromPart[0]->getAlias() . ')');
+                $qb->select('COUNT('.$fromPart[0]->getAlias().')');
             }
 
             $this->rowCount = $qb->getQuery()->getSingleScalarResult();
diff --git a/src/ZfcDatagrid/DataSource/Doctrine2Collection.php b/src/ZfcDatagrid/DataSource/Doctrine2Collection.php
index 21817695..1375e293 100644
--- a/src/ZfcDatagrid/DataSource/Doctrine2Collection.php
+++ b/src/ZfcDatagrid/DataSource/Doctrine2Collection.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource;
 
 use Doctrine\Common\Collections\Collection;
@@ -10,19 +11,17 @@
 class Doctrine2Collection extends AbstractDataSource
 {
     /**
-     *
      * @var Collection
      */
     private $data;
 
     /**
-     *
      * @var EntityManager
      */
     private $em;
 
     /**
-     * Data source
+     * Data source.
      *
      * @param mixed $data
      */
@@ -33,14 +32,13 @@ public function __construct($data)
         } else {
             $return = $data;
             if (is_object($data)) {
-                $return = 'instanceof ' . get_class($return);
+                $return = 'instanceof '.get_class($return);
             }
-            throw new \InvalidArgumentException('Unknown data input: "' . $return . '"');
+            throw new \InvalidArgumentException('Unknown data input: "'.$return.'"');
         }
     }
 
     /**
-     *
      * @return Collection
      */
     public function getData()
@@ -49,7 +47,6 @@ public function getData()
     }
 
     /**
-     *
      * @param EntityManager $em
      */
     public function setEntityManager(EntityManager $em)
@@ -58,7 +55,6 @@ public function setEntityManager(EntityManager $em)
     }
 
     /**
-     *
      * @return EntityManager
      */
     public function getEntityManager()
@@ -66,9 +62,6 @@ public function getEntityManager()
         return $this->em;
     }
 
-    /**
-     *
-     */
     public function execute()
     {
         $hydrator = new DoctrineHydrator($this->getEntityManager());
diff --git a/src/ZfcDatagrid/DataSource/PhpArray.php b/src/ZfcDatagrid/DataSource/PhpArray.php
index 3d52998c..1305bc49 100644
--- a/src/ZfcDatagrid/DataSource/PhpArray.php
+++ b/src/ZfcDatagrid/DataSource/PhpArray.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource;
 
 use Zend\Paginator\Adapter\ArrayAdapter as PaginatorAdapter;
@@ -9,7 +10,7 @@ class PhpArray extends AbstractDataSource
     private $data = [];
 
     /**
-     * Set the data source
+     * Set the data source.
      *
      * @param array $data
      */
@@ -18,12 +19,11 @@ public function __construct($data)
         if (is_array($data)) {
             $this->data = $data;
         } else {
-            throw new \InvalidArgumentException("Unsupported data input, please provide an array");
+            throw new \InvalidArgumentException('Unsupported data input, please provide an array');
         }
     }
 
     /**
-     *
      * @return array
      */
     public function getData()
@@ -34,13 +34,13 @@ public function getData()
     /**
      * Execute the query and set the paginator
      * - with sort statements
-     * - with filters statements
+     * - with filters statements.
      */
     public function execute()
     {
         $data = $this->getData();
 
-        /**
+        /*
          * Step 1) Apply sorting
          *
          * @see http://php.net/manual/de/function.array-multisort.php
@@ -50,7 +50,7 @@ public function execute()
             $data = $this->sortArrayMultiple($data, $this->getSortConditions());
         }
 
-        /**
+        /*
          * Step 2) Apply filters
          */
         foreach ($this->getFilters() as $filter) {
@@ -64,7 +64,7 @@ public function execute()
         }
 
         /**
-         * Step 3) Remove unneeded columns
+         * Step 3) Remove unneeded columns.
          *
          * @todo ? Better performance or let it be?
          */
@@ -76,7 +76,7 @@ public function execute()
 
             $colString = $col->getSelectPart1();
             if ($col->getSelectPart2() != '') {
-                $colString = $col->getSelectPart1() . '_' . $col->getSelectPart2();
+                $colString = $col->getSelectPart1().'_'.$col->getSelectPart2();
             }
 
             $selectedColumns[] = $colString;
@@ -84,21 +84,21 @@ public function execute()
 
         foreach ($data as &$row) {
             foreach ($row as $keyRowCol => $rowCol) {
-                if (! in_array($keyRowCol, $selectedColumns)) {
+                if (!in_array($keyRowCol, $selectedColumns)) {
                     unset($row[$keyRowCol]);
                 }
             }
         }
 
-        /**
+        /*
          * Step 4) Pagination
          */
         $this->setPaginatorAdapter(new PaginatorAdapter($data));
     }
 
     /**
+     * @param array $sortCondition
      *
-     * @param  array $sortCondition
      * @return array
      */
     private function getSortArrayParameter($sortCondition)
@@ -108,22 +108,22 @@ private function getSortArrayParameter($sortCondition)
         ];
 
         if ('DESC' === $sortCondition['sortDirection']) {
-            $desc        = SORT_DESC;
+            $desc = SORT_DESC;
             $sortArray[] = $desc;
         } else {
-            $asc         = SORT_ASC;
+            $asc = SORT_ASC;
             $sortArray[] = $asc;
         }
 
         switch (get_class($sortCondition['column']->getType())) {
 
             case 'ZfcDatagrid\Column\Type\Number':
-                $numeric     = SORT_NUMERIC;
+                $numeric = SORT_NUMERIC;
                 $sortArray[] = $numeric;
                 break;
 
             default:
-                $regular     = SORT_REGULAR;
+                $regular = SORT_REGULAR;
                 $sortArray[] = $regular;
                 break;
         }
@@ -132,9 +132,10 @@ private function getSortArrayParameter($sortCondition)
     }
 
     /**
-     *
      * @see http://php.net/manual/de/function.array-multisort.php Example in comments: array_orderby()
+     *
      * @author jimpoz at jimpoz dot com
+     *
      * @return array
      */
     private function sortArrayMultiple(array $data, $sortConditions)
@@ -148,7 +149,7 @@ private function sortArrayMultiple(array $data, $sortConditions)
 
             $dataCol = [];
             foreach ($data as $key => $row) {
-                if (! isset($row[$column])) {
+                if (!isset($row[$column])) {
                     $value = '';
                 } else {
                     $value = $row[$column];
@@ -167,10 +168,11 @@ private function sortArrayMultiple(array $data, $sortConditions)
     }
 
     /**
-     * Multisort an array
+     * Multisort an array.
+     *
+     * @param array $data
+     * @param array $sortArguments
      *
-     * @param  array                     $data
-     * @param  array                     $sortArguments
      * @throws \InvalidArgumentException
      *
      * @return array
@@ -181,7 +183,7 @@ private function applyMultiSort(array $data, array $sortArguments)
         foreach ($sortArguments as $values) {
             $remain = count($values) % 3;
             if ($remain != 0) {
-                throw new \InvalidArgumentException('The parameter count for each sortArgument has to be three. Given count of: ' . count($values));
+                throw new \InvalidArgumentException('The parameter count for each sortArgument has to be three. Given count of: '.count($values));
             }
             $args[] = $values[0]; // column value
             $args[] = $values[1]; // sort direction
diff --git a/src/ZfcDatagrid/DataSource/PhpArray/Filter.php b/src/ZfcDatagrid/DataSource/PhpArray/Filter.php
index 08ba4485..0f8f2423 100644
--- a/src/ZfcDatagrid/DataSource/PhpArray/Filter.php
+++ b/src/ZfcDatagrid/DataSource/PhpArray/Filter.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource\PhpArray;
 
 use ZfcDatagrid\Filter as DatagridFilter;
@@ -6,13 +7,11 @@
 class Filter
 {
     /**
-     *
      * @var \ZfcDatagrid\Filter
      */
     private $filter;
 
     /**
-     *
      * @param \ZfcDatagrid\Filter $filter
      */
     public function __construct(DatagridFilter $filter)
@@ -21,7 +20,6 @@ public function __construct(DatagridFilter $filter)
     }
 
     /**
-     *
      * @return \ZfcDatagrid\Filter
      */
     public function getFilter()
@@ -32,18 +30,20 @@ public function getFilter()
     /**
      * Does the value get filtered?
      *
-     * @param  array      $row
+     * @param array $row
+     *
      * @throws \Exception
-     * @return boolean
+     *
+     * @return bool
      */
     public function applyFilter(array $row)
     {
         $wasTrueOneTime = false;
-        $isApply        = false;
+        $isApply = false;
 
         foreach ($this->getFilter()->getValues() as $filterValue) {
             $filter = $this->getFilter();
-            $col    = $filter->getColumn();
+            $col = $filter->getColumn();
 
             $value = $row[$col->getUniqueId()];
             $value = $col->getType()->getFilterValue($value);
diff --git a/src/ZfcDatagrid/DataSource/ZendSelect.php b/src/ZfcDatagrid/DataSource/ZendSelect.php
index e5664579..2efedf26 100644
--- a/src/ZfcDatagrid/DataSource/ZendSelect.php
+++ b/src/ZfcDatagrid/DataSource/ZendSelect.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource;
 
 use Zend\Db\Sql;
@@ -9,21 +10,20 @@
 class ZendSelect extends AbstractDataSource
 {
     /**
-     *
      * @var Sql\Select
      */
     private $select;
 
     /**
-     *
      * @var \Zend\Db\Sql\Sql
      */
     private $sqlObject;
 
     /**
-     * Data source
+     * Data source.
+     *
+     * @param Sql\Select $data
      *
-     * @param  Sql\Select                $data
      * @throws \InvalidArgumentException
      */
     public function __construct($data)
@@ -36,7 +36,6 @@ public function __construct($data)
     }
 
     /**
-     *
      * @return Sql\Select
      */
     public function getData()
@@ -46,6 +45,7 @@ public function getData()
 
     /**
      * @param $adapterOrSqlObject
+     *
      * @throws \InvalidArgumentException
      */
     public function setAdapter($adapterOrSqlObject)
@@ -60,7 +60,6 @@ public function setAdapter($adapterOrSqlObject)
     }
 
     /**
-     *
      * @return \Zend\Db\Sql\Sql
      */
     public function getAdapter()
@@ -69,12 +68,11 @@ public function getAdapter()
     }
 
     /**
-     *
      * @throws \Exception
      */
     public function execute()
     {
-        if ($this->getAdapter() === null || ! $this->getAdapter() instanceof \Zend\Db\Sql\Sql) {
+        if ($this->getAdapter() === null || !$this->getAdapter() instanceof \Zend\Db\Sql\Sql) {
             throw new \Exception('Object "Zend\Db\Sql\Sql" is missing, please call setAdapter() first!');
         }
 
@@ -95,7 +93,7 @@ public function execute()
 
             $colString = $col->getSelectPart1();
             if ($col->getSelectPart2() != '') {
-                $colString = new Expression($platform->quoteIdentifier($colString) . $platform->getIdentifierSeparator() . $platform->quoteIdentifier($col->getSelectPart2()));
+                $colString = new Expression($platform->quoteIdentifier($colString).$platform->getIdentifierSeparator().$platform->quoteIdentifier($col->getSelectPart2()));
             }
 
             $selectColumns[$col->getUniqueId()] = $colString;
@@ -118,7 +116,7 @@ public function execute()
             foreach ($this->getSortConditions() as $sortCondition) {
                 /** @var \ZfcDataGrid\Column\AbstractColumn $col */
                 $col = $sortCondition['column'];
-                $select->order($col->getUniqueId() . ' ' . $sortCondition['sortDirection']);
+                $select->order($col->getUniqueId().' '.$sortCondition['sortDirection']);
             }
         }
 
diff --git a/src/ZfcDatagrid/DataSource/ZendSelect/Filter.php b/src/ZfcDatagrid/DataSource/ZendSelect/Filter.php
index 726a8d14..e709c4b3 100644
--- a/src/ZfcDatagrid/DataSource/ZendSelect/Filter.php
+++ b/src/ZfcDatagrid/DataSource/ZendSelect/Filter.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\DataSource\ZendSelect;
 
 use Zend\Db\Sql\Predicate\PredicateSet;
@@ -11,25 +12,22 @@
 class Filter
 {
     /**
-     *
      * @var Sql
      */
     private $sql;
 
     /**
-     *
      * @var Select
      */
     private $select;
 
     public function __construct(Sql $sql, Select $select)
     {
-        $this->sql    = $sql;
+        $this->sql = $sql;
         $this->select = $select;
     }
 
     /**
-     *
      * @return \Zend\Db\Sql\Sql
      */
     public function getSql()
@@ -38,7 +36,6 @@ public function getSql()
     }
 
     /**
-     *
      * @return \Zend\Db\Sql\Select
      */
     public function getSelect()
@@ -47,7 +44,8 @@ public function getSelect()
     }
 
     /**
-     * @param  DatagridFilter $filter
+     * @param DatagridFilter $filter
+     *
      * @throws \Exception
      */
     public function applyFilter(DatagridFilter $filter)
@@ -55,18 +53,18 @@ public function applyFilter(DatagridFilter $filter)
         $select = $this->getSelect();
 
         $adapter = $this->getSql()->getAdapter();
-        $qi      = function ($name) use ($adapter) {
+        $qi = function ($name) use ($adapter) {
             return $adapter->getPlatform()->quoteIdentifier($name);
         };
 
-        $col    = $filter->getColumn();
+        $col = $filter->getColumn();
         if (!$col instanceof Column\Select) {
-            throw new \Exception('This column cannot be filtered: ' . $col->getUniqueId());
+            throw new \Exception('This column cannot be filtered: '.$col->getUniqueId());
         }
 
         $colString = $col->getSelectPart1();
         if ($col->getSelectPart2() != '') {
-            $colString .= '.' . $col->getSelectPart2();
+            $colString .= '.'.$col->getSelectPart2();
         }
         if ($col instanceof Column\Select && $col->hasFilterSelectExpression()) {
             $colString = sprintf($col->getFilterSelectExpression(), $colString);
@@ -80,32 +78,32 @@ public function applyFilter(DatagridFilter $filter)
             switch ($filter->getOperator()) {
 
                 case DatagridFilter::LIKE:
-                    $wheres[] = $where->like($colString, '%' . $value . '%');
+                    $wheres[] = $where->like($colString, '%'.$value.'%');
                     break;
 
                 case DatagridFilter::LIKE_LEFT:
-                    $wheres[] = $where->like($colString, '%' . $value);
+                    $wheres[] = $where->like($colString, '%'.$value);
                     break;
 
                 case DatagridFilter::LIKE_RIGHT:
-                    $wheres[] = $where->like($colString, $value . '%');
+                    $wheres[] = $where->like($colString, $value.'%');
                     break;
 
                 case DatagridFilter::NOT_LIKE:
-                    $wheres[] = $where->literal($qi($colString) . 'NOT LIKE ?', [
-                        '%' . $value . '%',
+                    $wheres[] = $where->literal($qi($colString).'NOT LIKE ?', [
+                        '%'.$value.'%',
                     ]);
                     break;
 
                 case DatagridFilter::NOT_LIKE_LEFT:
-                    $wheres[] = $where->literal($qi($colString) . 'NOT LIKE ?', [
-                        '%' . $value,
+                    $wheres[] = $where->literal($qi($colString).'NOT LIKE ?', [
+                        '%'.$value,
                     ]);
                     break;
 
                 case DatagridFilter::NOT_LIKE_RIGHT:
-                    $wheres[] = $where->literal($qi($colString) . 'NOT LIKE ?', [
-                        $value . '%',
+                    $wheres[] = $where->literal($qi($colString).'NOT LIKE ?', [
+                        $value.'%',
                     ]);
                     break;
 
@@ -138,7 +136,7 @@ public function applyFilter(DatagridFilter $filter)
                     break 2;
 
                 default:
-                    throw new \InvalidArgumentException('This operator is currently not supported: ' . $filter->getOperator());
+                    throw new \InvalidArgumentException('This operator is currently not supported: '.$filter->getOperator());
                     break;
             }
         }
diff --git a/src/ZfcDatagrid/Datagrid.php b/src/ZfcDatagrid/Datagrid.php
index 6976bef6..a8c12f36 100644
--- a/src/ZfcDatagrid/Datagrid.php
+++ b/src/ZfcDatagrid/Datagrid.php
@@ -1,9 +1,11 @@
 <?php
+
 namespace ZfcDatagrid;
 
 use ArrayIterator;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\QueryBuilder;
+use Interop\Container\ContainerInterface;
 use Zend\Cache;
 use Zend\Console\Request as ConsoleRequest;
 use Zend\Db\Sql\Select as ZendSelect;
@@ -11,7 +13,7 @@
 use Zend\I18n\Translator\Translator;
 use Zend\Mvc\MvcEvent;
 use Zend\Paginator\Paginator;
-use Zend\ServiceManager\ServiceLocatorAwareTrait;
+use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\Session\Container as SessionContainer;
 use Zend\Stdlib\ResponseInterface;
 use Zend\View\Model\JsonModel;
@@ -20,145 +22,123 @@
 
 class Datagrid
 {
-    use ServiceLocatorAwareTrait;
-
     /**
-     *
      * @var array
      */
     protected $options = [];
 
     /**
-     *
      * @var SessionContainer
      */
     protected $session;
 
     /**
-     *
      * @var Cache\Storage\StorageInterface
      */
     protected $cache;
 
     /**
-     *
      * @var string
      */
     protected $cacheId;
 
     /**
-     *
      * @var MvcEvent
      */
     protected $mvcEvent;
 
     /**
-     *
      * @var array
      */
     protected $parameters = [];
 
     /**
-     *
      * @var mixed
      */
     protected $url;
 
     /**
-     *
      * @var HttpRequest
      */
     protected $request;
 
     /**
-     * View or Response
+     * View or Response.
      *
      * @var \Zend\Http\Response\Stream|\Zend\View\Model\ViewModel
      */
     protected $response;
 
     /**
-     *
      * @var Renderer\AbstractRenderer
      */
     private $renderer;
 
     /**
-     *
      * @var Translator
      */
     protected $translator;
 
     /**
-     *
      * @var string
      */
     protected $id;
 
     /**
-     * The grid title
+     * The grid title.
      *
      * @var string
      */
     protected $title = '';
 
     /**
-     *
      * @var DataSource\DataSourceInterface
      */
     protected $dataSource = null;
 
     /**
-     *
-     * @var integer
+     * @var int
      */
     protected $defaulItemsPerPage = 25;
 
     /**
-     *
      * @var array
      */
     protected $columns = [];
 
     /**
-     *
      * @var Style\AbstractStyle[]
      */
     protected $rowStyles = [];
 
     /**
-     *
      * @var Column\Action\AbstractAction
      */
     protected $rowClickAction;
 
     /**
-     *
      * @var Action\Mass
      */
     protected $massActions = [];
 
     /**
-     * The prepared data
+     * The prepared data.
      *
      * @var array
      */
     protected $preparedData = [];
 
     /**
-     *
      * @var array
      */
     protected $isUserFilterEnabled = true;
 
     /**
-     *
      * @var Paginator
      */
     protected $paginator = null;
 
     /**
-     *
      * @var array
      */
     protected $exportRenderers;
@@ -169,43 +149,36 @@ class Datagrid
     protected $toolbarTemplate;
 
     /**
-     *
      * @var array
      */
     protected $toolbarTemplateVariables = [];
 
     /**
-     *
      * @var ViewModel
      */
     protected $viewModel;
 
     /**
-     *
-     * @var boolean
+     * @var bool
      */
     protected $isInit = false;
 
     /**
-     *
-     * @var boolean
+     * @var bool
      */
     protected $isDataLoaded = false;
 
     /**
-     *
-     * @var boolean
+     * @var bool
      */
     protected $isRendered = false;
 
     /**
-     *
      * @var string
      */
     protected $forceRenderer;
 
     /**
-     *
      * @var Renderer\AbstractRenderer
      */
     private $rendererService;
@@ -222,7 +195,12 @@ class Datagrid
     ];
 
     /**
-     * Init method is called automatically with the service creation
+     * @var ServiceLocatorInterface
+     */
+    protected $serviceLocator = null;
+
+    /**
+     * Init method is called automatically with the service creation.
      */
     public function init()
     {
@@ -235,8 +213,7 @@ public function init()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function isInit()
     {
@@ -244,7 +221,7 @@ public function isInit()
     }
 
     /**
-     * Set the options from config
+     * Set the options from config.
      *
      * @param array $config
      */
@@ -254,7 +231,7 @@ public function setOptions(array $config)
     }
 
     /**
-     * Get the config options
+     * Get the config options.
      *
      * @return array
      */
@@ -264,7 +241,7 @@ public function getOptions()
     }
 
     /**
-     * Set the grid id
+     * Set the grid id.
      *
      * @param string $id
      */
@@ -278,7 +255,7 @@ public function setId($id = null)
     }
 
     /**
-     * Get the grid id
+     * Get the grid id.
      *
      * @return string
      */
@@ -292,7 +269,7 @@ public function getId()
     }
 
     /**
-     * Set the session
+     * Set the session.
      *
      * @param \Zend\Session\Container $session
      */
@@ -302,7 +279,7 @@ public function setSession(SessionContainer $session)
     }
 
     /**
-     * Get session container
+     * Get session container.
      *
      * Instantiate session container if none currently exists
      *
@@ -327,7 +304,6 @@ public function setCache(Cache\Storage\StorageInterface $cache)
     }
 
     /**
-     *
      * @return Cache\Storage\StorageInterface
      */
     public function getCache()
@@ -336,7 +312,7 @@ public function getCache()
     }
 
     /**
-     * Set the cache id
+     * Set the cache id.
      *
      * @param string $id
      */
@@ -346,7 +322,7 @@ public function setCacheId($id)
     }
 
     /**
-     * Get the cache id
+     * Get the cache id.
      *
      * @return string
      */
@@ -355,7 +331,7 @@ public function getCacheId()
         if (null === $this->cacheId) {
             $this->cacheId = md5($this->getSession()
                 ->getManager()
-                ->getId() . '_' . $this->getId());
+                ->getId().'_'.$this->getId());
         }
 
         return $this->cacheId;
@@ -367,11 +343,10 @@ public function getCacheId()
     public function setMvcEvent(MvcEvent $mvcEvent)
     {
         $this->mvcEvent = $mvcEvent;
-        $this->request  = $mvcEvent->getRequest();
+        $this->request = $mvcEvent->getRequest();
     }
 
     /**
-     *
      * @return MvcEvent
      */
     public function getMvcEvent()
@@ -380,7 +355,6 @@ public function getMvcEvent()
     }
 
     /**
-     *
      * @return HttpRequest
      */
     public function getRequest()
@@ -389,14 +363,15 @@ public function getRequest()
     }
 
     /**
-     * Set the translator
+     * Set the translator.
+     *
+     * @param Translator $translator
      *
-     * @param  Translator                $translator
      * @throws \InvalidArgumentException
      */
     public function setTranslator($translator = null)
     {
-        if (! $translator instanceof Translator && ! $translator instanceof \Zend\I18n\Translator\TranslatorInterface) {
+        if (!$translator instanceof Translator && !$translator instanceof \Zend\I18n\Translator\TranslatorInterface) {
             throw new \InvalidArgumentException('Translator must be an instanceof "Zend\I18n\Translator\Translator" or "Zend\I18n\Translator\TranslatorInterface"');
         }
 
@@ -404,7 +379,6 @@ public function setTranslator($translator = null)
     }
 
     /**
-     *
      * @return Translator
      */
     public function getTranslator()
@@ -413,8 +387,7 @@ public function getTranslator()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasTranslator()
     {
@@ -426,9 +399,10 @@ public function hasTranslator()
     }
 
     /**
-     * Set the data source
+     * Set the data source.
+     *
+     * @param mixed $data
      *
-     * @param  mixed      $data
      * @throws \Exception
      */
     public function setDataSource($data)
@@ -441,14 +415,14 @@ public function setDataSource($data)
             $this->dataSource = new DataSource\Doctrine2($data);
         } elseif ($data instanceof ZendSelect) {
             $args = func_get_args();
-            if (count($args) === 1 || (! $args[1] instanceof \Zend\Db\Adapter\Adapter && ! $args[1] instanceof \Zend\Db\Sql\Sql)) {
+            if (count($args) === 1 || (!$args[1] instanceof \Zend\Db\Adapter\Adapter && !$args[1] instanceof \Zend\Db\Sql\Sql)) {
                 throw new \InvalidArgumentException('For "Zend\Db\Sql\Select" also a "Zend\Db\Adapter\Sql" or "Zend\Db\Sql\Sql" is needed.');
             }
             $this->dataSource = new DataSource\ZendSelect($data);
             $this->dataSource->setAdapter($args[1]);
         } elseif ($data instanceof Collection) {
             $args = func_get_args();
-            if (count($args) === 1 || ! $args[1] instanceof \Doctrine\ORM\EntityManager) {
+            if (count($args) === 1 || !$args[1] instanceof \Doctrine\ORM\EntityManager) {
                 throw new \InvalidArgumentException('If providing a Collection, also the Doctrine\ORM\EntityManager is needed as a second parameter');
             }
             $this->dataSource = new DataSource\Doctrine2Collection($data);
@@ -459,7 +433,6 @@ public function setDataSource($data)
     }
 
     /**
-     *
      * @return \ZfcDatagrid\DataSource\DataSourceInterface
      */
     public function getDataSource()
@@ -470,7 +443,7 @@ public function getDataSource()
     /**
      * Datasource defined?
      *
-     * @return boolean
+     * @return bool
      */
     public function hasDataSource()
     {
@@ -482,9 +455,9 @@ public function hasDataSource()
     }
 
     /**
-     * Set default items per page (-1 for unlimited)
+     * Set default items per page (-1 for unlimited).
      *
-     * @param integer $count
+     * @param int $count
      */
     public function setDefaultItemsPerPage($count = 25)
     {
@@ -492,8 +465,7 @@ public function setDefaultItemsPerPage($count = 25)
     }
 
     /**
-     *
-     * @return integer
+     * @return int
      */
     public function getDefaultItemsPerPage()
     {
@@ -501,7 +473,7 @@ public function getDefaultItemsPerPage()
     }
 
     /**
-     * Set the title
+     * Set the title.
      *
      * @param string $title
      */
@@ -511,7 +483,6 @@ public function setTitle($title)
     }
 
     /**
-     *
      * @return string
      */
     public function getTitle()
@@ -520,7 +491,7 @@ public function getTitle()
     }
 
     /**
-     * Add a external parameter
+     * Add a external parameter.
      *
      * @param string $name
      * @param mixed  $value
@@ -531,7 +502,7 @@ public function addParameter($name, $value)
     }
 
     /**
-     * These parameters are handled to the view + over all grid actions
+     * These parameters are handled to the view + over all grid actions.
      *
      * @param array $parameters
      */
@@ -541,7 +512,6 @@ public function setParameters(array $parameters)
     }
 
     /**
-     *
      * @return array
      */
     public function getParameters()
@@ -552,7 +522,7 @@ public function getParameters()
     /**
      * Has parameters?
      *
-     * @return boolean
+     * @return bool
      */
     public function hasParameters()
     {
@@ -560,7 +530,7 @@ public function hasParameters()
     }
 
     /**
-     * Set the base url
+     * Set the base url.
      *
      * @param string $url
      */
@@ -570,7 +540,6 @@ public function setUrl($url)
     }
 
     /**
-     *
      * @return string
      */
     public function getUrl()
@@ -579,7 +548,7 @@ public function getUrl()
     }
 
     /**
-     * Set the export renderers (overwrite the config)
+     * Set the export renderers (overwrite the config).
      *
      * @param array $renderers
      */
@@ -589,14 +558,14 @@ public function setExportRenderers(array $renderers = [])
     }
 
     /**
-     * Get the export renderers
+     * Get the export renderers.
      *
      * @return array
      */
     public function getExportRenderers()
     {
         if (null === $this->exportRenderers) {
-            $options               = $this->getOptions();
+            $options = $this->getOptions();
             $this->exportRenderers = $options['settings']['export']['formats'];
         }
 
@@ -604,7 +573,7 @@ public function getExportRenderers()
     }
 
     /**
-     * Create a column from array instanceof
+     * Create a column from array instanceof.
      *
      * @param array $config
      *
@@ -616,21 +585,21 @@ private function createColumn($config)
             return $config;
         }
 
-        if (! is_array($config) && ! $config instanceof Column\AbstractColumn) {
+        if (!is_array($config) && !$config instanceof Column\AbstractColumn) {
             throw new \InvalidArgumentException('createColumn() supports only a config array or instanceof Column\AbstractColumn as a parameter');
         }
 
         $colType = isset($config['colType']) ? $config['colType'] : 'Select';
         if (class_exists($colType, true)) {
             $class = $colType;
-        } elseif (class_exists('ZfcDatagrid\\Column\\' . $colType, true)) {
-            $class = 'ZfcDatagrid\\Column\\' . $colType;
+        } elseif (class_exists('ZfcDatagrid\\Column\\'.$colType, true)) {
+            $class = 'ZfcDatagrid\\Column\\'.$colType;
         } else {
             throw new \InvalidArgumentException(sprintf('Column type: "%s" not found!', $colType));
         }
 
         if ('ZfcDatagrid\\Column\\Select' == $class) {
-            if (! isset($config['select']['column'])) {
+            if (!isset($config['select']['column'])) {
                 throw new \InvalidArgumentException('For "ZfcDatagrid\Column\Select" the option select[column] must be defined!');
             }
             $table = isset($config['select']['table']) ? $config['select']['table'] : null;
@@ -641,10 +610,10 @@ private function createColumn($config)
         }
 
         foreach ($config as $key => $value) {
-            $method = 'set' . ucfirst($key);
+            $method = 'set'.ucfirst($key);
             if (method_exists($instance, $method)) {
                 if (in_array($key, $this->specialMethods)) {
-                    if (! is_array($value)) {
+                    if (!is_array($value)) {
                         $value = [
                             $value,
                         ];
@@ -666,7 +635,7 @@ private function createColumn($config)
     }
 
     /**
-     * Set multiple columns by array (willoverwrite all existing)
+     * Set multiple columns by array (willoverwrite all existing).
      *
      * @param array $columns
      */
@@ -675,7 +644,7 @@ public function setColumns(array $columns)
         $useColumns = [];
 
         foreach ($columns as $col) {
-            $col                             = $this->createColumn($col);
+            $col = $this->createColumn($col);
             $useColumns[$col->getUniqueId()] = $col;
         }
 
@@ -683,18 +652,17 @@ public function setColumns(array $columns)
     }
 
     /**
-     * Add a column by array config or instanceof Column\AbstractColumn
+     * Add a column by array config or instanceof Column\AbstractColumn.
      *
      * @param array|Column\AbstractColumn $col
      */
     public function addColumn($col)
     {
-        $col                                = $this->createColumn($col);
+        $col = $this->createColumn($col);
         $this->columns[$col->getUniqueId()] = $col;
     }
 
     /**
-     *
      * @return \ZfcDatagrid\Column\AbstractColumn[]
      */
     public function getColumns()
@@ -703,8 +671,8 @@ public function getColumns()
     }
 
     /**
+     * @param string $id
      *
-     * @param  string                $id
      * @return Column\AbstractColumn null
      */
     public function getColumnByUniqueId($id)
@@ -717,7 +685,6 @@ public function getColumnByUniqueId($id)
     }
 
     /**
-     *
      * @param Style\AbstractStyle $style
      */
     public function addRowStyle(Style\AbstractStyle $style)
@@ -726,7 +693,6 @@ public function addRowStyle(Style\AbstractStyle $style)
     }
 
     /**
-     *
      * @return Style\AbstractStyle[]
      */
     public function getRowStyles()
@@ -735,8 +701,7 @@ public function getRowStyles()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasRowStyles()
     {
@@ -744,18 +709,17 @@ public function hasRowStyles()
     }
 
     /**
-     * If disabled, the toolbar filter will not be shown to the user
+     * If disabled, the toolbar filter will not be shown to the user.
      *
-     * @param boolean $mode
+     * @param bool $mode
      */
     public function setUserFilterDisabled($mode = true)
     {
-        $this->isUserFilterEnabled = (bool) ! $mode;
+        $this->isUserFilterEnabled = (bool) !$mode;
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function isUserFilterEnabled()
     {
@@ -772,18 +736,13 @@ public function setRowClickAction(Column\Action\AbstractAction $action)
         $this->rowClickAction = $action;
     }
 
-    /**
-     *
-     * @return null Column\Action\AbstractAction
-     */
     public function getRowClickAction()
     {
         return $this->rowClickAction;
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasRowClickAction()
     {
@@ -795,7 +754,7 @@ public function hasRowClickAction()
     }
 
     /**
-     * Add a mass action
+     * Add a mass action.
      *
      * @param Action\Mass $action
      */
@@ -805,7 +764,6 @@ public function addMassAction(Action\Mass $action)
     }
 
     /**
-     *
      * @return Action\Mass[]
      */
     public function getMassActions()
@@ -814,8 +772,7 @@ public function getMassActions()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function hasMassAction()
     {
@@ -825,7 +782,7 @@ public function hasMassAction()
     /**
      * Overwrite the render
      * F.x.
-     * if you want to directly render a PDF
+     * if you want to directly render a PDF.
      *
      * @param string $name
      */
@@ -835,13 +792,13 @@ public function setRendererName($name = null)
     }
 
     /**
-     * Get the current renderer name
+     * Get the current renderer name.
      *
      * @return string
      */
     public function getRendererName()
     {
-        $options       = $this->getOptions();
+        $options = $this->getOptions();
         $parameterName = $options['generalParameterNames']['rendererType'];
 
         if ($this->forceRenderer !== null) {
@@ -865,9 +822,10 @@ public function getRendererName()
     }
 
     /**
-     * Return the current renderer
+     * Return the current renderer.
      *
      * @throws \Exception
+     *
      * @return \ZfcDatagrid\Renderer\AbstractRenderer
      */
     public function getRenderer()
@@ -875,7 +833,7 @@ public function getRenderer()
         if (null === $this->renderer) {
             if (isset($this->rendererService)) {
                 $renderer = $this->rendererService;
-                if (! $renderer instanceof Renderer\AbstractRenderer) {
+                if (!$renderer instanceof Renderer\AbstractRenderer) {
                     throw new \Exception('Renderer service must implement "ZfcDatagrid\Renderer\AbstractRenderer"');
                 }
                 $renderer->setOptions($this->getOptions());
@@ -904,8 +862,7 @@ public function getRenderer()
     }
 
     /**
-     *
-     * @return boolean
+     * @return bool
      */
     public function isDataLoaded()
     {
@@ -913,7 +870,7 @@ public function isDataLoaded()
     }
 
     /**
-     * Load the data
+     * Load the data.
      */
     public function loadData()
     {
@@ -930,29 +887,29 @@ public function loadData()
         }
 
         /**
-         * Apply cache
+         * Apply cache.
          */
         $renderer = $this->getRenderer();
 
-        /**
+        /*
          * Step 1) Apply needed columns + filters + sort
          * - from Request (HTML View) -> and save in cache for export
          * - or from cache (Export PDF / Excel) -> same view like HTML (without LIMIT/Pagination)
          */
         {
-            /**
+            /*
              * Step 1.1) Only select needed columns (performance)
              */
             $this->getDataSource()->setColumns($this->getColumns());
 
-            /**
+            /*
              * Step 1.2) Sorting
              */
             foreach ($renderer->getSortConditions() as $condition) {
                 $this->getDataSource()->addSortCondition($condition['column'], $condition['sortDirection']);
             }
 
-            /**
+            /*
              * Step 1.3) Filtering
              */
             foreach ($renderer->getFilters() as $filter) {
@@ -975,7 +932,7 @@ public function loadData()
 
             /* @var $currentItems \ArrayIterator */
             $data = $this->paginator->getCurrentItems();
-            if (! is_array($data)) {
+            if (!is_array($data)) {
                 if ($data instanceof \Zend\Db\ResultSet\ResultSet) {
                     $data = $data->toArray();
                 } elseif ($data instanceof ArrayIterator) {
@@ -1000,8 +957,8 @@ public function loadData()
         if ($this->getOptions()['settings']['export']['enabled'] && $renderer->isExport() === false) {
             $cacheData = [
                 'sortConditions' => $renderer->getSortConditions(),
-                'filters'        => $renderer->getFilters(),
-                'currentPage'    => $this->getPaginator()->getCurrentPageNumber(),
+                'filters' => $renderer->getFilters(),
+                'currentPage' => $this->getPaginator()->getCurrentPageNumber(),
             ];
             $success = $this->getCache()->setItem($this->getCacheId(), $cacheData);
             if ($success !== true) {
@@ -1032,7 +989,7 @@ public function loadData()
     }
 
     /**
-     * Render the grid
+     * Render the grid.
      */
     public function render()
     {
@@ -1042,7 +999,7 @@ public function render()
 
         /**
          * Step 4) Render the data to the defined output format (HTML, PDF...)
-         * - Styling the values based on column (and value)
+         * - Styling the values based on column (and value).
          */
         $renderer = $this->getRenderer();
         $renderer->setTitle($this->getTitle());
@@ -1058,7 +1015,7 @@ public function render()
     /**
      * Is already rendered?
      *
-     * @return boolean
+     * @return bool
      */
     public function isRendered()
     {
@@ -1066,8 +1023,8 @@ public function isRendered()
     }
 
     /**
-     *
      * @throws \Exception
+     *
      * @return Paginator
      */
     public function getPaginator()
@@ -1080,7 +1037,6 @@ public function getPaginator()
     }
 
     /**
-     *
      * @return array
      */
     private function getPreparedData()
@@ -1089,7 +1045,7 @@ private function getPreparedData()
     }
 
     /**
-     * Set the toolbar view template
+     * Set the toolbar view template.
      *
      * @param string $name
      */
@@ -1100,7 +1056,7 @@ public function setToolbarTemplate($name)
 
     /**
      * Get the toolbar template name
-     * Return null if nothing custom set
+     * Return null if nothing custom set.
      *
      * @return string|null
      */
@@ -1110,7 +1066,7 @@ public function getToolbarTemplate()
     }
 
     /**
-     * Set the toolbar view template variables
+     * Set the toolbar view template variables.
      *
      * @param array $variables
      */
@@ -1120,7 +1076,7 @@ public function setToolbarTemplateVariables(array $variables)
     }
 
     /**
-     * Get the toolbar template variables
+     * Get the toolbar template variables.
      *
      * @return array
      */
@@ -1132,7 +1088,8 @@ public function getToolbarTemplateVariables()
     /**
      * Set a custom ViewModel...generally NOT necessary!
      *
-     * @param  ViewModel  $viewModel
+     * @param ViewModel $viewModel
+     *
      * @throws \Exception
      */
     public function setViewModel(ViewModel $viewModel)
@@ -1145,7 +1102,6 @@ public function setViewModel(ViewModel $viewModel)
     }
 
     /**
-     *
      * @return ViewModel
      */
     public function getViewModel()
@@ -1158,12 +1114,11 @@ public function getViewModel()
     }
 
     /**
-     *
      * @return \Zend\Stdlib\ResponseInterface|\Zend\Http\Response\Stream|\Zend\View\Model\ViewModel
      */
     public function getResponse()
     {
-        if (! $this->isRendered()) {
+        if (!$this->isRendered()) {
             $this->render();
         }
 
@@ -1173,13 +1128,13 @@ public function getResponse()
     /**
      * Is this a HTML "init" response?
      * YES: loading the HTML for the grid
-     * NO: AJAX loading OR it's an export
+     * NO: AJAX loading OR it's an export.
      *
-     * @return boolean
+     * @return bool
      */
     public function isHtmlInitReponse()
     {
-        if (! $this->getResponse() instanceof JsonModel && ! $this->getResponse() instanceof ResponseInterface) {
+        if (!$this->getResponse() instanceof JsonModel && !$this->getResponse() instanceof ResponseInterface) {
             return true;
         }
 
@@ -1187,7 +1142,8 @@ public function isHtmlInitReponse()
     }
 
     /**
-     * @param  Renderer\AbstractRenderer $rendererService
+     * @param Renderer\AbstractRenderer $rendererService
+     *
      * @return self
      */
     public function setRendererService(Renderer\AbstractRenderer $rendererService)
@@ -1196,4 +1152,28 @@ public function setRendererService(Renderer\AbstractRenderer $rendererService)
 
         return $this;
     }
+
+    /**
+     * Set service locator.
+     *
+     * @param ContainerInterface $serviceLocator
+     *
+     * @return mixed
+     */
+    public function setServiceLocator(ContainerInterface $serviceLocator)
+    {
+        $this->serviceLocator = $serviceLocator;
+
+        return $this;
+    }
+
+    /**
+     * Get service locator.
+     *
+     * @return ContainerInterface
+     */
+    public function getServiceLocator()
+    {
+        return $this->serviceLocator;
+    }
 }
diff --git a/src/ZfcDatagrid/Filter.php b/src/ZfcDatagrid/Filter.php
index 6c353dbd..2f74d88f 100644
--- a/src/ZfcDatagrid/Filter.php
+++ b/src/ZfcDatagrid/Filter.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid;
 
 use InvalidArgumentException;
@@ -7,7 +8,7 @@ class Filter
 {
     /**
      * The constant values are used for display on the usergrid filter
-     * This is for help, how the data is filtered really
+     * This is for help, how the data is filtered really.
      *
      * @var string
      */
@@ -55,7 +56,6 @@ class Filter
     const BETWEEN = '%s <> %s';
 
     /**
-     *
      * @var Column\AbstractColumn
      */
     private $column;
@@ -67,7 +67,7 @@ class Filter
     private $displayColumnValue;
 
     /**
-     * Apply a filter based on a column
+     * Apply a filter based on a column.
      *
      * @param Column\AbstractColumn $column
      * @param string                $inputFilterValue
@@ -79,14 +79,15 @@ public function setFromColumn(Column\AbstractColumn $column, $inputFilterValue)
     }
 
     /**
-     * Convert the input filter to operator + filter + display filter value
+     * Convert the input filter to operator + filter + display filter value.
      *
      * Partly idea taken from ZfDatagrid
      *
      * @see https://github.com/zfdatagrid/grid/blob/master/library/Bvb/Grid.php#L1438
      *
-     * @param  string $inputFilterValue
-     * @param  mixed  $defaultOperator
+     * @param string $inputFilterValue
+     * @param mixed  $defaultOperator
+     *
      * @return array
      */
     private function setColumnOperator($inputFilterValue, $defaultOperator = self::LIKE)
@@ -97,23 +98,23 @@ private function setColumnOperator($inputFilterValue, $defaultOperator = self::L
         $this->displayColumnValue = $inputFilterValue;
 
         $operator = $defaultOperator;
-        $value    = $inputFilterValue;
+        $value = $inputFilterValue;
 
         if (substr($inputFilterValue, 0, 2) == '=(') {
             $operator = self::IN;
-            $value    = substr($inputFilterValue, 2);
+            $value = substr($inputFilterValue, 2);
             if (substr($value, -1) == ')') {
                 $value = substr($value, 0, -1);
             }
         } elseif (substr($inputFilterValue, 0, 3) == '!=(') {
             $operator = self::NOT_IN;
-            $value    = substr($inputFilterValue, 3);
+            $value = substr($inputFilterValue, 3);
             if (substr($value, -1) == ')') {
                 $value = substr($value, 0, -1);
             }
         } elseif (substr($inputFilterValue, 0, 2) == '!=' || substr($inputFilterValue, 0, 2) == '<>') {
             $operator = self::NOT_EQUAL;
-            $value    = substr($inputFilterValue, 2);
+            $value = substr($inputFilterValue, 2);
         } elseif (substr($inputFilterValue, 0, 2) == '!~' || substr($inputFilterValue, 0, 1) == '!') {
             // NOT LIKE or NOT EQUAL
             if (substr($inputFilterValue, 0, 2) == '!~') {
@@ -126,14 +127,14 @@ private function setColumnOperator($inputFilterValue, $defaultOperator = self::L
                 // NOT LIKE
                 if ((substr($value, 0, 1) == '*' && substr($value, -1) == '*') || (substr($value, 0, 1) == '%' && substr($value, -1) == '%')) {
                     $operator = self::NOT_LIKE;
-                    $value    = substr($value, 1);
-                    $value    = substr($value, 0, -1);
+                    $value = substr($value, 1);
+                    $value = substr($value, 0, -1);
                 } elseif (substr($value, 0, 1) == '*' || substr($value, 0, 1) == '%') {
                     $operator = self::NOT_LIKE_LEFT;
-                    $value    = substr($value, 1);
+                    $value = substr($value, 1);
                 } elseif (substr($value, -1) == '*' || substr($value, -1) == '%') {
                     $operator = self::NOT_LIKE_RIGHT;
-                    $value    = substr($value, 0, -1);
+                    $value = substr($value, 0, -1);
                 } else {
                     $operator = self::NOT_LIKE;
                 }
@@ -150,38 +151,38 @@ private function setColumnOperator($inputFilterValue, $defaultOperator = self::L
 
             if ((substr($value, 0, 1) == '*' && substr($value, -1) == '*') || (substr($value, 0, 1) == '%' && substr($value, -1) == '%')) {
                 $operator = self::LIKE;
-                $value    = substr($value, 1);
-                $value    = substr($value, 0, -1);
+                $value = substr($value, 1);
+                $value = substr($value, 0, -1);
             } elseif (substr($value, 0, 1) == '*' || substr($value, 0, 1) == '%') {
                 $operator = self::LIKE_LEFT;
-                $value    = substr($value, 1);
+                $value = substr($value, 1);
             } elseif (substr($value, -1) == '*' || substr($value, -1) == '%') {
                 $operator = self::LIKE_RIGHT;
-                $value    = substr($value, 0, -1);
+                $value = substr($value, 0, -1);
             } else {
                 $operator = self::LIKE;
             }
         } elseif (substr($inputFilterValue, 0, 2) == '==') {
             $operator = self::EQUAL;
-            $value    = substr($inputFilterValue, 2);
+            $value = substr($inputFilterValue, 2);
         } elseif (substr($inputFilterValue, 0, 1) == '=') {
             $operator = self::EQUAL;
-            $value    = substr($inputFilterValue, 1);
+            $value = substr($inputFilterValue, 1);
         } elseif (substr($inputFilterValue, 0, 2) == '>=') {
             $operator = self::GREATER_EQUAL;
-            $value    = substr($inputFilterValue, 2);
+            $value = substr($inputFilterValue, 2);
         } elseif (substr($inputFilterValue, 0, 1) == '>') {
             $operator = self::GREATER;
-            $value    = substr($inputFilterValue, 1);
+            $value = substr($inputFilterValue, 1);
         } elseif (substr($inputFilterValue, 0, 2) == '<=') {
             $operator = self::LESS_EQUAL;
-            $value    = substr($inputFilterValue, 2);
+            $value = substr($inputFilterValue, 2);
         } elseif (substr($inputFilterValue, 0, 1) == '<') {
             $operator = self::LESS;
-            $value    = substr($inputFilterValue, 1);
+            $value = substr($inputFilterValue, 1);
         } elseif (strpos($inputFilterValue, '<>') !== false) {
             $operator = self::BETWEEN;
-            $value    = explode('<>', $inputFilterValue);
+            $value = explode('<>', $inputFilterValue);
         }
         $this->operator = $operator;
 
@@ -220,7 +221,7 @@ private function setColumnOperator($inputFilterValue, $defaultOperator = self::L
          */
         foreach ($value as &$val) {
             $type = $this->getColumn()->getType();
-            $val  = $type->getFilterValue($val);
+            $val = $type->getFilterValue($val);
 
             // @TODO Translation + Replace
         }
@@ -229,9 +230,9 @@ private function setColumnOperator($inputFilterValue, $defaultOperator = self::L
     }
 
     /**
-     * Is this a column filter
+     * Is this a column filter.
      *
-     * @return boolean
+     * @return bool
      */
     public function isColumnFilter()
     {
@@ -243,7 +244,7 @@ public function isColumnFilter()
     }
 
     /**
-     * Only needed for column filter
+     * Only needed for column filter.
      *
      * @return Column\AbstractColumn
      */
@@ -253,7 +254,6 @@ public function getColumn()
     }
 
     /**
-     *
      * @return array
      */
     public function getValues()
@@ -262,7 +262,6 @@ public function getValues()
     }
 
     /**
-     *
      * @return string
      */
     public function getOperator()
@@ -271,7 +270,7 @@ public function getOperator()
     }
 
     /**
-     * Get the value displayed to the user
+     * Get the value displayed to the user.
      *
      * @return string
      */
@@ -281,7 +280,7 @@ public function getDisplayColumnValue()
     }
 
     /**
-     * Check if a value is the same (used for style, display actions)
+     * Check if a value is the same (used for style, display actions).
      *
      * @param mixed  $currentValue
      *                              rowValue
@@ -289,98 +288,98 @@ public function getDisplayColumnValue()
      *                              filterValue
      * @param string $operator
      *
-     * @return boolean
+     * @return bool
      */
-    public static function isApply($currentValue, $expectedValue, $operator = Filter::EQUAL)
+    public static function isApply($currentValue, $expectedValue, $operator = self::EQUAL)
     {
         list($currentValue, $expectedValue) = self::convertValues($currentValue, $expectedValue, $operator);
 
         switch ($operator) {
 
-            case Filter::LIKE:
+            case self::LIKE:
                 if (stripos($currentValue, $expectedValue) !== false) {
                     return true;
                 }
                 break;
 
-            case Filter::LIKE_LEFT:
-                $length        = strlen($expectedValue);
-                $start         = 0 - $length;
+            case self::LIKE_LEFT:
+                $length = strlen($expectedValue);
+                $start = 0 - $length;
                 $searchedValue = substr($currentValue, $start, $length);
                 if (stripos($searchedValue, $expectedValue) !== false) {
                     return true;
                 }
                 break;
 
-            case Filter::LIKE_RIGHT:
-                $length        = strlen($expectedValue);
+            case self::LIKE_RIGHT:
+                $length = strlen($expectedValue);
                 $searchedValue = substr($currentValue, 0, $length);
                 if (stripos($searchedValue, $expectedValue) !== false) {
                     return true;
                 }
                 break;
 
-            case Filter::NOT_LIKE:
+            case self::NOT_LIKE:
                 if (stripos($currentValue, $expectedValue) === false) {
                     return true;
                 }
                 break;
 
-            case Filter::NOT_LIKE_LEFT:
-                $length        = strlen($expectedValue);
-                $start         = 0 - $length;
+            case self::NOT_LIKE_LEFT:
+                $length = strlen($expectedValue);
+                $start = 0 - $length;
                 $searchedValue = substr($currentValue, $start, $length);
                 if (stripos($searchedValue, $expectedValue) === false) {
                     return true;
                 }
                 break;
 
-            case Filter::NOT_LIKE_RIGHT:
-                $length        = strlen($expectedValue);
+            case self::NOT_LIKE_RIGHT:
+                $length = strlen($expectedValue);
                 $searchedValue = substr($currentValue, 0, $length);
                 if (stripos($searchedValue, $expectedValue) === false) {
                     return true;
                 }
                 break;
 
-            case Filter::EQUAL:
-            case Filter::IN:
+            case self::EQUAL:
+            case self::IN:
                 return $currentValue == $expectedValue;
                 break;
 
-            case Filter::NOT_EQUAL:
-            case Filter::NOT_IN:
+            case self::NOT_EQUAL:
+            case self::NOT_IN:
                 return $currentValue != $expectedValue;
                 break;
 
-            case Filter::GREATER_EQUAL:
+            case self::GREATER_EQUAL:
                 return $currentValue >= $expectedValue;
                 break;
 
-            case Filter::GREATER:
+            case self::GREATER:
                 return $currentValue > $expectedValue;
                 break;
 
-            case Filter::LESS_EQUAL:
+            case self::LESS_EQUAL:
                 return $currentValue <= $expectedValue;
                 break;
 
-            case Filter::LESS:
+            case self::LESS:
                 return $currentValue < $expectedValue;
                 break;
 
-            case Filter::BETWEEN:
+            case self::BETWEEN:
                 if (count($expectedValue) >= 2) {
                     if ($currentValue >= $expectedValue[0] && $currentValue <= $expectedValue[1]) {
                         return true;
                     }
                 } else {
-                    throw new InvalidArgumentException('Between needs exactly an array of two expected values. Give: "' . print_r($expectedValue, true));
+                    throw new InvalidArgumentException('Between needs exactly an array of two expected values. Give: "'.print_r($expectedValue, true));
                 }
                 break;
 
             default:
-                throw new InvalidArgumentException('currently not implemented filter type: "' . $operator . '"');
+                throw new InvalidArgumentException('currently not implemented filter type: "'.$operator.'"');
                 break;
         }
 
@@ -388,23 +387,23 @@ public static function isApply($currentValue, $expectedValue, $operator = Filter
     }
 
     /**
+     * @param string $currentValue
+     * @param string $expectedValue
+     * @param string $operator
      *
-     * @param  string   $currentValue
-     * @param  string   $expectedValue
-     * @param  string   $operator
      * @return string[]
      */
-    private static function convertValues($currentValue, $expectedValue, $operator = Filter::EQUAL)
+    private static function convertValues($currentValue, $expectedValue, $operator = self::EQUAL)
     {
         switch ($operator) {
 
-            case Filter::LIKE:
-            case Filter::LIKE_LEFT:
-            case Filter::LIKE_RIGHT:
-            case Filter::NOT_LIKE:
-            case Filter::NOT_LIKE_LEFT:
-            case Filter::NOT_LIKE_RIGHT:
-                $currentValue  = (string) $currentValue;
+            case self::LIKE:
+            case self::LIKE_LEFT:
+            case self::LIKE_RIGHT:
+            case self::NOT_LIKE:
+            case self::NOT_LIKE_LEFT:
+            case self::NOT_LIKE_RIGHT:
+                $currentValue = (string) $currentValue;
                 $expectedValue = (string) $expectedValue;
                 break;
         }
diff --git a/src/ZfcDatagrid/Library/ImageResize.php b/src/ZfcDatagrid/Library/ImageResize.php
index eecc6d70..44439475 100644
--- a/src/ZfcDatagrid/Library/ImageResize.php
+++ b/src/ZfcDatagrid/Library/ImageResize.php
@@ -1,29 +1,31 @@
 <?php
+
 namespace ZfcDatagrid\Library;
 
 class ImageResize
 {
     /**
-     * Calculate the width / height, respecting the ratio
+     * Calculate the width / height, respecting the ratio.
+     *
+     * @param float $width
+     * @param float $height
+     * @param float $maxWidth
+     * @param float $maxHeight
      *
-     * @param  float $width
-     * @param  float $height
-     * @param  float $maxWidth
-     * @param  float $maxHeight
      * @return array
      */
     public static function getCalculatedSize($width, $height, $maxWidth, $maxHeight)
     {
-        $widthDiffRatio  = $maxWidth / $width;
+        $widthDiffRatio = $maxWidth / $width;
         $heightDiffRatio = $maxHeight / $height;
 
         if ($widthDiffRatio <= $heightDiffRatio) {
             // resize based on width
-            $newWidth  = $maxWidth;
+            $newWidth = $maxWidth;
             $newHeight = $height * $widthDiffRatio;
         } else {
             // resize based on height
-            $newWidth  = $width * $heightDiffRatio;
+            $newWidth = $width * $heightDiffRatio;
             $newHeight = $maxHeight;
         }
 
diff --git a/src/ZfcDatagrid/Module.php b/src/ZfcDatagrid/Module.php
index 327b3168..678e26b2 100644
--- a/src/ZfcDatagrid/Module.php
+++ b/src/ZfcDatagrid/Module.php
@@ -1,17 +1,17 @@
 <?php
+
 namespace ZfcDatagrid;
 
 class Module
 {
     /**
-     *
      * @return array|mixed
      */
     public function getConfig()
     {
-        $config = include __DIR__ . '/../../config/module.config.php';
+        $config = include __DIR__.'/../../config/module.config.php';
         if ($config['ZfcDatagrid']['renderer']['bootstrapTable']['daterange']['enabled'] === true) {
-            $configNoCache = include __DIR__ . '/../../config/daterange.config.php';
+            $configNoCache = include __DIR__.'/../../config/daterange.config.php';
 
             $config = array_merge_recursive($config, $configNoCache);
         }
diff --git a/src/ZfcDatagrid/PrepareData.php b/src/ZfcDatagrid/PrepareData.php
index 9401dfc6..fa773987 100644
--- a/src/ZfcDatagrid/PrepareData.php
+++ b/src/ZfcDatagrid/PrepareData.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid;
 
 use Zend\I18n\Translator\Translator;
@@ -6,19 +7,16 @@
 class PrepareData
 {
     /**
-     *
      * @var array
      */
     private $columns = [];
 
     /**
-     *
      * @var array
      */
     private $data = [];
 
     /**
-     *
      * @var array null
      */
     private $dataPrepared;
@@ -26,13 +24,11 @@ class PrepareData
     private $rendererName;
 
     /**
-     *
      * @var Translator
      */
     private $translator;
 
     /**
-     *
      * @param array $data
      * @param array $columns
      */
@@ -43,7 +39,6 @@ public function __construct(array $data, array $columns)
     }
 
     /**
-     *
      * @param array $columns
      */
     public function setColumns(array $columns)
@@ -52,7 +47,6 @@ public function setColumns(array $columns)
     }
 
     /**
-     *
      * @return array
      */
     public function getColumns()
@@ -61,7 +55,6 @@ public function getColumns()
     }
 
     /**
-     *
      * @param array $data
      */
     public function setData(array $data)
@@ -70,8 +63,8 @@ public function setData(array $data)
     }
 
     /**
+     * @param bool $raw
      *
-     * @param  boolean $raw
      * @return array
      */
     public function getData($raw = false)
@@ -86,7 +79,6 @@ public function getData($raw = false)
     }
 
     /**
-     *
      * @param string $name
      */
     public function setRendererName($name = null)
@@ -95,7 +87,6 @@ public function setRendererName($name = null)
     }
 
     /**
-     *
      * @return string
      */
     public function getRendererName()
@@ -104,13 +95,13 @@ public function getRendererName()
     }
 
     /**
+     * @param Translator $translator
      *
-     * @param  Translator                $translator
      * @throws \InvalidArgumentException
      */
     public function setTranslator($translator)
     {
-        if (! $translator instanceof Translator && ! $translator instanceof \Zend\I18n\Translator\TranslatorInterface) {
+        if (!$translator instanceof Translator && !$translator instanceof \Zend\I18n\Translator\TranslatorInterface) {
             throw new \InvalidArgumentException('Translator must be an instanceof "Zend\I18n\Translator\Translator" or "Zend\I18n\Translator\TranslatorInterface"');
         }
 
@@ -118,7 +109,6 @@ public function setTranslator($translator)
     }
 
     /**
-     *
      * @return \Zend\I18n\Translator\Translator
      */
     public function getTranslator()
@@ -130,7 +120,8 @@ public function getTranslator()
      * Return true if preparing executed, false if already done!
      *
      * @throws \Exception
-     * @return boolean
+     *
+     * @return bool
      */
     public function prepare()
     {
@@ -166,7 +157,7 @@ public function prepare()
                     $row[$col->getUniqueId()] = $dataPopulation->toString();
                 }
 
-                if (! isset($row[$col->getUniqueId()])) {
+                if (!isset($row[$col->getUniqueId()])) {
                     $row[$col->getUniqueId()] = '';
                 }
 
diff --git a/src/ZfcDatagrid/Renderer/AbstractExport.php b/src/ZfcDatagrid/Renderer/AbstractExport.php
index 7d5f03ae..72ace753 100644
--- a/src/ZfcDatagrid/Renderer/AbstractExport.php
+++ b/src/ZfcDatagrid/Renderer/AbstractExport.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * Methods which can be used in (all) export renderer
- *
+ * Methods which can be used in (all) export renderer.
  */
 namespace ZfcDatagrid\Renderer;
 
@@ -10,7 +9,6 @@
 abstract class AbstractExport extends AbstractRenderer
 {
     /**
-     *
      * @var array
      */
     protected $allowedColumnTypes = [
@@ -21,15 +19,15 @@ abstract class AbstractExport extends AbstractRenderer
     ];
 
     /**
-     *
      * @var Column\AbstractColumn[]
      */
     protected $columnsToExport;
 
     /**
-     * Decide which columns we want to display
+     * Decide which columns we want to display.
      *
      * @return Column\AbstractColumn[]
+     *
      * @throws \Exception
      */
     protected function getColumnsToExport()
@@ -42,7 +40,7 @@ protected function getColumnsToExport()
         foreach ($this->getColumns() as $column) {
             /* @var $column \ZfcDatagrid\Column\AbstractColumn */
 
-            if (! $column instanceof Column\Action && $column->isHidden() === false && in_array(get_class($column->getType()), $this->allowedColumnTypes)) {
+            if (!$column instanceof Column\Action && $column->isHidden() === false && in_array(get_class($column->getType()), $this->allowedColumnTypes)) {
                 $columnsToExport[] = $column;
             }
         }
@@ -56,16 +54,17 @@ protected function getColumnsToExport()
     }
 
     /**
-     * Get the paper width in MM (milimeter)
+     * Get the paper width in MM (milimeter).
      *
      * @return float
+     *
      * @throws \Exception
      */
     protected function getPaperWidth()
     {
         $optionsRenderer = $this->getOptionsRenderer();
 
-        $papersize   = $optionsRenderer['papersize'];
+        $papersize = $optionsRenderer['papersize'];
         $orientation = $optionsRenderer['orientation'];
 
         if (substr($papersize, 0, 1) != 'A') {
@@ -78,7 +77,7 @@ protected function getPaperWidth()
         // A0 dimensions = 841 x 1189 mm
         $currentX = 841;
         $currentY = 1189;
-        for ($i = 0; $i < $divisor; $i ++) {
+        for ($i = 0; $i < $divisor; ++$i) {
             $tempY = $currentX;
             $tempX = floor($currentY / 2);
 
@@ -95,20 +94,20 @@ protected function getPaperWidth()
 
     /**
      * Get a valid filename to save
-     * (WITHOUT the extension!)
+     * (WITHOUT the extension!).
      *
      * @return string
      */
     protected function getFilename()
     {
-        $filenameParts   = [];
+        $filenameParts = [];
         $filenameParts[] = date('Y-m-d_H-i-s');
 
         if ($this->getTitle() != '') {
             $title = $this->getTitle();
             $title = str_replace(' ', '_', $title);
 
-            $filenameParts[] = preg_replace("/[^a-z0-9_-]+/i", "", $title);
+            $filenameParts[] = preg_replace('/[^a-z0-9_-]+/i', '', $title);
         }
 
         return implode('_', $filenameParts);
diff --git a/src/ZfcDatagrid/Renderer/AbstractRenderer.php b/src/ZfcDatagrid/Renderer/AbstractRenderer.php
index f34bb92c..82b34e7d 100644
--- a/src/ZfcDatagrid/Renderer/AbstractRenderer.php
+++ b/src/ZfcDatagrid/Renderer/AbstractRenderer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Renderer;
 
 use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
@@ -13,31 +14,26 @@
 abstract class AbstractRenderer implements RendererInterface
 {
     /**
-     *
      * @var array
      */
     protected $options = [];
 
     /**
-     *
      * @var string
      */
     protected $title;
 
     /**
-     *
      * @var Cache\Storage\StorageInterface
      */
     protected $cache;
 
     /**
-     *
      * @var string
      */
     protected $cacheId;
 
     /**
-     *
      * @var Paginator
      */
     protected $paginator;
@@ -63,48 +59,41 @@ abstract class AbstractRenderer implements RendererInterface
     protected $filters = null;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $currentPageNumber = null;
 
     /**
-     *
      * @var array
      */
     protected $data = [];
 
     /**
-     *
      * @var MvcEvent
      */
     protected $mvcEvent;
 
     /**
-     *
      * @var ViewModel
      */
     protected $viewModel;
 
     /**
-     *
      * @var string
      */
     protected $template;
 
     /**
-     *
      * @var string
      */
     protected $templateToolbar;
 
     /**
-     *
      * @var array
      */
     protected $toolbarTemplateVariables = [];
 
     /**
-     *
      * @var Translator
      */
     protected $translator;
@@ -115,7 +104,6 @@ public function setOptions(array $options)
     }
 
     /**
-     *
      * @return array
      */
     public function getOptions()
@@ -124,7 +112,6 @@ public function getOptions()
     }
 
     /**
-     *
      * @return array
      */
     public function getOptionsRenderer()
@@ -138,7 +125,6 @@ public function getOptionsRenderer()
     }
 
     /**
-     *
      * @param ViewModel $viewModel
      */
     public function setViewModel(ViewModel $viewModel)
@@ -147,7 +133,6 @@ public function setViewModel(ViewModel $viewModel)
     }
 
     /**
-     *
      * @return \Zend\View\Model\ViewModel
      */
     public function getViewModel()
@@ -156,7 +141,7 @@ public function getViewModel()
     }
 
     /**
-     * Set the view template
+     * Set the view template.
      *
      * @param string $name
      */
@@ -166,7 +151,7 @@ public function setTemplate($name)
     }
 
     /**
-     * Get the view template name
+     * Get the view template name.
      *
      * @return string
      */
@@ -180,10 +165,12 @@ public function getTemplate()
     }
 
     /**
-     * Get the default template path (if there is no own set)
+     * Get the default template path (if there is no own set).
+     *
+     * @param string $type layout or toolbar
      *
-     * @param  string     $type layout or toolbar
      * @return string
+     *
      * @throws \Exception
      */
     private function getTemplatePathDefault($type = 'layout')
@@ -194,16 +181,16 @@ private function getTemplatePathDefault($type = 'layout')
         }
 
         if ('layout' === $type) {
-            return 'zfc-datagrid/renderer/' . $this->getName() . '/' . $type;
+            return 'zfc-datagrid/renderer/'.$this->getName().'/'.$type;
         } elseif ('toolbar' === $type) {
             return 'zfc-datagrid/toolbar/toolbar';
         }
 
-        throw new \Exception('Unknown type: "' . $type . '"');
+        throw new \Exception('Unknown type: "'.$type.'"');
     }
 
     /**
-     * Set the toolbar view template name
+     * Set the toolbar view template name.
      *
      * @param string $name
      */
@@ -214,6 +201,7 @@ public function setToolbarTemplate($name)
 
     /**
      * @return string
+     *
      * @throws \Exception
      */
     public function getToolbarTemplate()
@@ -226,7 +214,7 @@ public function getToolbarTemplate()
     }
 
     /**
-     * Set the toolbar view template variables
+     * Set the toolbar view template variables.
      *
      * @param array $variables
      */
@@ -236,7 +224,7 @@ public function setToolbarTemplateVariables(array $variables)
     }
 
     /**
-     * Get the toolbar template variables
+     * Get the toolbar template variables.
      *
      * @return array
      */
@@ -257,7 +245,6 @@ public function setPaginator(Paginator $paginator)
     }
 
     /**
-     *
      * @return \Zend\Paginator\Paginator
      */
     public function getPaginator()
@@ -266,7 +253,7 @@ public function getPaginator()
     }
 
     /**
-     * Set the columns
+     * Set the columns.
      *
      * @param array $columns
      */
@@ -276,7 +263,7 @@ public function setColumns(array $columns)
     }
 
     /**
-     * Get all columns
+     * Get all columns.
      *
      * @return \ZfcDatagrid\Column\AbstractColumn[]
      */
@@ -286,7 +273,6 @@ public function getColumns()
     }
 
     /**
-     *
      * @param \ZfcDataGrid\Column\Style\AbstractStyle[] $rowStyles
      */
     public function setRowStyles($rowStyles = [])
@@ -295,7 +281,6 @@ public function setRowStyles($rowStyles = [])
     }
 
     /**
-     *
      * @return \ZfcDataGrid\Column\Style\AbstractStyle[]
      */
     public function getRowStyles()
@@ -304,7 +289,7 @@ public function getRowStyles()
     }
 
     /**
-     * Calculate the sum of the displayed column width to 100%
+     * Calculate the sum of the displayed column width to 100%.
      *
      * @param array $columns
      */
@@ -327,7 +312,7 @@ protected function calculateColumnWidthPercent(array $columns)
     }
 
     /**
-     * The prepared data
+     * The prepared data.
      *
      * @param array $data
      */
@@ -337,7 +322,6 @@ public function setData(array $data)
     }
 
     /**
-     *
      * @return array
      */
     public function getData()
@@ -346,7 +330,6 @@ public function getData()
     }
 
     /**
-     *
      * @return array
      */
     public function getCacheData()
@@ -355,14 +338,14 @@ public function getCacheData()
     }
 
     /**
-     *
      * @throws \Exception
+     *
      * @return array|false
      */
     private function getCacheSortConditions()
     {
         $cacheData = $this->getCacheData();
-        if (! isset($cacheData['sortConditions'])) {
+        if (!isset($cacheData['sortConditions'])) {
             return false;
         }
 
@@ -370,14 +353,14 @@ private function getCacheSortConditions()
     }
 
     /**
-     *
      * @throws \Exception
+     *
      * @return array|false
      */
     private function getCacheFilters()
     {
         $cacheData = $this->getCacheData();
-        if (! isset($cacheData['filters'])) {
+        if (!isset($cacheData['filters'])) {
             return false;
         }
 
@@ -405,7 +388,6 @@ public function getMvcEvent()
     }
 
     /**
-     *
      * @return \Zend\Stdlib\RequestInterface
      */
     public function getRequest()
@@ -414,13 +396,13 @@ public function getRequest()
     }
 
     /**
+     * @param Translator $translator
      *
-     * @param  Translator                $translator
      * @throws \InvalidArgumentException
      */
     public function setTranslator($translator)
     {
-        if (! $translator instanceof Translator && ! $translator instanceof \Zend\I18n\Translator\TranslatorInterface) {
+        if (!$translator instanceof Translator && !$translator instanceof \Zend\I18n\Translator\TranslatorInterface) {
             throw new \InvalidArgumentException('Translator must be an instanceof "Zend\I18n\Translator\Translator" or "Zend\I18n\Translator\TranslatorInterface"');
         }
 
@@ -428,7 +410,6 @@ public function setTranslator($translator)
     }
 
     /**
-     *
      * @return \Zend\I18n\Translator\Translator
      */
     public function getTranslator()
@@ -438,6 +419,7 @@ public function getTranslator()
 
     /**
      * @param $string
+     *
      * @return string
      */
     public function translate($string)
@@ -446,7 +428,7 @@ public function translate($string)
     }
 
     /**
-     * Set the title
+     * Set the title.
      *
      * @param string $title
      */
@@ -456,7 +438,6 @@ public function setTitle($title)
     }
 
     /**
-     *
      * @return string
      */
     public function getTitle()
@@ -473,7 +454,6 @@ public function setCache(Cache\Storage\StorageInterface $cache)
     }
 
     /**
-     *
      * @return Cache\Storage\StorageInterface
      */
     public function getCache()
@@ -482,7 +462,6 @@ public function getCache()
     }
 
     /**
-     *
      * @param string $cacheId
      */
     public function setCacheId($cacheId)
@@ -491,7 +470,6 @@ public function setCacheId($cacheId)
     }
 
     /**
-     *
      * @return string
      */
     public function getCacheId()
@@ -501,18 +479,18 @@ public function getCacheId()
 
     /**
      * Set the sort conditions explicit (e.g.
-     * from a custom form)
+     * from a custom form).
      *
      * @param array $sortConditions
      */
     public function setSortConditions(array $sortConditions)
     {
         foreach ($sortConditions as $sortCondition) {
-            if (! is_array($sortCondition)) {
+            if (!is_array($sortCondition)) {
                 throw new InvalidArgumentException('Sort condition have to be an array');
             }
 
-            if (! array_key_exists('column', $sortCondition)) {
+            if (!array_key_exists('column', $sortCondition)) {
                 throw new InvalidArgumentException('Sort condition missing array key column');
             }
         }
@@ -521,7 +499,6 @@ public function setSortConditions(array $sortConditions)
     }
 
     /**
-     *
      * @return array
      */
     public function getSortConditions()
@@ -543,7 +520,7 @@ public function getSortConditions()
     }
 
     /**
-     * Get the default sort conditions defined for the columns
+     * Get the default sort conditions defined for the columns.
      *
      * @return array
      */
@@ -556,7 +533,7 @@ public function getSortConditionsDefault()
                 $sortDefaults = $column->getSortDefault();
 
                 $sortConditions[$sortDefaults['priority']] = [
-                    'column'        => $column,
+                    'column' => $column,
                     'sortDirection' => $sortDefaults['sortDirection'],
                 ];
 
@@ -571,14 +548,14 @@ public function getSortConditionsDefault()
 
     /**
      * Set filters explicit (e.g.
-     * from a custom form)
+     * from a custom form).
      *
      * @param array $filters
      */
     public function setFilters(array $filters)
     {
         foreach ($filters as $filter) {
-            if (! $filter instanceof Filter) {
+            if (!$filter instanceof Filter) {
                 throw new InvalidArgumentException('Filter have to be an instanceof ZfcDatagrid\Filter');
             }
         }
@@ -587,7 +564,6 @@ public function setFilters(array $filters)
     }
 
     /**
-     *
      * @return Filter[]
      */
     public function getFilters()
@@ -609,7 +585,7 @@ public function getFilters()
     }
 
     /**
-     * Get the default filter conditions defined for the columns
+     * Get the default filter conditions defined for the columns.
      *
      * @return Filter[]
      */
@@ -632,9 +608,9 @@ public function getFiltersDefault()
     }
 
     /**
-     * Set the current page number
+     * Set the current page number.
      *
-     * @param integer $page
+     * @param int $page
      */
     public function setCurrentPageNumber($page)
     {
@@ -642,9 +618,9 @@ public function setCurrentPageNumber($page)
     }
 
     /**
-     * Should be implemented for each renderer itself (just default)
+     * Should be implemented for each renderer itself (just default).
      *
-     * @return integer
+     * @return int
      */
     public function getCurrentPageNumber()
     {
@@ -656,14 +632,14 @@ public function getCurrentPageNumber()
     }
 
     /**
-     * Should be implemented for each renderer itself (just default)
+     * Should be implemented for each renderer itself (just default).
      *
-     * @return integer
+     * @return int
      */
     public function getItemsPerPage($defaultItems = 25)
     {
         if ($this->isExport() === true) {
-            return (int) - 1;
+            return (int) -1;
         }
 
         return $defaultItems;
@@ -691,7 +667,7 @@ public function prepareViewModel(Datagrid $grid)
         }
         $viewModel->setVariable('rendererName', $this->getName());
 
-        $options               = $this->getOptions();
+        $options = $this->getOptions();
         $generalParameterNames = $options['generalParameterNames'];
         $viewModel->setVariable('generalParameterNames', $generalParameterNames);
 
@@ -717,17 +693,17 @@ public function prepareViewModel(Datagrid $grid)
             $parameterNames = $optionsRenderer['parameterNames'];
             $viewModel->setVariable('parameterNames', $parameterNames);
 
-            $activeParameters                                 = [];
+            $activeParameters = [];
             $activeParameters[$parameterNames['currentPage']] = $this->getCurrentPageNumber();
             {
-                $sortColumns    = [];
+                $sortColumns = [];
                 $sortDirections = [];
                 foreach ($this->getSortConditions() as $sortCondition) {
-                    $sortColumns[]    = $sortCondition['column']->getUniqueId();
+                    $sortColumns[] = $sortCondition['column']->getUniqueId();
                     $sortDirections[] = $sortCondition['sortDirection'];
                 }
 
-                $activeParameters[$parameterNames['sortColumns']]    = implode(',', $sortColumns);
+                $activeParameters[$parameterNames['sortColumns']] = implode(',', $sortColumns);
                 $activeParameters[$parameterNames['sortDirections']] = implode(',', $sortDirections);
             }
             $viewModel->setVariable('activeParameters', $activeParameters);
@@ -737,27 +713,31 @@ public function prepareViewModel(Datagrid $grid)
     }
 
     /**
-     * Return the name of the renderer
+     * Return the name of the renderer.
+     *
      * @return string
      */
     abstract public function getName();
 
     /**
-     * Determine if the renderer is for export
-     * @return boolean
+     * Determine if the renderer is for export.
+     *
+     * @return bool
      */
     abstract public function isExport();
 
     /**
      * Determin if the renderer is HTML
      * It can be export + html -> f.x.
-     * printing for HTML
-     * @return boolean
+     * printing for HTML.
+     *
+     * @return bool
      */
     abstract public function isHtml();
 
     /**
      * Execute all...
+     *
      * @return ViewModel Response\Stream
      */
     abstract public function execute();
diff --git a/src/ZfcDatagrid/Renderer/BootstrapTable/Renderer.php b/src/ZfcDatagrid/Renderer/BootstrapTable/Renderer.php
index 6aa1e25d..92cc808c 100644
--- a/src/ZfcDatagrid/Renderer/BootstrapTable/Renderer.php
+++ b/src/ZfcDatagrid/Renderer/BootstrapTable/Renderer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Renderer\BootstrapTable;
 
 use Zend\Http\PhpEnvironment\Request as HttpRequest;
@@ -32,14 +33,14 @@ public function isHtml()
     }
 
     /**
-     *
      * @return HttpRequest
+     *
      * @throws \Exception
      */
     public function getRequest()
     {
         $request = parent::getRequest();
-        if (! $request instanceof HttpRequest) {
+        if (!$request instanceof HttpRequest) {
             throw new \Exception('Request must be an instance of Zend\Http\PhpEnvironment\Request for HTML rendering');
         }
 
@@ -47,10 +48,10 @@ public function getRequest()
     }
 
     /**
-     *
      * @see \ZfcDatagrid\Renderer\AbstractRenderer::getSortConditions()
      *
      * @return array
+     *
      * @throws \Exception
      */
     public function getSortConditions()
@@ -63,13 +64,13 @@ public function getSortConditions()
         $request = $this->getRequest();
 
         $optionsRenderer = $this->getOptionsRenderer();
-        $parameterNames  = $optionsRenderer['parameterNames'];
+        $parameterNames = $optionsRenderer['parameterNames'];
 
         $sortConditions = [];
-        $sortColumns    = $request->getPost($parameterNames['sortColumns'], $request->getQuery($parameterNames['sortColumns']));
+        $sortColumns = $request->getPost($parameterNames['sortColumns'], $request->getQuery($parameterNames['sortColumns']));
         $sortDirections = $request->getPost($parameterNames['sortDirections'], $request->getQuery($parameterNames['sortDirections']));
         if ($sortColumns != '') {
-            $sortColumns    = explode(',', $sortColumns);
+            $sortColumns = explode(',', $sortColumns);
             $sortDirections = explode(',', $sortDirections);
 
             if (count($sortColumns) != count($sortDirections)) {
@@ -88,7 +89,7 @@ public function getSortConditions()
                     if ($column->getUniqueId() == $sortColumn) {
                         $sortConditions[] = [
                             'sortDirection' => $sortDirection,
-                            'column'        => $column,
+                            'column' => $column,
                         ];
 
                         $column->setSortActive($sortDirection);
@@ -108,7 +109,6 @@ public function getSortConditions()
     }
 
     /**
-     *
      * @todo Make parameter config
      *
      * @see \ZfcDatagrid\Renderer\AbstractRenderer::getFilters()
@@ -152,12 +152,13 @@ public function getFilters()
 
     /**
      * @return int
+     *
      * @throws \Exception
      */
     public function getCurrentPageNumber()
     {
         $optionsRenderer = $this->getOptionsRenderer();
-        $parameterNames  = $optionsRenderer['parameterNames'];
+        $parameterNames = $optionsRenderer['parameterNames'];
 
         $request = $this->getRequest();
         if ($request instanceof HttpRequest) {
diff --git a/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRow.php b/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRow.php
index 3e96acf1..678f3658 100644
--- a/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRow.php
+++ b/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRow.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Renderer\BootstrapTable\View\Helper;
 
 use Zend\View\Helper\AbstractHelper;
@@ -6,15 +7,16 @@
 use ZfcDatagrid\Column\Action\AbstractAction;
 
 /**
- * View Helper
+ * View Helper.
  */
 class TableRow extends AbstractHelper
 {
-    /** @var  \Zend\I18n\Translator\Translator|null|false */
+    /** @var \Zend\I18n\Translator\Translator|null|false */
     private $translator;
 
     /**
-     * @param  false|null|\Zend\I18n\Translator\Translator $translator
+     * @param false|null|\Zend\I18n\Translator\Translator $translator
+     *
      * @return self
      */
     public function setTranslator($translator)
@@ -25,8 +27,8 @@ public function setTranslator($translator)
     }
 
     /**
+     * @param string $message
      *
-     * @param  string $message
      * @return string
      */
     private function translate($message)
@@ -40,7 +42,8 @@ private function translate($message)
 
     /**
      * @param $row
-     * @param  bool|true $open
+     * @param bool|true $open
+     *
      * @return string
      */
     private function getTr($row, $open = true)
@@ -49,7 +52,7 @@ private function getTr($row, $open = true)
             return '</tr>';
         } else {
             if (isset($row['idConcated'])) {
-                return '<tr id="' . $row['idConcated'] . '">';
+                return '<tr id="'.$row['idConcated'].'">';
             } else {
                 return '<tr>';
             }
@@ -58,7 +61,8 @@ private function getTr($row, $open = true)
 
     /**
      * @param $dataValue
-     * @param  array  $attributes
+     * @param array $attributes
+     *
      * @return string
      */
     private function getTd($dataValue, $attributes = [])
@@ -66,22 +70,23 @@ private function getTd($dataValue, $attributes = [])
         $attr = [];
         foreach ($attributes as $name => $value) {
             if ($value != '') {
-                $attr[] = $name . '="' . $value . '"';
+                $attr[] = $name.'="'.$value.'"';
             }
         }
 
         $attr = implode(' ', $attr);
 
-        return '<td ' . $attr . '>' . $dataValue . '</td>';
+        return '<td '.$attr.'>'.$dataValue.'</td>';
     }
 
     /**
+     * @param array          $row
+     * @param array          $cols
+     * @param AbstractAction $rowClickAction
+     * @param array          $rowStyles
      *
-     * @param  array          $row
-     * @param  array          $cols
-     * @param  AbstractAction $rowClickAction
-     * @param  array          $rowStyles
      * @throws \Exception
+     *
      * @return string
      */
     public function __invoke($row, array $cols, AbstractAction $rowClickAction = null, array $rowStyles = [], $hasMassActions = false)
@@ -89,7 +94,7 @@ public function __invoke($row, array $cols, AbstractAction $rowClickAction = nul
         $return = $this->getTr($row);
 
         if (true === $hasMassActions) {
-            $return .= '<td><input type="checkbox" name="massActionSelected[]" value="' . $row['idConcated'] . '" /></td>';
+            $return .= '<td><input type="checkbox" name="massActionSelected[]" value="'.$row['idConcated'].'" /></td>';
         }
 
         foreach ($cols as $col) {
@@ -98,7 +103,7 @@ public function __invoke($row, array $cols, AbstractAction $rowClickAction = nul
             $value = $row[$col->getUniqueId()];
 
             $cssStyles = [];
-            $classes   = [];
+            $classes = [];
 
             if ($col->isHidden() === true) {
                 $classes[] = 'hidden';
@@ -111,7 +116,7 @@ public function __invoke($row, array $cols, AbstractAction $rowClickAction = nul
                     break;
 
                 case 'ZfcDatagrid\Column\Type\PhpArray':
-                    $value = '<pre>' . print_r($value, true) . '</pre>';
+                    $value = '<pre>'.print_r($value, true).'</pre>';
                     break;
             }
 
@@ -130,19 +135,19 @@ public function __invoke($row, array $cols, AbstractAction $rowClickAction = nul
                             break;
 
                         case 'ZfcDatagrid\Column\Style\Color':
-                            $cssStyles[] = 'color: #' . $style->getRgbHexString();
+                            $cssStyles[] = 'color: #'.$style->getRgbHexString();
                             break;
 
                         case 'ZfcDatagrid\Column\Style\BackgroundColor':
-                            $cssStyles[] = 'background-color: #' . $style->getRgbHexString();
+                            $cssStyles[] = 'background-color: #'.$style->getRgbHexString();
                             break;
 
                         case 'ZfcDatagrid\Column\Style\Align':
-                            $cssStyles[] = 'text-align: ' . $style->getAlignment();
+                            $cssStyles[] = 'text-align: '.$style->getAlignment();
                             break;
 
                         case 'ZfcDatagrid\Column\Style\Strikethrough':
-                            $value = '<s>' . $value . '</s>';
+                            $value = '<s>'.$value.'</s>';
                             break;
 
                         case 'ZfcDatagrid\Column\Style\CSSClass':
@@ -154,7 +159,7 @@ public function __invoke($row, array $cols, AbstractAction $rowClickAction = nul
                             break;
 
                         default:
-                            throw new \InvalidArgumentException('Not defined style: "' . get_class($style) . '"');
+                            throw new \InvalidArgumentException('Not defined style: "'.get_class($style).'"');
                             break;
                     }
                 }
@@ -177,12 +182,12 @@ public function __invoke($row, array $cols, AbstractAction $rowClickAction = nul
             // "rowClick" action
             if ($col instanceof Column\Select && $rowClickAction instanceof AbstractAction
                     && $col->isRowClickEnabled()) {
-                $value = '<a href="' . $rowClickAction->getLinkReplaced($row) . '">' . $value . '</a>';
+                $value = '<a href="'.$rowClickAction->getLinkReplaced($row).'">'.$value.'</a>';
             }
 
             $attributes = [
-                'class'               => implode(' ', $classes),
-                'style'               => implode(';', $cssStyles),
+                'class' => implode(' ', $classes),
+                'style' => implode(';', $cssStyles),
                 'data-columnUniqueId' => $col->getUniqueId(),
             ];
 
diff --git a/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRowFactory.php b/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRowFactory.php
index a086538e..7ada1d1b 100644
--- a/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRowFactory.php
+++ b/src/ZfcDatagrid/Renderer/BootstrapTable/View/Helper/TableRowFactory.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace ZfcDatagrid\Renderer\BootstrapTable\View\Helper;
 
+use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -8,17 +10,29 @@
 class TableRowFactory implements FactoryInterface
 {
     /**
-     * @param  ServiceLocatorInterface|AbstractPluginManager $serviceLocator
+     * @param ContainerInterface $container
+     * @param string             $requestedName
+     * @param array|null         $options
+     *
      * @return TableRow
      */
-    public function createService(ServiceLocatorInterface $serviceLocator)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
         $tableRow = new TableRow();
-        if ($serviceLocator->getServiceLocator()->has('translator')) {
-            /** @noinspection PhpParamsInspection */
-            $tableRow->setTranslator($serviceLocator->getServiceLocator()->get('translator'));
+        if ($container->has('translator')) {
+            $tableRow->setTranslator($container->get('translator'));
         }
 
         return $tableRow;
     }
+
+    /**
+     * @param ServiceLocatorInterface|AbstractPluginManager $serviceLocator
+     *
+     * @return TableRow
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        return $this($serviceLocator->getServiceLocator(), TableRow::class);
+    }
 }
diff --git a/src/ZfcDatagrid/Renderer/Csv/Renderer.php b/src/ZfcDatagrid/Renderer/Csv/Renderer.php
index 238a6ed5..f16e8922 100644
--- a/src/ZfcDatagrid/Renderer/Csv/Renderer.php
+++ b/src/ZfcDatagrid/Renderer/Csv/Renderer.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * Render datagrid as CSV
- *
+ * Render datagrid as CSV.
  */
 namespace ZfcDatagrid\Renderer\Csv;
 
@@ -28,7 +27,6 @@ public function isHtml()
     }
 
     /**
-     *
      * @return \Zend\View\Model\ViewModel
      */
     public function execute()
@@ -44,15 +42,15 @@ public function execute()
             $enclosure = $optionsRenderer['enclosure'];
         }
 
-        $options       = $this->getOptions();
+        $options = $this->getOptions();
         $optionsExport = $options['settings']['export'];
 
-        $path         = $optionsExport['path'];
-        $saveFilename = date('Y-m-d_H-i-s') . $this->getCacheId() . '.csv';
+        $path = $optionsExport['path'];
+        $saveFilename = date('Y-m-d_H-i-s').$this->getCacheId().'.csv';
 
-        $fp = fopen($path . '/' . $saveFilename, 'w');
+        $fp = fopen($path.'/'.$saveFilename, 'w');
         // Force UTF-8 for CSV rendering in EXCEL.
-        fprintf($fp, chr(0xEF) . chr(0xBB) . chr(0xBF));
+        fprintf($fp, chr(0xEF).chr(0xBB).chr(0xBF));
 
         /*
          * Save the file
@@ -86,7 +84,7 @@ public function execute()
          * Return the file
          */
         $response = new ResponseStream();
-        $response->setStream(fopen($path . '/' . $saveFilename, 'r'));
+        $response->setStream(fopen($path.'/'.$saveFilename, 'r'));
 
         $headers = new Headers();
         $headers->addHeaders([
@@ -96,11 +94,11 @@ public function execute()
                 'application/download',
                 'text/csv; charset=utf-8',
             ],
-            'Content-Length'      => filesize($path . '/' . $saveFilename),
-            'Content-Disposition' => 'attachment;filename=' . $this->getFilename() . '.csv',
-            'Cache-Control'       => 'must-revalidate',
-            'Pragma'              => 'no-cache',
-            'Expires'             => 'Thu, 1 Jan 1970 00:00:00 GMT',
+            'Content-Length' => filesize($path.'/'.$saveFilename),
+            'Content-Disposition' => 'attachment;filename='.$this->getFilename().'.csv',
+            'Cache-Control' => 'must-revalidate',
+            'Pragma' => 'no-cache',
+            'Expires' => 'Thu, 1 Jan 1970 00:00:00 GMT',
         ]);
 
         $response->setHeaders($headers);
diff --git a/src/ZfcDatagrid/Renderer/JqGrid/Renderer.php b/src/ZfcDatagrid/Renderer/JqGrid/Renderer.php
index a93ec2c0..5a83e071 100644
--- a/src/ZfcDatagrid/Renderer/JqGrid/Renderer.php
+++ b/src/ZfcDatagrid/Renderer/JqGrid/Renderer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Renderer\JqGrid;
 
 use Zend\Http\PhpEnvironment\Request as HttpRequest;
@@ -33,14 +34,14 @@ public function isExport()
     }
 
     /**
-     *
      * @return HttpRequest
+     *
      * @throws \Exception
      */
     public function getRequest()
     {
         $request = parent::getRequest();
-        if (! $request instanceof HttpRequest) {
+        if (!$request instanceof HttpRequest) {
             throw new \Exception('Request must be an instance of Zend\Http\PhpEnvironment\Request for HTML rendering');
         }
 
@@ -48,10 +49,10 @@ public function getRequest()
     }
 
     /**
-     *
      * @see \ZfcDatagrid\Renderer\AbstractRenderer::getSortConditions()
      *
      * @return array
+     *
      * @throws \Exception
      */
     public function getSortConditions()
@@ -63,14 +64,14 @@ public function getSortConditions()
         $request = $this->getRequest();
 
         $optionsRenderer = $this->getOptionsRenderer();
-        $parameterNames  = $optionsRenderer['parameterNames'];
+        $parameterNames = $optionsRenderer['parameterNames'];
 
         $sortConditions = [];
 
-        $sortColumns    = $request->getPost($parameterNames['sortColumns'], $request->getQuery($parameterNames['sortColumns']));
+        $sortColumns = $request->getPost($parameterNames['sortColumns'], $request->getQuery($parameterNames['sortColumns']));
         $sortDirections = $request->getPost($parameterNames['sortDirections'], $request->getQuery($parameterNames['sortDirections']));
         if ($sortColumns != '') {
-            $sortColumns    = explode(',', $sortColumns);
+            $sortColumns = explode(',', $sortColumns);
             $sortDirections = explode(',', $sortDirections);
 
             if (count($sortColumns) != count($sortDirections)) {
@@ -89,7 +90,7 @@ public function getSortConditions()
                     if ($column->getUniqueId() == $sortColumn) {
                         $sortConditions[] = [
                             'sortDirection' => $sortDirection,
-                            'column'        => $column,
+                            'column' => $column,
                         ];
 
                         $column->setSortActive($sortDirection);
@@ -110,6 +111,7 @@ public function getSortConditions()
 
     /**
      * @return array
+     *
      * @throws \Exception
      */
     public function getFilters()
@@ -122,9 +124,9 @@ public function getFilters()
         $filters = [];
 
         $optionsRenderer = $this->getOptionsRenderer();
-        $parameterNames  = $optionsRenderer['parameterNames'];
+        $parameterNames = $optionsRenderer['parameterNames'];
 
-        $request  = $this->getRequest();
+        $request = $this->getRequest();
         $isSearch = $request->getPost($parameterNames['isSearch'], $request->getQuery($parameterNames['isSearch']));
         if ('true' == $isSearch) {
             // User filtering
@@ -156,7 +158,7 @@ public function getFilters()
     public function getCurrentPageNumber()
     {
         $optionsRenderer = $this->getOptionsRenderer();
-        $parameterNames  = $optionsRenderer['parameterNames'];
+        $parameterNames = $optionsRenderer['parameterNames'];
 
         $request = $this->getRequest();
         if ($request instanceof HttpRequest) {
@@ -182,7 +184,7 @@ public function execute()
             $viewModel->setVariable('data', $this->getDataJqGrid());
 
             $columnsRowClickDisabled = [];
-            $columns                 = $viewModel->getVariable('columns');
+            $columns = $viewModel->getVariable('columns');
             foreach ($columns as $column) {
                 /* @var $column \ZfcDatagrid\Column\AbstractColumn */
 
@@ -230,9 +232,9 @@ public function getData()
     private function getDataJqGrid()
     {
         return [
-            'rows'    => $this->getData(),
-            'page'    => $this->getPaginator()->getCurrentPageNumber(),
-            'total'   => $this->getPaginator()->count(),
+            'rows' => $this->getData(),
+            'page' => $this->getPaginator()->getCurrentPageNumber(),
+            'total' => $this->getPaginator()->count(),
             'records' => $this->getPaginator()->getTotalItemCount(),
         ];
     }
diff --git a/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/Columns.php b/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/Columns.php
index 8e2487f0..2fb2594e 100644
--- a/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/Columns.php
+++ b/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/Columns.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Renderer\JqGrid\View\Helper;
 
 use Zend\View\Helper\AbstractHelper;
@@ -7,11 +8,11 @@
 use ZfcDatagrid\Filter;
 
 /**
- * View Helper
+ * View Helper.
  */
 class Columns extends AbstractHelper
 {
-    /** @var  \Zend\I18n\Translator\Translator|null|false */
+    /** @var \Zend\I18n\Translator\Translator|null|false */
     private $translator;
 
     const STYLE_BOLD = 'cellvalue = \'<span style="font-weight: bold;">\' + cellvalue + \'</span>\';';
@@ -21,7 +22,8 @@ class Columns extends AbstractHelper
     const STYLE_STRIKETHROUGH = 'cellvalue = \'<span style="text-decoration: line-through;">\' + cellvalue + \'</span>\';';
 
     /**
-     * @param  false|null|\Zend\I18n\Translator\Translator $translator
+     * @param false|null|\Zend\I18n\Translator\Translator $translator
+     *
      * @return self
      */
     public function setTranslator($translator)
@@ -32,8 +34,8 @@ public function setTranslator($translator)
     }
 
     /**
+     * @param string $message
      *
-     * @param  string $message
      * @return string
      */
     private function translate($message)
@@ -46,8 +48,8 @@ private function translate($message)
     }
 
     /**
+     * @param array $columns
      *
-     * @param  array  $columns
      * @return string
      */
     public function __invoke(array $columns)
@@ -58,14 +60,14 @@ public function __invoke(array $columns)
             /* @var $column \ZfcDatagrid\Column\AbstractColumn */
 
             $options = [
-                'name'  => (string) $column->getUniqueId(),
+                'name' => (string) $column->getUniqueId(),
                 'index' => (string) $column->getUniqueId(),
                 'label' => $this->translate((string) $column->getLabel()),
 
-                'width'    => $column->getWidth(),
-                'hidden'   => (bool) $column->isHidden(),
+                'width' => $column->getWidth(),
+                'hidden' => (bool) $column->isHidden(),
                 'sortable' => (bool) $column->isUserSortEnabled(),
-                'search'   => (bool) $column->isUserFilterEnabled(),
+                'search' => (bool) $column->isUserFilterEnabled(),
             ];
 
             /*
@@ -81,7 +83,7 @@ public function __invoke(array $columns)
                 foreach ($column->getStyles() as $style) {
                     /** @var \ZfcDatagrid\Column\Style\Align $style */
                     if (get_class($style) == 'ZfcDatagrid\Column\Style\Align') {
-                        $options['align']    = $style->getAlignment();
+                        $options['align'] = $style->getAlignment();
                         $alignAlreadyDefined = true;
                         break;
                     }
@@ -106,10 +108,10 @@ public function __invoke(array $columns)
             /*
              * Filtering
              */
-            $searchoptions                = [];
+            $searchoptions = [];
             $searchoptions['clearSearch'] = false;
             if ($column->hasFilterSelectOptions() === true) {
-                $options['stype']       = 'select';
+                $options['stype'] = 'select';
                 $searchoptions['value'] = $column->getFilterSelectOptions();
 
                 if ($column->hasFilterDefaultValue() === true) {
@@ -143,26 +145,26 @@ public function __invoke(array $columns)
                     }
                 } elseif ('formatter' == $key) {
                     if (stripos($value, 'formatter') === false && stripos($value, 'function') === false) {
-                        $value = '"' . $value . '"';
+                        $value = '"'.$value.'"';
                     }
                 } elseif ('cellattr' == $key) {
                     // SKIP THIS
                 } else {
-                    $value = '"' . $value . '"';
+                    $value = '"'.$value.'"';
                 }
 
-                $colModel[] = (string) $key . ': ' . $value;
+                $colModel[] = (string) $key.': '.$value;
             }
 
-            $return[] = '{' . implode(',', $colModel) . '}';
+            $return[] = '{'.implode(',', $colModel).'}';
         }
 
-        return '[' . implode(',', $return) . ']';
+        return '['.implode(',', $return).']';
     }
 
     /**
+     * @param Column\AbstractColumn $column
      *
-     * @param  Column\AbstractColumn $column
      * @return string
      */
     private function getFormatter(Column\AbstractColumn $column)
@@ -197,16 +199,17 @@ private function getFormatter(Column\AbstractColumn $column)
             $prefix = 'function (cellvalue, options, rowObject) {';
             $suffix = ' return cellvalue; }';
 
-            $formatter = $prefix . $formatter . $suffix;
+            $formatter = $prefix.$formatter.$suffix;
         }
 
         return $formatter;
     }
 
     /**
+     * @param Column\AbstractColumn $col
      *
-     * @param  Column\AbstractColumn $col
      * @throws \Exception
+     *
      * @return array
      */
     private function getStyles(Column\AbstractColumn $col)
@@ -218,12 +221,12 @@ private function getStyles(Column\AbstractColumn $col)
          */
         foreach ($col->getStyles() as $style) {
             $prepend = '';
-            $append  = '';
+            $append = '';
 
             /* @var $style \ZfcDatagrid\Column\Style\AbstractStyle */
             foreach ($style->getByValues() as $rule) {
                 $colString = $rule['column']->getUniqueId();
-                $operator  = '';
+                $operator = '';
                 switch ($rule['operator']) {
 
                     case Filter::EQUAL:
@@ -235,11 +238,11 @@ private function getStyles(Column\AbstractColumn $col)
                         break;
 
                     default:
-                        throw new \Exception('Currently not supported filter operation: "' . $rule['operator'] . '"');
+                        throw new \Exception('Currently not supported filter operation: "'.$rule['operator'].'"');
                         break;
                 }
 
-                $prepend = 'if (rowObject.' . $colString . ' ' . $operator . ' \'' . $rule['value'] . '\') {';
+                $prepend = 'if (rowObject.'.$colString.' '.$operator.' \''.$rule['value'].'\') {';
                 $append .= '}';
             }
 
@@ -259,11 +262,11 @@ private function getStyles(Column\AbstractColumn $col)
                     break;
 
                 case 'ZfcDatagrid\Column\Style\Color':
-                    $styleString = 'cellvalue = \'<span style="color: #' . $style->getRgbHexString() . ';">\' + cellvalue + \'</span>\';';
+                    $styleString = 'cellvalue = \'<span style="color: #'.$style->getRgbHexString().';">\' + cellvalue + \'</span>\';';
                     break;
 
                 case 'ZfcDatagrid\Column\Style\CSSClass':
-                    $styleString = 'cellvalue = \'<span class="' . $style->getClass() . '">\' + cellvalue + \'</span>\';';
+                    $styleString = 'cellvalue = \'<span class="'.$style->getClass().'">\' + cellvalue + \'</span>\';';
                     break;
 
                 case 'ZfcDatagrid\Column\Style\BackgroundColor':
@@ -280,11 +283,11 @@ private function getStyles(Column\AbstractColumn $col)
                     break;
 
                 default:
-                    throw new \Exception('Not defined style: "' . get_class($style) . '"');
+                    throw new \Exception('Not defined style: "'.get_class($style).'"');
                     break;
             }
 
-            $styleFormatter[] = $prepend . $styleString . $append;
+            $styleFormatter[] = $prepend.$styleString.$append;
         }
 
         return $styleFormatter;
diff --git a/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/ColumnsFactory.php b/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/ColumnsFactory.php
index c5ca7242..ccb08021 100644
--- a/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/ColumnsFactory.php
+++ b/src/ZfcDatagrid/Renderer/JqGrid/View/Helper/ColumnsFactory.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace ZfcDatagrid\Renderer\JqGrid\View\Helper;
 
+use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -8,17 +10,29 @@
 class ColumnsFactory implements FactoryInterface
 {
     /**
-     * @param  ServiceLocatorInterface|AbstractPluginManager $serviceLocator
+     * @param ContainerInterface $container
+     * @param string             $requestedName
+     * @param array|null         $options
+     *
      * @return Columns
      */
-    public function createService(ServiceLocatorInterface $serviceLocator)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
         $tableRow = new Columns();
-        if ($serviceLocator->getServiceLocator()->has('translator')) {
-            /** @noinspection PhpParamsInspection */
-            $tableRow->setTranslator($serviceLocator->getServiceLocator()->get('translator'));
+        if ($container->has('translator')) {
+            $tableRow->setTranslator($container->get('translator'));
         }
 
         return $tableRow;
     }
+
+    /**
+     * @param ServiceLocatorInterface|AbstractPluginManager $serviceLocator
+     *
+     * @return Columns
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        return $this($serviceLocator->getServiceLocator(), Columns::class);
+    }
 }
diff --git a/src/ZfcDatagrid/Renderer/PHPExcel/Renderer.php b/src/ZfcDatagrid/Renderer/PHPExcel/Renderer.php
index d5c46b40..502b51d6 100644
--- a/src/ZfcDatagrid/Renderer/PHPExcel/Renderer.php
+++ b/src/ZfcDatagrid/Renderer/PHPExcel/Renderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Output as an excel file
+ * Output as an excel file.
  */
 namespace ZfcDatagrid\Renderer\PHPExcel;
 
@@ -35,7 +35,7 @@ public function isHtml()
 
     public function execute()
     {
-        $options       = $this->getOptions();
+        $options = $this->getOptions();
         $optionsExport = $options['settings']['export'];
 
         $optionsRenderer = $this->getOptionsRenderer();
@@ -48,8 +48,8 @@ public function execute()
         $sheet->setTitle($this->translate($optionsRenderer['sheetName']));
 
         if (true === $optionsRenderer['displayTitle']) {
-            $sheet->setCellValue('A' . $optionsRenderer['rowTitle'], $this->getTitle());
-            $sheet->getStyle('A' . $optionsRenderer['rowTitle'])
+            $sheet->setCellValue('A'.$optionsRenderer['rowTitle'], $this->getTitle());
+            $sheet->getStyle('A'.$optionsRenderer['rowTitle'])
                 ->getFont()
                 ->setSize(15);
         }
@@ -68,14 +68,14 @@ public function execute()
          * Header
          */
         $xColumn = 0;
-        $yRow    = $optionsRenderer['startRowData'];
+        $yRow = $optionsRenderer['startRowData'];
         foreach ($this->getColumnsToExport() as $col) {
             /* @var $column \ZfcDatagrid\Column\AbstractColumn */
             $sheet->setCellValueByColumnAndRow($xColumn, $yRow, $this->translate($col->getLabel()));
 
             $sheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($xColumn))->setWidth($col->getWidth());
 
-            $xColumn ++;
+            ++$xColumn;
         }
 
         /*
@@ -94,7 +94,7 @@ public function execute()
 
                 /* @var $column \ZfcDatagrid\Column\AbstractColumn */
                 $currentColumn = PHPExcel_Cell::stringFromColumnIndex($xColumn);
-                $cell          = $sheet->getCell($currentColumn . $yRow);
+                $cell = $sheet->getCell($currentColumn.$yRow);
 
                 switch (get_class($col->getType())) {
 
@@ -118,7 +118,7 @@ public function execute()
                         break;
                 }
 
-                $columnStyle = $sheet->getStyle($currentColumn . $yRow);
+                $columnStyle = $sheet->getStyle($currentColumn.$yRow);
                 $columnStyle->getAlignment()->setWrapText(true);
 
                 /*
@@ -146,7 +146,7 @@ public function execute()
 
                             case 'ZfcDatagrid\Column\Style\BackgroundColor':
                                 $columnStyle->getFill()->applyFromArray([
-                                    'type'  => \PHPExcel_Style_Fill::FILL_SOLID,
+                                    'type' => \PHPExcel_Style_Fill::FILL_SOLID,
                                     'color' => [
                                         'rgb' => $style->getRgbHexString(),
                                     ],
@@ -183,16 +183,16 @@ public function execute()
                                 break;
 
                             default:
-                                throw new \Exception('Not defined yet: "' . get_class($style) . '"');
+                                throw new \Exception('Not defined yet: "'.get_class($style).'"');
                                 break;
                         }
                     }
                 }
 
-                $xColumn ++;
+                ++$xColumn;
             }
 
-            $yRow ++;
+            ++$yRow;
         }
 
         /*
@@ -203,9 +203,9 @@ public function execute()
         // Letzte Zeile merken
 
         // Autofilter + Freeze
-        $sheet->setAutoFilter('A' . $optionsRenderer['startRowData'] . ':' . $highest['column'] . $highest['row']);
+        $sheet->setAutoFilter('A'.$optionsRenderer['startRowData'].':'.$highest['column'].$highest['row']);
         $freezeRow = $optionsRenderer['startRowData'] + 1;
-        $sheet->freezePane('A' . $freezeRow);
+        $sheet->freezePane('A'.$freezeRow);
 
         // repeat the data header for each page!
         $sheet->getPageSetup()->setRowsToRepeatAtTopByStartAndEnd($optionsRenderer['startRowData'], $optionsRenderer['startRowData']);
@@ -225,17 +225,17 @@ public function execute()
                 ],
             ],
             'fill' => [
-                'type'       => PHPExcel_Style_Fill::FILL_SOLID,
+                'type' => PHPExcel_Style_Fill::FILL_SOLID,
                 'startcolor' => [
                     'argb' => PHPExcel_Style_Color::COLOR_YELLOW,
                 ],
             ],
         ];
-        $range = 'A' . $optionsRenderer['startRowData'] . ':' . $highest['column'] . $optionsRenderer['startRowData'];
+        $range = 'A'.$optionsRenderer['startRowData'].':'.$highest['column'].$optionsRenderer['startRowData'];
         $sheet->getStyle($range)->applyFromArray($style);
 
         // print borders
-        $range = 'A' . $freezeRow . ':' . $highest['column'] . $highest['row'];
+        $range = 'A'.$freezeRow.':'.$highest['column'].$highest['row'];
         $sheet->getStyle($range)->applyFromArray([
             'borders' => [
                 'allborders' => [
@@ -247,18 +247,18 @@ public function execute()
         /*
          * Save the file
          */
-        $path         = $optionsExport['path'];
-        $saveFilename = date('Y-m-d_H-i-s') . $this->getCacheId() . '.xlsx';
+        $path = $optionsExport['path'];
+        $saveFilename = date('Y-m-d_H-i-s').$this->getCacheId().'.xlsx';
 
         $excelWriter = new \PHPExcel_Writer_Excel2007($phpExcel);
         $excelWriter->setPreCalculateFormulas(false);
-        $excelWriter->save($path . '/' . $saveFilename);
+        $excelWriter->save($path.'/'.$saveFilename);
 
         /*
          * Send the response stream
          */
         $response = new ResponseStream();
-        $response->setStream(fopen($path . '/' . $saveFilename, 'r'));
+        $response->setStream(fopen($path.'/'.$saveFilename, 'r'));
 
         $headers = new Headers();
         $headers->addHeaders([
@@ -267,11 +267,11 @@ public function execute()
                 'application/octet-stream',
                 'application/download',
             ],
-            'Content-Length'      => filesize($path . '/' . $saveFilename),
-            'Content-Disposition' => 'attachment;filename=' . $this->getFilename() . '.xlsx',
-            'Cache-Control'       => 'must-revalidate',
-            'Pragma'              => 'no-cache',
-            'Expires'             => 'Thu, 1 Jan 1970 00:00:00 GMT',
+            'Content-Length' => filesize($path.'/'.$saveFilename),
+            'Content-Disposition' => 'attachment;filename='.$this->getFilename().'.xlsx',
+            'Cache-Control' => 'must-revalidate',
+            'Pragma' => 'no-cache',
+            'Expires' => 'Thu, 1 Jan 1970 00:00:00 GMT',
         ]);
 
         $response->setHeaders($headers);
@@ -280,7 +280,7 @@ public function execute()
     }
 
     /**
-     * Calculates the column width, based on the papersize and orientation
+     * Calculates the column width, based on the papersize and orientation.
      *
      * @param \PHPExcel_Worksheet $sheet
      * @param array               $columns
@@ -307,7 +307,7 @@ protected function calculateColumnWidth(\PHPExcel_Worksheet $sheet, array $colum
     }
 
     /**
-     * Set the printing options
+     * Set the printing options.
      *
      * @param PHPExcel $phpExcel
      */
@@ -322,7 +322,7 @@ protected function setPrinting(PHPExcel $phpExcel)
         /*
          * Printing setup
          */
-        $papersize   = $optionsRenderer['papersize'];
+        $papersize = $optionsRenderer['papersize'];
         $orientation = $optionsRenderer['orientation'];
         foreach ($phpExcel->getAllSheets() as $sheet) {
             /* @var $sheet \PHPExcel_Worksheet */
@@ -368,9 +368,9 @@ protected function setPrinting(PHPExcel $phpExcel)
      */
     protected function setHeaderFooter(\PHPExcel_Worksheet $sheet)
     {
-        $textRight = $this->translate('Page') . ' &P / &N';
+        $textRight = $this->translate('Page').' &P / &N';
 
-        $sheet->getHeaderFooter()->setOddHeader('&L&16&G ' . $this->translate($this->getTitle()));
-        $sheet->getHeaderFooter()->setOddFooter('&R' . $textRight);
+        $sheet->getHeaderFooter()->setOddHeader('&L&16&G '.$this->translate($this->getTitle()));
+        $sheet->getHeaderFooter()->setOddFooter('&R'.$textRight);
     }
 }
diff --git a/src/ZfcDatagrid/Renderer/PrintHtml/Renderer.php b/src/ZfcDatagrid/Renderer/PrintHtml/Renderer.php
index bfcec8f5..52bfbb41 100644
--- a/src/ZfcDatagrid/Renderer/PrintHtml/Renderer.php
+++ b/src/ZfcDatagrid/Renderer/PrintHtml/Renderer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Renderer\PrintHtml;
 
 use Zend\View\Model\ViewModel;
@@ -22,7 +23,6 @@ public function isHtml()
     }
 
     /**
-     *
      * @return \Zend\View\Model\ViewModel
      */
     public function execute()
diff --git a/src/ZfcDatagrid/Renderer/RendererInterface.php b/src/ZfcDatagrid/Renderer/RendererInterface.php
index 6454d3ea..046b9e34 100644
--- a/src/ZfcDatagrid/Renderer/RendererInterface.php
+++ b/src/ZfcDatagrid/Renderer/RendererInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Renderer;
 
 use Zend\View\Model\ViewModel;
@@ -6,37 +7,35 @@
 interface RendererInterface
 {
     /**
-     *
      * @return array
      */
     public function getSortConditions();
 
     /**
-     *
      * @return array
      */
     public function getFilters();
 
     /**
-     * Return the name of the renderer
+     * Return the name of the renderer.
      *
      * @return string
      */
     public function getName();
 
     /**
-     * Determine if the renderer is for export
+     * Determine if the renderer is for export.
      *
-     * @return boolean
+     * @return bool
      */
     public function isExport();
 
     /**
      * Determin if the renderer is HTML
      * It can be export + html -> f.x.
-     * printing for HTML
+     * printing for HTML.
      *
-     * @return boolean
+     * @return bool
      */
     public function isHtml();
 
diff --git a/src/ZfcDatagrid/Renderer/TCPDF/Renderer.php b/src/ZfcDatagrid/Renderer/TCPDF/Renderer.php
index 372f49aa..a7189adf 100644
--- a/src/ZfcDatagrid/Renderer/TCPDF/Renderer.php
+++ b/src/ZfcDatagrid/Renderer/TCPDF/Renderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Output as a PDF file
+ * Output as a PDF file.
  */
 namespace ZfcDatagrid\Renderer\TCPDF;
 
@@ -22,13 +22,11 @@ class Renderer extends AbstractExport
     ];
 
     /**
-     *
      * @var TCPDF
      */
     protected $pdf;
 
     /**
-     *
      * @var Alignment
      */
     protected $alignment = 'L';
@@ -85,7 +83,7 @@ protected function printGrid()
 
         foreach ($this->getData() as $row) {
             $rowHeight = $this->getRowHeight($row);
-            $y         = $pdf->GetY();
+            $y = $pdf->GetY();
 
             $usedHeight = $y + $rowHeight;
 
@@ -108,15 +106,15 @@ protected function saveAndSend()
     {
         $pdf = $this->getPdf();
 
-        $options       = $this->getOptions();
+        $options = $this->getOptions();
         $optionsExport = $options['settings']['export'];
 
-        $path         = $optionsExport['path'];
-        $saveFilename = date('Y-m-d_H-i-s') . $this->getCacheId() . '.pdf';
-        $pdf->Output($path . '/' . $saveFilename, 'F');
+        $path = $optionsExport['path'];
+        $saveFilename = date('Y-m-d_H-i-s').$this->getCacheId().'.pdf';
+        $pdf->Output($path.'/'.$saveFilename, 'F');
 
         $response = new ResponseStream();
-        $response->setStream(fopen($path . '/' . $saveFilename, 'r'));
+        $response->setStream(fopen($path.'/'.$saveFilename, 'r'));
 
         $headers = new Headers();
         $headers->addHeaders([
@@ -125,11 +123,11 @@ protected function saveAndSend()
                 'application/octet-stream',
                 'application/download',
             ],
-            'Content-Length'      => filesize($path . '/' . $saveFilename),
-            'Content-Disposition' => 'attachment;filename=' . $this->getFilename() . '.pdf',
-            'Cache-Control'       => 'must-revalidate',
-            'Pragma'              => 'no-cache',
-            'Expires'             => 'Thu, 1 Jan 1970 00:00:00 GMT',
+            'Content-Length' => filesize($path.'/'.$saveFilename),
+            'Content-Disposition' => 'attachment;filename='.$this->getFilename().'.pdf',
+            'Cache-Control' => 'must-revalidate',
+            'Pragma' => 'no-cache',
+            'Expires' => 'Thu, 1 Jan 1970 00:00:00 GMT',
         ]);
 
         $response->setHeaders($headers);
@@ -141,7 +139,7 @@ protected function initPdf()
     {
         $optionsRenderer = $this->getOptionsRenderer();
 
-        $papersize   = $optionsRenderer['papersize'];
+        $papersize = $optionsRenderer['papersize'];
         $orientation = $optionsRenderer['orientation'];
         if ('landscape' == $orientation) {
             $orientation = 'L';
@@ -170,7 +168,6 @@ protected function initPdf()
     }
 
     /**
-     *
      * @return TCPDF
      */
     public function getPdf()
@@ -183,7 +180,7 @@ public function getPdf()
     }
 
     /**
-     * Calculates the column width, based on the papersize and orientation
+     * Calculates the column width, based on the papersize and orientation.
      *
      * @param array $cols
      */
@@ -192,7 +189,7 @@ protected function calculateColumnWidth(array $cols)
         // First make sure the columns width is 100 "percent"
         $this->calculateColumnWidthPercent($cols);
 
-        $pdf     = $this->getPdf();
+        $pdf = $this->getPdf();
         $margins = $pdf->getMargins();
 
         $paperWidth = $this->getPaperWidth();
@@ -206,8 +203,8 @@ protected function calculateColumnWidth(array $cols)
     }
 
     /**
+     * @param array $row
      *
-     * @param  array  $row
      * @return number
      */
     protected function getRowHeight(array $row)
@@ -267,9 +264,9 @@ protected function printTableHeader()
         $height = $optionsRenderer['style']['header']['height'];
         $this->setFontHeader();
 
-        $pdf         = $this->getPdf();
+        $pdf = $this->getPdf();
         $currentPage = $pdf->getPage();
-        $y           = $pdf->GetY();
+        $y = $pdf->GetY();
         foreach ($this->getColumnsToExport() as $col) {
             /* @var $col \ZfcDatagrid\Column\AbstractColumn */
             $x = $pdf->GetX();
@@ -289,7 +286,7 @@ protected function printTableRow(array $row, $rowHeight)
         $pdf = $this->getPdf();
 
         $currentPage = $pdf->getPage();
-        $y           = $pdf->GetY();
+        $y = $pdf->GetY();
         foreach ($this->getColumnsToExport() as $col) {
             /* @var $col \ZfcDatagrid\Column\AbstractColumn */
 
@@ -310,7 +307,7 @@ protected function printTableRow(array $row, $rowHeight)
                     }
 
                     try {
-                        $resizeType   = $col->getType()->getResizeType();
+                        $resizeType = $col->getType()->getResizeType();
                         $resizeHeight = $col->getType()->getResizeHeight();
                         if ('dynamic' === $resizeType) {
                             // resizing properly to width + height (and keeping the ratio)
@@ -343,7 +340,7 @@ protected function printTableRow(array $row, $rowHeight)
              */
             $this->setFontData();
 
-            $isHtml          = false;
+            $isHtml = false;
             $backgroundColor = false;
 
             $styles = array_merge($this->getRowStyles(), $col->getStyles());
@@ -370,7 +367,7 @@ protected function printTableRow(array $row, $rowHeight)
                             break;
 
                         case 'ZfcDatagrid\Column\Style\Strikethrough':
-                            $text   = '<del>' . $text . '</del>';
+                            $text = '<del>'.$text.'</del>';
                             $isHtml = true;
                             break;
 
@@ -399,7 +396,7 @@ protected function printTableRow(array $row, $rowHeight)
                             break;
 
                         default:
-                            throw new \Exception('Not defined yet: "' . get_class($style) . '"');
+                            throw new \Exception('Not defined yet: "'.get_class($style).'"');
                             break;
                     }
                 }
@@ -411,10 +408,10 @@ protected function printTableRow(array $row, $rowHeight)
     }
 
     /**
+     * @param string $imageData
+     * @param number $maxWidth
+     * @param number $maxHeight
      *
-     * @param  string $imageData
-     * @param  number $maxWidth
-     * @param  number $maxHeight
      * @return array
      */
     protected function calcImageSize($imageData, $maxWidth, $maxHeight)
@@ -422,8 +419,8 @@ protected function calcImageSize($imageData, $maxWidth, $maxHeight)
         $pdf = $this->getPdf();
 
         list($width, $height) = getimagesizefromstring($imageData);
-        $width                = $pdf->pixelsToUnits($width);
-        $height               = $pdf->pixelsToUnits($height);
+        $width = $pdf->pixelsToUnits($width);
+        $height = $pdf->pixelsToUnits($height);
 
         list($newWidth, $newHeight) = ImageResize::getCalculatedSize($width, $height, $maxWidth, $maxHeight);
 
@@ -436,11 +433,11 @@ protected function calcImageSize($imageData, $maxWidth, $maxHeight)
     protected function setFontHeader()
     {
         $optionsRenderer = $this->getOptionsRenderer();
-        $style           = $optionsRenderer['style']['header'];
+        $style = $optionsRenderer['style']['header'];
 
-        $font       = $style['font'];
-        $size       = $style['size'];
-        $color      = $style['color'];
+        $font = $style['font'];
+        $size = $style['size'];
+        $color = $style['color'];
         $background = $style['background-color'];
 
         $pdf = $this->getPdf();
@@ -454,11 +451,11 @@ protected function setFontHeader()
     protected function setFontData()
     {
         $optionsRenderer = $this->getOptionsRenderer();
-        $style           = $optionsRenderer['style']['data'];
+        $style = $optionsRenderer['style']['data'];
 
-        $font       = $style['font'];
-        $size       = $style['size'];
-        $color      = $style['color'];
+        $font = $style['font'];
+        $size = $style['size'];
+        $color = $style['color'];
         $background = $style['background-color'];
 
         $pdf = $this->getPdf();
@@ -477,16 +474,15 @@ protected function setBold()
     protected function setItalic()
     {
         $optionsRenderer = $this->getOptionsRenderer();
-        $style           = $optionsRenderer['style']['data'];
-        $font            = $style['font'];
-        $size            = $style['size'];
+        $style = $optionsRenderer['style']['data'];
+        $font = $style['font'];
+        $size = $style['size'];
 
         $pdf = $this->getPdf();
-        $pdf->setFont($font . 'I', '', $size);
+        $pdf->setFont($font.'I', '', $size);
     }
 
     /**
-     *
      * @param array $rgb
      */
     protected function setColor(array $rgb)
@@ -496,7 +492,6 @@ protected function setColor(array $rgb)
     }
 
     /**
-     *
      * @param array $rgb
      */
     protected function setBackgroundColor(array $rgb)
@@ -506,7 +501,6 @@ protected function setBackgroundColor(array $rgb)
     }
 
     /**
-     *
      * @param string $alignment
      */
     public function setTextAlignment($alignment)
@@ -515,7 +509,6 @@ public function setTextAlignment($alignment)
     }
 
     /**
-     *
      * @return string
      */
     public function getTextAlignment()
diff --git a/src/ZfcDatagrid/Renderer/ZendTable/Renderer.php b/src/ZfcDatagrid/Renderer/ZendTable/Renderer.php
index 1b626227..325958aa 100644
--- a/src/ZfcDatagrid/Renderer/ZendTable/Renderer.php
+++ b/src/ZfcDatagrid/Renderer/ZendTable/Renderer.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Renderer\ZendTable;
 
 use Zend\Console\Adapter\AdapterInterface as ConsoleAdapter;
@@ -11,24 +12,21 @@
 use ZfcDatagrid\Renderer\AbstractRenderer;
 
 /**
- * For CLI
+ * For CLI.
  */
 class Renderer extends AbstractRenderer
 {
     /**
-     *
      * @var ConsoleAdapter
      */
     private $consoleAdapter;
 
     /**
-     *
      * @var Column\AbstractColumn[]
      */
     private $columnsToDisplay;
 
     /**
-     *
      * @return string
      */
     public function getName()
@@ -37,7 +35,6 @@ public function getName()
     }
 
     /**
-     *
      * @return bool
      */
     public function isExport()
@@ -46,7 +43,6 @@ public function isExport()
     }
 
     /**
-     *
      * @return bool
      */
     public function isHtml()
@@ -55,14 +51,14 @@ public function isHtml()
     }
 
     /**
-     *
      * @return ConsoleRequest
+     *
      * @throws \Exception
      */
     public function getRequest()
     {
         $request = parent::getRequest();
-        if (! $request instanceof ConsoleRequest) {
+        if (!$request instanceof ConsoleRequest) {
             throw new \Exception('Request must be an instance of Zend\Console\Request for console rendering');
         }
 
@@ -70,7 +66,6 @@ public function getRequest()
     }
 
     /**
-     *
      * @param ConsoleAdapter $adapter
      */
     public function setConsoleAdapter(ConsoleAdapter $adapter)
@@ -79,7 +74,6 @@ public function setConsoleAdapter(ConsoleAdapter $adapter)
     }
 
     /**
-     *
      * @return ConsoleAdapter
      */
     public function getConsoleAdapter()
@@ -92,7 +86,6 @@ public function getConsoleAdapter()
     }
 
     /**
-     *
      * @todo enable parameters from console
      *
      * @return array
@@ -106,14 +99,14 @@ public function getSortConditions()
         $request = $this->getRequest();
 
         $optionsRenderer = $this->getOptionsRenderer();
-        $parameterNames  = $optionsRenderer['parameterNames'];
+        $parameterNames = $optionsRenderer['parameterNames'];
 
         $sortConditions = [];
 
-        $sortColumns    = $request->getParam($parameterNames['sortColumns']);
+        $sortColumns = $request->getParam($parameterNames['sortColumns']);
         $sortDirections = $request->getParam($parameterNames['sortDirections']);
         if ($sortColumns != '') {
-            $sortColumns    = explode(',', $sortColumns);
+            $sortColumns = explode(',', $sortColumns);
             $sortDirections = explode(',', $sortDirections);
 
             foreach ($sortColumns as $key => $sortColumn) {
@@ -132,7 +125,7 @@ public function getSortConditions()
                     if ($column->getUniqueId() == $sortColumn) {
                         $sortConditions[] = [
                             'sortDirection' => $sortDirection,
-                            'column'        => $column,
+                            'column' => $column,
                         ];
 
                         $column->setSortActive($sortDirection);
@@ -152,7 +145,6 @@ public function getSortConditions()
     }
 
     /**
-     *
      * @todo enable parameters from console
      *
      * @return array
@@ -163,16 +155,16 @@ public function getFilters()
     }
 
     /**
-     * Should be implemented for each renderer itself (just default)
+     * Should be implemented for each renderer itself (just default).
      *
-     * @return integer
+     * @return int
      */
     public function getCurrentPageNumber()
     {
         $request = $this->getRequest();
 
         $optionsRenderer = $this->getOptionsRenderer();
-        $parameterNames  = $optionsRenderer['parameterNames'];
+        $parameterNames = $optionsRenderer['parameterNames'];
         if ($request->getParam($parameterNames['currentPage']) != '') {
             return (int) $request->getParam($parameterNames['currentPage']);
         }
@@ -181,9 +173,10 @@ public function getCurrentPageNumber()
     }
 
     /**
+     * @param int $defaultItems
      *
-     * @param  int        $defaultItems
      * @return int
+     *
      * @throws \Exception
      */
     public function getItemsPerPage($defaultItems = 25)
@@ -191,7 +184,7 @@ public function getItemsPerPage($defaultItems = 25)
         $request = $this->getRequest();
 
         $optionsRenderer = $this->getOptionsRenderer();
-        $parameterNames  = $optionsRenderer['parameterNames'];
+        $parameterNames = $optionsRenderer['parameterNames'];
         if ($request->getParam($parameterNames['itemsPerPage']) != '') {
             return (int) $request->getParam($parameterNames['itemsPerPage']);
         }
@@ -200,7 +193,6 @@ public function getItemsPerPage($defaultItems = 25)
     }
 
     /**
-     *
      * @return \Zend\Stdlib\ResponseInterface
      */
     public function execute()
@@ -214,12 +206,11 @@ public function execute()
     }
 
     /**
-     *
      * @return TextTable
      */
     private function getTable()
     {
-        $paginator  = $this->getPaginator();
+        $paginator = $this->getPaginator();
 
         $options = [
             'columnWidths' => $this->getColumnWidths(),
@@ -241,7 +232,7 @@ private function getTable()
         $table->appendRow($tableRow);
 
         /**
-         * Header
+         * Header.
          */
         $tableRow = new Table\Row();
         foreach ($this->getColumnsToDisplay() as $column) {
@@ -296,7 +287,7 @@ private function getTable()
          */
         $tableRow = new Table\Row();
 
-        $footer = $this->translate('Page') . ' ';
+        $footer = $this->translate('Page').' ';
         $footer .= sprintf('%s %s %s', $paginator->getCurrentPageNumber(), $this->translate('of'), $paginator->count());
 
         $footer .= ' / ';
@@ -321,9 +312,10 @@ private function getTable()
     }
 
     /**
-     * Decide which columns we want to display
+     * Decide which columns we want to display.
      *
      * @return Column\AbstractColumn[]
+     *
      * @throws \Exception
      */
     private function getColumnsToDisplay()
@@ -336,7 +328,7 @@ private function getColumnsToDisplay()
         foreach ($this->getColumns() as $column) {
             /* @var $column \ZfcDatagrid\Column\AbstractColumn */
 
-            if (! $column instanceof Column\Action && $column->isHidden() === false) {
+            if (!$column instanceof Column\Action && $column->isHidden() === false) {
                 $columnsToDisplay[] = $column;
             }
         }
@@ -350,7 +342,6 @@ private function getColumnsToDisplay()
     }
 
     /**
-     *
      * @return array
      */
     private function getColumnWidths()
@@ -362,7 +353,7 @@ private function getColumnWidths()
         $border = count($cols) + 1;
 
         $widthAvailable = $this->getConsoleAdapter()->getWidth() - $border;
-        $onePercent     = $widthAvailable / 100;
+        $onePercent = $widthAvailable / 100;
 
         $colWidths = [];
         foreach ($cols as $col) {
@@ -377,7 +368,7 @@ private function getColumnWidths()
         while (array_sum($colWidths) < $widthAvailable) {
             $colWidths[$i] = $colWidths[$i] + 1;
 
-            $i ++;
+            ++$i;
         }
 
         return $colWidths;
diff --git a/src/ZfcDatagrid/Service/AbstractDatagrid.php b/src/ZfcDatagrid/Service/AbstractDatagrid.php
index c807d12a..81554927 100644
--- a/src/ZfcDatagrid/Service/AbstractDatagrid.php
+++ b/src/ZfcDatagrid/Service/AbstractDatagrid.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace ZfcDatagrid\Service;
 
+use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -9,35 +11,49 @@
 abstract class AbstractDatagrid extends Datagrid implements FactoryInterface
 {
     /**
+     * @param ContainerInterface $container
+     * @param string             $requestedName
+     * @param array|null         $options
      *
-     * @return Datagrid
+     * @return $this
      */
-    public function createService(ServiceLocatorInterface $sm)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $this->setServiceLocator($sm);
-        $config = $sm->get('config');
+        $this->setServiceLocator($container);
+        $config = $container->get('config');
 
-        if (! isset($config['ZfcDatagrid'])) {
+        if (!isset($config['ZfcDatagrid'])) {
             throw new InvalidArgumentException('Config key "ZfcDatagrid" is missing');
         }
 
         /* @var $application \Zend\Mvc\Application */
-        $application = $sm->get('application');
+        $application = $container->get('application');
 
         parent::setOptions($config['ZfcDatagrid']);
         parent::setMvcEvent($application->getMvcEvent());
-        if ($sm->has('translator') === true) {
-            parent::setTranslator($sm->get('translator'));
+
+        if ($container->has('translator') === true) {
+            parent::setTranslator($container->get('translator'));
         }
-        /** @noinspection PhpParamsInspection */
-        parent::setRendererService($sm->get('zfcDatagrid.renderer.' . parent::getRendererName()));
+
+        parent::setRendererService($container->get('zfcDatagrid.renderer.'.parent::getRendererName()));
         parent::init();
 
         return $this;
     }
 
     /**
-     * Call initGrid on rendering
+     * @param ServiceLocatorInterface $serviceLocator
+     *
+     * @return Datagrid
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        return $this($serviceLocator, Datagrid::class);
+    }
+
+    /**
+     * Call initGrid on rendering.
      */
     public function render()
     {
@@ -46,9 +62,5 @@ public function render()
         parent::render();
     }
 
-    /**
-     *
-     * @return void
-     */
     abstract public function initGrid();
 }
diff --git a/src/ZfcDatagrid/Service/DatagridFactory.php b/src/ZfcDatagrid/Service/DatagridFactory.php
index 56fa6f03..58b45f07 100644
--- a/src/ZfcDatagrid/Service/DatagridFactory.php
+++ b/src/ZfcDatagrid/Service/DatagridFactory.php
@@ -1,7 +1,9 @@
 <?php
+
 namespace ZfcDatagrid\Service;
 
 use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
+use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use ZfcDatagrid\Datagrid;
@@ -9,32 +11,45 @@
 class DatagridFactory implements FactoryInterface
 {
     /**
+     * @param ContainerInterface $container
+     * @param string             $requestedName
+     * @param array|null         $options
      *
-     * @param  ServiceLocatorInterface $sm
      * @return Datagrid
      */
-    public function createService(ServiceLocatorInterface $sm)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $sm->get('config');
+        $config = $container->get('config');
 
         if (!isset($config['ZfcDatagrid'])) {
             throw new InvalidArgumentException('Config key "ZfcDatagrid" is missing');
         }
 
         /* @var $application \Zend\Mvc\Application */
-        $application = $sm->get('application');
+        $application = $container->get('application');
 
         $grid = new Datagrid();
-        $grid->setServiceLocator($sm);
+        $grid->setServiceLocator($container);
         $grid->setOptions($config['ZfcDatagrid']);
         $grid->setMvcEvent($application->getMvcEvent());
-        if ($sm->has('translator') === true) {
-            $grid->setTranslator($sm->get('translator'));
+
+        if ($container->has('translator') === true) {
+            $grid->setTranslator($container->get('translator'));
         }
-        /** @noinspection PhpParamsInspection */
-        $grid->setRendererService($sm->get('zfcDatagrid.renderer.' . $grid->getRendererName()));
+
+        $grid->setRendererService($container->get('zfcDatagrid.renderer.'.$grid->getRendererName()));
         $grid->init();
 
         return $grid;
     }
+
+    /**
+     * @param ServiceLocatorInterface $serviceLocator
+     *
+     * @return Datagrid
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        return $this($serviceLocator, Datagrid::class);
+    }
 }
diff --git a/src/ZfcDatagrid/Service/DatagridManager.php b/src/ZfcDatagrid/Service/DatagridManager.php
index 75a2eea6..b10a8285 100644
--- a/src/ZfcDatagrid/Service/DatagridManager.php
+++ b/src/ZfcDatagrid/Service/DatagridManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Service;
 
 use Zend\ServiceManager\AbstractPluginManager;
@@ -11,7 +12,7 @@
 class DatagridManager extends AbstractPluginManager
 {
     /**
-     * Don't share form elements by default
+     * Don't share form elements by default.
      *
      * @var bool
      */
@@ -25,15 +26,16 @@ public function validatePlugin($plugin)
     }
 
     /**
-     * Retrieve a service from the manager by name
+     * Retrieve a service from the manager by name.
      *
      * Allows passing an array of options to use when creating the instance.
      * createFromInvokable() will use these and pass them to the instance
      * constructor if not null and a non-empty array.
      *
-     * @param  string       $name
-     * @param  string|array $options
-     * @param  bool         $usePeeringServiceManagers
+     * @param string       $name
+     * @param string|array $options
+     * @param bool         $usePeeringServiceManagers
+     *
      * @return object
      */
     public function get($name, $options = [], $usePeeringServiceManagers = true)
diff --git a/src/ZfcDatagrid/Service/DatagridManagerFactory.php b/src/ZfcDatagrid/Service/DatagridManagerFactory.php
index d64d901c..01f94038 100644
--- a/src/ZfcDatagrid/Service/DatagridManagerFactory.php
+++ b/src/ZfcDatagrid/Service/DatagridManagerFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ZfcDatagrid\Service;
 
 use Zend\Form\FormElementManager;
@@ -10,9 +11,10 @@ class DatagridManagerFactory extends AbstractPluginManagerFactory
     const PLUGIN_MANAGER_CLASS = 'ZfcDatagrid\Service\DatagridManager';
 
     /**
-     * Create and return the MVC controller plugin manager
+     * Create and return the MVC controller plugin manager.
+     *
+     * @param ServiceLocatorInterface $serviceLocator
      *
-     * @param  ServiceLocatorInterface $serviceLocator
      * @return FormElementManager
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
diff --git a/src/ZfcDatagrid/Service/ZendDbAdapterFactory.php b/src/ZfcDatagrid/Service/ZendDbAdapterFactory.php
index c26880cf..c0258ca2 100644
--- a/src/ZfcDatagrid/Service/ZendDbAdapterFactory.php
+++ b/src/ZfcDatagrid/Service/ZendDbAdapterFactory.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace ZfcDatagrid\Service;
 
+use Interop\Container\ContainerInterface;
 use Zend\Db\Adapter\Adapter;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -8,13 +10,26 @@
 class ZendDbAdapterFactory implements FactoryInterface
 {
     /**
-     * @param  ServiceLocatorInterface $sm
+     * @param ContainerInterface $container
+     * @param string             $requestedName
+     * @param array|null         $options
+     *
      * @return Adapter
      */
-    public function createService(ServiceLocatorInterface $sm)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $sm->get('config');
+        $config = $container->get('config');
 
         return new Adapter($config['zfcDatagrid_dbAdapter']);
     }
+
+    /**
+     * @param ServiceLocatorInterface $serviceLocator
+     *
+     * @return Adapter
+     */
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        return $this($serviceLocator, Adapter::class);
+    }
 }
diff --git a/tests/ZfcDatagridTest/Service/DatagridFactoryTest.php b/tests/ZfcDatagridTest/Service/DatagridFactoryTest.php
index 870f00be..56b9e6ef 100644
--- a/tests/ZfcDatagridTest/Service/DatagridFactoryTest.php
+++ b/tests/ZfcDatagridTest/Service/DatagridFactoryTest.php
@@ -98,7 +98,7 @@ public function testCanCreateServiceWithTranslator()
 
     public function testCanCreateServiceWithMvcTranslator()
     {
-        $mvcTranslatorMock = $this->getMockBuilder('Zend\Mvc\I18n\Translator')
+        $mvcTranslatorMock = $this->getMockBuilder('Zend\I18n\Translator\Translator')
             ->disableOriginalConstructor()
             ->getMock();