Skip to content

Commit

Permalink
Merge pull request #811 from MarijnKoesen/fix_code_style
Browse files Browse the repository at this point in the history
Fix codestyle to be compliant with the standards
  • Loading branch information
robertbasic committed Nov 22, 2017
2 parents b3749e4 + 760294d commit c5c4f6c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ class BaseClassStub
{
use MockeryPHPUnitIntegration;

public function finish() {
public function finish()
{
$this->checkMockeryExceptions();
}

public function markAsRisky() {}
public function markAsRisky()
{
}
};

class MockeryPHPUnitIntegrationTest extends MockeryTestCase
Expand Down
2 changes: 0 additions & 2 deletions tests/Mockery/ExpectationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1930,7 +1930,6 @@ public function testAnExampleWithSomeExpectationAmendsOnCallCounts()
$this->assertTrue($service->addBookmark('http://example.com/3', 'some_tag3'));
$this->assertTrue($service->hasBookmarksTagged('php'));
$this->assertTrue($service->hasBookmarksTagged('php'));

}

public function testAnExampleWithSomeExpectationAmendsOnCallCounts_PHPUnitTest()
Expand Down Expand Up @@ -2013,7 +2012,6 @@ public function testShouldDeferMissingExpectationBasedOnArgs()
$this->assertEquals('456', $mock->foo());
$this->assertEquals('123', $mock->foo("baz"));
$this->assertEquals('bar', $mock->foo("qux"));

}

public function testCanReturnSelf()
Expand Down
12 changes: 8 additions & 4 deletions tests/Mockery/Php72LanguageFeaturesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,16 @@ public function it_can_mock_a_class_with_an_object_return_type_hint()
}
}

class ArgumentObjectTypeHint
class ArgumentObjectTypeHint
{
function foo(object $foo) {}
public function foo(object $foo)
{
}
}

class ReturnTypeObjectTypeHint
class ReturnTypeObjectTypeHint
{
function foo(): object {}
public function foo(): object
{
}
}

0 comments on commit c5c4f6c

Please sign in to comment.