Merge pull request #25 from Soullivaneuh/patch-1

Show configuration error on invalid

Author: matthiasnoback

PhpUnit/ConfigurationValuesAreValidConstraint.php

@@ -12,7 +12,7 @@ public function __construct(ConfigurationInterface $configuration, $breadcrumbPa
         parent::__construct($configuration, $breadcrumbPath);
     }
 
-    public function matches($other)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
         $this->validateConfigurationValuesArray($other);
 
@@ -22,9 +22,16 @@ public function matches($other)
             $this->processConfiguration($other);
         } catch (InvalidConfigurationException $exception) {
             $success = false;
+            $description = empty($description) ? $exception->getMessage() : $description."\n".$exception->getMessage();
         }
 
-        return $success;
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $this->fail($other, $description);
+        }
     }
 
     public function toString()

Tests/PhpUnit/AbstractConfigurationTestCaseTest.php

@@ -59,7 +59,7 @@ public function it_can_assert_that_a_configuration_is_valid()
      */
     public function it_fails_when_a_configuration_is_invalid_when_it_should_have_been_valid()
     {
-        $this->setExpectedException('\PHPUnit_Framework_ExpectationFailedException', 'valid');
+        $this->setExpectedException('\PHPUnit_Framework_ExpectationFailedException', 'The child node "required_value" at path "root" must be configured.');
 
         $this->assertConfigurationIsValid(
             array(

Tests/PhpUnit/ConfigurationTestCaseTraitActual.php

@@ -58,7 +58,7 @@ public function it_can_assert_that_a_configuration_is_valid()
      */
     public function it_fails_when_a_configuration_is_invalid_when_it_should_have_been_valid()
     {
-        $this->setExpectedException('\PHPUnit_Framework_ExpectationFailedException', 'valid');
+        $this->setExpectedException('\PHPUnit_Framework_ExpectationFailedException', 'The child node "required_value" at path "root" must be configured.');
 
         $this->assertConfigurationIsValid(
             array(