Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Edujugon committed Jun 4, 2017
2 parents d6ce2fe + 94f33e2 commit e4fdb52
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: php

php:
- 5.5
- 5.6
- 7.0
- 7.1

Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
},
"minimum-stability": "dev",
"require": {
"php": "^7.0",
"illuminate/support": "^5.1"
},
"require-dev": {
"phpunit/phpunit": "~5.7"
"phpunit/phpunit": "~4.8"
}
}
4 changes: 2 additions & 2 deletions src/Odoo.php
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ private function auth($db, $username, $password, array $array = [])
* @return string
* @throws OdooException OdooException
*/
private function setApiEndPoint(string $endPoint)
private function setApiEndPoint($endPoint)
{
if (empty($this->host))
throw new OdooException('You must provide the odoo host by host setter method');
Expand Down Expand Up @@ -704,7 +704,7 @@ private function buildParams($params)
* @param null $cast Cast returned data based on this param.
* @return mixed
*/
private function makeResponse(Collection $result, $key = null, $cast = null)
private function makeResponse($result, $key = null, $cast = null)
{
if (array_key_exists('faultCode', $result->toArray()))
return $result['faultCode'];
Expand Down

0 comments on commit e4fdb52

Please sign in to comment.