Resolved merge conflict in Zend\GData\AuthSub

zendframework · Jun 12, 2012 · aa9ef86 · aa9ef86
commit aa9ef86
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/PatternFactory.php b/src/PatternFactory.php
@@ -54,8 +54,7 @@ public static function factory($patternName, $options = array())
         }
         if (is_array($options)) {
             $options = new Pattern\PatternOptions($options);
-        }
-        if (!$options instanceof Pattern\PatternOptions) {
+        } elseif (!$options instanceof Pattern\PatternOptions) {
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s expects an array, Traversable object, or %s\Pattern\PatternOptions object; received "%s"',
                 __METHOD__,