Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/Exception/BadMethodCallException.php
Expand Up @@ -14,7 +14,7 @@
* @category Zend
* @package Zend_Cache
*/
class BadMethodCallException extends \BadMethodCallException implements
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
{
}
2 changes: 1 addition & 1 deletion src/Exception/InvalidArgumentException.php
Expand Up @@ -14,7 +14,7 @@
* @category Zend
* @package Zend_Cache
*/
class InvalidArgumentException extends \InvalidArgumentException implements
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
{
}
2 changes: 1 addition & 1 deletion src/Exception/UnexpectedValueException.php
Expand Up @@ -14,7 +14,7 @@
* @category Zend
* @package Zend_Cache
*/
class UnexpectedValueException extends \UnexpectedValueException implements
class UnexpectedValueException extends \UnexpectedValueException implements
ExceptionInterface
{
}
2 changes: 1 addition & 1 deletion src/Exception/UnsupportedMethodCallException.php
Expand Up @@ -14,7 +14,7 @@
* @category Zend
* @package Zend_Cache
*/
class UnsupportedMethodCallException extends \BadMethodCallException implements
class UnsupportedMethodCallException extends \BadMethodCallException implements
ExceptionInterface
{
}
10 changes: 5 additions & 5 deletions src/PatternPluginManager.php
Expand Up @@ -16,7 +16,7 @@
* Plugin manager implementation for cache pattern adapters
*
* Enforces that adatpers retrieved are instances of
* Pattern\PatternInterface. Additionally, it registers a number of default
* Pattern\PatternInterface. Additionally, it registers a number of default
* patterns available.
*
* @category Zend
Expand All @@ -26,7 +26,7 @@ class PatternPluginManager extends AbstractPluginManager
{
/**
* Default set of adapters
*
*
* @var array
*/
protected $invokableClasses = array(
Expand All @@ -40,7 +40,7 @@ class PatternPluginManager extends AbstractPluginManager

/**
* Don't share by default
*
*
* @var array
*/
protected $shareByDefault = false;
Expand All @@ -49,8 +49,8 @@ class PatternPluginManager extends AbstractPluginManager
* Validate the plugin
*
* Checks that the pattern adapter loaded is an instance of Pattern\PatternInterface.
*
* @param mixed $plugin
*
* @param mixed $plugin
* @return void
* @throws Exception\RuntimeException if invalid
*/
Expand Down
6 changes: 3 additions & 3 deletions src/Storage/Adapter/ZendServerDisk.php
Expand Up @@ -23,10 +23,10 @@
* @package Zend_Cache
* @subpackage Storage
*/
class ZendServerDisk extends AbstractZendServer implements
AvailableSpaceCapableInterface,
class ZendServerDisk extends AbstractZendServer implements
AvailableSpaceCapableInterface,
ClearByNamespaceInterface,
FlushableInterface,
FlushableInterface,
TotalSpaceCapableInterface
{

Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Adapter/ZendServerShm.php
Expand Up @@ -21,7 +21,7 @@
* @package Zend_Cache
* @subpackage Storage
*/
class ZendServerShm extends AbstractZendServer implements
class ZendServerShm extends AbstractZendServer implements
ClearByNamespaceInterface,
FlushableInterface,
TotalSpaceCapableInterface
Expand Down
10 changes: 5 additions & 5 deletions src/Storage/AdapterPluginManager.php
Expand Up @@ -17,7 +17,7 @@
* Plugin manager implementation for cache storage adapters
*
* Enforces that adapters retrieved are instances of
* StorageInterface. Additionally, it registers a number of default
* StorageInterface. Additionally, it registers a number of default
* adapters available.
*
* @category Zend
Expand All @@ -28,7 +28,7 @@ class AdapterPluginManager extends AbstractPluginManager
{
/**
* Default set of adapters
*
*
* @var array
*/
protected $invokableClasses = array(
Expand All @@ -48,7 +48,7 @@ class AdapterPluginManager extends AbstractPluginManager

/**
* Do not share by default
*
*
* @var array
*/
protected $shareByDefault = false;
Expand All @@ -57,8 +57,8 @@ class AdapterPluginManager extends AbstractPluginManager
* Validate the plugin
*
* Checks that the adapter loaded is an instance of StorageInterface.
*
* @param mixed $plugin
*
* @param mixed $plugin
* @return void
* @throws Exception\RuntimeException if invalid
*/
Expand Down
10 changes: 5 additions & 5 deletions src/Storage/PluginManager.php
Expand Up @@ -17,7 +17,7 @@
* Plugin manager implementation for cache plugins
*
* Enforces that plugins retrieved are instances of
* Plugin\PluginInterface. Additionally, it registers a number of default
* Plugin\PluginInterface. Additionally, it registers a number of default
* plugins available.
*
* @category Zend
Expand All @@ -28,7 +28,7 @@ class PluginManager extends AbstractPluginManager
{
/**
* Default set of plugins
*
*
* @var array
*/
protected $invokableClasses = array(
Expand All @@ -41,7 +41,7 @@ class PluginManager extends AbstractPluginManager

/**
* Do not share by default
*
*
* @var array
*/
protected $shareByDefault = false;
Expand All @@ -50,8 +50,8 @@ class PluginManager extends AbstractPluginManager
* Validate the plugin
*
* Checks that the plugin loaded is an instance of Plugin\PluginInterface.
*
* @param mixed $plugin
*
* @param mixed $plugin
* @return void
* @throws Exception\RuntimeException if invalid
*/
Expand Down
3 changes: 2 additions & 1 deletion test/Pattern/CallbackCacheTest.php
Expand Up @@ -39,7 +39,8 @@ public static function emptyMethod() {}
* Test function
* @see ZendTest\Cache\Pattern\Foo::bar
*/
function bar () {
function bar ()
{
return call_user_func_array(__NAMESPACE__ . '\TestCallbackCache::bar', func_get_args());
}

Expand Down

0 comments on commit 016f50c

Please sign in to comment.