Merge branch 'magento-commerce:develop' into add-enum

magento · Nov 21, 2023 · 0579a55 · 0579a55
2 parents e24d682 + 3b85c72
commit 0579a55
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "magento/magento-semver",
     "description": "Magento Semantic Version Checker",
-    "version": "13.0.0-beta1",
+    "version": "13.0.0-beta2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/composer.lock b/composer.lock
diff --git a/src/Analyzer/ClassMethodAnalyzer.php b/src/Analyzer/ClassMethodAnalyzer.php
@@ -459,7 +459,11 @@ private function getDocReturnDeclaration(ClassMethod $method)
             ($parsedComment = $method->getAttribute('docCommentParsed'))
             && isset($parsedComment['return'])
         ) {
-            $result = implode('|', $parsedComment['return']);
+            if ($parsedComment['return'][0] instanceof NullableType) {
+                $result =  '?' . $parsedComment['return'][0]->type;
+            } else {
+                $result = implode('|', $parsedComment['return']);
+            }
 
             return $result;
         } elseif ($this->dependencyGraph !== null) {