From dd868f578bf3a38b4de08dab3f57b49edb45be7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Bugy=C3=ADk?= Date: Tue, 27 Nov 2018 20:13:23 +0100 Subject: [PATCH 1/2] Link to http://grido.bugyik.cz wasn't a good idea Unfortunately there are too many stupid people Closes #294 --- README.md | 1 - assets/dist/css/grido.css | 2 +- assets/dist/css/grido.min.css | 2 +- assets/dist/js/grido.bundle.js | 2 +- assets/dist/js/grido.bundle.min.js | 2 +- assets/dist/js/grido.js | 2 +- assets/dist/js/grido.min.js | 2 +- assets/js/grido.js | 2 +- assets/sass/grido.scss | 2 +- src/Components/Actions/Action.php | 2 +- src/Components/Actions/Event.php | 2 +- src/Components/Actions/Href.php | 2 +- src/Components/Button.php | 2 +- src/Components/Columns/Column.php | 2 +- src/Components/Columns/Date.php | 2 +- src/Components/Columns/Editable.php | 2 +- src/Components/Columns/Email.php | 2 +- src/Components/Columns/Link.php | 2 +- src/Components/Columns/Number.php | 2 +- src/Components/Columns/Text.php | 2 +- src/Components/Component.php | 2 +- src/Components/Container.php | 2 +- src/Components/Export.php | 2 +- src/Components/Filters/Check.php | 2 +- src/Components/Filters/Condition.php | 2 +- src/Components/Filters/Custom.php | 2 +- src/Components/Filters/Date.php | 2 +- src/Components/Filters/DateRange.php | 2 +- src/Components/Filters/Filter.php | 2 +- src/Components/Filters/Number.php | 2 +- src/Components/Filters/Select.php | 2 +- src/Components/Filters/Text.php | 2 +- src/Components/Operation.php | 2 +- src/Components/Paginator.php | 2 +- src/Customization.php | 2 +- src/DataSources/ArraySource.php | 2 +- src/DataSources/DibiFluent.php | 2 +- src/DataSources/Doctrine.php | 2 +- src/DataSources/IDataSource.php | 2 +- src/DataSources/Model.php | 2 +- src/DataSources/NetteDatabase.php | 2 +- src/Exception.php | 2 +- src/Grid.php | 2 +- src/Helpers.php | 2 +- src/Translations/FileTranslator.php | 2 +- src/Translations/cs.php | 2 +- src/Translations/en.php | 2 +- src/Translations/sk.php | 2 +- src/templates/bootstrap.latte | 2 +- src/templates/default.latte | 2 +- tests/Helper.php | 2 +- 51 files changed, 50 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 4d430e33..cb416d7f 100644 --- 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 index 5b89d7f1..f5b9835d 100644 --- 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 index 796a62b7..765729ce 100644 --- a/assets/dist/css/grido.min.css +++ b/assets/dist/css/grido.min.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/js/grido.bundle.js b/assets/dist/js/grido.bundle.js index 22914be0..532483e3 100644 --- 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 index f50f090d..302b8f2e 100644 --- a/assets/dist/js/grido.bundle.min.js +++ b/assets/dist/js/grido.bundle.min.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.js b/assets/dist/js/grido.js index 36cc1246..06f732d6 100644 --- 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 index 1a5b6e71..9cb5a2a0 100644 --- a/assets/dist/js/grido.min.js +++ b/assets/dist/js/grido.min.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/js/grido.js b/assets/js/grido.js index 18ad0be0..c93470c7 100644 --- 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 index bc64943d..5c823c84 100644 --- 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/src/Components/Actions/Action.php b/src/Components/Actions/Action.php index c9ea078f..30215793 100644 --- a/src/Components/Actions/Action.php +++ b/src/Components/Actions/Action.php @@ -1,7 +1,7 @@ Date: Tue, 16 Apr 2019 00:04:45 +1200 Subject: [PATCH 2/2] Change PHP keywords to comply with PSR2 Signed-off-by: CodeLingoBot --- tests/bootstrap.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 569a8aa9..26fa1497 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -30,11 +30,11 @@ function id($val) return $val; } -function before(\Closure $function = NULL) +function before(\Closure $function = null) { static $val; if (!func_num_args()) { - return ($val ? $val() : NULL); + return ($val ? $val() : null); } $val = $function; } @@ -50,11 +50,11 @@ function mock() return call_user_func_array('Mockery::mock', func_get_args()); } -function run($path, $name = NULL) +function run($path, $name = null) { $name = $name ? $name - : (isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : NULL); + : (isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : null); $code = file_get_contents($path); $tokens = token_get_all($code);