update readme and composer.json

Author: Stefan Chiriac

.travis.yml

@@ -4,6 +4,7 @@ php:
   - 5.5
   - 5.4
   - 5.6
+  - 7.0
 
 matrix:
   fast_finish: true
@@ -15,7 +16,7 @@ before_script:
   - composer install --dev --prefer-source
   - phpenv rehash
 
-script: vendor/bin/kahlan
+script: vendor/kahlan/kahlan/bin/kahlan
 
 after_success:
   - "if [ $(phpenv version-name) = '5.6' ]; then curl -F '[email protected]' https://coveralls.io/api/v1/jobs --verbose; fi"

README.md

@@ -7,6 +7,7 @@
 
 # About
 This is a [Phalcon Framework](http://phalconphp.com/) adapter for [DataTables](http://www.datatables.net/).
+This version contains community fixes and multi model search support
 # Support
 ### Currently supported
 * QueryBuilder interface
@@ -26,7 +27,7 @@ This is a [Phalcon Framework](http://phalconphp.com/) adapter for [DataTables](h
 ```json
 {
     "require": {
-        "m1ome/phalcon-datatables": "1.*"
+        "magnxpyr/phalcon-datatables": "1.*"
     }
 }
 ```

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "m1ome/phalcon-datatables",
+    "name": "magnxpyr/phalcon-datatables",
     "description": "DataTables adapter for Phalcon Framework",
     "keywords": ["Phalcon", "DataTables", "Plugin"],
     "license": "MIT",
@@ -12,6 +12,10 @@
       {
         "name": "Pavel Makarenko",
         "email": "[email protected]"
+      },
+      {
+        "name": "Stefan Chiriac",
+        "email": "[email protected]"
       }
     ],
     "minimum-stability": "dev",
@@ -24,7 +28,7 @@
       }
     },
     "require-dev": {
-      "crysalead/kahlan": "~1.1",
-      "fzaninotto/faker": "1.5.*@dev"
+      "fzaninotto/faker": "1.5.*@dev",
+      "kahlan/kahlan": "^3.0"
     }
 }

composer.lock

@@ -1,9 +1,9 @@
 <?php
-use filter\Filter;
-use kahlan\reporter\coverage\exporter\Coveralls;
+use Kahlan\Filter\Filter;
+use Kahlan\Reporter\Coverage\Exporter\Coveralls;
 
-$args = $this->args();
-$args->argument('coverage', 'default', 3);
+$args = $this->commandLine();
+$args->option('coverage', 'default', 3);
 
 Filter::register('phalcon.namespace', function($chain) {
   $this->_autoloader->addPsr4('Spec\\Models\\', __DIR__ . '/spec/models/');