Skip to content

Commit 8440989

Browse files
committed
Fix class names for XP classes in main namespaces
1 parent 8946e2f commit 8440989

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/php/lang/AbstractClassLoader.class.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,10 @@ public function loadClass0($class) {
117117
// * Global namespace -> ClassName, alias as com\example\ClassName
118118
//
119119
// Alias lang.** classes into global namespace
120-
if (FALSE === ($p= strrpos($class, '.'))) {
120+
if (false === ($p= strrpos($class, '.'))) {
121121
$name= $class;
122-
} else if (NULL !== $package) {
122+
\xp::$sn[$class]= $name;
123+
} else if (null !== $package) {
123124
$name= strtr($class, '.', '·');
124125
class_alias($name, strtr($class, '.', '\\'));
125126
\xp::$sn[$class]= $name;

src/main/php/lang/reflect/Routine.class.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ public function hasAnnotation($name, $key= null) {
210210
*/
211211
public function getAnnotation($name, $key= null) {
212212
$details= \lang\XPClass::detailsForMethod($this->_reflect->getDeclaringClass()->getName(), $this->_reflect->getName());
213-
214213
if (!$details || !($key
215214
? array_key_exists($key, @$details[DETAIL_ANNOTATIONS][$name])
216215
: array_key_exists($name, @$details[DETAIL_ANNOTATIONS])

0 commit comments

Comments
 (0)