Skip to content
This repository has been archived by the owner on Sep 20, 2021. It is now read-only.

undef(resolve) adding Hoa namespace to resolve to avoid conflict #22

Merged
merged 2 commits into from
Aug 30, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion Bin/Resolve.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public function main()
' is equivalent to:', "\n";
}

$resolved = resolve($path, $exists, $unfold);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hoa\Protocol\Protocol::getInstance()->resolve(…) is better.

$resolved = \Hoa\resolve($path, $exists, $unfold);

foreach ((array) $resolved as $r) {
echo $r, "\n";
Expand Down
2 changes: 1 addition & 1 deletion Test/Unit/Wrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ protected function openDirectory(SUT $wrapper, array $children = [])
$wrapper->dir_opendir('hoa://Test/Vfs/Bar?type=directory', 0);

foreach ($children as $child) {
resolve('hoa://Test/Vfs/Bar/' . $child . '?type=file');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hoa\Protocol\Protocol::getInstance()->resolve(…) is better.

\Hoa\resolve('hoa://Test/Vfs/Bar/' . $child . '?type=file');
}

return $wrapper;
Expand Down
2 changes: 1 addition & 1 deletion Wrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ public function getStreamName()

}

namespace
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this.

namespace Hoa
{

/**
Expand Down