Skip to content

Commit

Permalink
0.1.1
Browse files Browse the repository at this point in the history
- added root namespaces for all internal PHP functions
  • Loading branch information
Karel Wintersky committed May 26, 2024
1 parent 9c9a68f commit 99c629c
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 37 deletions.
4 changes: 2 additions & 2 deletions src/XMLNavigator/Convertation/XmlConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function toPrettyPrint(
string $xmlUri = '',
): array {
$isPrevious = $this->isPrevious($xmlText, $xmlUri);
if (!$isPrevious || !count($this->prettyXml)) {
if (!$isPrevious || !\count($this->prettyXml)) {
$this->prettyXml =
FastXmlToArray::prettyPrint(
$xmlText,
Expand All @@ -84,7 +84,7 @@ public function toHierarchyOfElements(
string $xmlUri = '',
): array {
$isPrevious = $this->isPrevious($xmlText, $xmlUri);
if (!$isPrevious || !count($this->xmlStructure)) {
if (!$isPrevious || !\count($this->xmlStructure)) {
$this->xmlStructure =
FastXmlToArray::convert(
$xmlText,
Expand Down
6 changes: 3 additions & 3 deletions src/XMLNavigator/Extraction/ElementComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ protected static function extractBaseDepth(array $elems): int
{
$first = [];
if ($elems) {
reset($elems);
$first = current($elems);
\reset($elems);
$first = \current($elems);
}
$base = 0;
if ($first) {
$base = current($first)[ElementExtractor::DEPTH];
$base = \current($first)[ElementExtractor::DEPTH];
}

return $base;
Expand Down
14 changes: 7 additions & 7 deletions src/XMLNavigator/Extraction/ElementExtractor.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static function extractElements(
$tryRead = $reader->read();
}
while ($tryRead && $reader->depth > $base) {
$isAllowed = in_array(
$isAllowed = \in_array(
$reader->nodeType,
static::ALLOWED_NODE_TYPES,
true
Expand Down Expand Up @@ -86,7 +86,7 @@ private static function props(
$attribs[$reader->name] = $reader->value;
}

$hasAttribs = count($attribs) !== 0;
$hasAttribs = \count($attribs) !== 0;
if (!$hasAttribs) {
$result = [
$path[$reader->depth] => [0 => $reader->depth]
Expand Down Expand Up @@ -126,23 +126,23 @@ private static function assume(
string $attributesIndex,
string $valueIndex
): void {
$name = key($props);
$data = current($props);
$name = \key($props);
$data = \current($props);
$isSet = isset($data[1]);
if (!$isSet) {
$elems[] = [$name => [static::DEPTH => $data[0]]];
}

$isArr = $isSet && is_array($data[1]);
$isArr = $isSet && \is_array($data[1]);
if ($isSet && $isArr) {
$elems[] = [$name => [static::DEPTH => $data[0]]];

end($elems);
\end($elems);
$elems[key($elems)][$name][$attributesIndex] =
$data[1];
}
if ($isSet && !$isArr) {
end($elems);
\end($elems);
$elems[key($elems)][$name][$valueIndex] = $data[1];
}
}
Expand Down
14 changes: 6 additions & 8 deletions src/XMLNavigator/Extraction/HierarchyComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,10 @@ private static function createTheHierarchyOfElements(
$hierarchy = [$elementsIndex => []];
$ptr = &$hierarchy[$elementsIndex];
foreach ($elems as $i => $elem) {
$data = current($elem);
/*$logger->debug('будем добавлять элемент' . json_encode($data, JSON_PRETTY_PRINT));*/

$data = \current($elem);
$curr = $data[ElementExtractor::DEPTH];
/*$logger->debug("уровень элемента `$curr`");*/
$name = key($elem);
$name = \key($elem);
/*$logger->debug("имя элемента `$name`");*/

$letDoSearch = $prev !== $curr;
Expand All @@ -79,9 +77,9 @@ private static function createTheHierarchyOfElements(
/*$logger->debug("текущий уровень=>`$d`");*/

$end = 0;
if (count($ptr)) {
end($ptr);
$end = key($ptr);
if (\count($ptr)) {
\end($ptr);
$end = \key($ptr);
}
/*$logger->debug("последний индекс на текущем уровне=>`$end`");*/

Expand All @@ -103,7 +101,7 @@ private static function createTheHierarchyOfElements(
$ii = $i + 1;
if (
isset($elems[$ii])
&& current($elems[$ii])[ElementExtractor::DEPTH] > $curr
&& \current($elems[$ii])[ElementExtractor::DEPTH] > $curr
) {
$new[$elementsIndex] = [];
}
Expand Down
30 changes: 15 additions & 15 deletions src/XMLNavigator/Extraction/PrettyPrintComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,24 @@ private static function composePrettyPrintByXmlElements(
$ptr = &$result;
$isMulti = false;
foreach ($elems as $elem) {
$data = current($elem);
$data = \current($elem);

$curr = $data[ElementExtractor::DEPTH];
$name = key($elem);
$name = \key($elem);

$letDoSearch = $prev !== $curr;
if ($letDoSearch) {
$ptr = &$result;
for ($d = $base; $d < $curr; $d++) {
$end = 0;
if (count($ptr)) {
end($ptr);
$end = key($ptr);
if (\count($ptr)) {
\end($ptr);
$end = \key($ptr);
}
if ($isMulti && ($d + 1) === $curr) {
$ptr = &$ptr[$end];
end($ptr);
$end = key($ptr);
\end($ptr);
$end = \key($ptr);
}

$ptr = &$ptr[$end];
Expand Down Expand Up @@ -99,24 +99,24 @@ private static function composePrettyPrintByXmlElements(
/* Order of IF operators is most important */
$isMulti = false;
if (
key_exists($name, $ptr) &&
is_array($ptr[$name]) &&
key_exists(0, $ptr[$name])
\key_exists($name, $ptr) &&
\is_array($ptr[$name]) &&
\key_exists(0, $ptr[$name])
) {
$ptr[$name][] = $new;
$isMulti = true;
}

if (
key_exists($name, $ptr) &&
\key_exists($name, $ptr) &&
(
!is_array($ptr[$name]) ||
!key_exists(0, $ptr[$name])
!\is_array($ptr[$name]) ||
!\key_exists(0, $ptr[$name])
)
) {
$first = $ptr[$name];
$ptr[$name] = [];
$isStr = is_string($first);
$isStr = \is_string($first);
if ($isStr) {
$ptr[$name][] = [$valueIndex => $first];
}
Expand All @@ -128,7 +128,7 @@ private static function composePrettyPrintByXmlElements(
$isMulti = true;
}

if (!key_exists($name, $ptr)) {
if (!\key_exists($name, $ptr)) {
$ptr[$name] = $new;
}

Expand Down
4 changes: 2 additions & 2 deletions src/XMLNavigator/Navigation/XmlElement.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public function __construct(
string $seq = Notation::SEQUENCE,
)
{
$keys = array_flip(array_keys($data));
$letThrow = !key_exists($name, $keys);
$keys = \array_flip(array_keys($data));
$letThrow = !\key_exists($name, $keys);
if ($letThrow) {
throw new InvalidArgumentException(
'input array MUST BE like' .
Expand Down

0 comments on commit 99c629c

Please sign in to comment.