Skip to content

Commit

Permalink
minor #3189 Improve the default behavior of iterator_to_array() (javi…
Browse files Browse the repository at this point in the history
…ereguiluz)

This PR was merged into the 3.0.x-dev branch.

Discussion
----------

Improve the default behavior of iterator_to_array()

This change is related to the following discussion:

![iterator_to_array](https://user-images.githubusercontent.com/73419/81332765-db356500-90a3-11ea-87fd-a66453f7fd8d.jpg)

Commits
-------

2bcfd81 Improve the default behavior of iterator_to_array()
  • Loading branch information
javiereguiluz committed May 8, 2020
2 parents 3d77e37 + 2bcfd81 commit 5de84ed
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/Context/AdminContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function getMainMenu(): MainMenuDto
}

$configuredMenuItems = $this->dashboardControllerInstance->configureMenuItems();
$mainMenuItems = is_array($configuredMenuItems) ? $configuredMenuItems : iterator_to_array($configuredMenuItems);
$mainMenuItems = is_array($configuredMenuItems) ? $configuredMenuItems : iterator_to_array($configuredMenuItems, false);
$selectedMenuIndex = $this->request->query->getInt('menuIndex', -1);
$selectedMenuSubIndex = $this->request->query->getInt('submenuIndex', -1);

Expand Down
4 changes: 2 additions & 2 deletions src/Form/Type/CrudAutocompleteType.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function getBlockPrefix()
*/
public function mapDataToForms($data, $forms)
{
$form = current(iterator_to_array($forms));
$form = current(iterator_to_array($forms, false));
$form->setData($data);
}

Expand All @@ -70,7 +70,7 @@ public function mapDataToForms($data, $forms)
*/
public function mapFormsToData($forms, &$data)
{
$form = current(iterator_to_array($forms));
$form = current(iterator_to_array($forms, false));
$data = $form->getData();
}
}
4 changes: 2 additions & 2 deletions src/Form/Type/FileUploadType.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public function getBlockPrefix(): string
public function mapDataToForms($currentFiles, $forms): void
{
/** @var FormInterface $fileForm */
$fileForm = current(iterator_to_array($forms));
$fileForm = current(iterator_to_array($forms, false));
$fileForm->setData($currentFiles);
}

Expand All @@ -229,7 +229,7 @@ public function mapDataToForms($currentFiles, $forms): void
public function mapFormsToData($forms, &$currentFiles): void
{
/** @var FormInterface[] $children */
$children = iterator_to_array($forms);
$children = iterator_to_array($forms, false);
$uploadedFiles = $children['file']->getData();

/** @var FileUploadState $state */
Expand Down
2 changes: 1 addition & 1 deletion src/Orm/EntityPaginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function getResults(): ?iterable

public function getResultsAsJson(): string
{
$results = null !== $this->getResults() ? iterator_to_array($this->getResults()) : [];
$results = null !== $this->getResults() ? iterator_to_array($this->getResults(), false) : [];
foreach ($results as $entityInstance) {
$entityDto = $this->entityFactory->createForEntityInstance($entityInstance);

Expand Down
2 changes: 1 addition & 1 deletion src/Registry/CrudControllerRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static function new(iterable $crudControllers): self
{
$registry = new self();

foreach (iterator_to_array($crudControllers) as $controller) {
foreach (iterator_to_array($crudControllers, false) as $controller) {
$controllerFqcn = \get_class($controller);
$registry->controllerFqcnToEntityFqcnMap[$controllerFqcn] = $controller::getEntityFqcn();
}
Expand Down

0 comments on commit 5de84ed

Please sign in to comment.