Fix indenting

main
Jordi Boggiano 5 years ago
parent b51cfce8e6
commit 369e8a2247
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC

@ -39,9 +39,9 @@ class Event extends BaseEvent
*/ */
private $devMode; private $devMode;
/** /**
* @var BaseEvent * @var BaseEvent
*/ */
private $originatingEvent; private $originatingEvent;
/** /**
@ -100,7 +100,7 @@ class Event extends BaseEvent
*/ */
public function getOriginatingEvent() public function getOriginatingEvent()
{ {
return $this->originatingEvent; return $this->originatingEvent;
} }
/** /**
@ -111,9 +111,9 @@ class Event extends BaseEvent
*/ */
public function setOriginatingEvent(BaseEvent $event) public function setOriginatingEvent(BaseEvent $event)
{ {
$this->originatingEvent = $this->calculateOriginatingEvent($event); $this->originatingEvent = $this->calculateOriginatingEvent($event);
return $this; return $this;
} }
/** /**
@ -124,10 +124,10 @@ class Event extends BaseEvent
*/ */
private function calculateOriginatingEvent(BaseEvent $event) private function calculateOriginatingEvent(BaseEvent $event)
{ {
if ($event instanceof Event && $event->getOriginatingEvent()) { if ($event instanceof Event && $event->getOriginatingEvent()) {
return $this->calculateOriginatingEvent($event->getOriginatingEvent()); return $this->calculateOriginatingEvent($event->getOriginatingEvent());
} }
return $event; return $event;
} }
} }

@ -1,73 +1,80 @@
<?php <?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Test\Script; namespace Composer\Test\Script;
use Composer\Composer; use Composer\Composer;
use Composer\Config; use Composer\Config;
use Composer\Script\Event; use Composer\Script\Event;
use Composer\Test\TestCase; use Composer\Test\TestCase;
class EventTest extends TestCase { class EventTest extends TestCase
{
public function testEventSetsOriginatingEvent() { public function testEventSetsOriginatingEvent()
$io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock(); {
$composer = $this->createComposerInstance(); $io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock();
$composer = $this->createComposerInstance();
$originatingEvent = new \Composer\EventDispatcher\Event('originatingEvent');
$originatingEvent = new \Composer\EventDispatcher\Event('originatingEvent');
$scriptEvent = new Event('test', $composer, $io, true);
$scriptEvent = new Event('test', $composer, $io, true);
$this->assertNull(
$scriptEvent->getOriginatingEvent(), $this->assertNull(
'originatingEvent is initialized as null' $scriptEvent->getOriginatingEvent(),
); 'originatingEvent is initialized as null'
);
$scriptEvent->setOriginatingEvent($originatingEvent);
$scriptEvent->setOriginatingEvent($originatingEvent);
$this->assertSame(
$originatingEvent, $this->assertSame(
$scriptEvent->getOriginatingEvent(), $originatingEvent,
'getOriginatingEvent() SHOULD return test event' $scriptEvent->getOriginatingEvent(),
); 'getOriginatingEvent() SHOULD return test event'
);
} }
public function testEventCalculatesNestedOriginatingEvent() { public function testEventCalculatesNestedOriginatingEvent()
$io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock(); {
$composer = $this->createComposerInstance(); $io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock();
$composer = $this->createComposerInstance();
$originatingEvent = new \Composer\EventDispatcher\Event('upperOriginatingEvent'); $originatingEvent = new \Composer\EventDispatcher\Event('upperOriginatingEvent');
$intermediateEvent = new Event('intermediate', $composer, $io, true); $intermediateEvent = new Event('intermediate', $composer, $io, true);
$intermediateEvent->setOriginatingEvent($originatingEvent); $intermediateEvent->setOriginatingEvent($originatingEvent);
$scriptEvent = new Event('test', $composer, $io, true); $scriptEvent = new Event('test', $composer, $io, true);
$scriptEvent->setOriginatingEvent($intermediateEvent); $scriptEvent->setOriginatingEvent($intermediateEvent);
$this->assertNotSame( $this->assertNotSame(
$intermediateEvent, $intermediateEvent,
$scriptEvent->getOriginatingEvent(), $scriptEvent->getOriginatingEvent(),
'getOriginatingEvent() SHOULD NOT return intermediate events' 'getOriginatingEvent() SHOULD NOT return intermediate events'
); );
$this->assertSame( $this->assertSame(
$originatingEvent, $originatingEvent,
$scriptEvent->getOriginatingEvent(), $scriptEvent->getOriginatingEvent(),
'getOriginatingEvent() SHOULD return upper-most event' 'getOriginatingEvent() SHOULD return upper-most event'
); );
}
}
private function createComposerInstance()
private function createComposerInstance() {
{ $composer = new Composer;
$composer = new Composer; $config = new Config;
$config = new Config; $composer->setConfig($config);
$composer->setConfig($config); $package = $this->getMockBuilder('Composer\Package\RootPackageInterface')->getMock();
$package = $this->getMockBuilder('Composer\Package\RootPackageInterface')->getMock(); $composer->setPackage($package);
$composer->setPackage($package);
return $composer;
return $composer; }
} }
}

Loading…
Cancel
Save