Skip to content

expand import@ before applying other transformations #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drzraf wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

expand import@ before applying other transformations #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a0ff0f
reverted as not used
rhukster Sep 23, 2022
2e98d3b
expand import@ before applying other transformations
Apr 29, 2022
e9bff20
fix #33
Apr 29, 2022
01793d8
further simplify deepImport()
Sep 27, 2022
31e0626
process @<suffix> as long as suffix is not null
Sep 27, 2022
1aabe9e
cleaner recursion
Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions Blueprints/src/BlueprintForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public function load($extends = null)
}

// Import blueprints.
$this->deepImport($this->items);
$this->deepInit($this->items);
} catch (Exception $e) {
$filename = $this->filename;
Expand Down Expand Up @@ -387,6 +388,37 @@ protected function deepMerge(array $a, array $b)
return $a;
}


/**
* @param array $items
* @param array $path
* @return string
*/
protected function deepImport(array &$items, $path = [])
{
do {
$run_again = false;
$field = end($path) === 'fields';
foreach ($items as $key => &$item) {
if ($field && isset($item['type'])) {
$item['name'] = $key;
}
// Handle import@
if (strpos($key, '@') !== false && preg_match('/^(@*)?import(@\d*)?$/', $key)) {
unset($items[$key]);
$this->doImport($item, $path);
$run_again = true;
break;
} elseif (\is_array($item)) {
// Recursively initialize form.
$newPath = array_merge($path, [$key]);
$this->deepImport($item, $newPath);
}
}
unset($item);
} while ($run_again);
}

/**
* @param array $items
* @param array $path
Expand Down Expand Up @@ -418,10 +450,6 @@ protected function deepInit(array &$items, $path = [])
return null;
}
break;
case 'import':
unset($items[$key]);
$this->doImport($item, $path);
break;
case 'ordering':
$ordering = $item;
unset($items[$key]);
Expand All @@ -435,7 +463,7 @@ protected function deepInit(array &$items, $path = [])
$newPath = array_merge($path, [$key]);

$location = $this->deepInit($item, $newPath);
if ($location) {
if (null !== $location) {
$order[$key] = $location;
} elseif ($location === null) {
unset($items[$key]);
Expand Down
2 changes: 0 additions & 2 deletions StreamWrapper/src/ReadOnlyStream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ class ReadOnlyStream extends Stream
/** @var ResourceLocatorInterface */
protected static $locator;

public $context;

/**
* @param string $uri
* @param string $mode
Expand Down