Move development from fork to main repo on develop branch, test more PHP versions

This commit is contained in:
Timothy Warren 2016-07-19 16:57:44 -04:00
parent ac867c903a
commit 6e1f28724e
5 changed files with 41 additions and 8 deletions

View File

@ -15,6 +15,11 @@ variables:
POSTGRES_USER: test POSTGRES_USER: test
POSTGRES_PASSWORD: test POSTGRES_PASSWORD: test
test:5.5:
image: php:5.5
script:
- phpunit -c build --no-coverage
test:5.6: test:5.6:
image: php:5.6 image: php:5.6
script: script:

View File

@ -3,10 +3,10 @@ sudo: false
language: php language: php
php: php:
- 5.3
- 5.4 - 5.4
- 5.5 - 5.5
- 5.6 - 5.6
- 7
- hhvm - hhvm
- nightly - nightly
@ -27,5 +27,5 @@ after_script:
matrix: matrix:
allow_failures: allow_failures:
- php: 5.3 - php: 5.4
- php: hhvm - php: hhvm

View File

@ -1,10 +1,10 @@
# Contributing # Contributing
Please submit pull requests to [timw4mail/Query](https://github.com/timw4mail/Query), but other issues to [aviat4ion/Query](https://github.com/aviat4ion/Query) Please submit pull requests and issues to [aviat4ion/Query](https://git.timshomepage.net/aviat4ion/Query)
### Pull Requests ### Pull Requests
* All pull requests should have accompanying tests following the structure / makeup of the `/tests` folder * All pull requests should have accompanying tests following the structure / makeup of the `/tests` folder
* Pull requests should reference the issue number on [aviat4ion/Query](https://github.com/aviat4ion/Query), if applicable. * Pull requests should reference the issue number on [aviat4ion/Query](https://git.timshomepage.net/aviat4ion/Query), if applicable.
* Pull requests must follow project style: * Pull requests must follow project style:
1. Follow [CodeIgniter Style](http://codeigniter.com/user_guide/general/styleguide.html) 1. Follow [CodeIgniter Style](http://codeigniter.com/user_guide/general/styleguide.html)
2. Use tabs for indentation, and do not align arrays or other multiple line statements. 2. Use tabs for indentation, and do not align arrays or other multiple line statements.

27
LICENSE.md Normal file
View File

@ -0,0 +1,27 @@
# DON'T BE A DICK PUBLIC LICENSE
> Version 1, December 2009
> Copyright (C) 2012 Timothy J. Warren <tim@timshomepage.net>
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.
> DON'T BE A DICK PUBLIC LICENSE
> TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
1. Do whatever you like with the original work, just don't be a dick.
Being a dick includes - but is not limited to - the following instances:
1a. Outright copyright infringement - Don't just copy this and change the name.
1b. Selling the unmodified original with no work done what-so-ever, that's REALLY being a dick.
1c. Modifying the original work to contain hidden harmful content. That would make you a PROPER dick.
2. If you become rich through modifications, related works/services, or supporting the original work,
share the love. Only a dick would make loads off this work and not buy the original work's
creator(s) a pint.
3. Code is provided with no warranty. Using somebody else's code and bitching when it goes wrong makes
you a DONKEY dick. Fix the problem yourself. A non-dick would submit the fix back.

View File

@ -1,6 +1,7 @@
sonar.projectKey=query sonar.projectKey=query
sonar.projectName=Query Builder sonar.projectName=Query Builder
sonar.projectVersion=1.0 sonar.projectVersion=2.5.1
sonar.sources=src sonar.sources=src
sonar.language=php
sonar.php.coverage.reportPath=build/logs/clover.xml sonar.php.coverage.reportPath=build/logs/clover.xml
#sonar.php.tests.reportPath=build/logs/junit.xml sonar.php.tests.reportPath=build/logs/junit.xml