From 68b34863990ccac83f03643efb5edb84fd9dd1fb Mon Sep 17 00:00:00 2001 From: Brian Date: Tue, 26 Aug 2014 18:17:00 +0300 Subject: [PATCH 1/3] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 05a17c3..0334f72 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,6 @@ }, "require": { "php": ">=5.3.3", - "apache/log4php": "2.1.0" + "apache/log4php": ">=2.1.0" } } From 903391ffc61fa1d8b704827d9fdaeac890850d27 Mon Sep 17 00:00:00 2001 From: Eugene Leonovich Date: Tue, 9 Sep 2014 15:02:00 +0200 Subject: [PATCH 2/3] Remove duplicate check --- src/mg/PAGI/Client/Result/PlayResult.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/mg/PAGI/Client/Result/PlayResult.php b/src/mg/PAGI/Client/Result/PlayResult.php index cf62a1f..1277361 100644 --- 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?'); } } } } -} \ No newline at end of file +} From 5b5c9fef105f1d3415a022bfdbb17a0ec1bbe9b0 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 12 Sep 2014 18:55:20 +0300 Subject: [PATCH 3/3] Updated composer.json log4php version to 2.3.0 This now matches PAMI to allow composer installation of both PAGI and PAMI in the same project without a conflict. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0334f72..ce7c878 100644 --- 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" } }