o5 · slepic · Nov 27, 2018 · Sep 24, 2019 · Nov 7, 2019 · Nov 27, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,15 @@
 language: php
 
 php:
-    - 5.6
-    - 7.0
+    - 7.1
     - hhvm
 
 matrix:
     allow_failures:
         - php: hhvm
 
 before_install:
-    - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then COVERAGE="-c `php -i | grep 'xdebug.ini'` --coverage coverage.xml --coverage-src=src/ "; else COVERAGE="" && if [ $TRAVIS_PHP_VERSION = '5.6' ]; then phpenv config-rm xdebug.ini; fi; fi
+    - if [ $TRAVIS_PHP_VERSION = '7.1' ]; then COVERAGE="-c `php -i | grep 'xdebug.ini'` --coverage coverage.xml --coverage-src=src/ "; else COVERAGE="" && if [ $TRAVIS_PHP_VERSION = '7.1' ]; then phpenv config-rm xdebug.ini; fi; fi
     - composer global require hirak/prestissimo
 
 install:
@@ -21,4 +20,4 @@ script:
     - vendor/bin/tester -p php $COVERAGE tests/
 
 after_script:
-    - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi
+    - if [ $TRAVIS_PHP_VERSION = '7.1' ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi
diff --git a/README.md b/README.md
@@ -11,7 +11,6 @@
 
 Grido is an extension for [Nette Framework](http://nette.org/). Grido helps you with data listing, formatting, sorting, paging, filtering, editing, bulk actions and exporting them.
 It doesn't matter which datasource you are using. For now, Grido works with [Nette Database](https://github.com/nette/database), [Dibi](https://github.com/dg/dibi), [Doctrine](https://github.com/doctrine/doctrine2) and ArraySource (raw PHP Arrays).
-You can try it in [live demo](http://grido.bugyik.cz/example/)!
 
 ![Alt text](http://img.bugyik.cz/Grido.png "Sample")
 

diff --git a/assets/dist/css/grido.css b/assets/dist/css/grido.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 /*!
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/assets/dist/css/grido.min.css b/assets/dist/css/grido.min.css
diff --git a/assets/dist/js/grido.bundle.js b/assets/dist/js/grido.bundle.js
@@ -1,5 +1,5 @@
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/assets/dist/js/grido.bundle.min.js b/assets/dist/js/grido.bundle.min.js
diff --git a/assets/dist/js/grido.js b/assets/dist/js/grido.js
@@ -1,5 +1,5 @@
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/assets/dist/js/grido.min.js b/assets/dist/js/grido.min.js
diff --git a/assets/js/grido.js b/assets/js/grido.js
@@ -1,5 +1,5 @@
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/assets/sass/grido.scss b/assets/sass/grido.scss
@@ -1,5 +1,5 @@
 /*!
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/composer.json b/composer.json
@@ -24,27 +24,32 @@
         }
     },
     "scripts": {
-        "test": "./vendor/bin/tester --colors 1 -p php tests/",
+        "test": "./vendor/bin/tester --colors 1 -j 4 -c tests/php-unix.ini -p php tests/",
         "syntax": "./vendor/bin/phpcs --standard=standards.xml --colors --encoding=utf-8 -sp src/",
         "syntax-fix": "./vendor/bin/phpcbf --standard=standards.xml src/"
     },
     "require": {
-        "php": ">=5.6",
-        "nette/utils": "~2.4",
-        "nette/forms": "~2.2",
-        "latte/latte": "~2.3",
-        "nette/application": "~2.2",
-        "nette/component-model": "~2.2",
+        "php": ">=7.1",
+        "nette/utils": "^3.0",
+        "nette/forms": "^3.0",
+        "latte/latte": "^2.5",
+        "nette/application": "^3.0",
+        "nette/component-model": "^3.0",
         "symfony/property-access": "~3.0"
     },
     "require-dev": {
-        "tracy/tracy": "~2.3",
-        "nette/bootstrap": "~2.3",
-        "nette/database": "~2.2",
+        "tracy/tracy": "^2.6",
+        "nette/bootstrap": "^3.0",
+        "nette/database": "^3.0",
         "nette/tester": "~1.7.1",
-        "mockery/mockery": "~0.9.3",
-        "dibi/dibi": "~3.0.1",
-        "kdyby/doctrine": "~3.3.0",
-        "squizlabs/php_codesniffer": "~2.5"
-    }
+        "mockery/mockery": "^1.0",
+        "squizlabs/php_codesniffer": "~2.5",
+        "kdyby/annotations": "^3.0",
+        "kdyby/console": "dev-master",
+        "kdyby/doctrine": "dev-master",
+        "kdyby/events": "dev-master",
+        "dibi/dibi": "^4.0"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/src/Components/Actions/Action.php b/src/Components/Actions/Action.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Actions/Event.php b/src/Components/Actions/Event.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Actions/Href.php b/src/Components/Actions/Href.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *
@@ -30,7 +30,7 @@ class Href extends Action
     /** @var array second param for method $presenter->link() */
     protected $arguments = [];
 
-    /** @var callback for custom href attribute creating */
+    /** @var callable callback for custom href attribute creating */
     protected $customHref;
 
     /**
@@ -50,10 +50,10 @@ public function __construct($grid, $name, $label, $destination = NULL, array $ar
 
     /**
      * Sets callback for custom link creating.
-     * @param callback $callback
+     * @param callable $callback
      * @return Href
      */
-    public function setCustomHref($callback)
+    public function setCustomHref(callable $callback)
     {
         $this->customHref = $callback;
         return $this;

diff --git a/src/Components/Button.php b/src/Components/Button.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Columns/Column.php b/src/Components/Columns/Column.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Columns/Date.php b/src/Components/Columns/Date.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Columns/Editable.php b/src/Components/Columns/Editable.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2014 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Columns/Email.php b/src/Components/Columns/Email.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Columns/Link.php b/src/Components/Columns/Link.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Columns/Number.php b/src/Components/Columns/Number.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Columns/Text.php b/src/Components/Columns/Text.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *
@@ -24,14 +24,14 @@ class Text extends Editable
     protected $truncate;
 
     /**
-     * @param string $maxLen UTF-8 encoding
+     * @param int $maxLen UTF-8 encoding
      * @param string $append UTF-8 encoding
      * @return Column
      */
-    public function setTruncate($maxLen, $append = "\xE2\x80\xA6")
+    public function setTruncate(int $maxLen, string $append = "\xE2\x80\xA6")
     {
-        $this->truncate = function($string) use ($maxLen, $append) {
-            return \Nette\Utils\Strings::truncate($string, $maxLen, $append);
+        $this->truncate = function(?string $string) use ($maxLen, $append): string {
+            return $string !== null ? \Nette\Utils\Strings::truncate($string, $maxLen, $append) : '';
         };
 
         return $this;

diff --git a/src/Components/Component.php b/src/Components/Component.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Container.php b/src/Components/Container.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *
@@ -382,10 +382,10 @@ public function addActionEvent($name, $label, $onClick = NULL)
 
     /**
      * @param array $operations
-     * @param callback $onSubmit - callback after operation submit
+     * @param callable $onSubmit - callback after operation submit
      * @return Operation
      */
-    public function setOperation(array $operations, $onSubmit)
+    public function setOperation(array $operations, callable $onSubmit)
     {
         return new Operation($this, $operations, $onSubmit);
     }

diff --git a/src/Components/Export.php b/src/Components/Export.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *
@@ -163,7 +163,7 @@ public function handleExport()
      * @param \Nette\Http\IResponse $httpResponse
      * @return void
      */
-    public function send(\Nette\Http\IRequest $httpRequest, \Nette\Http\IResponse $httpResponse)
+    public function send(\Nette\Http\IRequest $httpRequest, \Nette\Http\IResponse $httpResponse): void
     {
         $encoding = 'utf-8';
         $label = $this->label

diff --git a/src/Components/Filters/Check.php b/src/Components/Filters/Check.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Filters/Condition.php b/src/Components/Filters/Condition.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Filters/Custom.php b/src/Components/Filters/Custom.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Filters/Date.php b/src/Components/Filters/Date.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Filters/DateRange.php b/src/Components/Filters/DateRange.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Filters/Filter.php b/src/Components/Filters/Filter.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Filters/Number.php b/src/Components/Filters/Number.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *

diff --git a/src/Components/Filters/Select.php b/src/Components/Filters/Select.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Grido (http://grido.bugyik.cz)
+ * This file is part of the Grido (https://github.com/o5/grido)
  *
  * Copyright (c) 2011 Petr Bugyík (http://petr.bugyik.cz)
  *