pfilsx / DataGridBundle

src/DependencyInjection/DataGridExtension.php

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
-        $ymlLoader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $ymlLoader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $ymlLoader->load('data_grid.yml');
 
         $container->getDefinition('data_grid.configuration')

src/Twig/DataGridExtension.php

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
         ];
     }
 
-    public function generateGrid(Environment $environment, DataGrid $grid, array $attributes = []){
+    public function generateGrid(Environment $environment, DataGrid $grid, array $attributes = []) {
         $template = $grid->getTemplate();
-        if (!$template->hasBlock('grid_table', [])){
+        if (!$template->hasBlock('grid_table', [])) {
             $template = $environment->loadTemplate(self::DEFAULT_TEMPLATE);
             $grid->setTemplate($template);
         }

src/Grid/Filters/AbstractFilter.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     {
         $this->container = $container;
         foreach ($config as $key => $value) {
-            $setter = 'set' . ucfirst($key);
+            $setter = 'set'.ucfirst($key);
             if (method_exists($this, $setter)) {
                 $this->$setter($value);
             }

src/Grid/Columns/AbstractColumn.php

Spacing +16 added lines, -16 removed lines

@@ -32,28 +32,28 @@ 
      */
     protected $container;
 
-    public function __construct(ContainerInterface $container,array $config = [])
+    public function __construct(ContainerInterface $container, array $config = [])
     {
 
         $this->container = $container;
-        foreach ($config as $key => $value){
+        foreach ($config as $key => $value) {
             $setter = 'set'.ucfirst($key);
-            if (method_exists($this, $setter)){
+            if (method_exists($this, $setter)) {
                 $this->$setter($value);
             }
         }
         $this->checkConfiguration();
     }
 
-    protected function checkConfiguration(){
+    protected function checkConfiguration() {
 
     }
 
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 
-    public function hasAttributes(){
+    public function hasAttributes() {
         return !empty($this->attributes);
     }
     /**
@@ -94,15 +94,15 @@ 
     {
         $this->label = $label;
     }
-    public function hasFilter(){
+    public function hasFilter() {
         return is_subclass_of($this->filter, AbstractFilter::class);
     }
 
-    public function getFilter(){
+    public function getFilter() {
         return $this->filter;
     }
 
-    public function setFilter(array $filter){
+    public function setFilter(array $filter) {
         $filterClass = $filter['class'];
         unset($filter['class']);
         $filter['template'] = $this->template;
@@ -112,26 +112,26 @@ 
 
 
 
-    public function hasSort(){
+    public function hasSort() {
         return $this->sort !== false && !empty($this->attribute);
     }
 
-    public function setSort($direction){
+    public function setSort($direction) {
         $this->sort = $direction;
     }
 
-    public function getSort(){
+    public function getSort() {
         return $this->sort;
     }
 
-    public function getAttribute(){
+    public function getAttribute() {
         return null;
     }
 
-    public function getFilterValue(){
+    public function getFilterValue() {
         return $this->filterValue;
     }
-    public function setFilterValue($value){
+    public function setFilterValue($value) {
         $this->filterValue = $value;
     }
 
@@ -155,7 +155,7 @@ 
     public function setTemplate($template): void
     {
         $this->template = $template;
-        if ($this->hasFilter()){
+        if ($this->hasFilter()) {
             $this->filter->setTemplate($template);
         }
     }

src/Grid/DataGrid.php

Spacing +35 added lines, -35 removed lines

@@ -82,53 +82,53 @@ 
         $this->repository = $repository;
         $this->columns = $columns;
         $this->twig = $options['twig'];
-        foreach ($options as $key => $value){
+        foreach ($options as $key => $value) {
             $setter = 'set'.ucfirst($key);
-            if (method_exists($this, $setter)){
+            if (method_exists($this, $setter)) {
                 $this->$setter($value);
             }
         }
-        foreach ($columns as $column){
-            if ($column->hasFilter() && $column->isVisible()){
+        foreach ($columns as $column) {
+            if ($column->hasFilter() && $column->isVisible()) {
                 $this->hasFilters = true;
                 break;
             }
         }
-        if ($this->hasPagination()){
+        if ($this->hasPagination()) {
             $this->rebuildPaginationOptions();
         }
     }
 
-    public function getShowTitles(){
+    public function getShowTitles() {
         return $this->showTitles;
     }
-    protected function setShowTitles($value){
+    protected function setShowTitles($value) {
         $this->showTitles = (bool)$value;
     }
 
-    public function getRepository(){
+    public function getRepository() {
         return $this->repository;
     }
 
-    public function getColumns(){
+    public function getColumns() {
         return $this->columns;
     }
 
-    public function hasFilters(){
+    public function hasFilters() {
         return $this->hasFilters;
     }
 
-    public function getData(){
+    public function getData() {
         $this->filtersCriteria
             ->orderBy($this->sort)
             ->setMaxResults($this->hasPagination() ? $this->limit : null)
-            ->setFirstResult($this->hasPagination() ? ($this->page-1)*$this->limit : null);
+            ->setFirstResult($this->hasPagination() ? ($this->page-1) * $this->limit : null);
         return $this->repository->matching($this->filtersCriteria);
     }
     /**
      * @return Twig_Template
      */
-    public function getTemplate(){
+    public function getTemplate() {
         return $this->template;
     }
 
@@ -139,30 +139,30 @@ 
      * @throws \Twig\Error\RuntimeError
      * @throws \Twig\Error\SyntaxError
      */
-    public function setTemplate(string $path){
+    public function setTemplate(string $path) {
         $template = $this->twig->loadTemplate($path);
         $this->template = $template;
     }
 
-    public function getRouter(){
+    public function getRouter() {
         return $this->router;
     }
 
-    protected function setRouter(RouterInterface $router){
+    protected function setRouter(RouterInterface $router) {
         $this->router = $router;
     }
 
-    public function getNoDataMessage(){
+    public function getNoDataMessage() {
         return $this->noDataMessage;
     }
-    protected function setNoDataMessage(string $message){
+    protected function setNoDataMessage(string $message) {
         $this->noDataMessage = $message;
     }
 
-    protected function setSort(array $sort){
+    protected function setSort(array $sort) {
         list($attribute, $direction) = $sort;
-        foreach ($this->columns as $column){
-            if ($column->hasSort() && $column->getAttribute() == $attribute){
+        foreach ($this->columns as $column) {
+            if ($column->hasSort() && $column->getAttribute() == $attribute) {
                 $column->setSort($direction);
                 $this->sort = [$attribute => $direction];
                 break;
@@ -170,49 +170,49 @@ 
         }
     }
 
-    protected function setPage(int $page){
+    protected function setPage(int $page) {
         $this->page = $page;
     }
 
-    protected function setPagination(bool $value){
+    protected function setPagination(bool $value) {
         $this->pagination = $value;
     }
 
-    public function hasPagination(){
+    public function hasPagination() {
         return $this->pagination && is_numeric($this->paginationOptions['limit']);
     }
 
-    protected function setPaginationOptions(array $options){
+    protected function setPaginationOptions(array $options) {
         $this->paginationOptions = array_merge($this->paginationOptions, $options);
     }
 
-    public function getPaginationOptions(){
+    public function getPaginationOptions() {
         return $this->paginationOptions;
     }
 
-    protected function setFiltersCriteria(Criteria $criteria){
+    protected function setFiltersCriteria(Criteria $criteria) {
         $this->filtersCriteria = $criteria;
     }
 
     /**
      * @internal
      */
-    protected function rebuildPaginationOptions(){
+    protected function rebuildPaginationOptions() {
         $this->limit = $this->paginationOptions['limit'];
         $total = $this->repository->matching($this->filtersCriteria)->count();
         $this->maxPage = (int)ceil($total / $this->limit);
         $this->page  = $this->page != null && $this->page > 0 && $this->page <= $this->maxPage
             ? $this->page : 1;
-        if ($this->maxPage == 0){
+        if ($this->maxPage == 0) {
             $this->paginationOptions['pages'] = [1];
-        } elseif ($this->maxPage <= 10){
-            $this->paginationOptions['pages'] = range(1,$this->maxPage);
-        } elseif ($this->page < 5){
-            $this->paginationOptions['pages'] = array_merge(range(1,6), [null,$this->maxPage]);
-        } elseif ($this->page  > $this->maxPage - 4){
+        } elseif ($this->maxPage <= 10) {
+            $this->paginationOptions['pages'] = range(1, $this->maxPage);
+        } elseif ($this->page < 5) {
+            $this->paginationOptions['pages'] = array_merge(range(1, 6), [null, $this->maxPage]);
+        } elseif ($this->page > $this->maxPage-4) {
             $this->paginationOptions['pages'] = array_merge([1, null], range($this->maxPage-5, $this->maxPage));
         } else {
-            $this->paginationOptions['pages'] = array_merge([1,null], range($this->page -2,$this->page +2), [null, $this->maxPage]);
+            $this->paginationOptions['pages'] = array_merge([1, null], range($this->page-2, $this->page+2), [null, $this->maxPage]);
         }
         $this->paginationOptions['currentPage'] = $this->page;
     }

src/Grid/DataGridFactory.php

Braces +5 added lines, -4 removed lines

@@ -116,10 +116,11 @@
     }
 
     protected function setPage($page){
-        if (is_numeric($page))
-            $this->options['page'] = (int)$page;
-        else
-            $this->options['page'] = 1;
+        if (is_numeric($page)) {
+                    $this->options['page'] = (int)$page;
+        } else {
+                    $this->options['page'] = 1;
+        }
     }
 
     protected function setDefaultTemplate($template){

Spacing +16 added lines, -16 removed lines

@@ -57,9 +57,9 @@ 
         $this->gridBuilder = new DataGridBuilder($container);
         $this->filterBuilder = new DataGridFiltersBuilder($container);
         $this->options['filtersCriteria'] = $this->filterBuilder->getCriteria();
-        foreach ($configs->getConfigs() as $key => $value){
+        foreach ($configs->getConfigs() as $key => $value) {
             $setter = 'setDefault'.ucfirst($key);
-            if (method_exists($this, $setter)){
+            if (method_exists($this, $setter)) {
                 $this->$setter($value);
             }
         }
@@ -69,7 +69,7 @@ 
     public function createGrid(string $gridType, ServiceEntityRepository $repository): DataGrid
     {
         if (!is_subclass_of($gridType, AbstractGridType::class)) {
-            throw new InvalidArgumentException('Expected subclass of ' . AbstractGridType::class);
+            throw new InvalidArgumentException('Expected subclass of '.AbstractGridType::class);
         }
         $this->repository = $repository;
         /** @var AbstractGridType $type */
@@ -84,20 +84,20 @@ 
     protected function handleRequest(): void
     {
         $params = array_key_exists('data_grid', $this->request->query->all()) ? $this->request->query->get('data_grid') : [];
-        if (array_key_exists('sortBy', $params)){
+        if (array_key_exists('sortBy', $params)) {
             $this->setSort($params['sortBy']);
             unset($params['sortBy']);
         }
-        if (array_key_exists('pagination',$this->options) && $this->options['pagination']){
-            if (array_key_exists('page', $params)){
+        if (array_key_exists('pagination', $this->options) && $this->options['pagination']) {
+            if (array_key_exists('page', $params)) {
                 $this->setPage($params['page']);
                 unset($params['page']);
             } else {
                 $this->setPage(1);
             }
         }
-        foreach ($this->columns as $column){
-            if ($column->hasFilter() && array_key_exists($column->getAttribute(), $params)){
+        foreach ($this->columns as $column) {
+            if ($column->hasFilter() && array_key_exists($column->getAttribute(), $params)) {
                 $column->setFilterValue($params[$column->getAttribute()]);
             }
         }
@@ -106,30 +106,30 @@ 
         $this->options['filtersCriteria'] = $this->filterBuilder->getCriteria();
     }
 
-    protected function setSort($attribute){
+    protected function setSort($attribute) {
         $first = substr($attribute, 0, 1);
-        if ($first == '-'){
-            $this->options['sort'] = [substr($attribute,1), 'DESC'];
+        if ($first == '-') {
+            $this->options['sort'] = [substr($attribute, 1), 'DESC'];
         } else {
             $this->options['sort'] = [$attribute, 'ASC'];
         }
     }
 
-    protected function setPage($page){
+    protected function setPage($page) {
         if (is_numeric($page))
             $this->options['page'] = (int)$page;
         else
             $this->options['page'] = 1;
     }
 
-    protected function setDefaultTemplate($template){
+    protected function setDefaultTemplate($template) {
         $this->gridBuilder->setTemplate($template);
     }
-    protected function setDefaultNoDataMessage($message){
+    protected function setDefaultNoDataMessage($message) {
         $this->gridBuilder->setNoDataMessage($message);
     }
-    protected function setDefaultPagination($pagination){
-        if ($pagination['enabled']){
+    protected function setDefaultPagination($pagination) {
+        if ($pagination['enabled']) {
             $this->gridBuilder->enablePagination($pagination['options']);
         }
     }

src/Config/DataGridConfiguration.php

Spacing +7 added lines, -7 removed lines

@@ -14,25 +14,25 @@
 
     protected $paginationOptions;
 
-    public function __construct(array $config){
-        foreach ($config as $key => $value){
+    public function __construct(array $config) {
+        foreach ($config as $key => $value) {
             $setter = 'set'.ucfirst($key);
-            if (method_exists($this, $setter)){
+            if (method_exists($this, $setter)) {
                 $this->$setter($value);
             }
         }
     }
 
-    protected function setTemplate(string $template){
+    protected function setTemplate(string $template) {
         $this->template = $template;
     }
 
-    protected function setNoDataMessage(string $message){
+    protected function setNoDataMessage(string $message) {
         $this->noDataMessage = $message;
     }
 
-    protected function setPagination(array $options){
-        if (!empty($options)){
+    protected function setPagination(array $options) {
+        if (!empty($options)) {
             $this->pagination = true;
             $this->paginationOptions = $options;
         } else {

src/Grid/DataGridFiltersBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
     public function addDateFilter(string $attribute, string $comparison = 'equal'): DataGridFiltersBuilderInterface
     {
         if (array_key_exists($attribute, $this->params)) {
-            $comparisonFunc = lcfirst($comparison) . 'Date';
+            $comparisonFunc = lcfirst($comparison).'Date';
             if (method_exists($this, $comparisonFunc)) {
                 $this->$comparisonFunc($attribute);
             } else {

src/Grid/DataGridBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
     public function addColumn(string $columnClass, array $config = []): DataGridBuilderInterface
     {
         if (!is_subclass_of($columnClass, AbstractColumn::class)) {
-            throw new InvalidArgumentException('Expected subclass of' . AbstractColumn::class);
+            throw new InvalidArgumentException('Expected subclass of'.AbstractColumn::class);
         }
         $this->columns[] = new $columnClass($this->container, array_merge(['template' => $this->options['template']], $config));
         return $this;
@@ -66,7 +66,7 @@ 
     public function setTemplate(string $path) : DataGridBuilderInterface
     {
         $this->options['template'] = $path;
-        foreach ($this->columns as $column){
+        foreach ($this->columns as $column) {
             $column->setTemplate($path);
         }
         return $this;
@@ -83,7 +83,7 @@ 
 
     public function enablePagination($options = []) : DataGridBuilderInterface
     {
-        if (is_array($options) && !empty($options)){
+        if (is_array($options) && !empty($options)) {
             $this->options['pagination'] = true;
             $this->options['paginationOptions'] = $options;
         } else {