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
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- hhvm
- 7.0
- 7.1

before_script:
- travis_retry composer self-update
Expand Down
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@
}
],
"require": {
"php": ">=5.4.0",
"voryx/thruway": "0.3.*",
"illuminate/support": "5.*",
"illuminate/console": "5.*"
"php": ">=7.0.1",
"illuminate/support": "^5.5",
"illuminate/console": "^5.5",
"thruway/client": "^0.5.3",
"thruway/pawl-transport": "^0.5.0"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"phpunit/phpunit": "^6",
"mockery/mockery": "0.9.*",
"fabpot/php-cs-fixer": "*",
"squizlabs/php_codesniffer": "1.*"
"squizlabs/php_codesniffer": "^3.2",
"friendsofphp/php-cs-fixer": "^2.11"
},
"autoload": {
"psr-0": {
Expand Down
7 changes: 6 additions & 1 deletion src/Vinelab/Minion/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,13 @@ public function __construct($realm, array $providers)
*/
public function onSessionStart($session, $transport)
{
// Below disabled. Logging is now handled through a static class
// so there is no way that I can see to disable the logging since
// the split from voryx/thruway to thruway/client. getManager is
// also no longer a method on the Client class.
// Shush the logs.
$this->getManager()->setQuiet(true);
// $this->getManager()->setQuiet(true);

// Boot up providers
$this->bootProviders();
}
Expand Down
3 changes: 2 additions & 1 deletion tests/UnitTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
/**
* @author Abed Halawi <abed.halawi@vinelab.com>
*/
class UnitTestCase extends PHPUnit_Framework_TestCase
class UnitTestCase extends PHPUnit\Framework\TestCase
{
public function test_running()
{
$this->asserttrue(true);
}

protected function unProtectMethod($name, $class)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/ClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ protected function getProxyCallbackMock()
}
}

class ClientTestProviderStub extends PHPUnit_Framework_TestCase
class ClientTestProviderStub extends PHPUnit\Framework\TestCase
{
public function __construct($client)
{
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/DictionaryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
* @author Abed Halawi <abed.halawi@vinelab.com>
*/
class DictionaryTest extends PHPUnit_Framework_TestCase
class DictionaryTest extends PHPUnit\Framework\TestCase
{
public function test_initializing_dictionary()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/MinionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
* @author Abed Halawi <abed.halawi@vinelab.com>
*/
class MinionTest extends PHPUnit_Framework_TestCase
class MinionTest extends PHPUnit\Framework\TestCase
{
public function setUp()
{
Expand Down