diff --git a/src/Phalcon/assets/Manager.php b/src/Phalcon/assets/Manager.php index 2c45ce8b..d93e5abb 100644 --- a/src/Phalcon/assets/Manager.php +++ b/src/Phalcon/assets/Manager.php @@ -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 * diff --git a/src/Phalcon/config/adapter/Grouped.php b/src/Phalcon/config/adapter/Grouped.php index c939f511..bffbd2f6 100644 --- a/src/Phalcon/config/adapter/Grouped.php +++ b/src/Phalcon/config/adapter/Grouped.php @@ -13,10 +13,10 @@ * 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", + * ] * ); * * @@ -24,11 +24,11 @@ * 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" * ); * * @@ -36,21 +36,21 @@ * 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", + * ], + * ], * ); * */ diff --git a/src/Phalcon/db/adapter/pdo/Mysql.php b/src/Phalcon/db/adapter/pdo/Mysql.php index 808b3fa5..32bdc42a 100644 --- a/src/Phalcon/db/adapter/pdo/Mysql.php +++ b/src/Phalcon/db/adapter/pdo/Mysql.php @@ -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) {} + } diff --git a/src/Phalcon/db/dialect/Mysql.php b/src/Phalcon/db/dialect/Mysql.php index 988bc314..02d04af0 100644 --- a/src/Phalcon/db/dialect/Mysql.php +++ b/src/Phalcon/db/dialect/Mysql.php @@ -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() {} + } diff --git a/src/Phalcon/http/Response.php b/src/Phalcon/http/Response.php index 00ff7824..9047fed2 100644 --- a/src/Phalcon/http/Response.php +++ b/src/Phalcon/http/Response.php @@ -79,12 +79,10 @@ public function setStatusCode($code, $message = null) {} * Returns the status code * * - * print_r( - * $response->getStatusCode() - * ); + * echo $response->getStatusCode(); * * - * @return array + * @return int|null */ public function getStatusCode() {} diff --git a/src/Phalcon/mvc/model/query/Builder.php b/src/Phalcon/mvc/model/query/Builder.php index 2c2c93d9..82905ca1 100644 --- a/src/Phalcon/mvc/model/query/Builder.php +++ b/src/Phalcon/mvc/model/query/Builder.php @@ -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 @@ -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 @@ -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 @@ -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) {} }