Merge branch 'master' into error-on-empty-jumpTo

marcelog · Jan 20, 2015 · 4f66544 · 4f66544
2 parents 6856ad2 + 7960415
commit 4f66544
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -20,6 +20,6 @@
   },
   "require": {
     "php": ">=5.3.3",
-    "apache/log4php": "2.1.0"
+    "apache/log4php": "2.3.0"
   }
 }
diff --git a/src/mg/PAGI/Client/Result/PlayResult.php b/src/mg/PAGI/Client/Result/PlayResult.php
@@ -57,14 +57,12 @@ public function __construct(IReadResult $result)
         parent::__construct($result);
         if ($result->hasData()) {
             // check offset
-            if ($result->hasData()) {
-                $data = explode('=', $result->getData());
-                if (isset($data[1])) {
-                    if ($data[1] == 0) {
-                        throw new SoundFileException('Invalid format?');
-                    }
+            $data = explode('=', $result->getData());
+            if (isset($data[1])) {
+                if ($data[1] == 0) {
+                    throw new SoundFileException('Invalid format?');
                 }
             }
         }
     }
-}
+}