Skip to content

Commit

Permalink
Lets use Extension as a name instead of _Object as TestListener is de…
Browse files Browse the repository at this point in the history
…precated and soon we will use this only for extensions
  • Loading branch information
sebastianbergmann committed Jan 24, 2020
1 parent 2fdddf1 commit a5251f1
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
16 changes: 8 additions & 8 deletions src/Util/Configuration.php
Expand Up @@ -15,8 +15,8 @@
use PHPUnit\Framework\TestSuite;
use PHPUnit\Runner\TestSuiteSorter;
use PHPUnit\TextUI\DefaultResultPrinter;
use PHPUnit\Util\Configuration\_Object;
use PHPUnit\Util\Configuration\ObjectCollection;
use PHPUnit\Util\Configuration\Extension;
use PHPUnit\Util\Configuration\ExtensionCollection;
use PHPUnit\Util\TestDox\CliTestDoxPrinter;
use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;

Expand Down Expand Up @@ -123,15 +123,15 @@ public function getFilename(): string
return $this->filename;
}

public function getExtensionConfiguration(): ObjectCollection
public function getExtensionConfiguration(): ExtensionCollection
{
$extensions = [];

foreach ($this->xpath->query('extensions/extension') as $extension) {
$extensions[] = $this->getElementConfigurationParameters($extension);
}

return ObjectCollection::fromArray($extensions);
return ExtensionCollection::fromArray($extensions);
}

/**
Expand Down Expand Up @@ -219,15 +219,15 @@ public function getTestdoxGroupConfiguration(): array
/**
* Returns the configuration for listeners.
*/
public function getListenerConfiguration(): ObjectCollection
public function getListenerConfiguration(): ExtensionCollection
{
$listeners = [];

foreach ($this->xpath->query('listeners/listener') as $listener) {
$listeners[] = $this->getElementConfigurationParameters($listener);
}

return ObjectCollection::fromArray($listeners);
return ExtensionCollection::fromArray($listeners);
}

/**
Expand Down Expand Up @@ -1185,7 +1185,7 @@ private function parseGroupConfiguration(string $root): array
return $groups;
}

private function getElementConfigurationParameters(DOMElement $element): _Object
private function getElementConfigurationParameters(DOMElement $element): Extension
{
$class = (string) $element->getAttribute('class');
$file = '';
Expand All @@ -1198,6 +1198,6 @@ private function getElementConfigurationParameters(DOMElement $element): _Object
);
}

return new _Object($class, $file, $arguments);
return new Extension($class, $file, $arguments);
}
}
Expand Up @@ -11,7 +11,7 @@

use PHPUnit\Framework\Exception;

final class _Object
final class Extension
{
/**
* @var string
Expand Down
Expand Up @@ -9,15 +9,15 @@
*/
namespace PHPUnit\Util\Configuration;

final class ObjectCollection implements \IteratorAggregate
final class ExtensionCollection implements \IteratorAggregate
{
/**
* @var _Object[]
* @var Extension[]
*/
private $items = [];

/**
* @param _Object[] $items
* @param Extension[] $items
*/
public static function fromArray(array $items): self
{
Expand All @@ -35,19 +35,19 @@ private function __construct()
}

/**
* @return _Object[]
* @return Extension[]
*/
public function asArray(): array
{
return $this->items;
}

public function getIterator(): ObjectCollectionIterator
public function getIterator(): ExtensionCollectionIterator
{
return new ObjectCollectionIterator($this);
return new ExtensionCollectionIterator($this);
}

private function add(_Object $item): void
private function add(Extension $item): void
{
$this->items[] = $item;
}
Expand Down
Expand Up @@ -9,10 +9,10 @@
*/
namespace PHPUnit\Util\Configuration;

final class ObjectCollectionIterator implements \Countable, \Iterator
final class ExtensionCollectionIterator implements \Countable, \Iterator
{
/**
* @var _Object[]
* @var Extension[]
*/
private $items;

Expand All @@ -21,7 +21,7 @@ final class ObjectCollectionIterator implements \Countable, \Iterator
*/
private $position;

public function __construct(ObjectCollection $collection)
public function __construct(ExtensionCollection $collection)
{
$this->items = $collection->asArray();
}
Expand All @@ -46,7 +46,7 @@ public function key(): int
return $this->position;
}

public function current(): _Object
public function current(): Extension
{
return $this->items[$this->position];
}
Expand Down

0 comments on commit a5251f1

Please sign in to comment.