Skip to content

Commit

Permalink
Merge pull request #421 from moarty/master
Browse files Browse the repository at this point in the history
Align stubs with real zephir methods requirements
  • Loading branch information
sergeyklay committed Jun 3, 2015
2 parents c7d9a3e + 60a7f64 commit a538517
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion ide/2.0.0/Phalcon/db/Adapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function getSqlVariables() {}
*
* @param array $descriptor
*/
public function __construct($descriptor) {}
public function __construct(array $descriptor) {}

/**
* Sets the event manager
Expand Down
2 changes: 1 addition & 1 deletion ide/2.0.0/Phalcon/db/AdapterInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interface AdapterInterface
*
* @param array $descriptor
*/
public function __construct($descriptor);
public function __construct(array $descriptor);

/**
* Returns the first row in a SQL query result
Expand Down
4 changes: 2 additions & 2 deletions ide/2.0.0/Phalcon/db/DialectInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function sharedLock($sqlQuery);
* @param array $definition
* @return string
*/
public function select($definition);
public function select(array $definition);

/**
* Gets a list of columns
Expand Down Expand Up @@ -182,7 +182,7 @@ public function dropForeignKey($tableName, $schemaName, $referenceName);
* @param $string tableName
* @return
*/
public function createTable($tableName, $schemaName, $definition);
public function createTable($tableName, $schemaName, array $definition);

/**
* Generates SQL to drop a table
Expand Down
2 changes: 1 addition & 1 deletion ide/2.0.0/Phalcon/mvc/Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public function getWriteConnection() {}
* @param array $whiteList
* @return \Phalcon\Mvc\Model
*/
public function assign($data, $dataColumnMap = null, $whiteList = null) {}
public function assign(array $data, $dataColumnMap = null, $whiteList = null) {}

/**
* Assigns values to a model from an array returning a new model.
Expand Down
12 changes: 5 additions & 7 deletions ide/2.0.0/Phalcon/mvc/ModelInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,12 @@ public function getDirtyState();
/**
* Assigns values to a model from an array
*
* @param array $data
* @param mixed $dataColumnMap
* @param mixed $whiteList
* @param \Phalcon\Mvc\Model $object
* @param array $columnMap
* @return \Phalcon\Mvc\Model
* @param array data
* @param array dataColumnMap array to transform keys of data to another
* @param array whiteList
* @return Phalcon\Mvc\Model
*/
public function assign($data, $dataColumnMap = null, $whiteList = null);
public function assign(array $data, $dataColumnMap = null, $whiteList = null);

/**
* Assigns values to a model from an array returning a new model
Expand Down

0 comments on commit a538517

Please sign in to comment.