From 9b8b3d0ee6ebc2d84bbe0a683179c5399b12291e Mon Sep 17 00:00:00 2001 From: Maks3w Date: Wed, 11 Jul 2012 22:09:11 +0200 Subject: [PATCH 1/4] [zen-46] Replace use statements in documentation and tests --- test/ArrayUtilsTest.php | 10 +++++----- test/ErrorHandlerTest.php | 4 ++-- test/GlobTest.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/ArrayUtilsTest.php b/test/ArrayUtilsTest.php index 041619404..5f62911ef 100644 --- a/test/ArrayUtilsTest.php +++ b/test/ArrayUtilsTest.php @@ -10,11 +10,11 @@ namespace ZendTest\Stdlib; -use PHPUnit_Framework_TestCase as TestCase, - stdClass, - \ArrayObject, - Zend\Stdlib\ArrayUtils, - Zend\Config\Config; +use PHPUnit_Framework_TestCase as TestCase; +use stdClass; +use \ArrayObject; +use Zend\Stdlib\ArrayUtils; +use Zend\Config\Config; class ArrayUtilsTest extends TestCase { diff --git a/test/ErrorHandlerTest.php b/test/ErrorHandlerTest.php index 79f90f333..f1613d4e1 100644 --- a/test/ErrorHandlerTest.php +++ b/test/ErrorHandlerTest.php @@ -10,8 +10,8 @@ namespace ZendTest\Stdlib; -use PHPUnit_Framework_TestCase as TestCase, - Zend\Stdlib\ErrorHandler; +use PHPUnit_Framework_TestCase as TestCase; +use Zend\Stdlib\ErrorHandler; class ErrorHandlerTest extends TestCase { diff --git a/test/GlobTest.php b/test/GlobTest.php index 32827f84e..3a88a4df3 100644 --- a/test/GlobTest.php +++ b/test/GlobTest.php @@ -10,8 +10,8 @@ namespace ZendTest\Stdlib; -use PHPUnit_Framework_TestCase as TestCase, - Zend\Stdlib\Glob; +use PHPUnit_Framework_TestCase as TestCase; +use Zend\Stdlib\Glob; class GlobTest extends TestCase { From d01cf3a1c9088391ca0e9fab7b5d2d0285e154dc Mon Sep 17 00:00:00 2001 From: Maks3w Date: Wed, 11 Jul 2012 22:11:34 +0200 Subject: [PATCH 2/4] Remove global prefix in use statements --- test/ArrayUtilsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ArrayUtilsTest.php b/test/ArrayUtilsTest.php index 5f62911ef..15333bb1d 100644 --- a/test/ArrayUtilsTest.php +++ b/test/ArrayUtilsTest.php @@ -12,7 +12,7 @@ use PHPUnit_Framework_TestCase as TestCase; use stdClass; -use \ArrayObject; +use ArrayObject; use Zend\Stdlib\ArrayUtils; use Zend\Config\Config; From 509f72e70b8a510b1ec724aa9daec1dea4937a41 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 11 Jul 2012 17:26:04 -0500 Subject: [PATCH 3/4] Remove Zend\Stdlib\SubClass The main reason for this class was to work around changes in PHP between versions 5.3.3 and 5.3.7 regarding how is_subclass_of() works. In the earlier versions, it was buggy. In 5.3.7 and up, the bugs are fixed, and the solution is very fast. There are very few places in the framework where an is_subclass_of() test makes sense, and those are typically only with classes responsible for creating other classes -- factories, primarily. As such, the number of places where this will be of use is minimal, and can be maintained. The main goal is to have a consistent, performant way to do the check when required, and one which will work with case sensitive contexts. The solution by @prolic in zendframework/zf2#1807 is good; we just don't need to abstract this, particularly as we'll be able to remove this entirely in ZF3. Additionally, abstracting it gives additional dependencies for those components needing it, and in cases like autoloaders, DI, and the service manager, the extra dependency is undesirable as these should stand alone. The code has been duplicated into each class requiring the lookup (I put the check into AbstractPluginManager, as it's not unlikely other plugin managers may need this). --- test/SubClassTest.php | 30 ------------------------------ test/TestAsset/DummySubclasses.php | 16 ---------------- 2 files changed, 46 deletions(-) delete mode 100644 test/SubClassTest.php delete mode 100644 test/TestAsset/DummySubclasses.php diff --git a/test/SubClassTest.php b/test/SubClassTest.php deleted file mode 100644 index 91fa4e334..000000000 --- a/test/SubClassTest.php +++ /dev/null @@ -1,30 +0,0 @@ -assertTrue($test1); - $this->assertTrue($test2); - } - -} diff --git a/test/TestAsset/DummySubclasses.php b/test/TestAsset/DummySubclasses.php deleted file mode 100644 index 99fc86831..000000000 --- a/test/TestAsset/DummySubclasses.php +++ /dev/null @@ -1,16 +0,0 @@ - Date: Thu, 12 Jul 2012 21:11:36 +0200 Subject: [PATCH 4/4] [PSR-2] fixers=braces,elseif,short_tag,php_closing_tag,trailing_spaces,linefeed Applied php-cs-fixer --fixers=braces,elseif,short_tag,php_closing_tag,trailing_spaces,linefeed --- src/ArraySerializableInterface.php | 6 +-- src/ArrayStack.php | 4 +- src/ArrayUtils.php | 16 +++---- src/CallbackHandler.php | 34 +++++++------- src/Glob.php | 44 +++++++++---------- src/Hydrator/ArraySerializable.php | 16 +++---- src/Hydrator/ClassMethods.php | 28 ++++++------ src/Hydrator/HydratorInterface.php | 10 ++--- src/Hydrator/ObjectProperty.php | 10 ++--- src/Hydrator/Reflection.php | 2 +- src/Message.php | 20 ++++----- src/Parameters.php | 24 +++++----- src/ParametersInterface.php | 6 +-- src/SplPriorityQueue.php | 14 +++--- src/SplQueue.php | 6 +-- src/SplStack.php | 6 +-- test/GlobTest.php | 2 +- test/HydratorTest.php | 6 +-- test/MessageTest.php | 16 +++---- test/OptionsTest.php | 14 +++--- test/SplPriorityQueueTest.php | 6 +-- test/TestAsset/ClassMethodsCamelCase.php | 10 ++--- .../ClassMethodsCamelCaseMissing.php | 12 ++--- test/TestAsset/ClassMethodsUnderscore.php | 10 ++--- test/TestAsset/TestOptions.php | 6 +-- 25 files changed, 163 insertions(+), 165 deletions(-) diff --git a/src/ArraySerializableInterface.php b/src/ArraySerializableInterface.php index 5dfbe229c..20dd4633c 100644 --- a/src/ArraySerializableInterface.php +++ b/src/ArraySerializableInterface.php @@ -18,15 +18,15 @@ interface ArraySerializableInterface { /** * Exchange internal values from provided array - * - * @param array $array + * + * @param array $array * @return void */ public function exchangeArray(array $array); /** * Return an array representation of the object - * + * * @return array */ public function getArrayCopy(); diff --git a/src/ArrayStack.php b/src/ArrayStack.php index 4b691cf0e..013ff262d 100644 --- a/src/ArrayStack.php +++ b/src/ArrayStack.php @@ -24,9 +24,9 @@ class ArrayStack extends ArrayObject /** * Retrieve iterator * - * Retrieve an array copy of the object, reverse its order, and return an + * Retrieve an array copy of the object, reverse its order, and return an * ArrayIterator with that reversed array. - * + * * @return ArrayIterator */ public function getIterator() diff --git a/src/ArrayUtils.php b/src/ArrayUtils.php index a06919606..866b784f6 100644 --- a/src/ArrayUtils.php +++ b/src/ArrayUtils.php @@ -33,7 +33,7 @@ public static function hasStringKeys($value, $allowEmpty = false) { if (!is_array($value)) { return false; - } + } if (!$value) { return $allowEmpty; @@ -53,7 +53,7 @@ public static function hasIntegerKeys($value, $allowEmpty = false) { if (!is_array($value)) { return false; - } + } if (!$value) { return $allowEmpty; @@ -80,8 +80,8 @@ public static function hasNumericKeys($value, $allowEmpty = false) { if (!is_array($value)) { return false; - } - + } + if (!$value) { return $allowEmpty; } @@ -113,8 +113,8 @@ public static function isList($value, $allowEmpty = false) { if (!is_array($value)) { return false; - } - + } + if (!$value) { return $allowEmpty; } @@ -155,8 +155,8 @@ public static function isHashTable($value, $allowEmpty = false) { if (!is_array($value)) { return false; - } - + } + if (!$value) { return $allowEmpty; } diff --git a/src/CallbackHandler.php b/src/CallbackHandler.php index e8543838a..edce4ff4a 100644 --- a/src/CallbackHandler.php +++ b/src/CallbackHandler.php @@ -39,9 +39,9 @@ class CallbackHandler /** * Constructor - * + * * @param string $event Event to which slot is subscribed - * @param string|array|object $callback PHP callback + * @param string|array|object $callback PHP callback * @param array $options Options used by the callback handler (e.g., priority) * @return void */ @@ -54,14 +54,14 @@ public function __construct($callback, array $metadata = array()) /** * Registers the callback provided in the constructor * - * If you have pecl/weakref {@see http://pecl.php.net/weakref} installed, + * If you have pecl/weakref {@see http://pecl.php.net/weakref} installed, * this method provides additional behavior. * - * If a callback is a functor, or an array callback composing an object + * If a callback is a functor, or an array callback composing an object * instance, this method will pass the object to a WeakRef instance prior * to registering the callback. - * - * @param callback $callback + * + * @param callback $callback * @return void */ protected function registerCallback($callback) @@ -93,7 +93,7 @@ protected function registerCallback($callback) list($target, $method) = $callback; - // If we have an array callback, and the first argument is not an + // If we have an array callback, and the first argument is not an // object, register as-is if (!is_object($target)) { $this->callback = $callback; @@ -108,7 +108,7 @@ protected function registerCallback($callback) /** * Retrieve registered callback - * + * * @return Callback */ public function getCallback() @@ -130,7 +130,7 @@ public function getCallback() return $callback; } - // Array callback with WeakRef object -- retrieve the object first, and + // Array callback with WeakRef object -- retrieve the object first, and // then return list($target, $method) = $callback; if ($target instanceof WeakRef) { @@ -143,7 +143,7 @@ public function getCallback() /** * Invoke handler - * + * * @param array $args Arguments to pass to callback * @return mixed */ @@ -162,7 +162,7 @@ public function call(array $args = array()) $this->validateStringCallbackFor54($callback); } - // Minor performance tweak; use call_user_func() until > 3 arguments + // Minor performance tweak; use call_user_func() until > 3 arguments // reached switch (count($args)) { case 0: @@ -197,7 +197,7 @@ public function call(array $args = array()) /** * Invoke as functor - * + * * @return mixed */ public function __invoke() @@ -207,7 +207,7 @@ public function __invoke() /** * Get all callback metadata - * + * * @return array */ public function getMetadata() @@ -217,8 +217,8 @@ public function getMetadata() /** * Retrieve a single metadatum - * - * @param string $name + * + * @param string $name * @return mixed */ public function getMetadatum($name) @@ -233,8 +233,8 @@ public function getMetadatum($name) * Validate a static method call * * Validates that a static method call in PHP 5.4 will actually work - * - * @param string $callback + * + * @param string $callback * @return true * @throws Exception\InvalidCallbackException if invalid */ diff --git a/src/Glob.php b/src/Glob.php index bfd0f7a13..e97019853 100644 --- a/src/Glob.php +++ b/src/Glob.php @@ -29,10 +29,10 @@ abstract class Glob const GLOB_ONLYDIR = 0x20; const GLOB_ERR = 0x30; /**#@-*/ - + /** * Find pathnames matching a pattern. - * + * * @see http://docs.php.net/glob * @param string $pattern * @param integer $flags @@ -47,10 +47,10 @@ public static function glob($pattern, $flags, $forceFallback = false) return self::systemGlob($pattern, $flags); } } - + /** * Use the glob function provided by the system. - * + * * @param string $pattern * @param integer $flags * @return array|false @@ -81,10 +81,10 @@ protected static function systemGlob($pattern, $flags) return glob($pattern, $globFlags); } - + /** * Expand braces manually, then use the system glob. - * + * * @param string $pattern * @param integer $flags * @return array|false @@ -94,26 +94,26 @@ protected static function fallbackGlob($pattern, $flags) if (!$flags & self::GLOB_BRACE) { return self::systemGlob($pattern, $flags); } - + $flags &= ~self::GLOB_BRACE; $length = strlen($pattern); $paths = array(); - + if ($flags & self::GLOB_NOESCAPE) { $begin = strpos($pattern, '{'); } else { $begin = 0; - + while (true) { if ($begin === $length) { $begin = false; break; - } else if ($pattern[$begin] === '\\' && ($begin + 1) < $length) { + } elseif ($pattern[$begin] === '\\' && ($begin + 1) < $length) { $begin++; - } else if ($pattern[$begin] === '{') { + } elseif ($pattern[$begin] === '{') { break; } - + $begin++; } } @@ -121,7 +121,7 @@ protected static function fallbackGlob($pattern, $flags) if ($begin === false) { return self::systemGlob($pattern, $flags); } - + $next = self::nextBraceSub($pattern, $begin + 1, $flags); if ($next === null) { @@ -140,7 +140,7 @@ protected static function fallbackGlob($pattern, $flags) $p = $begin + 1; - while (true) { + while (true) { $subPattern = substr($pattern, 0, $begin) . substr($pattern, $p, $next - $p) . substr($pattern, $rest + 1); @@ -150,7 +150,7 @@ protected static function fallbackGlob($pattern, $flags) if ($result) { $paths = array_merge($paths, $result); } - + if ($pattern[$next] === '}') { break; } @@ -158,17 +158,17 @@ protected static function fallbackGlob($pattern, $flags) $p = $next + 1; $next = self::nextBraceSub($pattern, $p, $flags); } - + return array_unique($paths); } - + /** * Find the end of the sub-pattern in a brace expression. - * + * * @param string $pattern * @param integer $begin * @param integer $flags - * @return integer|null + * @return integer|null */ protected static function nextBraceSub($pattern, $begin, $flags) { @@ -181,12 +181,12 @@ protected static function nextBraceSub($pattern, $begin, $flags) if (++$current === $length) { break; } - + $current++; - } else { + } else { if (($pattern[$current] === '}' && $depth-- === 0) || ($pattern[$current] === ',' && $depth === 0)) { break; - } else if ($pattern[$current++] === '{') { + } elseif ($pattern[$current++] === '{') { $depth++; } } diff --git a/src/Hydrator/ArraySerializable.php b/src/Hydrator/ArraySerializable.php index cc281a085..41dd7ab61 100644 --- a/src/Hydrator/ArraySerializable.php +++ b/src/Hydrator/ArraySerializable.php @@ -21,10 +21,10 @@ class ArraySerializable implements HydratorInterface { /** * Extract values from the provided object - * + * * Extracts values via the object's getArrayCopy() method. - * - * @param object $object + * + * @param object $object * @return array * @throws Exception\BadMethodCallException for an $object not implementing getArrayCopy() */ @@ -42,11 +42,11 @@ public function extract($object) /** * Hydrate an object * - * Hydrates an object by passing $data to either its exchangeArray() or + * Hydrates an object by passing $data to either its exchangeArray() or * populate() method. - * - * @param array $data - * @param object $object + * + * @param array $data + * @param object $object * @return object * @throws Exception\BadMethodCallException for an $object not implementing exchangeArray() or populate() */ @@ -54,7 +54,7 @@ public function hydrate(array $data, $object) { if (is_callable(array($object, 'exchangeArray'))) { $object->exchangeArray($data); - } else if (is_callable(array($object, 'populate'))) { + } elseif (is_callable(array($object, 'populate'))) { $object->populate($data); } else { throw new Exception\BadMethodCallException(sprintf( diff --git a/src/Hydrator/ClassMethods.php b/src/Hydrator/ClassMethods.php index f642bbc8a..136aa5725 100644 --- a/src/Hydrator/ClassMethods.php +++ b/src/Hydrator/ClassMethods.php @@ -24,22 +24,22 @@ class ClassMethods implements HydratorInterface * @var boolean */ protected $underscoreSeparatedKeys; - + /** * Define if extract values will use camel case or name with underscore - * @param boolean $underscoreSeparatedKeys + * @param boolean $underscoreSeparatedKeys */ public function __construct($underscoreSeparatedKeys = true) { $this->underscoreSeparatedKeys = $underscoreSeparatedKeys; } - + /** * Extract values from an object with class methods * * Extracts the getter/setter of the given $object. - * - * @param object $object + * + * @param object $object * @return array * @throws Exception\BadMethodCallException for a non-object $object */ @@ -51,9 +51,8 @@ public function extract($object) __METHOD__ )); } - - $transform = function($letters) - { + + $transform = function($letters) { $letter = array_shift($letters); return '_' . strtolower($letter); }; @@ -75,7 +74,7 @@ public function extract($object) $attributes[$attribute] = $object->$method(); } } - + return $attributes; } @@ -83,9 +82,9 @@ public function extract($object) * Hydrate an object by populating getter/setter methods * * Hydrates an object by getter/setter methods of the object. - * - * @param array $data - * @param object $object + * + * @param array $data + * @param object $object * @return object * @throws Exception\BadMethodCallException for a non-object $object */ @@ -97,9 +96,8 @@ public function hydrate(array $data, $object) __METHOD__ )); } - - $transform = function($letters) - { + + $transform = function($letters) { $letter = substr(array_shift($letters), 1, 1); return ucfirst($letter); }; diff --git a/src/Hydrator/HydratorInterface.php b/src/Hydrator/HydratorInterface.php index 84774f8b4..d014b3fdc 100644 --- a/src/Hydrator/HydratorInterface.php +++ b/src/Hydrator/HydratorInterface.php @@ -19,17 +19,17 @@ interface HydratorInterface { /** * Extract values from an object - * - * @param object $object + * + * @param object $object * @return array */ public function extract($object); /** * Hydrate $object with the provided $data. - * - * @param array $data - * @param object $object + * + * @param array $data + * @param object $object * @return object */ public function hydrate(array $data, $object); diff --git a/src/Hydrator/ObjectProperty.php b/src/Hydrator/ObjectProperty.php index e2c8c1067..c78ea76e8 100644 --- a/src/Hydrator/ObjectProperty.php +++ b/src/Hydrator/ObjectProperty.php @@ -23,8 +23,8 @@ class ObjectProperty implements HydratorInterface * Extract values from an object * * Extracts the accessible non-static properties of the given $object. - * - * @param object $object + * + * @param object $object * @return array * @throws Exception\BadMethodCallException for a non-object $object */ @@ -44,9 +44,9 @@ public function extract($object) * Hydrate an object by populating public properties * * Hydrates an object by setting public properties of the object. - * - * @param array $data - * @param object $object + * + * @param array $data + * @param object $object * @return object * @throws Exception\BadMethodCallException for a non-object $object */ diff --git a/src/Hydrator/Reflection.php b/src/Hydrator/Reflection.php index 8851b4691..36181c095 100644 --- a/src/Hydrator/Reflection.php +++ b/src/Hydrator/Reflection.php @@ -68,7 +68,7 @@ protected static function getReflProperties($input) { if (is_object($input)) { $input = get_class($input); - } else if (!is_string($input)) { + } elseif (!is_string($input)) { throw new Exception\InvalidArgumentException('Input must be a string or an object.'); } diff --git a/src/Message.php b/src/Message.php index 2c68547f1..e5e8f088a 100644 --- a/src/Message.php +++ b/src/Message.php @@ -25,13 +25,13 @@ class Message implements MessageInterface protected $content = ''; /** - * Set message metadata + * Set message metadata * - * Non-destructive setting of message metadata; always adds to the metadata, never overwrites + * Non-destructive setting of message metadata; always adds to the metadata, never overwrites * the entire metadata container. - * - * @param string|int|array|Traversable $spec - * @param mixed $value + * + * @param string|int|array|Traversable $spec + * @param mixed $value * @return Message */ public function setMetadata($spec, $value = null) @@ -54,8 +54,8 @@ public function setMetadata($spec, $value = null) /** * Retrieve all metadata or a single metadatum as specified by key - * - * @param null|string|int $key + * + * @param null|string|int $key * @param null|mixed $default * @return mixed */ @@ -78,8 +78,8 @@ public function getMetadata($key = null, $default = null) /** * Set message content - * - * @param mixed $value + * + * @param mixed $value * @return Message */ public function setContent($value) @@ -90,7 +90,7 @@ public function setContent($value) /** * Get message content - * + * * @return mixed */ public function getContent() diff --git a/src/Parameters.php b/src/Parameters.php index 3fa8c3a1a..de67fe7b8 100644 --- a/src/Parameters.php +++ b/src/Parameters.php @@ -19,8 +19,8 @@ class Parameters extends ArrayObject implements ParametersInterface * * Enforces that we have an array, and enforces parameter access to array * elements. - * - * @param array $values + * + * @param array $values * @return void */ public function __construct(array $values = null) @@ -33,8 +33,8 @@ public function __construct(array $values = null) /** * Populate from native PHP array - * - * @param array $values + * + * @param array $values * @return void */ public function fromArray(array $values) @@ -44,8 +44,8 @@ public function fromArray(array $values) /** * Populate from query string - * - * @param string $string + * + * @param string $string * @return void */ public function fromString($string) @@ -57,7 +57,7 @@ public function fromString($string) /** * Serialize to native PHP array - * + * * @return array */ public function toArray() @@ -67,7 +67,7 @@ public function toArray() /** * Serialize to query string - * + * * @return string */ public function toString() @@ -79,8 +79,8 @@ public function toString() * Retrieve by key * * Returns null if the key does not exist. - * - * @param string $name + * + * @param string $name * @return mixed */ public function offsetGet($name) @@ -90,7 +90,7 @@ public function offsetGet($name) } return null; } - + /** * @param string $name * @param mixed $default optional default value @@ -103,7 +103,7 @@ public function get($name, $default = null) } return $default; } - + /** * @param string $name * @param mixed $value diff --git a/src/ParametersInterface.php b/src/ParametersInterface.php index f9fc539f4..42d309540 100644 --- a/src/ParametersInterface.php +++ b/src/ParametersInterface.php @@ -15,7 +15,7 @@ use Serializable; use Traversable; -/* +/* * Basically, an ArrayObject. You could simply define something like: * class QueryParams extends ArrayObject implements Parameters {} * and have 90% of the functionality @@ -35,8 +35,8 @@ public function toArray(); /* Allow serialization to query format; e.g., for PUT or POST requests */ public function toString(); - + public function get($name, $default = null); - + public function set($name, $value); } diff --git a/src/SplPriorityQueue.php b/src/SplPriorityQueue.php index 92799c1a1..a960d72a3 100644 --- a/src/SplPriorityQueue.php +++ b/src/SplPriorityQueue.php @@ -31,11 +31,11 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable /** * Insert a value with a given priority * - * Utilizes {@var $serial} to ensure that values of equal priority are + * Utilizes {@var $serial} to ensure that values of equal priority are * emitted in the same order in which they are inserted. - * - * @param mixed $datum - * @param mixed $priority + * + * @param mixed $datum + * @param mixed $priority * @return void */ public function insert($datum, $priority) @@ -50,7 +50,7 @@ public function insert($datum, $priority) * Serialize to an array * * Array will be priority => data pairs - * + * * @return array */ public function toArray() @@ -79,7 +79,7 @@ public function toArray() /** * Serialize - * + * * @return string */ public function serialize() @@ -102,7 +102,7 @@ public function serialize() /** * Deserialize - * + * * @param string $data * @return void */ diff --git a/src/SplQueue.php b/src/SplQueue.php index ff59a5f8b..e753201d8 100644 --- a/src/SplQueue.php +++ b/src/SplQueue.php @@ -22,7 +22,7 @@ class SplQueue extends \SplQueue implements Serializable { /** * Return an array representing the queue - * + * * @return array */ public function toArray() @@ -36,7 +36,7 @@ public function toArray() /** * Serialize - * + * * @return string */ public function serialize() @@ -46,7 +46,7 @@ public function serialize() /** * Unserialize - * + * * @param string $data * @return void */ diff --git a/src/SplStack.php b/src/SplStack.php index 199502fa9..be3c76a42 100644 --- a/src/SplStack.php +++ b/src/SplStack.php @@ -22,7 +22,7 @@ class SplStack extends \SplStack implements Serializable { /** * Serialize to an array representing the stack - * + * * @return array */ public function toArray() @@ -36,7 +36,7 @@ public function toArray() /** * Serialize - * + * * @return string */ public function serialize() @@ -46,7 +46,7 @@ public function serialize() /** * Unserialize - * + * * @param string $data * @return void */ diff --git a/test/GlobTest.php b/test/GlobTest.php index 3a88a4df3..8a8728b71 100644 --- a/test/GlobTest.php +++ b/test/GlobTest.php @@ -20,7 +20,7 @@ public function testFallback() if (!defined('GLOB_BRACE')) { $this->markTestSkipped('GLOB_BRACE not available'); } - + $this->assertEquals( glob(__DIR__ . '/_files/{alph,bet}a', GLOB_BRACE), Glob::glob(__DIR__ . '/_files/{alph,bet}a', Glob::GLOB_BRACE, true) diff --git a/test/HydratorTest.php b/test/HydratorTest.php index a98bb3d15..10fae389e 100644 --- a/test/HydratorTest.php +++ b/test/HydratorTest.php @@ -53,7 +53,7 @@ public function setUp() $this->classMethodsUnderscore = new ClassMethodsUnderscore(); $this->reflection = new ReflectionAsset; } - + public function testInitiateValues() { $this->assertEquals($this->classMethodsCamelCase->getFooBar(), '1'); @@ -92,7 +92,7 @@ public function testHydratorClassMethodsCamelCase() $this->assertEquals($test->getFooBar(), 'foo'); $this->assertEquals($test->getFooBarBaz(), 'bar'); } - + public function testHydratorClassMethodsCamelCaseWithSetterMissing() { $hydrator = new ClassMethods(false); @@ -106,7 +106,7 @@ public function testHydratorClassMethodsCamelCaseWithSetterMissing() $this->assertEquals($test->getFooBar(), 'foo'); $this->assertEquals($test->getFooBarBaz(), '2'); } - + public function testHydratorClassMethodsUnderscore() { $hydrator = new ClassMethods(true); diff --git a/test/MessageTest.php b/test/MessageTest.php index 9371e54ef..9f81add04 100644 --- a/test/MessageTest.php +++ b/test/MessageTest.php @@ -21,7 +21,7 @@ public function testMessageCanSetAndGetContent() $this->assertInstanceOf('Zend\Stdlib\Message', $ret); $this->assertEquals('I can set content', $message->getContent()); } - + public function testMessageCanSetAndGetMetadataKeyAsString() { $message = new Message(); @@ -30,7 +30,7 @@ public function testMessageCanSetAndGetMetadataKeyAsString() $this->assertEquals('bar', $message->getMetadata('foo')); $this->assertEquals(array('foo' => 'bar'), $message->getMetadata()); } - + public function testMessageCanSetAndGetMetadataKeyAsArray() { $message = new Message(); @@ -38,29 +38,29 @@ public function testMessageCanSetAndGetMetadataKeyAsArray() $this->assertInstanceOf('Zend\Stdlib\Message', $ret); $this->assertEquals('bar', $message->getMetadata('foo')); } - + public function testMessageGetMetadataWillUseDefaultValueIfNoneExist() { $message = new Message(); $this->assertEquals('bar', $message->getMetadata('foo', 'bar')); } - + public function testMessageThrowsExceptionOnInvalidKeyForMetadataSet() { $message = new Message(); - + $this->setExpectedException('Zend\Stdlib\Exception\InvalidArgumentException'); $message->setMetadata(new \stdClass()); } - + public function testMessageThrowsExceptionOnInvalidKeyForMetadataGet() { $message = new Message(); - + $this->setExpectedException('Zend\Stdlib\Exception\InvalidArgumentException'); $message->getMetadata(new \stdClass()); } - + public function testMessageToStringWorks() { $message = new Message(); diff --git a/test/OptionsTest.php b/test/OptionsTest.php index 39d40a953..50f5f1932 100644 --- a/test/OptionsTest.php +++ b/test/OptionsTest.php @@ -20,18 +20,18 @@ class OptionsTest extends \PHPUnit_Framework_TestCase public function testConstructionWithArray() { $options = new TestOptions(array('test_field' => 1)); - + $this->assertEquals(1, $options->test_field); } - + public function testConstructionWithTraversable() { $config = new ArrayObject(array('test_field' => 1)); $options = new TestOptions($config); - + $this->assertEquals(1, $options->test_field); } - + public function testConstructionWithNull() { try { @@ -40,14 +40,14 @@ public function testConstructionWithNull() $this->fail("Unexpected InvalidArgumentException raised"); } } - + public function testUnsetting() { $options = new TestOptions(array('test_field' => 1)); - + $this->assertEquals(true, isset($options->test_field)); unset($options->testField); $this->assertEquals(false, isset($options->test_field)); - + } } diff --git a/test/SplPriorityQueueTest.php b/test/SplPriorityQueueTest.php index ccf2c5e58..40a3c4ea6 100644 --- a/test/SplPriorityQueueTest.php +++ b/test/SplPriorityQueueTest.php @@ -66,9 +66,9 @@ public function testSerializationAndDeserializationShouldMaintainState() public function testCanRetrieveQueueAsArray() { $expected = array( - 'bar', - 'foo', - 'baz', + 'bar', + 'foo', + 'baz', 'bat', ); $test = $this->queue->toArray(); diff --git a/test/TestAsset/ClassMethodsCamelCase.php b/test/TestAsset/ClassMethodsCamelCase.php index bb1afcc80..4371637ca 100644 --- a/test/TestAsset/ClassMethodsCamelCase.php +++ b/test/TestAsset/ClassMethodsCamelCase.php @@ -13,25 +13,25 @@ class ClassMethodsCamelCase { protected $fooBar = '1'; - + protected $fooBarBaz = '2'; - + public function getFooBar() { return $this->fooBar; } - + public function setFooBar($value) { $this->fooBar = $value; return $this; } - + public function getFooBarBaz() { return $this->fooBarBaz; } - + public function setFooBarBaz($value) { $this->fooBarBaz = $value; diff --git a/test/TestAsset/ClassMethodsCamelCaseMissing.php b/test/TestAsset/ClassMethodsCamelCaseMissing.php index 11851e461..7ad333e26 100644 --- a/test/TestAsset/ClassMethodsCamelCaseMissing.php +++ b/test/TestAsset/ClassMethodsCamelCaseMissing.php @@ -13,28 +13,28 @@ class ClassMethodsCamelCaseMissing { protected $fooBar = '1'; - + protected $fooBarBaz = '2'; - + public function getFooBar() { return $this->fooBar; } - + public function setFooBar($value) { $this->fooBar = $value; return $this; } - + public function getFooBarBaz() { return $this->fooBarBaz; } - + /* * comment to detection verification - * + * public function setFooBarBaz($value) { $this->fooBarBaz = $value; diff --git a/test/TestAsset/ClassMethodsUnderscore.php b/test/TestAsset/ClassMethodsUnderscore.php index e42baea6b..47d5cf1bb 100644 --- a/test/TestAsset/ClassMethodsUnderscore.php +++ b/test/TestAsset/ClassMethodsUnderscore.php @@ -13,25 +13,25 @@ class ClassMethodsUnderscore { protected $foo_bar = '1'; - + protected $foo_bar_baz = '2'; - + public function getFooBar() { return $this->foo_bar; } - + public function setFooBar($value) { $this->foo_bar = $value; return $this; } - + public function getFooBarBaz() { return $this->foo_bar_baz; } - + public function setFooBarBaz($value) { $this->foo_bar_baz = $value; diff --git a/test/TestAsset/TestOptions.php b/test/TestAsset/TestOptions.php index 51a6024c5..a2fbe9842 100644 --- a/test/TestAsset/TestOptions.php +++ b/test/TestAsset/TestOptions.php @@ -18,12 +18,12 @@ class TestOptions extends AbstractOptions { protected $testField; - - public function setTestField($value) + + public function setTestField($value) { $this->testField = $value; } - + public function getTestField() { return $this->testField;