Fix: model name eq model

src/langs/php/combinator.js

@@ -140,7 +140,13 @@ class Combinator extends CombinatorBase {
     }
 
     // avoid keywords
-    realFullClassName = realFullClassName.split('\\').map(m => {
+    let realFullClassNameArr = realFullClassName.split('\\');
+    realFullClassName = realFullClassNameArr.map((m, i) => {
+      if (i === realFullClassNameArr.length - 1 && m.toLowerCase() === 'model') {
+        // If the model class name is 'model'
+        // add the '_' suffix.
+        return m + '_';
+      }
       return _avoidKeywords(m);
     }).join('\\');
 
@@ -217,7 +223,9 @@ class Combinator extends CombinatorBase {
     this.classNameMap = {};
 
     let emitter, outputParts = { head: '', body: '', foot: '' };
-
+    if (object.type === 'model' && object.name.toLowerCase() === 'model') {
+      object.name = object.name + '_';
+    }
     /******************************** emit body ********************************/
     emitter = new Emitter(this.config);
     if (object.name.indexOf('.') > -1) {
@@ -1011,7 +1019,7 @@ class Combinator extends CombinatorBase {
     } else {
       emitter.emitln(' {}');
     }
-   
+
     if (gram.elseItem.length && gram.elseItem.length > 0) {
       gram.elseItem.forEach(e => {
         this.grammer(emitter, e);

tests/expected/model/Models/MyModel.php

@@ -7,6 +7,7 @@
 use import\Client as importClient;
 use GuzzleHttp\Psr7\Stream;
 
+use Tea\PHP\Tests\Models\model_;
 use Tea\PHP\Tests\Models\MyModel\submodel;
 use Tea\PHP\Tests\Models\MyModel\subarraymodel;
 use Tea\PHP\Tests\Models\M;
@@ -19,6 +20,7 @@ class MyModel extends Model {
         'link' => 'link',
     ];
     public function validate() {
+        Model::validateRequired('model', $this->model, true);
         Model::validateRequired('stringfield', $this->stringfield, true);
         Model::validateRequired('bytesfield', $this->bytesfield, true);
         Model::validateRequired('stringarrayfield', $this->stringarrayfield, true);
@@ -57,6 +59,9 @@ public function validate() {
     }
     public function toMap() {
         $res = [];
+        if (null !== $this->model) {
+            $res['model'] = null !== $this->model ? $this->model->toMap() : null;
+        }
         if (null !== $this->stringfield) {
             $res['stringfield'] = $this->stringfield;
         }
@@ -215,6 +220,9 @@ public function toMap() {
      */
     public static function fromMap($map = []) {
         $model = new self();
+        if(isset($map['model'])){
+            $model->model = model_::fromMap($map['model']);
+        }
         if(isset($map['stringfield'])){
             $model->stringfield = $map['stringfield'];
         }
@@ -343,6 +351,11 @@ public static function fromMap($map = []) {
         }
         return $model;
     }
+    /**
+     * @var model_
+     */
+    public $model;
+
     /**
      * @var string
      */

tests/expected/model/Models/model_.php

@@ -0,0 +1,35 @@
+<?php
+
+// This file is auto-generated, don't edit it. Thanks.
+namespace Tea\PHP\Tests\Models;
+
+use AlibabaCloud\Tea\Model;
+
+class model_ extends Model {
+    public function validate() {
+        Model::validateRequired('str', $this->str, true);
+    }
+    public function toMap() {
+        $res = [];
+        if (null !== $this->str) {
+            $res['str'] = $this->str;
+        }
+        return $res;
+    }
+    /**
+     * @param array $map
+     * @return model_
+     */
+    public static function fromMap($map = []) {
+        $model = new self();
+        if(isset($map['str'])){
+            $model->str = $map['str'];
+        }
+        return $model;
+    }
+    /**
+     * @var string
+     */
+    public $str;
+
+}

tests/fixtures/model/main.dara

@@ -6,7 +6,12 @@ model M = {
 
 model Class = {};
 
+model model = {
+  str: string
+}
+
 model MyModel = {
+  model: model,
   stringfield: string,
   bytesfield: bytes,
   stringarrayfield: [ string ],
@@ -46,3 +51,4 @@ model MyModel = {
   uint64Field: uint64,
   link?: string(name='link', example='http://*/*.png'),
 };
+

tests/php.tests.js

@@ -114,7 +114,8 @@ describe('PHP Generator', function () {
       'Models/MyModel.php',
       'Models/MyModel/subarraymodel.php',
       'Models/MyModel/submodel.php',
-      'Models/Class_.php'
+      'Models/Class_.php',
+      'Models/model_.php',
     ]);
   });