public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix indenting

pull/8186/head
Jordi Boggiano 2019-07-29 16:43:24 +02:00
parent b51cfce8e6
commit 369e8a2247
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 68 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Composer/Script/Event.php
View File

@ -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;
} }
} }

107
tests/Composer/Test/Script/EventTest.php
View File

@ -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()
{
$io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock();
$composer = $this->createComposerInstance();
public function testEventSetsOriginatingEvent() { $originatingEvent = new \Composer\EventDispatcher\Event('originatingEvent');
$io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock();
$composer = $this->createComposerInstance();
$originatingEvent = new \Composer\EventDispatcher\Event('originatingEvent'); $scriptEvent = new Event('test', $composer, $io, true);
$scriptEvent = new Event('test', $composer, $io, true); $this->assertNull(
$scriptEvent->getOriginatingEvent(),
'originatingEvent is initialized as null'
);
$this->assertNull( $scriptEvent->setOriginatingEvent($originatingEvent);
$scriptEvent->getOriginatingEvent(),
'originatingEvent is initialized as null'
);
$scriptEvent->setOriginatingEvent($originatingEvent); $this->assertSame(
$originatingEvent,
$scriptEvent->getOriginatingEvent(),
'getOriginatingEvent() SHOULD return test event'
);
}
$this->assertSame( public function testEventCalculatesNestedOriginatingEvent()
$originatingEvent, {
$scriptEvent->getOriginatingEvent(), $io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock();
'getOriginatingEvent() SHOULD return test event' $composer = $this->createComposerInstance();
);
} $originatingEvent = new \Composer\EventDispatcher\Event('upperOriginatingEvent');
$intermediateEvent = new Event('intermediate', $composer, $io, true);
$intermediateEvent->setOriginatingEvent($originatingEvent);
public function testEventCalculatesNestedOriginatingEvent() { $scriptEvent = new Event('test', $composer, $io, true);
$io = $this->getMockBuilder('Composer\IO\IOInterface')->getMock(); $scriptEvent->setOriginatingEvent($intermediateEvent);
$composer = $this->createComposerInstance();
$this->assertNotSame(
$intermediateEvent,
$scriptEvent->getOriginatingEvent(),
'getOriginatingEvent() SHOULD NOT return intermediate events'
);
$originatingEvent = new \Composer\EventDispatcher\Event('upperOriginatingEvent'); $this->assertSame(
$intermediateEvent = new Event('intermediate', $composer, $io, true); $originatingEvent,
$intermediateEvent->setOriginatingEvent($originatingEvent); $scriptEvent->getOriginatingEvent(),
'getOriginatingEvent() SHOULD return upper-most event'
);
}
$scriptEvent = new Event('test', $composer, $io, true); private function createComposerInstance()
$scriptEvent->setOriginatingEvent($intermediateEvent); {
$composer = new Composer;
$config = new Config;
$composer->setConfig($config);
$package = $this->getMockBuilder('Composer\Package\RootPackageInterface')->getMock();
$composer->setPackage($package);
$this->assertNotSame( return $composer;
$intermediateEvent, }
$scriptEvent->getOriginatingEvent(),
'getOriginatingEvent() SHOULD NOT return intermediate events'
);
$this->assertSame(
$originatingEvent,
$scriptEvent->getOriginatingEvent(),
'getOriginatingEvent() SHOULD return upper-most event'
);
}
private function createComposerInstance()
{
$composer = new Composer;
$config = new Config;
$composer->setConfig($config);
$package = $this->getMockBuilder('Composer\Package\RootPackageInterface')->getMock();
$composer->setPackage($package);
return $composer;
}
} }