Skip to content

Commit

Permalink
Updated stubs regarding to the 3.2.1 version
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeyklay committed Jul 10, 2017
1 parent 326033e commit 346c3ca
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 32 deletions.
7 changes: 7 additions & 0 deletions src/Phalcon/assets/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ public function getJs() {}
*/
public function collection($name) {}

/**
* @param array $resources
* @param string $type
* @return array
*/
public function collectionResourcesByType(array $resources, $type) {}

/**
* Traverses a collection calling the callback to generate its HTML
*
Expand Down
48 changes: 24 additions & 24 deletions src/Phalcon/config/adapter/Grouped.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,44 @@
* use Phalcon\Config\Adapter\Grouped;
*
* $config = new Grouped(
* [
* "path/to/config.php",
* "path/to/config.dist.php",
* ]
* [
* "path/to/config.php",
* "path/to/config.dist.php",
* ]
* );
* </code>
*
* <code>
* use Phalcon\Config\Adapter\Grouped;
*
* $config = new Grouped(
* [
* "path/to/config.json",
* "path/to/config.dist.json",
* ],
* "json"
* [
* "path/to/config.json",
* "path/to/config.dist.json",
* ],
* "json"
* );
* </code>
*
* <code>
* use Phalcon\Config\Adapter\Grouped;
*
* $config = new Grouped(
* [
* [
* "filePath" => "path/to/config.php",
* "adapter" => "php",
* ],
* [
* "filePath" => "path/to/config.json",
* "adapter" => "json",
* ],
* [
* "adapter" => "array",
* "config" => [
* "property" => "value",
* ],
* ],
* [
* [
* "filePath" => "path/to/config.php",
* "adapter" => "php",
* ],
* [
* "filePath" => "path/to/config.json",
* "adapter" => "json",
* ],
* [
* "adapter" => "array",
* "config" => [
* "property" => "value",
* ],
* ],
* );
* </code>
*/
Expand Down
10 changes: 10 additions & 0 deletions src/Phalcon/db/adapter/pdo/Mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,14 @@ public function describeIndexes($table, $schema = null) {}
*/
public function describeReferences($table, $schema = null) {}

/**
* Adds a foreign key to a table
*
* @param string $tableName
* @param string $schemaName
* @param \Phalcon\Db\ReferenceInterface $reference
* @return bool
*/
public function addForeignKey($tableName, $schemaName, \Phalcon\Db\ReferenceInterface $reference) {}

}
7 changes: 7 additions & 0 deletions src/Phalcon/db/dialect/Mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,4 +256,11 @@ public function tableOptions($table, $schema = null) {}
*/
protected function _getTableOptions(array $definition) {}

/**
* Generates SQL to check DB parameter FOREIGN_KEY_CHECKS.
*
* @return string
*/
public function getForeignKeyChecks() {}

}
6 changes: 2 additions & 4 deletions src/Phalcon/http/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,10 @@ public function setStatusCode($code, $message = null) {}
* Returns the status code
*
* <code>
* print_r(
* $response->getStatusCode()
* );
* echo $response->getStatusCode();
* </code>
*
* @return array
* @return int|null
*/
public function getStatusCode() {}

Expand Down
8 changes: 4 additions & 4 deletions src/Phalcon/mvc/model/query/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ final public function autoescape($identifier) {}
* @param mixed $maximum
* @return Builder
*/
private function _conditionBetween($clause, $operator, $expr, $minimum, $maximum) {}
protected function _conditionBetween($clause, $operator, $expr, $minimum, $maximum) {}

/**
* Appends a NOT BETWEEN condition
Expand All @@ -715,7 +715,7 @@ private function _conditionBetween($clause, $operator, $expr, $minimum, $maximum
* @param mixed $maximum
* @return Builder
*/
private function _conditionNotBetween($clause, $operator, $expr, $minimum, $maximum) {}
protected function _conditionNotBetween($clause, $operator, $expr, $minimum, $maximum) {}

/**
* Appends an IN condition
Expand All @@ -726,7 +726,7 @@ private function _conditionNotBetween($clause, $operator, $expr, $minimum, $maxi
* @param array $values
* @return Builder
*/
private function _conditionIn($clause, $operator, $expr, array $values) {}
protected function _conditionIn($clause, $operator, $expr, array $values) {}

/**
* Appends a NOT IN condition
Expand All @@ -737,6 +737,6 @@ private function _conditionIn($clause, $operator, $expr, array $values) {}
* @param array $values
* @return Builder
*/
private function _conditionNotIn($clause, $operator, $expr, array $values) {}
protected function _conditionNotIn($clause, $operator, $expr, array $values) {}

}

0 comments on commit 346c3ca

Please sign in to comment.