symfony
diff --git a/‎src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
Lines changed: 6 additions & 3 deletions b/‎src/Symfony/Component/Config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
Lines changed: 6 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
Lines changed: 12 additions & 1 deletion b/‎src/Symfony/Component/Config/Tests/Definition/Builder/TreeBuilderTest.php
Lines changed: 12 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Config/Tests/Fixtures/BarNode.php
Lines changed: 18 additions & 0 deletions b/‎src/Symfony/Component/Config/Tests/Fixtures/BarNode.php
Lines changed: 18 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Config/Tests/Fixtures/Builder/BarNodeDefinition.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Config/Tests/Fixtures/Builder/BarNodeDefinition.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/CompoundFormTest.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Form/Tests/CompoundFormTest.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
Lines changed: 5 additions & 3 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
Lines changed: 5 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
Lines changed: 7 additions & 7 deletions b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
Lines changed: 7 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
Lines changed: 7 additions & 2 deletions b/‎src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
Lines changed: 7 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/FormBuilderTest.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Form/Tests/FormBuilderTest.php
Lines changed: 2 additions & 0 deletions
@@ -145,13 +145,16 @@ public function providePrototypedArrayNodeDefaults()
 
     public function testNestedPrototypedArrayNodes()
     {
-        $node = new ArrayNodeDefinition('root');
-        $node
+        $nodeDefinition = new ArrayNodeDefinition('root');
+        $nodeDefinition
             ->addDefaultChildrenIfNoneSet()
             ->prototype('array')
                   ->prototype('array')
         ;
-        $node->getNode();
+        $node = $nodeDefinition->getNode();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\PrototypedArrayNode', $node);
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\PrototypedArrayNode', $node->getPrototype());
     }
 
     public function testEnabledNodeDefaults()
 
@@ -71,6 +71,8 @@ public function testPrototypedArrayNodeUseTheCustomNodeBuilder()
         $root = $builder->root('override', 'array', new CustomNodeBuilder());
 
         $root->prototype('bar')->end();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\BarNode', $root->getNode(true)->getPrototype());
     }
 
     public function testAnExtendedNodeBuilderGetsPropagatedToTheChildren()
@@ -79,7 +81,7 @@ public function testAnExtendedNodeBuilderGetsPropagatedToTheChildren()
 
         $builder->root('propagation')
             ->children()
-                ->setNodeClass('extended', 'Symfony\Component\Config\Tests\Definition\Builder\VariableNodeDefinition')
+                ->setNodeClass('extended', 'Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition')
                 ->node('foo', 'extended')->end()
                 ->arrayNode('child')
                     ->children()
@@ -88,6 +90,15 @@ public function testAnExtendedNodeBuilderGetsPropagatedToTheChildren()
                 ->end()
             ->end()
         ->end();
+
+        $node = $builder->buildTree();
+        $children = $node->getChildren();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\BooleanNode', $children['foo']);
+
+        $childChildren = $children['child']->getChildren();
+
+        $this->assertInstanceOf('Symfony\Component\Config\Definition\BooleanNode', $childChildren['foo']);
     }
 
     public function testDefinitionInfoGetsTransferredToNode()
 
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Config\Tests\Fixtures;
+
+use Symfony\Component\Config\Definition\ArrayNode;
+
+class BarNode extends ArrayNode
+{
+}
@@ -12,10 +12,12 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\Config\Tests\Fixtures\BarNode;
 
 class BarNodeDefinition extends NodeDefinition
 {
     protected function createNode()
     {
+        return new BarNode($this->name);
     }
 }
@@ -299,6 +299,8 @@ public function testRemoveThrowsExceptionIfAlreadySubmitted()
     public function testRemoveIgnoresUnknownName()
     {
         $this->form->remove('notexisting');
+
+        $this->assertCount(0, $this->form);
     }
 
     public function testArrayAccess()
 
@@ -126,9 +126,9 @@ public function testChoiceLoaderOptionExpectsChoiceLoaderInterface()
 
     public function testChoiceListAndChoicesCanBeEmpty()
     {
-        $this->factory->create(static::TESTED_TYPE, null, array(
+        $this->assertInstanceOf('Symfony\Component\Form\FormInterface', $this->factory->create(static::TESTED_TYPE, null, array(
             'choices_as_values' => true,
-        ));
+        )));
     }
 
     public function testExpandedChoicesOptionsTurnIntoChildren()
