Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Classes/Configuration/AbstractBaseConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@ abstract class AbstractBaseConfiguration
*/
public function __construct(array $configuration)
{
if (static::validate($configuration)->hasErrors()) {
$validationResult = static::validate($configuration);

if ($validationResult->hasErrors()) {
$configurationClassName = (new \ReflectionClass(get_called_class()))->getShortName();

// TODO: This is crappy. Do it better!!!
$errorsAsString = implode("\n", static::validate($configuration)->getErrors());
$errorsAsString = implode("\n", $validationResult->getErrors());

throw new InvalidConfigurationException("Invalid configuration.\n" . $errorsAsString);
throw new InvalidConfigurationException("Invalid $configurationClassName. " . $errorsAsString);
}
$this->configuration = $configuration;
}
Expand Down
9 changes: 9 additions & 0 deletions Tests/Unit/Configuration/IconConfigurationTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
namespace ITplusX\FlexiblePages\Tests\Unit\Configuration;

use ITplusX\FlexiblePages\Configuration\Exceptions\InvalidConfigurationException;
use ITplusX\FlexiblePages\Configuration\IconConfiguration;
use ITplusX\FlexiblePages\Page\Icon;
use ITplusX\FlexiblePages\Tests\Fixtures\PageTypesConfigurationFixture;
Expand Down Expand Up @@ -69,4 +70,12 @@ public function testIdentifierCreationFromConfigurationWithPathOnly()

$this->assertSame('icon-111', $icon->getIdentifier());
}

public function testInvalidConfigurationExceptionMessageContainsClassName()
{
$this->expectException(InvalidConfigurationException::class);
$this->expectExceptionMessageRegExp('/IconConfiguration/');

new IconConfiguration([]);
}
}
9 changes: 9 additions & 0 deletions Tests/Unit/Configuration/PageTypeConfigurationTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
namespace ITplusX\FlexiblePages\Tests\Unit\Configuration;

use ITplusX\FlexiblePages\Configuration\Exceptions\InvalidConfigurationException;
use ITplusX\FlexiblePages\Configuration\PageTypeConfiguration;
use ITplusX\FlexiblePages\Tests\Fixtures\PageTypesConfigurationFixture;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -29,4 +30,12 @@ public function testConstructionOfPageTypeFromConfiguration()

$this->assertSame($label, $pageType->getLabel());
}

public function testInvalidConfigurationExceptionMessageContainsClassName()
{
$this->expectException(InvalidConfigurationException::class);
$this->expectExceptionMessageRegExp('/PageTypeConfiguration/');

new PageTypeConfiguration([]);
}
}