Skip to content
This repository has been archived by the owner on Dec 17, 2018. It is now read-only.

Commit

Permalink
Fixed issues with requirements (#57)
Browse files Browse the repository at this point in the history
* fixed issues with requirements

* fixed issues with requirements

* fixed issues with requirements
  • Loading branch information
cleentfaar committed May 30, 2016
1 parent 9f56e0e commit 9fc6f11
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ before_script: composer install
script: ./bin/phpunit --coverage-clover=coverage.clover

after_script:
- if [ "$TRAVIS_PHP_VERSION" != "7.0" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [ "$TRAVIS_PHP_VERSION" != "7.0" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
- if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [ "$TRAVIS_PHP_VERSION" != "7.0" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
"require": {
"php": ">=5.5",
"ext-curl": "*",
"jms/serializer": "~1.0",
"symfony/event-dispatcher": "~2.3",
"symfony/yaml": "~2.3",
"guzzlehttp/guzzle": "~6.0",
"doctrine/collections": "~1.2"
"jms/serializer": "^1.0",
"symfony/event-dispatcher": "^2.3|^3.0",
"symfony/yaml": "^2.3|^3.0",
"guzzlehttp/guzzle": "^6.0",
"doctrine/collections": "^1.2"
},
"require-dev": {
"phpunit/phpunit": "~4.7",
"mockery/mockery": "~0.9",
"symfony/var-dumper": "~2.3"
"phpunit/phpunit": "^4.7",
"mockery/mockery": "^0.9",
"symfony/var-dumper": "^2.3|^3.0"
},
"suggest": {
"cleentfaar/slack-bundle": "For easy integration with your Symfony projects",
Expand Down
7 changes: 4 additions & 3 deletions tests/src/CL/Slack/Tests/Transport/ApiClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Middleware;
use GuzzleHttp\Psr7\Response;
use Mockery as Mock;

/**
* @author Cas Leentfaar <[email protected]>
Expand Down Expand Up @@ -89,10 +90,10 @@ public function it_can_send_a_payload()
*/
public function it_can_not_send_a_payload_without_a_token()
{
/** @var PayloadInterface|\PHPUnit_Framework_MockObject_MockObject $mockPayload */
$mockPayload = $this->getMock('CL\Slack\Payload\PayloadInterface');
$apiClient = new ApiClient();
/* @var PayloadInterface|Mock\MockInterface $mockPayload */
$mockPayload = Mock::mock(PayloadInterface::class);

$apiClient = new ApiClient();
$apiClient->send($mockPayload);
}
}

0 comments on commit 9fc6f11

Please sign in to comment.