diff --git a/.gitignore b/.gitignore index f137394..40df76f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ composer.lock composer.phar vendor/ +.idea/ diff --git a/README.md b/README.md index 7ad4a03..f09199b 100644 --- a/README.md +++ b/README.md @@ -36,11 +36,13 @@ invit_plivo: ## Example ```php -$this->get('invit.plivo')->play([ - 'call_uuid' => 'cf5fe5ff-9952-yyyy-xxxx-b75ff490ffff', - 'urls' => 'https://s3-eu-west-1.amazonaws.com/waitsongbucket/wait.mp3', - 'loop' => 'true', - 'mix' => 'false', - 'legs' => 'both' -]); +$this->get(PlivoApi::class)->getCalls()->play( + 'cf5fe5ff-9952-yyyy-xxxx-b75ff490ffff', + ['https://s3-eu-west-1.amazonaws.com/waitsongbucket/wait.mp3'], + [ + 'loop' => 'true', + 'mix' => 'false', + 'legs' => 'both', + ] +); ``` diff --git a/composer.json b/composer.json index dd04704..a673ce1 100644 --- a/composer.json +++ b/composer.json @@ -11,10 +11,10 @@ ], "minimum-stability": "stable", "require": { - "php": "^5.6 || ^7.0", + "php": "^7.1", "symfony/dependency-injection": "^2.7 || ^3.0", "symfony/config": "^2.7 || ^3.0", - "plivo/plivo-php": "^1.1.7" + "plivo/plivo-php": "^4.0.0" }, "autoload": { "psr-0": { diff --git a/src/Invit/PlivoBundle/Helper/PlivoHelper.php b/src/Invit/PlivoBundle/Helper/PlivoHelper.php index 79201b7..73a994d 100644 --- a/src/Invit/PlivoBundle/Helper/PlivoHelper.php +++ b/src/Invit/PlivoBundle/Helper/PlivoHelper.php @@ -1,32 +1,23 @@ authToken = $authToken; } - /** - * @param Request $request - * - * @return bool - */ public function validateRequest(Request $request) : bool { - return RestAPI::validate_signature( + return PlivoApi::validate_signature( $request->getUri(), $request->request->all(), $request->headers->get('X-Plivo-Signature'), diff --git a/src/Invit/PlivoBundle/Resources/config/services.yml b/src/Invit/PlivoBundle/Resources/config/services.yml index 43bfa95..d500eef 100644 --- a/src/Invit/PlivoBundle/Resources/config/services.yml +++ b/src/Invit/PlivoBundle/Resources/config/services.yml @@ -1,14 +1,9 @@ -parameters: - invit_plivo.class: Plivo\RestAPI - services: - invit.plivo: - class: '%invit_plivo.class%' + Invit\PlivoBundle\Service\PlivoApi: arguments: - '%invit_plivo.auth.auth_id%' - '%invit_plivo.auth.auth_token%' - invit.plivo.helper: - class: Invit\PlivoBundle\Helper\PlivoHelper + Invit\PlivoBundle\Helper\PlivoHelper: arguments: - '%invit_plivo.auth.auth_token%' diff --git a/src/Invit/PlivoBundle/Service/PlivoApi.php b/src/Invit/PlivoBundle/Service/PlivoApi.php new file mode 100644 index 0000000..86eefd4 --- /dev/null +++ b/src/Invit/PlivoBundle/Service/PlivoApi.php @@ -0,0 +1,8 @@ +