deniskoronets / Laravel-GridView

src/GridViewRequest.php

Indentation +73 added lines, -73 removed lines

@@ -7,77 +7,77 @@
 
 class GridViewRequest
 {
-    use Configurable;
-
-    public $page;
-
-    public $sortColumn;
-
-    public $sortOrder;
-
-    public $perPage;
-
-    public $filters = [];
-
-    private function __construct($config)
-    {
-        $this->loadConfig($config);
-    }
-
-    private static function gridField(int $gridId, string $field)
-    {
-        return $gridId == 0 ? $field : 'grid.' . $gridId . '.' . $field;
-    }
-
-    /**
-     * Allows to parse request information and making request instance
-     * @param int $gridId
-     * @return GridViewRequest
-     */
-    public static function parse(int $gridId)
-    {
-        $request = Request::instance();
-
-        $page = $request->input(self::gridField($gridId, 'page'), 1);
-        $sortColumn = $request->input(self::gridField($gridId, 'sort'), '');
-        $sortOrder = $request->input(self::gridField($gridId, 'order'), 'DESC');
-        $filters = $request->input(self::gridField($gridId, 'filters'), []);
-
-        if ($page <= 0) {
-            $page = 1;
-        }
-
-        if (!is_string($sortColumn)) {
-            $sortColumn = '';
-        }
-
-        if (!in_array($sortOrder, ['ASC', 'DESC'])) {
-            $sortOrder = 'DESC';
-        }
-
-        if (!is_array($filters)) {
-            $filters = [];
-        }
-
-        return new GridViewRequest([
-            'page' => $page,
-            'sortColumn' => $sortColumn,
-            'sortOrder' => $sortOrder,
-            'filters' => $filters,
-        ]);
-    }
-
-    public function getFilterValue(string $name)
-    {
-        return $this->filters[$name] ?? '';
-    }
-
-    /**
-     * Should specify tests
-     * @return array
-     */
-    protected function configTests(): array
-    {
-        return [];
-    }
+	use Configurable;
+
+	public $page;
+
+	public $sortColumn;
+
+	public $sortOrder;
+
+	public $perPage;
+
+	public $filters = [];
+
+	private function __construct($config)
+	{
+		$this->loadConfig($config);
+	}
+
+	private static function gridField(int $gridId, string $field)
+	{
+		return $gridId == 0 ? $field : 'grid.' . $gridId . '.' . $field;
+	}
+
+	/**
+	 * Allows to parse request information and making request instance
+	 * @param int $gridId
+	 * @return GridViewRequest
+	 */
+	public static function parse(int $gridId)
+	{
+		$request = Request::instance();
+
+		$page = $request->input(self::gridField($gridId, 'page'), 1);
+		$sortColumn = $request->input(self::gridField($gridId, 'sort'), '');
+		$sortOrder = $request->input(self::gridField($gridId, 'order'), 'DESC');
+		$filters = $request->input(self::gridField($gridId, 'filters'), []);
+
+		if ($page <= 0) {
+			$page = 1;
+		}
+
+		if (!is_string($sortColumn)) {
+			$sortColumn = '';
+		}
+
+		if (!in_array($sortOrder, ['ASC', 'DESC'])) {
+			$sortOrder = 'DESC';
+		}
+
+		if (!is_array($filters)) {
+			$filters = [];
+		}
+
+		return new GridViewRequest([
+			'page' => $page,
+			'sortColumn' => $sortColumn,
+			'sortOrder' => $sortOrder,
+			'filters' => $filters,
+		]);
+	}
+
+	public function getFilterValue(string $name)
+	{
+		return $this->filters[$name] ?? '';
+	}
+
+	/**
+	 * Should specify tests
+	 * @return array
+	 */
+	protected function configTests(): array
+	{
+		return [];
+	}
 }
\ No newline at end of file

src/DataProviders/EloquentDataProvider.php

Indentation +53 added lines, -53 removed lines

