Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .docheader
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
*
* Eldnp/export.data-source.pdo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
*
* @see https://github.com/eldnp/export.data-source.pdo for the canonical source repository
* @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Oleg Verevskoy <verevskoy@gmail.com>
Expand Down
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
global:
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="satooshi/php-coveralls"
- LICENSE_CHECK_DEPS="malukenho/docheader"

matrix:
include:
Expand All @@ -23,6 +24,8 @@ matrix:
- php: 5.5
dist: precise
- php: 5.6
env:
- LICENSE_CHECK=true

before_install:
- if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
Expand All @@ -31,10 +34,12 @@ before_install:
install:
- travis_retry composer install $COMPOSER_ARGS
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
- if [[ $LICENSE_CHECK == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $LICENSE_CHECK_DEPS ; fi
- stty cols 120 && composer show
script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
- if [[ $LICENSE_CHECK == 'true' ]]; then composer license-check ; fi

after_script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ the "copyright" line and a pointer to where the full notice is found.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@
"@cs-check",
"@test"
],
"upload-coverage": "coveralls -v",
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"license-check": "docheader check src/ test/",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --coverage-clover clover.xml"
"test-coverage": "phpunit --coverage-clover clover.xml",
"upload-coverage": "coveralls -v"
}
}
4 changes: 2 additions & 2 deletions lib/Exception/LogicException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
*
* Eldnp/export.data-source.pdo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
*
* @see https://github.com/eldnp/export.data-source.pdo for the canonical source repository
* @copyright Copyright (c) 2017 Oleg Verevskoy <verevskoy@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions lib/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
*
* Eldnp/export.data-source.pdo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
*
* @see https://github.com/eldnp/export.data-source.pdo for the canonical source repository
* @copyright Copyright (c) 2017 Oleg Verevskoy <verevskoy@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions lib/PaginatedDataSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
*
* Eldnp/export.data-source.pdo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
*
* @see https://github.com/eldnp/export.data-source.pdo for the canonical source repository
* @copyright Copyright (c) 2017 Oleg Verevskoy <verevskoy@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions lib/PdoStatementDataSource.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
*
* Eldnp/export.data-source.pdo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
*
* @see https://github.com/eldnp/export.data-source.pdo for the canonical source repository
* @copyright Copyright (c) 2017 Oleg Verevskoy <verevskoy@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions test/Generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
*
* Eldnp/export.data-source.pdo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
*
* @see https://github.com/eldnp/export.data-source.pdo for the canonical source repository
* @copyright Copyright (c) 2017 Oleg Verevskoy <verevskoy@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions test/PaginatedDataSourceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
*
* Eldnp/export.data-source.pdo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
*
* @see https://github.com/eldnp/export.data-source.pdo for the canonical source repository
* @copyright Copyright (c) 2017 Oleg Verevskoy <verevskoy@gmail.com>
Expand Down
4 changes: 2 additions & 2 deletions test/PdoStatementDataSourceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
*
* Eldnp/export.data-source.pdo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
* along with Eldnp/export.data-source.pdo. If not, see <http://www.gnu.org/licenses/>.
*
* @see https://github.com/eldnp/export.data-source.pdo for the canonical source repository
* @copyright Copyright (c) 2017 Oleg Verevskoy <verevskoy@gmail.com>
Expand Down