Skip to content

Commit c06af92

Browse files
committed
Merge pull request #659 from sergeyklay/2.0.x
Updated stubs
2 parents f05772e + 2b239eb commit c06af92

File tree

17 files changed

+108
-20
lines changed

17 files changed

+108
-20
lines changed

ide/stubs/Phalcon/db/adapter/pdo/Mysql.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,16 @@ public function describeColumns($table, $schema = null) {}
6262
*/
6363
public function describeIndexes($table, $schema = null) {}
6464

65+
/**
66+
* Lists table references
67+
* <code>
68+
* print_r($connection->describeReferences('robots_parts'));
69+
* </code>
70+
*
71+
* @param string $table
72+
* @param string $schema
73+
* @return Reference[]
74+
*/
75+
public function describeReferences($table, $schema = null) {}
76+
6577
}

ide/stubs/Phalcon/http/request/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function getSize() {}
9292
public function getName() {}
9393

9494
/**
95-
* Returns the temporal name of the uploaded file
95+
* Returns the temporary name of the uploaded file
9696
*
9797
* @return string
9898
*/

ide/stubs/Phalcon/image/adapter/Imagick.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ protected function _text($text, $offsetX, $offsetY, $opacity, $r, $g, $b, $size,
129129
* Composite one image onto another
130130
*
131131
* @param mixed $image
132-
* @param Adapter $$mask mask Image instance
133132
*/
134133
protected function _mask(\Phalcon\Image\Adapter $image) {}
135134

@@ -191,8 +190,9 @@ public function getInternalImInstance() {}
191190
/**
192191
* Sets the limit for a particular resource in megabytes
193192
*
194-
* @param int $type Refer to the list of resourcetype constants (@see http://php.net/manual/ru/imagick.constants.php#imagick.constants.resourcetypes.)
195-
* @param int $limit The resource limit. The unit depends on the type of the resource being limited.
193+
* @link http://php.net/manual/ru/imagick.constants.php#imagick.constants.resourcetypes
194+
* @param int $type
195+
* @param int $limit
196196
*/
197197
public function setResourceLimit($type, $limit) {}
198198

ide/stubs/Phalcon/logger/Formatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Phalcon\Logger\Formatter
77
* This is a base class for logger formatters
88
*/
9-
abstract class Formatter
9+
abstract class Formatter implements \Phalcon\Logger\FormatterInterface
1010
{
1111

1212
/**

ide/stubs/Phalcon/logger/Multiple.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,18 @@ class Multiple
1515
protected $_formatter;
1616

1717

18+
protected $_logLevel;
19+
20+
1821

1922
public function getLoggers() {}
2023

2124

2225
public function getFormatter() {}
2326

27+
28+
public function getLogLevel() {}
29+
2430
/**
2531
* Pushes a logger to the logger tail
2632
*
@@ -35,6 +41,13 @@ public function push(\Phalcon\Logger\AdapterInterface $logger) {}
3541
*/
3642
public function setFormatter(\Phalcon\Logger\FormatterInterface $formatter) {}
3743

44+
/**
45+
* Sets a global level
46+
*
47+
* @param int $level
48+
*/
49+
public function setLogLevel($level) {}
50+
3851
/**
3952
* Sends a message to each registered logger
4053
*

ide/stubs/Phalcon/logger/formatter/Firephp.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Phalcon\Logger\Formatter\Firephp
77
* Formats messages so that they can be sent to FirePHP
88
*/
9-
class Firephp extends \Phalcon\Logger\Formatter implements \Phalcon\Logger\FormatterInterface
9+
class Firephp extends \Phalcon\Logger\Formatter
1010
{
1111

1212
protected $_showBacktrace = true;

ide/stubs/Phalcon/logger/formatter/Json.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Phalcon\Logger\Formatter\Json
77
* Formats messages using JSON encoding
88
*/
9-
class Json extends \Phalcon\Logger\Formatter implements \Phalcon\Logger\FormatterInterface
9+
class Json extends \Phalcon\Logger\Formatter
1010
{
1111

1212
/**

ide/stubs/Phalcon/logger/formatter/Line.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Phalcon\Logger\Formatter\Line
77
* Formats messages using an one-line string
88
*/
9-
class Line extends \Phalcon\Logger\Formatter implements \Phalcon\Logger\FormatterInterface
9+
class Line extends \Phalcon\Logger\Formatter
1010
{
1111
/**
1212
* Default date format

ide/stubs/Phalcon/logger/formatter/Syslog.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Phalcon\Logger\Formatter\Syslog
77
* Prepares a message to be used in a Syslog backend
88
*/
9-
class Syslog extends \Phalcon\Logger\Formatter implements \Phalcon\Logger\FormatterInterface
9+
class Syslog extends \Phalcon\Logger\Formatter
1010
{
1111

1212
/**

ide/stubs/Phalcon/mvc/Model.php

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public static function find($parameters = null) {}
384384
* </code>
385385
*
386386
* @param string|array $parameters
387-
* @return static|bool
387+
* @return static
388388
*/
389389
public static function findFirst($parameters = null) {}
390390

@@ -1137,6 +1137,24 @@ public static function __callStatic($method, $arguments) {}
11371137
*/
11381138
public function __set($property, $value) {}
11391139

1140+
/**
1141+
* Check for, and attempt to use, possible setter.
1142+
*
1143+
* @param string $property
1144+
* @param mixed $value
1145+
* @return string
1146+
*/
1147+
protected final function _possibleSetter($property, $value) {}
1148+
1149+
/**
1150+
* Check whether a property is declared private or protected.
1151+
* This is a stop-gap because we do not want to have to declare all properties.
1152+
*
1153+
* @param string $property
1154+
* @return boolean
1155+
*/
1156+
protected final function _isVisible($property) {}
1157+
11401158
/**
11411159
* Magic method to get related records using the relation alias as a property
11421160
*

0 commit comments

Comments
 (0)