Skip to content

Commit b3306b0

Browse files
authored
Merge pull request #924 from sergeyklay/3.0.x
Update stubs
2 parents 5ee29e4 + d3a8e7b commit b3306b0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+167
-154
lines changed

ide/stubs/Phalcon/Di.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ public function getService($name) {}
153153
public function get($name, $parameters = null) {}
154154

155155
/**
156-
* Resolves a service, the resolved service is stored in the DI, subsequent requests for this service will return the same instance
156+
* Resolves a service, the resolved service is stored in the DI, subsequent
157+
* requests for this service will return the same instance
157158
*
158159
* @param string $name
159160
* @param array $parameters

ide/stubs/Phalcon/Flash.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* $flash->error("Cannot open the file");
1111
* </code>
1212
*/
13-
abstract class Flash implements \Phalcon\Di\InjectionAwareInterface
13+
abstract class Flash implements \Phalcon\FlashInterface, \Phalcon\Di\InjectionAwareInterface
1414
{
1515

1616
protected $_cssClasses;
@@ -90,23 +90,23 @@ public function getDI() {}
9090
* Set whether the output must be implicitly flushed to the output or returned as string
9191
*
9292
* @param bool $implicitFlush
93-
* @return \Phalcon\FlashInterface
93+
* @return FlashInterface
9494
*/
9595
public function setImplicitFlush($implicitFlush) {}
9696

9797
/**
9898
* Set if the output must be implicitly formatted with HTML
9999
*
100100
* @param bool $automaticHtml
101-
* @return \Phalcon\FlashInterface
101+
* @return FlashInterface
102102
*/
103103
public function setAutomaticHtml($automaticHtml) {}
104104

105105
/**
106106
* Set an array with CSS classes to format the messages
107107
*
108108
* @param array $cssClasses
109-
* @return \Phalcon\FlashInterface
109+
* @return FlashInterface
110110
*/
111111
public function setCssClasses(array $cssClasses) {}
112112

ide/stubs/Phalcon/Kernel.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ class Kernel
1010
{
1111

1212
/**
13-
* Produces a pre-computed hash key based on a string. This function produces different numbers in 32bit/64bit processors
13+
* Produces a pre-computed hash key based on a string. This function
14+
* produces different numbers in 32bit/64bit processors
1415
*
1516
* @param string $key
1617
* @return string

ide/stubs/Phalcon/acl/AdapterInterface.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ public function setDefaultAction($defaultAccess);
2424
public function getDefaultAction();
2525

2626
/**
27-
* Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY) for no arguments provided in isAllowed action if there exists func for accessKey
27+
* Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY)
28+
* for no arguments provided in isAllowed action if there exists func for accessKey
2829
*
2930
* @param int $defaultAccess
3031
*/
3132
public function setNoArgumentsDefaultAction($defaultAccess);
3233

3334
/**
34-
* Returns the default ACL access level for no arguments provided in isAllowed action if there exists func for accessKey
35+
* Returns the default ACL access level for no arguments provided in
36+
* isAllowed action if there exists func for accessKey
3537
*
3638
* @return int
3739
*/

ide/stubs/Phalcon/acl/adapter/Memory.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,14 +295,17 @@ public function deny($roleName, $resourceName, $access, $func = null) {}
295295
public function isAllowed($roleName, $resourceName, $access, array $parameters = null) {}
296296

297297
/**
298-
* Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY) for no arguments provided in isAllowed action if there exists func for accessKey
298+
* Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY)
299+
* for no arguments provided in isAllowed action if there exists func for
300+
* accessKey
299301
*
300302
* @param int $defaultAccess
301303
*/
302304
public function setNoArgumentsDefaultAction($defaultAccess) {}
303305

304306
/**
305-
* Returns the default ACL access level for no arguments provided in isAllowed action if there exists func for accessKey
307+
* Returns the default ACL access level for no arguments provided in
308+
* isAllowed action if there exists func for accessKey
306309
*
307310
* @return int
308311
*/

ide/stubs/Phalcon/assets/Manager.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,39 +206,39 @@ public function output(\Phalcon\Assets\Collection $collection, $callback, $type)
206206
*
207207
* @param \Phalcon\Assets\Collection $collection
208208
* @param string $type
209-
* @return string|null
209+
* @return string
210210
*/
211211
public function outputInline(\Phalcon\Assets\Collection $collection, $type) {}
212212

213213
/**
214214
* Prints the HTML for CSS resources
215215
*
216216
* @param string $collectionName
217-
* @return string|null
217+
* @return string
218218
*/
219219
public function outputCss($collectionName = null) {}
220220

221221
/**
222222
* Prints the HTML for inline CSS
223223
*
224224
* @param string $collectionName
225-
* @return string|null
225+
* @return string
226226
*/
227227
public function outputInlineCss($collectionName = null) {}
228228

229229
/**
230230
* Prints the HTML for JS resources
231231
*
232232
* @param string $collectionName
233-
* @return string|null
233+
* @return string
234234
*/
235235
public function outputJs($collectionName = null) {}
236236

237237
/**
238238
* Prints the HTML for inline JS
239239
*
240240
* @param string $collectionName
241-
* @return string|null
241+
* @return string
242242
*/
243243
public function outputInlineJs($collectionName = null) {}
244244

ide/stubs/Phalcon/cache/Backend.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Phalcon\Cache\Backend
77
* This class implements common functionality for backend adapters. A backend cache adapter may extend this class
88
*/
9-
abstract class Backend
9+
abstract class Backend implements \Phalcon\Cache\BackendInterface
1010
{
1111

1212
protected $_frontend;

ide/stubs/Phalcon/cache/backend/Apc.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* $data = $cache->get("my-data");
2727
* </code>
2828
*/
29-
class Apc extends \Phalcon\Cache\Backend implements \Phalcon\Cache\BackendInterface
29+
class Apc extends \Phalcon\Cache\Backend
3030
{
3131

3232
/**
@@ -94,6 +94,13 @@ public function exists($keyName = null, $lifetime = null) {}
9494

9595
/**
9696
* Immediately invalidates all existing items.
97+
* <code>
98+
* use Phalcon\Cache\Backend\Apc;
99+
* $cache = new Apc($frontCache, ["prefix" => "app-data"]);
100+
* $cache->save("my-data", [1, 2, 3, 4, 5]);
101+
* // 'my-data' and all other used keys are deleted
102+
* $cache->flush();
103+
* </code>
97104
*
98105
* @return bool
99106
*/

ide/stubs/Phalcon/cache/backend/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* }
3030
* </code>
3131
*/
32-
class File extends \Phalcon\Cache\Backend implements \Phalcon\Cache\BackendInterface
32+
class File extends \Phalcon\Cache\Backend
3333
{
3434
/**
3535
* Default to false for backwards compatibility

ide/stubs/Phalcon/cache/backend/Libmemcached.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* $data = $cache->get("my-data");
3939
* </code>
4040
*/
41-
class Libmemcached extends \Phalcon\Cache\Backend implements \Phalcon\Cache\BackendInterface
41+
class Libmemcached extends \Phalcon\Cache\Backend
4242
{
4343

4444
protected $_memcache = null;

0 commit comments

Comments
 (0)