Skip to content

Commit a21177f

Browse files
committed
SharePoint API: service root url fix for web resource
1 parent 4cf1296 commit a21177f

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/SharePoint/Web.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2138,7 +2138,10 @@ public function getResourceUrl()
21382138
{
21392139
$url = parent::getResourceUrl();
21402140
if (!is_null($this->webUrl)) {
2141-
return str_replace("/_api", "{$this->webUrl}/_api", $url);
2141+
$urlInfo = parse_url($this->getContext()->getBaseUrl());
2142+
$rootSiteUrl = $urlInfo['scheme'] . '://' . $urlInfo['host'];
2143+
return "{$rootSiteUrl}{$this->webUrl}/_api/web";
2144+
#return str_replace("/_api", "{$this->webUrl}/_api", $url);
21422145
}
21432146
return $url;
21442147
}

tests/sharepoint/WebTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ public function testAssignUniquePermissions(Web $targetWeb)
9898
->breakRoleInheritance(true)
9999
->executeQuery();
100100

101-
$targetWeb->select("HasUniqueRoleAssignments")->get()->executeQuery();
102-
self::assertTrue($targetWeb->getHasUniqueRoleAssignments());
101+
$result = $targetWeb->select(["HasUniqueRoleAssignments"])->get()->executeQuery();
102+
self::assertTrue($result->getHasUniqueRoleAssignments());
103103
}
104104

105105
/**

0 commit comments

Comments
 (0)