Merge pull request #2263 from zephir-lang/development

0.14.0-beta.3
zephir-lang · Aug 6, 2021 · 0be9ad5 · 0be9ad5
2 parents 68df5a5 + 6eb5bfc
commit 0be9ad5
Show file tree

Hide file tree

Showing 13 changed files with 464 additions and 462 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org).
 
 ## [Unreleased]
 
+## [0.14.0-beta.3] - 2021-08-06
+### Fixed
+- Fixed class entry generation of external class [#2261](https://github.com/zephir-lang/zephir/issues/2261)
+
 ## [0.14.0-beta.2] - 2021-08-06
 ### Fixed
 - Fixed missing `config/` directory in `zephir.phar` [#2259](https://github.com/zephir-lang/zephir/issues/2259)
@@ -530,8 +534,9 @@ and this project adheres to [Semantic Versioning](http://semver.org).
   [#1524](https://github.com/zephir-lang/zephir/issues/1524)
 
 
-[Unreleased]: https://github.com/zephir-lang/zephir/compare/0.14.0-beta.2...HEAD
-[0.14.0-beta.1]: https://github.com/zephir-lang/zephir/compare/0.14.0-beta.1...0.14.0-beta.2
+[Unreleased]: https://github.com/zephir-lang/zephir/compare/0.14.0-beta.3...HEAD
+[0.14.0-beta.3]: https://github.com/zephir-lang/zephir/compare/0.14.0-beta.2...0.14.0-beta.3
+[0.14.0-beta.2]: https://github.com/zephir-lang/zephir/compare/0.14.0-beta.1...0.14.0-beta.2
 [0.14.0-beta.1]: https://github.com/zephir-lang/zephir/compare/0.13.5...0.14.0-beta.1
 [0.13.5]: https://github.com/zephir-lang/zephir/compare/0.13.4...0.13.5
 [0.13.4]: https://github.com/zephir-lang/zephir/compare/0.13.3...0.13.4

diff --git a/Library/ClassDefinition.php b/Library/ClassDefinition.php
@@ -1123,7 +1123,7 @@ public function compile(CompilationContext $compilationContext): void
                 $classEntry = $classExtendsDefinition->getClassEntry($compilationContext);
             } else {
                 $className = method_exists($classExtendsDefinition, 'getCompleteName') ? $classExtendsDefinition->getCompleteName() : $classExtendsDefinition->getName();
-                $classEntry = (new Entry($className, $compilationContext))->get();
+                $classEntry = (new Entry('\\'.ltrim($className, '\\'), $compilationContext))->get();
             }
 
             if (self::TYPE_CLASS === $this->getType()) {

diff --git a/Library/Classes/Entry.php b/Library/Classes/Entry.php
@@ -107,7 +107,7 @@ public function get(): string
             if ($reflection->isInternal()) {
                 return sprintf(
                     'zephir_get_internal_ce(SL("%s"))',
-                    strtolower($reflection->getName()),
+                    str_replace(self::NAMESPACE_SEPARATOR, self::NAMESPACE_SEPARATOR.self::NAMESPACE_SEPARATOR, strtolower($reflection->getName())),
                 );
             }
 

diff --git a/Library/Zephir.php b/Library/Zephir.php
@@ -16,7 +16,7 @@
  */
 final class Zephir
 {
-    public const VERSION = '0.14.0-beta.2-$Id$';
+    public const VERSION = '0.14.0-beta.3-$Id$';
 
     public const LOGO = <<<'ASCII'
  _____              __    _