diff --git a/src/Reference/MethodReference.php b/src/Reference/MethodReference.php
index 632aaa2..b068f33 100644
--- a/src/Reference/MethodReference.php
+++ b/src/Reference/MethodReference.php
@@ -30,20 +30,19 @@ public function getName(): string
public function resolve(Environment $environment, string $data): ResolvedReference
{
- $className = explode('::', $data)[0];
- $className = str_replace('\\\\', '\\', $className);
-
- if (!u($data)->containsAny('::')) {
+ $data = u($data);
+ if (!$data->containsAny('::')) {
throw new \RuntimeException(sprintf('Malformed method reference "%s" in file "%s"', $data, $environment->getCurrentFileName()));
}
- $methodName = explode('::', $data)[1];
+ [$className, $methodName] = $data->split('::', 2);
+ $className = $className->replace('\\\\', '\\');
$scrollTextFragment = sprintf('#:~:text=%s', rawurlencode('function '.$methodName));
return new ResolvedReference(
$environment->getCurrentFileName(),
$methodName.'()',
- sprintf('%s/%s.php%s', $this->symfonyRepositoryUrl, str_replace('\\', '/', $className), $scrollTextFragment),
+ sprintf('%s/%s.php%s', $this->symfonyRepositoryUrl, $className->replace('\\', '/'), $scrollTextFragment),
[],
[
'title' => sprintf('%s::%s()', $className, $methodName),
diff --git a/src/Reference/PhpClassReference.php b/src/Reference/PhpClassReference.php
index 0bb0ba8..fbaabe4 100644
--- a/src/Reference/PhpClassReference.php
+++ b/src/Reference/PhpClassReference.php
@@ -12,6 +12,7 @@
use Doctrine\RST\Environment;
use Doctrine\RST\References\Reference;
use Doctrine\RST\References\ResolvedReference;
+use function Symfony\Component\String\u;
class PhpClassReference extends Reference
{
@@ -29,14 +30,15 @@ public function getName(): string
public function resolve(Environment $environment, string $data): ResolvedReference
{
- $classnamePath = str_replace('\\', '-', strtolower($data));
+ $className = u($data)->replace('\\\\', '\\');
+
return new ResolvedReference(
$environment->getCurrentFileName(),
- $data,
- sprintf('%s/class.%s.php', $this->phpDocUrl, $classnamePath),
+ $className->afterLast('\\'),
+ sprintf('%s/class.%s.php', $this->phpDocUrl, $className->replace('\\', '-')->lower()),
[],
[
- 'title' => $data,
+ 'title' => $className,
]
);
}
diff --git a/src/Reference/PhpMethodReference.php b/src/Reference/PhpMethodReference.php
index ac53744..9a85a91 100644
--- a/src/Reference/PhpMethodReference.php
+++ b/src/Reference/PhpMethodReference.php
@@ -12,6 +12,7 @@
use Doctrine\RST\Environment;
use Doctrine\RST\References\Reference;
use Doctrine\RST\References\ResolvedReference;
+use function Symfony\Component\String\u;
class PhpMethodReference extends Reference
{
@@ -29,15 +30,21 @@ public function getName(): string
public function resolve(Environment $environment, string $data): ResolvedReference
{
- [$class, $method] = explode('::', $data, 2);
+ $data = u($data);
+ if (!$data->containsAny('::')) {
+ throw new \RuntimeException(sprintf('Malformed method reference "%s" in file "%s"', $data, $environment->getCurrentFileName()));
+ }
+
+ [$className, $methodName] = $data->split('::', 2);
+ $className = $className->replace('\\\\', '\\');
return new ResolvedReference(
$environment->getCurrentFileName(),
- $data.'()',
- sprintf('%s/%s.%s.php', $this->phpDocUrl, strtolower($class), strtolower($method)),
+ $methodName.'()',
+ sprintf('%s/%s.%s.php', $this->phpDocUrl, $className->replace('\\', '-')->lower(), $methodName->lower()),
[],
[
- 'title' => $class,
+ 'title' => sprintf('%s::%s()', $className, $methodName),
]
);
}
diff --git a/tests/fixtures/expected/blocks/references/php-class.html b/tests/fixtures/expected/blocks/references/php-class.html
index b1e018e..a91b1fd 100644
--- a/tests/fixtures/expected/blocks/references/php-class.html
+++ b/tests/fixtures/expected/blocks/references/php-class.html
@@ -1,2 +1,2 @@
ArrayAccess
-BcMath\Number
+Number
diff --git a/tests/fixtures/expected/blocks/references/php-method.html b/tests/fixtures/expected/blocks/references/php-method.html
index e86c571..59323ad 100644
--- a/tests/fixtures/expected/blocks/references/php-method.html
+++ b/tests/fixtures/expected/blocks/references/php-method.html
@@ -1 +1,2 @@
-Locale::getDefault()
+getDefault()
+add()
diff --git a/tests/fixtures/expected/main/datetime.html b/tests/fixtures/expected/main/datetime.html
index f36ddc3..d6892fa 100644
--- a/tests/fixtures/expected/main/datetime.html
+++ b/tests/fixtures/expected/main/datetime.html
@@ -79,7 +79,7 @@