Merge branch 'master' of github.com:meritoo/limesurvey-api-client into develop

# Conflicts:
#	.docker/config/Dockerfile
#	README.md
#	composer.json
This commit is contained in:
Krzysztof Nizioł
2018-09-07 00:01:36 +02:00
26 changed files with 633 additions and 558 deletions

View File

@@ -3,7 +3,6 @@
"description": "Client of LimeSurvey API",
"type": "library",
"license": "MIT",
"version": "0.0.11",
"authors": [
{
"name": "Meritoo",
@@ -11,17 +10,17 @@
}
],
"require": {
"php": ">=5.5.9",
"php": ">=5.6",
"fguillot/json-rpc": "^1.2",
"wiosna-dev/common-library": "0.0.17"
"meritoo/common-library": "^0.1.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.2",
"friendsofphp/php-cs-fixer": "^2.6",
"pdepend/pdepend": "^2.5",
"phploc/phploc": "^2.1",
"phploc/phploc": "^4.0",
"phpmd/phpmd": "^2.6",
"phpunit/phpunit": "^4.8",
"sebastian/phpcpd": "^2.0",
"phpunit/phpunit": "^5.7",
"sebastian/phpcpd": "^3.0",
"squizlabs/php_codesniffer": "^2.9"
},
"autoload": {