@@ -7,57 +7,57 @@
 
 class EloquentDataProvider extends BaseDataProvider
 {
-    protected $query;
-
-    /**
-     * EloquentDataProvider constructor.
-     * @param Builder $query
-     */
-    public function __construct(Builder $query)
-    {
-        $this->query = clone $query;
-    }
-
-    /**
-     * @param GridViewRequest $request
-     * @return Builder
-     */
-    protected function baseQuery(GridViewRequest $request)
-    {
-        $query = clone $this->query;
-
-        foreach ($request->filters as $field => $value) {
-            $query->where($field, 'LIKE', '%' . $value . '%');
-        }
-
-        if ($request->sortColumn) {
-            $query->orderBy($request->sortColumn, $request->sortOrder);
-        }
-
-        return $query;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getCount(GridViewRequest $request) : int
-    {
-        return $this->baseQuery($request)->count();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getData(GridViewRequest $request)
-    {
-        $query = $this->baseQuery($request);
-
-        if ($request->perPage == 0) {
-            return $query->get();
-        }
-
-        return $query->offset(($request->page - 1) * $request->perPage)
-            ->limit($request->perPage)
-            ->get();
-    }
+	protected $query;
+
+	/**
+	 * EloquentDataProvider constructor.
+	 * @param Builder $query
+	 */
+	public function __construct(Builder $query)
+	{
+		$this->query = clone $query;
+	}
+
+	/**
+	 * @param GridViewRequest $request
+	 * @return Builder
+	 */
+	protected function baseQuery(GridViewRequest $request)
+	{
+		$query = clone $this->query;
+
+		foreach ($request->filters as $field => $value) {
+			$query->where($field, 'LIKE', '%' . $value . '%');
+		}
+
+		if ($request->sortColumn) {
+			$query->orderBy($request->sortColumn, $request->sortOrder);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getCount(GridViewRequest $request) : int
+	{
+		return $this->baseQuery($request)->count();
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getData(GridViewRequest $request)
+	{
+		$query = $this->baseQuery($request);
+
+		if ($request->perPage == 0) {
+			return $query->get();
+		}
+
+		return $query->offset(($request->page - 1) * $request->perPage)
+			->limit($request->perPage)
+			->get();
+	}
 }
\ No newline at end of file

src/DataProviders/ArrayDataProvider.php

Indentation +56 added lines, -56 removed lines

@@ -6,71 +6,71 @@
 
 class ArrayDataProvider extends BaseDataProvider
 {
-    /**
-     * @var array
-     */
-    private $data;
+	/**
+	 * @var array
+	 */
+	private $data;
 
-    public function __construct(array $data)
-    {
-        $this->data = $data;
-    }
+	public function __construct(array $data)
+	{
+		$this->data = $data;
+	}
 
-    /**
-     * @param GridViewRequest $request
-     * @return array
-     */
-    protected function processData(GridViewRequest $request) : array
-    {
-        if (empty($this->data)) {
-            return [];
-        }
+	/**
+	 * @param GridViewRequest $request
+	 * @return array
+	 */
+	protected function processData(GridViewRequest $request) : array
+	{
+		if (empty($this->data)) {
+			return [];
+		}
 
-        $tmp = collect($this->data);
+		$tmp = collect($this->data);
 
-        if (!empty($request->filters)) {
-            $tmp->filter(function($item) use ($request) {
-                foreach ($request->filters as $filterKey => $filterValue) {
+		if (!empty($request->filters)) {
+			$tmp->filter(function($item) use ($request) {
+				foreach ($request->filters as $filterKey => $filterValue) {
 
-                    if (!isset($item[$filterKey])) {
-                        return false;
-                    }
+					if (!isset($item[$filterKey])) {
+						return false;
+					}
 
-                    if (strpos($item[$filterKey], $filterValue) === false) {
-                        return false;
-                    }
-                }
+					if (strpos($item[$filterKey], $filterValue) === false) {
+						return false;
+					}
+				}
 
-                return true;
-            });
-        }
+				return true;
+			});
+		}
 
-        if (!empty($request->sortColumn)) {
-            $tmp = $tmp->sortBy(
-                $request->sortColumn,
-                $request->sortOrder == 'DESC' ? SORT_DESC : SORT_ASC
-            );
-        }
+		if (!empty($request->sortColumn)) {
+			$tmp = $tmp->sortBy(
+				$request->sortColumn,
+				$request->sortOrder == 'DESC' ? SORT_DESC : SORT_ASC
+			);
+		}
 
-        return $tmp;
-    }
+		return $tmp;
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function getCount(GridViewRequest $request) : int
-    {
-        return count($this->processData($request));
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function getCount(GridViewRequest $request) : int
+	{
+		return count($this->processData($request));
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function getData(GridViewRequest $request)
-    {
-        return array_splice(
-            $this->processData($request),
-            ($request->page -1) * $request->perPage, $request->perPage
-        );
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function getData(GridViewRequest $request)
+	{
+		return array_splice(
+			$this->processData($request),
+			($request->page -1) * $request->perPage, $request->perPage
+		);
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     {
         return array_splice(
             $this->processData($request),
-            ($request->page -1) * $request->perPage, $request->perPage
+            ($request->page - 1) * $request->perPage, $request->perPage
         );
     }
 }
\ No newline at end of file

src/DataProviders/BaseDataProvider.php

Indentation +12 added lines, -12 removed lines

@@ -6,17 +6,17 @@
 
 abstract class BaseDataProvider
 {
-    /**
-     * Should return total amount of rows
-     * @param GridViewRequest $request
-     * @return int
-     */
-    abstract public function getCount(GridViewRequest $request) : int;
+	/**
+	 * Should return total amount of rows
+	 * @param GridViewRequest $request
+	 * @return int
+	 */
+	abstract public function getCount(GridViewRequest $request) : int;
 
-    /**
-     * Should return a list of data for current page
-     * @param GridViewRequest $request
-     * @return mixed
-     */
-    abstract public function getData(GridViewRequest $request);
+	/**
+	 * Should return a list of data for current page
+	 * @param GridViewRequest $request
+	 * @return mixed
+	 */
+	abstract public function getData(GridViewRequest $request);
 }
\ No newline at end of file

src/GridView.php

Indentation +204 added lines, -204 removed lines

@@ -15,208 +15,208 @@
 
 class GridView
 {
-    use Configurable;
-
-    /**
-     * Counter for ids
-     * @var int
-     */
-    private static $counter = 0;
-
-    /**
-     * Grid id (used for request handling, for
-     * @var int
-     */
-    private $id;
-
-    /**
-     * DataProvider provides gridview with the data for representation
-     * @var BaseDataProvider
-     */
-    public $dataProvider;
-
-    /**
-     * Columns config. You may specify array or GridColumn instance
-     * @var BaseColumn[]
-     */
-    public $columns = [];
-
-    /**
-     * Common options for all columns, will be appended to all columns configs
-     * @var array
-     */
-    public $columnOptions = [
-        'class' => AttributeColumn::class,
-    ];
-
-    /**
-     * Renders the final UI
-     * @var string|BaseRenderer
-     */
-    public $renderer = DefaultRenderer::class;
-
-    /**
-     * Allows to pass some options into renderer/customize rendered behavior
-     * @var array
-     */
-    public $rendererOptions = [];
-
-    /**
-     * Controls amount of data per page
-     * @var int
-     */
-    public $rowsPerPage = 25;
-
-    /**
-     * Allows to tune the <table> tag with html options
-     * @var array
-     */
-    public $tableHtmlOptions = [
-        'class' => 'table table-bordered gridview-table',
-    ];
-
-    /**
-     * Indicate if filters will be shown or not
-     * @var bool
-     */
-    public $showFilters = true;
-
-    /**
-     * @var Paginator
-     */
-    protected $pagination;
-
-    /**
-     * @var GridViewRequest
-     */
-    protected $request;
-
-    /**
-     * GridView constructor.
-     * @param array $config
-     * @throws Exceptions\GridViewConfigException
-     */
-    public function __construct(array $config)
-    {
-        $this->id = self::$counter++;
-
-        $this->loadConfig($config);
-
-        /**
-         * Making renderer
-         */
-        if (!is_object($this->renderer)) {
-            $className = GridViewHelper::resolveAlias('renderer', $this->renderer);
-            $this->renderer = new $className(array_merge(
-                $this->rendererOptions, [
-                    'gridView' => $this,
-                ]
-            ));
-        }
-
-        /**
-         * Build columns from config
-         */
-        $this->buildColumns();
-
-        $this->request = GridViewRequest::parse($this->id);
-        $this->request->perPage = $this->rowsPerPage;
-
-        $this->pagination = new LengthAwarePaginator(
-            $this->dataProvider->getData($this->request),
-            $this->dataProvider->getCount($this->request),
-            $this->rowsPerPage,
-            $this->request->page
-        );
-    }
-
-    /**
-     * @return array
-     */
-    protected function configTests(): array
-    {
-        return [
-            'dataProvider' => BaseDataProvider::class,
-            'columns' => 'array',
-            'renderer' => BaseRenderer::class,
-            'rowsPerPage' => 'int',
-            'tableHtmlOptions' => 'array',
-            'showFilters' => 'boolean',
-        ];
-    }
-
-    /**
-     * Build columns into objects
-     */
-    protected function buildColumns()
-    {
-        foreach ($this->columns as $key => &$columnOptions) {
-
-            /**
-             * In case of when column is already build
-             */
-            if (is_object($columnOptions)) {
-                continue;
-            }
-
-            /**
-             * When only attribute name/value passed
-             */
-            if (is_string($columnOptions)) {
-                $columnOptions = [
-                    'value' => $columnOptions,
-                ];
-            }
-
-            if ($columnOptions instanceof Closure) {
-                $columnOptions = [
-                    'class' => CallbackColumn::class,
-                    'value' => $columnOptions,
-                    'title' => GridViewHelper::columnTitle($key),
-                ];
-            }
-
-            /**
-             * Inline column declaration detector
-             */
-            if (is_string($columnOptions['value']) && strpos($columnOptions['value'], 'view:') === 0) {
-                $columnOptions['class'] = 'view';
-                $columnOptions['value'] = str_replace('view:', '', $columnOptions['value']);
-            }
-
-            $columnOptions = array_merge($this->columnOptions, $columnOptions);
-
-            $className = GridViewHelper::resolveAlias('column', $columnOptions['class']);
-            $columnOptions = new $className($columnOptions);
-        }
-    }
-
-    /**
-     * Draws widget and return html code
-     * @return string
-     */
-    public function render()
-    {
-        return $this->renderer->render($this);
-    }
-
-    public function getPagination()
-    {
-        return $this->pagination;
-    }
-
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function compileTableHtmlOptions()
-    {
-        return GridViewHelper::htmlOptionsToString($this->tableHtmlOptions);
-    }
+	use Configurable;
+
+	/**
+	 * Counter for ids
+	 * @var int
+	 */
+	private static $counter = 0;
+
+	/**
+	 * Grid id (used for request handling, for
+	 * @var int
+	 */
+	private $id;
+
+	/**
+	 * DataProvider provides gridview with the data for representation
+	 * @var BaseDataProvider
+	 */
+	public $dataProvider;
+
+	/**
+	 * Columns config. You may specify array or GridColumn instance
+	 * @var BaseColumn[]
+	 */
+	public $columns = [];
+
+	/**
+	 * Common options for all columns, will be appended to all columns configs
+	 * @var array
+	 */
+	public $columnOptions = [
+		'class' => AttributeColumn::class,
+	];
+
+	/**
+	 * Renders the final UI
+	 * @var string|BaseRenderer
+	 */
+	public $renderer = DefaultRenderer::class;
+
+	/**
+	 * Allows to pass some options into renderer/customize rendered behavior
+	 * @var array
+	 */
+	public $rendererOptions = [];
+
+	/**
+	 * Controls amount of data per page
+	 * @var int
+	 */
+	public $rowsPerPage = 25;
+
+	/**
+	 * Allows to tune the <table> tag with html options
+	 * @var array
+	 */
+	public $tableHtmlOptions = [
+		'class' => 'table table-bordered gridview-table',
+	];
+
+	/**
+	 * Indicate if filters will be shown or not
+	 * @var bool
+	 */
+	public $showFilters = true;
+
+	/**
+	 * @var Paginator
+	 */
+	protected $pagination;
+
+	/**
+	 * @var GridViewRequest
+	 */
+	protected $request;
+
+	/**
+	 * GridView constructor.
+	 * @param array $config
+	 * @throws Exceptions\GridViewConfigException
+	 */
+	public function __construct(array $config)
+	{
+		$this->id = self::$counter++;
+
+		$this->loadConfig($config);
+
+		/**
+		 * Making renderer
+		 */
+		if (!is_object($this->renderer)) {
+			$className = GridViewHelper::resolveAlias('renderer', $this->renderer);
+			$this->renderer = new $className(array_merge(
+				$this->rendererOptions, [
+					'gridView' => $this,
+				]
+			));
+		}
+
+		/**
+		 * Build columns from config
+		 */
+		$this->buildColumns();
+
+		$this->request = GridViewRequest::parse($this->id);
+		$this->request->perPage = $this->rowsPerPage;
+
+		$this->pagination = new LengthAwarePaginator(
+			$this->dataProvider->getData($this->request),
+			$this->dataProvider->getCount($this->request),
+			$this->rowsPerPage,
+			$this->request->page
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function configTests(): array
+	{
+		return [
+			'dataProvider' => BaseDataProvider::class,
+			'columns' => 'array',
+			'renderer' => BaseRenderer::class,
+			'rowsPerPage' => 'int',
+			'tableHtmlOptions' => 'array',
+			'showFilters' => 'boolean',
+		];
+	}
+
+	/**
+	 * Build columns into objects
+	 */
+	protected function buildColumns()
+	{
+		foreach ($this->columns as $key => &$columnOptions) {
+
+			/**
+			 * In case of when column is already build
+			 */
+			if (is_object($columnOptions)) {
+				continue;
+			}
+
+			/**
+			 * When only attribute name/value passed
+			 */
+			if (is_string($columnOptions)) {
+				$columnOptions = [
+					'value' => $columnOptions,
+				];
+			}
+
+			if ($columnOptions instanceof Closure) {
+				$columnOptions = [
+					'class' => CallbackColumn::class,
+					'value' => $columnOptions,
+					'title' => GridViewHelper::columnTitle($key),
+				];
+			}
+
+			/**
+			 * Inline column declaration detector
+			 */
+			if (is_string($columnOptions['value']) && strpos($columnOptions['value'], 'view:') === 0) {
+				$columnOptions['class'] = 'view';
+				$columnOptions['value'] = str_replace('view:', '', $columnOptions['value']);
+			}
+
+			$columnOptions = array_merge($this->columnOptions, $columnOptions);
+
+			$className = GridViewHelper::resolveAlias('column', $columnOptions['class']);
+			$columnOptions = new $className($columnOptions);
+		}
+	}
+
+	/**
+	 * Draws widget and return html code
+	 * @return string
+	 */
+	public function render()
+	{
+		return $this->renderer->render($this);
+	}
+
+	public function getPagination()
+	{
+		return $this->pagination;
+	}
+
+	public function getRequest()
+	{
+		return $this->request;
+	}
+
+	public function getId()
+	{
+		return $this->id;
+	}
+
+	public function compileTableHtmlOptions()
+	{
+		return GridViewHelper::htmlOptionsToString($this->tableHtmlOptions);
+	}
 }
\ No newline at end of file