Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to nette 3.0 #304

Closed
wants to merge 4 commits into from
Closed

update to nette 3.0 #304

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd868f5
Link to http://grido.bugyik.cz wasn't a good idea
o5 Nov 27, 2018
3747e7b
nette 3.0 compatibility
slepic Sep 24, 2019
d958631
bump php version used to generate code coverage to 7.1
slepic Nov 7, 2019
5112406
Fixed typehints and allowed Columns\Text::setTruncate for nullable st…
pupitooo Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: php

php:
- 5.6
- 7.0
- 7.1
- hhvm

matrix:
Expand All @@ -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 = '5.6' ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition is always false now and project will be without code-coverage report.

1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion assets/dist/css/grido.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion assets/dist/css/grido.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/dist/js/grido.bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion assets/dist/js/grido.bundle.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/dist/js/grido.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion assets/dist/js/grido.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/js/grido.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/grido.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
35 changes: 20 additions & 15 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion src/Components/Actions/Action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Actions/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Actions/Href.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Button.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Columns/Column.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Columns/Date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Columns/Editable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Columns/Email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Columns/Link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Columns/Number.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Columns/Text.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
4 changes: 2 additions & 2 deletions src/Components/Export.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Filters/Check.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Filters/Condition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Filters/Custom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Filters/Date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Filters/DateRange.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Filters/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Filters/Number.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Filters/Select.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Filters/Text.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
4 changes: 2 additions & 2 deletions src/Components/Operation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down Expand Up @@ -131,7 +131,7 @@ public function handleOperations(\Nette\Forms\Controls\SubmitButton $button)

foreach ($values as $key => $val) {
if ($val) {
$ids[] = $key;
$ids[] = (string) $key;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Components/Paginator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down Expand Up @@ -85,7 +85,7 @@ public function setStepCount($stepCount)
/**
* @return int
*/
public function getPage()
public function getPage(): int
{
if ($this->page === NULL) {
$this->page = parent::getPage();
Expand Down
2 changes: 1 addition & 1 deletion src/Customization.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down
Loading