[#5364] Incorporate feedback

zendframework · Jan 3, 2014 · c749ec4 · c749ec4
1 parent 4569ab9
commit c749ec4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php b/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php
@@ -9,6 +9,8 @@
 
 namespace Zend\Stdlib\Guard;
 
+use Traversable;
+
 /**
  * Provide a guard method for array or Traversable data
  */
@@ -28,7 +30,7 @@ protected function guardForArrayOrTraversable(
         $dataName = 'Argument',
         $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
     ) {
-        if (!is_array($data) && !($data instanceof \Traversable)) {
+        if (!is_array($data) && !($data instanceof Traversable)) {
             $message = sprintf(
                 "%s must be an array or Traversable, [%s] given",
                 $dataName,

diff --git a/library/Zend/Stdlib/Guard/GuardUtils.php b/library/Zend/Stdlib/Guard/GuardUtils.php
@@ -9,6 +9,8 @@
 
 namespace Zend\Stdlib\Guard;
 
+use Traversable;
+
 /**
  * Static guard helper class
  *
@@ -35,7 +37,7 @@ public static function guardForArrayOrTraversable(
         $dataName = 'Argument',
         $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
     ) {
-        if (!is_array($data) && !($data instanceof \Traversable)) {
+        if (!is_array($data) && !($data instanceof Traversable)) {
             $message = sprintf(
                 '%s must be an array or Traversable, [%s] given',
                 $dataName,
@@ -77,7 +79,7 @@ public static function guardAgainstNull(
         $dataName = 'Argument',
         $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
     ) {
-        if (is_null($data)) {
+        if (null === $data) {
             $message = sprintf('%s cannot be null', $dataName);
             throw new $exceptionClass($message);
         }

diff --git a/library/Zend/Stdlib/Guard/NullGuardTrait.php b/library/Zend/Stdlib/Guard/NullGuardTrait.php
@@ -28,7 +28,7 @@ protected function guardAgainstNull(
         $dataName = 'Argument',
         $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
     ) {
-        if (is_null($data)) {
+        if (null === $data) {
             $message = sprintf('%s cannot be null', $dataName);
             throw new $exceptionClass($message);
         }