@@ -2251,10 +2251,10 @@ public function testAdjustFullNameForMultipleNonExpanded()
     // https://github.com/symfony/symfony/issues/3298
     public function testInitializeWithEmptyChoices()
     {
-        $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
+        $this->assertInstanceOf('Symfony\Component\Form\FormInterface', $this->factory->createNamed('name', static::TESTED_TYPE, null, array(
             'choices' => array(),
             'choices_as_values' => true,
-        ));
+        )));
     }
 
     public function testInitializeWithDefaultObjectChoice()
 
@@ -43,11 +43,13 @@ public function testUnknownCountryIsNotIncluded()
         $choices = $this->factory->create(static::TESTED_TYPE, 'country')
             ->createView()->vars['choices'];
 
+        $countryCodes = array();
+
         foreach ($choices as $choice) {
-            if ('ZZ' === $choice->value) {
-                $this->fail('Should not contain choice "ZZ"');
-            }
+            $countryCodes[] = $choice->value;
         }
+
+        $this->assertNotContains('ZZ', $countryCodes);
     }
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
 
@@ -273,7 +273,7 @@ public function testInitializeWithDateTime()
     {
         // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
-        $this->factory->create(static::TESTED_TYPE, new \DateTime());
+        $this->assertInstanceOf('Symfony\Component\Form\FormInterface', $this->factory->create(static::TESTED_TYPE, new \DateTime()));
     }
 
     public function testSingleTextWidgetShouldUseTheRightInputType()
 
@@ -711,7 +711,7 @@ public function testInitializeWithDateTime()
     {
         // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
-        $this->factory->create(static::TESTED_TYPE, new \DateTime());
+        $this->assertInstanceOf('Symfony\Component\Form\FormInterface', $this->factory->create(static::TESTED_TYPE, new \DateTime()));
     }
 
     public function testSingleTextWidgetShouldUseTheRightInputType()
 
@@ -149,23 +149,23 @@ public function testPassMaxLengthBCToView()
 
     public function testDataClassMayBeNull()
     {
-        $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $this->assertInstanceOf('Symfony\Component\Form\FormBuilderInterface', $this->factory->createBuilder(static::TESTED_TYPE, null, array(
             'data_class' => null,
-        ));
+        )));
     }
 
     public function testDataClassMayBeAbstractClass()
     {
-        $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $this->assertInstanceOf('Symfony\Component\Form\FormBuilderInterface', $this->factory->createBuilder(static::TESTED_TYPE, null, array(
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\AbstractAuthor',
-        ));
+        )));
     }
 
     public function testDataClassMayBeInterface()
     {
-        $this->factory->createBuilder(static::TESTED_TYPE, null, array(
+        $this->assertInstanceOf('Symfony\Component\Form\FormBuilderInterface', $this->factory->createBuilder(static::TESTED_TYPE, null, array(
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\AuthorInterface',
-        ));
+        )));
     }
 
     /**
@@ -652,7 +652,7 @@ public function testCanGetErrorsWhenButtonInForm()
         $form = $builder->getForm();
 
         //This method should not throw a Fatal Error Exception.
-        $form->getErrorsAsString();
+        $this->assertInternalType('string', $form->getErrorsAsString());
     }
 
     public function testSubmitNull($expected = null, $norm = null, $view = null)
 
@@ -488,7 +488,7 @@ public function testInitializeWithDateTime()
     {
         // Throws an exception if "data_class" option is not explicitly set
         // to null in the type
-        $this->factory->create(static::TESTED_TYPE, new \DateTime());
+        $this->assertInstanceOf('Symfony\Component\Form\FormInterface', $this->factory->create(static::TESTED_TYPE, new \DateTime()));
     }
 
     public function testSingleTextWidgetShouldUseTheRightInputType()
 
@@ -46,16 +46,21 @@ public function testGetTypeExtensions()
 
     public function testThrowExceptionForInvalidExtendedType()
     {
+        $formTypeExtension = $this->createFormTypeExtensionMock('unmatched');
+
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
 
         $container->expects($this->any())
             ->method('get')
             ->with('extension')
-            ->willReturn($this->createFormTypeExtensionMock('unmatched'));
+            ->willReturn($formTypeExtension);
 
         $extension = new DependencyInjectionExtension($container, array(), array('test' => array('extension')), array());
 
-        $extension->getTypeExtensions('test');
+        $extensions = $extension->getTypeExtensions('test');
+
+        $this->assertCount(1, $extensions);
+        $this->assertSame($formTypeExtension, $extensions[0]);
     }
 
     public function testGetTypeGuesser()
 
@@ -161,6 +161,8 @@ public function testAddButton()
     {
         $this->builder->add(new ButtonBuilder('reset'));
         $this->builder->add(new SubmitButtonBuilder('submit'));
+
+        $this->assertCount(2, $this->builder->all());
     }
 
     public function testGetUnknown()