Skip to content

Commit

Permalink
Style-CI recommended changes...
Browse files Browse the repository at this point in the history
  • Loading branch information
davedevelopment committed Jun 24, 2015
1 parent ea7506d commit 9197d94
Show file tree
Hide file tree
Showing 39 changed files with 3 additions and 45 deletions.
1 change: 0 additions & 1 deletion examples/starship/Starship.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

class Starship
{

protected $_engineering = null;

public function __construct($engineering)
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Adapter/Phpunit/TestListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class TestListener implements \PHPUnit_Framework_TestListener
{

/**
* After each test, perform Mockery verification tasks and cleanup the
* statically stored Mockery container for the next test.
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/CompositeExpectation.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class CompositeExpectation implements ExpectationInterface
{

/**
* Stores an array of all expectations for this composite
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Configuration
{

/**
* Boolean assertion of whether we can mock methods which do not actually
* exist for the given class or object (ignored for unreal mocks)
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/CountValidator/AtLeast.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

class AtLeast extends CountValidatorAbstract
{

/**
* Checks if the validator can accept an additional nth call
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/CountValidator/AtMost.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

class AtMost extends CountValidatorAbstract
{

/**
* Validate the call count against this validator
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/CountValidator/CountValidatorAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

abstract class CountValidatorAbstract
{

/**
* Expectation for which this validator is assigned
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/CountValidator/Exact.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

class Exact extends CountValidatorAbstract
{

/**
* Validate the call count against this validator
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Exception/InvalidCountException.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

class InvalidCountException extends Mockery\CountValidator\Exception
{

protected $method = null;

protected $expected = 0;
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Exception/InvalidOrderException.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

class InvalidOrderException extends Mockery\Exception
{

protected $method = null;

protected $expected = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

class NoMatchingExpectationException extends Mockery\Exception
{

protected $method = null;

protected $actual = array();
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Expectation.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Expectation implements ExpectationInterface
{

/**
* Mock object to which this expectation belongs
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/ExpectationDirector.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class ExpectationDirector
{

/**
* Method name the director is directing
*
Expand Down
4 changes: 1 addition & 3 deletions library/Mockery/Generator/MockConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ public function __construct(
$instanceMock = false,
array $parameterOverrides = array(),
$mockOriginalDestructor = false
)

{
) {
$this->addTargets($targets);
$this->blackListedMethods = $blackListedMethods;
$this->whiteListedMethods = $whiteListedMethods;
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/Any.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Any extends MatcherAbstract
{

/**
* Check if the actual value matches the expected.
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/Closure.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Closure extends MatcherAbstract
{

/**
* Check if the actual value matches the expected.
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/Contains.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Contains extends MatcherAbstract
{

/**
* Check if the actual value matches the expected.
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/Ducktype.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Ducktype extends MatcherAbstract
{

/**
* Check if the actual value matches the expected.
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/HasKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class HasKey extends MatcherAbstract
{

/**
* Check if the actual value matches the expected.
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/HasValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class HasValue extends MatcherAbstract
{

/**
* Check if the actual value matches the expected.
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/MatcherAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

abstract class MatcherAbstract
{

/**
* The expected value (or part thereof)
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/MustBe.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class MustBe extends MatcherAbstract
{

/**
* Check if the actual value matches the expected.
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/Not.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Not extends MatcherAbstract
{

/**
* Check if the actual value does not match the expected (in this
* case it's specifically NOT expected).
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/Subset.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Subset extends MatcherAbstract
{

/**
* Check if the actual value matches the expected.
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Matcher/Type.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Type extends MatcherAbstract
{

/**
* Check if the actual value matches the expected.
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Mock.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

class Mock implements MockInterface
{

/**
* Stores an array of all expectation directors for this mock
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/MockInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

interface MockInterface
{

/**
* Alternative setup method to constructor
*
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Recorder.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Recorder
{

/**
* Mock object on which all recorded interactions will be set as
* expectations
Expand Down
1 change: 0 additions & 1 deletion library/Mockery/Undefined.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

class Undefined
{

/**
* Call capturing to merely return this same object.
*
Expand Down
6 changes: 2 additions & 4 deletions tests/Mockery/AdhocTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
*/
class Mockery_AdhocTest extends MockeryTestCase
{

public function setup()
{
$this->container = new \Mockery\Container(\Mockery::getDefaultGenerator(), \Mockery::getDefaultLoader());
Expand Down Expand Up @@ -93,7 +92,6 @@ public function testMockeryConstructAndDestructIsCalled()
$this->container->mockery_close();
$this->assertTrue(MockeryTest_NameOfExistingClassWithDestructor::$isDestructorWasCalled);
}

}

class MockeryTest_NameOfExistingClass
Expand All @@ -110,8 +108,8 @@ abstract class MockeryTest_NameOfAbstract
abstract public function foo();
}

class MockeryTest_NameOfExistingClassWithDestructor {

class MockeryTest_NameOfExistingClassWithDestructor
{
public static $isDestructorWasCalled = false;

public function __destruct()
Expand Down
1 change: 0 additions & 1 deletion tests/Mockery/ContainerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

class ContainerTest extends MockeryTestCase
{

/** @var Mockery\Container */
private $container;

Expand Down
1 change: 0 additions & 1 deletion tests/Mockery/ExpectationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

class ExpectationTest extends MockeryTestCase
{

public function setup()
{
$this->container = new \Mockery\Container(\Mockery::getDefaultGenerator(), \Mockery::getDefaultLoader());
Expand Down
1 change: 0 additions & 1 deletion tests/Mockery/HamcrestExpectationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

class HamcrestExpectationTest extends MockeryTestCase
{

public function setUp()
{
$this->container = new \Mockery\Container(\Mockery::getDefaultGenerator(), \Mockery::getDefaultLoader());
Expand Down
1 change: 0 additions & 1 deletion tests/Mockery/LoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

class Mockery_LoaderTest extends PHPUnit_Framework_TestCase
{

public function setUp()
{
spl_autoload_unregister('\Mockery\Loader::loadClass');
Expand Down
2 changes: 0 additions & 2 deletions tests/Mockery/MockClassWithFinalWakeupTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

class MockClassWithFinalWakeupTest extends MockeryTestCase
{

protected function setUp()
{
$this->container = new \Mockery\Container;
Expand Down Expand Up @@ -66,7 +65,6 @@ public function testCreateMockForClassWithNonFinalWakeup()

class TestWithFinalWakeup
{

public function foo()
{
return 'foo';
Expand Down
1 change: 0 additions & 1 deletion tests/Mockery/MockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

class Mockery_MockTest extends MockeryTestCase
{

public function setup()
{
$this->container = new \Mockery\Container(\Mockery::getDefaultGenerator(), \Mockery::getDefaultLoader());
Expand Down
1 change: 0 additions & 1 deletion tests/Mockery/MockingProtectedMethodsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

class MockingProtectedMethodsTest extends MockeryTestCase
{

public function setup()
{
$this->container = new \Mockery\Container;
Expand Down
1 change: 0 additions & 1 deletion tests/Mockery/MockingVariadicArgumentsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

class MockingVariadicArgumentsTest extends MockeryTestCase
{

public function setup()
{
$this->container = new \Mockery\Container;
Expand Down
1 change: 0 additions & 1 deletion tests/Mockery/RecorderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

class RecorderTest extends MockeryTestCase
{

public function setup()
{
$this->container = new \Mockery\Container(\Mockery::getDefaultGenerator(), \Mockery::getDefaultLoader());
Expand Down

0 comments on commit 9197d94

Please sign in to comment.