RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-09 02:59:27 +03:00
Code Issues Projects Releases Wiki Activity

fix cs

Browse Source
This commit is contained in:
William DURAND 2014-05-16 11:33:58 +02:00
parent a88e7d8278
commit fa92011126
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Parser/FormTypeParser.php
View File

@ -223,15 +223,18 @@ class FormTypeParser implements ParserInterface
} }
} }
private function handleChoiceListValues(ChoiceListInterface $choiceList) { private function handleChoiceListValues(ChoiceListInterface $choiceList)
{
$choices = array(); $choices = array();
foreach (array($choiceList->getPreferredViews(), $choiceList->getRemainingViews()) as $viewList) { foreach (array($choiceList->getPreferredViews(), $choiceList->getRemainingViews()) as $viewList) {
$choices = array_merge($choices, $this->handleChoiceViewsHierarchy($viewList)); $choices = array_merge($choices, $this->handleChoiceViewsHierarchy($viewList));
} }
return $choices; return $choices;
} }
private function handleChoiceViewsHierarchy(array $choiceViews) { private function handleChoiceViewsHierarchy(array $choiceViews)
{
$choices = array(); $choices = array();
foreach ($choiceViews as $item) { foreach ($choiceViews as $item) {
if ($item instanceof ChoiceView) { if ($item instanceof ChoiceView) {
@ -240,6 +243,7 @@ class FormTypeParser implements ParserInterface
$choices = array_merge($choices, $this->handleChoiceViewsHierarchy($item)); $choices = array_merge($choices, $this->handleChoiceViewsHierarchy($item));
} }
} }
return $choices; return $choices;
} }
} }

2
Tests/Fixtures/Form/ImprovedTestType.php
View File

@ -8,7 +8,6 @@
namespace Nelmio\ApiDocBundle\Tests\Fixtures\Form; namespace Nelmio\ApiDocBundle\Tests\Fixtures\Form;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList; use Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
@ -53,4 +52,3 @@ class ImprovedTestType extends AbstractType
return ''; return '';
} }
} }

2
Tests/Fixtures/app/config/routing.yml
View File

@ -148,4 +148,4 @@ test_route_private:
test_route_exclusive: test_route_exclusive:
pattern: /exclusive pattern: /exclusive
defaults: { _controller: NelmioApiDocTestBundle:Test:exclusive } defaults: { _controller: NelmioApiDocTestBundle:Test:exclusive }