Add & use OptionResolverIntrospector

Author: ogizanagi

Console/Descriptor/Descriptor.php

@@ -18,6 +18,8 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Form\ResolvedFormTypeInterface;
 use Symfony\Component\Form\Util\OptionsResolverWrapper;
+use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
+use Symfony\Component\OptionsResolver\Exception\NoConfigurationException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -104,20 +106,25 @@ protected function collectOptions(ResolvedFormTypeInterface $type)
 
     protected function getOptionDefinition(OptionsResolver $optionsResolver, $option)
     {
-        $refObject = new \ReflectionObject($optionsResolver);
-        foreach (array('defaults', 'lazy', 'allowedTypes', 'allowedValues', 'normalizers') as $name) {
-            $property = $refObject->getProperty($name);
-            $property->setAccessible(true);
-            $value = $property->getValue($optionsResolver);
-            if (array_key_exists($option, $value)) {
-                $definition[$name] = $value[$option];
+        $definition = array('required' => $optionsResolver->isRequired($option));
+
+        $introspector = new OptionsResolverIntrospector($optionsResolver);
+
+        $map = array(
+            'default' => 'getDefault',
+            'lazy' => 'getLazyClosures',
+            'allowedTypes' => 'getAllowedTypes',
+            'allowedValues' => 'getAllowedValues',
+            'normalizer' => 'getNormalizer',
+        );
+
+        foreach ($map as $key => $method) {
+            try {
+                $definition[$key] = $introspector->{$method}($option);
+            } catch (NoConfigurationException $e) {
+                // noop
             }
         }
-        $definition['required'] = $optionsResolver->isRequired($option);
-
-        if (isset($definition['lazy']) && 1 === count($definition['lazy'])) {
-            $definition['lazy'] = $definition['lazy'][0];
-        }
 
         return $definition;
     }

Console/Descriptor/JsonDescriptor.php

@@ -61,20 +61,20 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
 
         $map = array(
             'required' => 'required',
-            'default' => 'defaults',
+            'default' => 'default',
             'allowed_types' => 'allowedTypes',
             'allowed_values' => 'allowedValues',
         );
         foreach ($map as $label => $name) {
             if (array_key_exists($name, $definition)) {
                 $data[$label] = $definition[$name];
 
-                if ('defaults' === $name) {
+                if ('default' === $name) {
                     $data['is_lazy'] = isset($definition['lazy']);
                 }
             }
         }
-        $data['has_normalizer'] = isset($definition['normalizers']);
+        $data['has_normalizer'] = isset($definition['normalizer']);
 
         $this->writeData($data, $options);
     }

Console/Descriptor/TextDescriptor.php

@@ -103,15 +103,15 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
         $dump = $this->getDumpFunction();
         $map = array(
             'Required' => 'required',
-            'Default' => 'defaults',
+            'Default' => 'default',
             'Allowed types' => 'allowedTypes',
             'Allowed values' => 'allowedValues',
-            'Normalizer' => 'normalizers',
+            'Normalizer' => 'normalizer',
         );
         $rows = array();
         foreach ($map as $label => $name) {
             $value = array_key_exists($name, $definition) ? $dump($definition[$name]) : '-';
-            if ('defaults' === $name && isset($definition['lazy'])) {
+            if ('default' === $name && isset($definition['lazy'])) {
                 $value = "Value: $value\n\nClosure(s): ".$dump($definition['lazy']);
             }