#1324 - Fix models generation

phalcon · Oct 13, 2019 · e2e79ed · e2e79ed
1 parent 2c7973b
commit e2e79ed
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 70 deletions.
diff --git a/scripts/Phalcon/Builder/Model.php b/scripts/Phalcon/Builder/Model.php
@@ -21,12 +21,12 @@
 
 namespace Phalcon\Builder;
 
+use Phalcon\Db\Adapter\Pdo\AbstractPdo;
 use Phalcon\Text;
 use Phalcon\Utils;
 use ReflectionClass;
 use Phalcon\Db\Column;
 use Phalcon\Validation;
-use Phalcon\Db\Adapter\Pdo;
 use Phalcon\Generator\Snippet;
 use Phalcon\Db\ReferenceInterface;
 use Phalcon\Exception\RuntimeException;
@@ -148,7 +148,7 @@ public function build()
 
         $adapterName = 'Phalcon\Db\Adapter\Pdo\\' . $adapter;
         unset($configArray['adapter']);
-        /** @var Pdo $db */
+        /** @var AbstractPdo $db */
         $db = new $adapterName($configArray);
 
         $initialize = [];
@@ -500,10 +500,6 @@ public function build()
             $license = trim(file_get_contents('license.txt')) . PHP_EOL . PHP_EOL;
         }
 
-        if (false == $alreadyGetSourced) {
-            $methodRawCode[] = $snippet->getModelSource($this->modelOptions->getOption('name'));
-        }
-
         if (false == $alreadyFind) {
             $methodRawCode[] = $snippet->getModelFind($this->modelOptions->getOption('className'));
         }
@@ -624,10 +620,10 @@ protected function getEntityClassName(ReferenceInterface $reference, $namespace)
      * Get reference list from option
      *
      * @param string $schema
-     * @param Pdo $db
+     * @param AbstractPdo $db
      * @return array
      */
-    protected function getReferenceList($schema, Pdo $db)
+    protected function getReferenceList($schema, AbstractPdo $db)
     {
         if ($this->modelOptions->hasOption('referenceList')) {
             return $this->modelOptions->getOption('referenceList');

diff --git a/scripts/Phalcon/Generator/Snippet.php b/scripts/Phalcon/Generator/Snippet.php
@@ -31,23 +31,6 @@
  */
 class Snippet
 {
-    public function getModelSource($source)
-    {
-        $getSource = <<<EOD
-    /**
-     * Returns table name mapped in the model.
-     *
-     * @return string
-     */
-    public function getSource()
-    {
-        return '%s';
-    }
-EOD;
-
-        return PHP_EOL.sprintf($getSource, $source).PHP_EOL;
-    }
-
     public function getSetter($originalFieldName, $fieldName, $type, $setterName)
     {
         $templateSetter = <<<EOD
@@ -267,7 +250,7 @@ public function getModelFind($className)
      * @param mixed \$parameters
      * @return %s[]|%s|\Phalcon\Mvc\Model\ResultSetInterface
      */
-    public static function find(\$parameters = null)
+    public static function find(\$parameters = null): \Phalcon\Mvc\Model\ResultsetInterface
     {
         return parent::find(\$parameters);
     }

diff --git a/tests/_data/console/app/models/files/TestModel.php b/tests/_data/console/app/models/files/TestModel.php
@@ -42,23 +42,13 @@ public function initialize()
         $this->setSource("testModel");
     }
 
-    /**
-     * Returns table name mapped in the model.
-     *
-     * @return string
-     */
-    public function getSource()
-    {
-        return 'testModel';
-    }
-
     /**
      * Allows to query a set of records that match the specified conditions
      *
      * @param mixed $parameters
      * @return TestModel[]|TestModel|\Phalcon\Mvc\Model\ResultSetInterface
      */
-    public static function find($parameters = null)
+    public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInterface
     {
         return parent::find($parameters);
     }

diff --git a/tests/_data/console/app/models/files/TestModel2.php b/tests/_data/console/app/models/files/TestModel2.php
@@ -28,23 +28,13 @@ public function initialize()
         $this->setSource("test-model2");
     }
 
-    /**
-     * Returns table name mapped in the model.
-     *
-     * @return string
-     */
-    public function getSource()
-    {
-        return 'test-model2';
-    }
-
     /**
      * Allows to query a set of records that match the specified conditions
      *
      * @param mixed $parameters
      * @return TestModel2[]|TestModel2|\Phalcon\Mvc\Model\ResultSetInterface
      */
-    public static function find($parameters = null)
+    public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInterface
     {
         return parent::find($parameters);
     }

diff --git a/tests/_data/console/app/models/files/TestModel3.php b/tests/_data/console/app/models/files/TestModel3.php
@@ -28,23 +28,13 @@ public function initialize()
         $this->setSource("test_model3");
     }
 
-    /**
-     * Returns table name mapped in the model.
-     *
-     * @return string
-     */
-    public function getSource()
-    {
-        return 'test_model3';
-    }
-
     /**
      * Allows to query a set of records that match the specified conditions
      *
      * @param mixed $parameters
      * @return TestModel3[]|TestModel3|\Phalcon\Mvc\Model\ResultSetInterface
      */
-    public static function find($parameters = null)
+    public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInterface
     {
         return parent::find($parameters);
     }

diff --git a/tests/_data/console/app/models/files/Testmodel4.php b/tests/_data/console/app/models/files/Testmodel4.php
@@ -28,23 +28,13 @@ public function initialize()
         $this->setSource("Testmodel4");
     }
 
-    /**
-     * Returns table name mapped in the model.
-     *
-     * @return string
-     */
-    public function getSource()
-    {
-        return 'Testmodel4';
-    }
-
     /**
      * Allows to query a set of records that match the specified conditions
      *
      * @param mixed $parameters
      * @return Testmodel4[]|Testmodel4|\Phalcon\Mvc\Model\ResultSetInterface
      */
-    public static function find($parameters = null)
+    public static function find($parameters = null): \Phalcon\Mvc\Model\ResultsetInterface
     {
         return parent::find($parameters);
     }