patricksamson · patricksamson · Feb 19, 2016 · Nov 4, 2015 · Jan 30, 2016 · Jan 30, 2016
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,17 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.blade.php]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,77 @@
+<?php
+
+use Symfony\CS\Config\Config;
+use Symfony\CS\FixerInterface;
+use Symfony\CS\Finder\DefaultFinder;
+
+$fixers = [
+    'blankline_after_open_tag',
+    'braces',
+    'concat_without_spaces',
+    'double_arrow_multiline_whitespaces',
+    'duplicate_semicolon',
+    'elseif',
+    'empty_return',
+    'encoding',
+    'eof_ending',
+    'extra_empty_lines',
+    'function_call_space',
+    'function_declaration',
+    'include',
+    'indentation',
+    'join_function',
+    'line_after_namespace',
+    'linefeed',
+    'list_commas',
+    'logical_not_operators_with_successor_space',
+    'lowercase_constants',
+    'lowercase_keywords',
+    'method_argument_space',
+    'multiline_array_trailing_comma',
+    'multiline_spaces_before_semicolon',
+    'multiple_use',
+    'namespace_no_leading_whitespace',
+    'no_blank_lines_after_class_opening',
+    'no_empty_lines_after_phpdocs',
+    'object_operator',
+    'operators_spaces',
+    'parenthesis',
+    'phpdoc_indent',
+    'phpdoc_inline_tag',
+    'phpdoc_no_access',
+    'phpdoc_no_package',
+    'phpdoc_scalar',
+    'phpdoc_short_description',
+    'phpdoc_to_comment',
+    'phpdoc_trim',
+    'phpdoc_type_to_var',
+    'phpdoc_var_without_name',
+    'remove_leading_slash_use',
+    'remove_lines_between_uses',
+    'return',
+    'self_accessor',
+    'short_array_syntax',
+    'short_echo_tag',
+    'short_tag',
+    'single_array_no_trailing_comma',
+    'single_blank_line_before_namespace',
+    'single_line_after_imports',
+    'single_quote',
+    'spaces_before_semicolon',
+    'spaces_cast',
+    'standardize_not_equal',
+    'ternary_spaces',
+    'trailing_spaces',
+    'trim_array_spaces',
+    'unalign_equals',
+    'unary_operators_spaces',
+    'unused_use',
+    'visibility',
+    'whitespacy_lines',
+];
+
+return Config::create()
+    ->finder(DefaultFinder::create()->in(__DIR__))
+    ->fixers($fixers)
+    ->level(FixerInterface::NONE_LEVEL)
+    ->setUsingCache(true);
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1,12 @@
+preset: laravel
+
+risky: false
+
+linting: true
+
+finder:
+  exclude:
+    - "config"
+    - "lang"
+    - "tests"
+    - "views"
diff --git a/.travis.yml b/.travis.yml
@@ -1,23 +1,45 @@
 language: php
 
+sudo: false
+
 php:
-  - 5.5
   - 5.6
   - 7.0
   - hhvm
 
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
+env:
+  global:
+    - setup=basic
+    - COMPOSER_DISCARD_CHANGES=true
+    - COMPOSER_NO_INTERACTION=1
+    - COMPOSER_DISABLE_XDEBUG_WARN=1
+
+matrix:
+  include:
+    - php: 5.6
+      env: setup=lowest
+    - php: 5.6
+      env: setup=stable
+
 before_install:
-  - travis_retry composer self-update
+  - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
+  - composer self-update && composer -V
 
 install:
-  - travis_retry composer install --prefer-source --no-interaction
+  - if [[ $setup = 'basic' ]]; then travis_retry composer update --prefer-dist; fi
+  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --prefer-stable; fi
+  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --prefer-stable --prefer-lowest; fi
 
 script:
-  - if [ "$TRAVIS_PHP_VERSION" == "7.0" ] || [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then phpunit; fi
-  - if [ "$TRAVIS_PHP_VERSION" != "7.0" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpunit --coverage-text --coverage-clover=coverage.clover; fi
+  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
-after_script:
-  - if [ "$TRAVIS_PHP_VERSION" != "7.0" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php vendor/bin/codacycoverage clover coverage.clover; fi
+after_success:
+  - travis_retry php vendor/bin/coveralls
 
 notifications:
   email:

diff --git a/README.md b/README.md
@@ -3,12 +3,10 @@
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Software License][ico-license]](LICENSE.md)
 [![Build Status][ico-travis]][link-travis]
-[![Coverage Status][ico-scrutinizer]][link-scrutinizer]
-[![Codacy Badge][ico-codacy]][link-codacy]
+[![Code Coverage][ico-coveralls]][link-coveralls]
 [![Total Downloads][ico-downloads]][link-downloads]
 
-This is where your description should go. Try and limit it to a paragraph or two, and maybe throw in a mention of what
-PSRs you support to avoid any confusion with users and contributors.
+The package is a Laravel wrapper for [Bootstrap Table](https://github.com/wenzhixin/bootstrap-table) JS library. It allows you to quickly build reusable Datatables in your frontend and bind your API as its data source. Notable features are Sorting, Searching, Hide/Show columns, Pagination, and personalized columns.
 
 ## Install
 
@@ -19,16 +17,19 @@ composer require lykegenes/laravel-datagrid-builder
 ```
 
 Then, add this to your Service Providers :
+
 ``` php
 Lykegenes\DatagridBuilder\ServiceProvider::class,
 ```
 
 ...and this to your Aliases :
+
 ``` php
 'DatagridBuilder' => Lykegenes\DatagridBuilder\Facades\DatagridBuilder::class,
 ```
 
 Optionally, you can publish and edit the configuration file :
+
 ``` bash
 php artisan vendor:publish --provider="Lykegenes\DatagridBuilder\ServiceProvider" --tag=config
 ```
@@ -37,12 +38,6 @@ php artisan vendor:publish --provider="Lykegenes\DatagridBuilder\ServiceProvider
 
 See the [WIKI](https://github.com/Lykegenes/laravel-datagrid-builder/wiki)
 
-## Testing
-
-``` bash
-composer test
-```
-
 ## Credits
 
 - [Patrick Samson][link-author]
@@ -52,17 +47,15 @@ composer test
 
 The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
 
-[ico-version]: https://img.shields.io/packagist/v/lykegenes/laravel-datagrid-builder.svg?style=flat-square
-[ico-license]: https://img.shields.io/packagist/l/lykegenes/laravel-datagrid-builder.svg?style=flat-square
-[ico-travis]: https://img.shields.io/travis/Lykegenes/laravel-datagrid-builder/master.svg?style=flat-square
-[ico-scrutinizer]: https://img.shields.io/scrutinizer/coverage/g/lykegenes/laravel-datagrid-builder.svg?style=flat-square
-[ico-codacy]: https://api.codacy.com/project/badge/ff95c3e5360649638c61f2834bffd8b2
-[ico-downloads]: https://img.shields.io/packagist/dt/lykegenes/laravel-datagrid-builder.svg?style=flat-square
+[ico-version]: https://img.shields.io/packagist/v/lykegenes/laravel-datagrid-builder.svg
+[ico-license]: https://img.shields.io/packagist/l/lykegenes/laravel-datagrid-builder.svg
+[ico-travis]: https://img.shields.io/travis/Lykegenes/laravel-datagrid-builder/master.svg
+[ico-coveralls]: https://img.shields.io/coveralls/Lykegenes/laravel-datagrid-builder.svg
+[ico-downloads]: https://img.shields.io/packagist/dt/lykegenes/laravel-datagrid-builder.svg
 
 [link-packagist]: https://packagist.org/packages/lykegenes/laravel-datagrid-builder
 [link-travis]: https://travis-ci.org/Lykegenes/laravel-datagrid-builder
-[link-scrutinizer]: https://scrutinizer-ci.com/g/lykegenes/laravel-datagrid-builder/code-structure
-[link-codacy]: https://www.codacy.com/app/Lykegenes/laravel-datagrid-builder
+[link-coveralls]: https://coveralls.io/github/Lykegenes/laravel-datagrid-builder
 [link-downloads]: https://packagist.org/packages/lykegenes/laravel-datagrid-builder
 [link-author]: https://github.com/lykegenes
 [link-contributors]: ../../contributors
diff --git a/composer.json b/composer.json
@@ -21,10 +21,11 @@
 		"illuminate/http": "~5.1"
 	},
 	"require-dev": {
-		"phpunit/phpunit" : "4.*",
+		"phpunit/phpunit" : "~5.2",
         "mockery/mockery": "0.9.*",
-        "orchestra/testbench": "~3.0",
-        "codacy/coverage": "dev-master"
+        "orchestra/testbench": "~3.1",
+        "satooshi/php-coveralls": "~1.0",
+        "illuminate/foundation": "^5.1.3"
 	},
 	"autoload": {
 		"psr-4": {
@@ -34,11 +35,6 @@
 			"src/RenderingHelpers.php"
 		]
 	},
-	"autoload-dev": {
-		"classmap": [
-            "tests/DatagridBuilderTestCase.php"
-        ]
-	},
 	"scripts": {
 		"test": "phpunit"
 	},

diff --git a/config/config.php b/config/config.php
@@ -11,48 +11,55 @@
     | HTML elements that will be generated.
     |
      */
-    'default_css' => [
-        // Will be appended to the <table> element
-        'datagrid_class' => 'table table-condensed table-hover table-striped',
+    'datagrid_defaults' => [
+        'view' => 'datagrid-builder::datagrid',
+        'attr' => [
+            // HTML & CSS
+            'data-classes' => 'table table-striped table-bordered table-hover',
 
-        // Will be appended to all the <th> elements
-        'column_class' => 'table-column',
-    ],
+            // Data
+            'data-url' => null,
+            'data-method' => 'GET',
+            'data-cache' => true, // Cache Ajax requests.
+            'data-flat' => true, // requires the "Flat JSON" extension; flattens to a single-level array.
+            'data-data-field' => 'data', // Which JSON attribute contains the data array?
+            'data-id-field' => 'id', // Indicate which field is an identity field.
 
-    /*
-    |--------------------------------------------------------------------------
-    | Available Views
-    |--------------------------------------------------------------------------
-    |
-    | This array contains all the views that can be used to properly
-    | generate a datagrid.
-    |
-     */
-    'views' => [
-        // For client-side processing
-        'client_datagrid' => 'datagrid-builder::clientDatagrid',
+            // Sorting
+            'data-sortable' => true, // False to disable sortable of all columns.
+
+            // Pagination
+            'data-pagination' => true,
+            'data-side-pagination' => 'client', // 'client' or 'server' with Ajax
+            'data-page-size' => 10,
+            'data-page-list' => '[5, 10, 20, 50, All]',
 
-        // For server-side processing
-        'server_datagrid' => 'datagrid-builder::serverDatagrid',
+            // Search
+            'data-search' => true,
+            'data-search-time-out' => 250, // Wait for X ms after last input before firing the search.
 
-        // For the table headers
-        'column' => 'datagrid-builder::column',
+            // UI
+            'data-locale' => 'en-US',
+            'data-show-refresh' => true,
+            'data-show-toggle' => false, // Toggle for the card view
+            'data-show-columns' => true, // Menu to show/hide columns.
+            'data-show-footer' => false, // A summary footer, for totals and such.
+        ],
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Default Datagrid View
-    |--------------------------------------------------------------------------
-    |
-    | Set the default view that will be used when generating a datagrid.
-    | Use one of the keys from the 'views' array above.
-    |
-     */
-    'default_datagrid_view' => 'client_datagrid',
+    'column_defaults' => [
+        'view' => 'datagrid-builder::column',
+        'attr' => [
+            'data-sortable' => true,
+            'data-order' => 'asc',
+            'data-visible' => true,
+            'data-searchable' => true,
+            'data-class' => null, // The column class name.
+            'data-field' => null, // The column field name.
+            'data-title' => null, // The column header title text.
+        ],
+    ],
 
-    /**
-     * jQuery Bootgrid assets location
-     */
     /*
     |--------------------------------------------------------------------------
     | Assets Location
@@ -65,7 +72,7 @@
     | that you already included it.
     |
      */
-    'css_url' => '//cdnjs.cloudflare.com/ajax/libs/jquery-bootgrid/1.3.1/jquery.bootgrid.min.css',
-    'js_url'  => '//cdnjs.cloudflare.com/ajax/libs/jquery-bootgrid/1.3.1/jquery.bootgrid.min.js',
+    'css_url' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.9.1/bootstrap-table.min.css',
+    'js_url' => '//cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.9.1/bootstrap-table.min.js',
 
 ];
diff --git a/phpunit.xml b/phpunit.xml
@@ -15,6 +15,11 @@
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
+    <testsuites>
+        <testsuite name="Integration">
+            <directory>./tests/Integration</directory>
+        </testsuite>
+    </testsuites>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="false">
             <directory suffix=".php">./src/</directory>