Merge

Author: pascalbaljet

.travis.yml

@@ -14,9 +14,9 @@ matrix:
       env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.3
       env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.4snapshot
+    - php: 7.4
       env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
-    - php: 7.4snapshot
+    - php: 7.4
       env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.2
       env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
@@ -26,10 +26,22 @@ matrix:
       env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.3
       env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.4snapshot
+    - php: 7.4
       env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
-    - php: 7.4snapshot
+    - php: 7.4
       env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.2
+      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.2
+      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.3
+      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.3
+      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.4
+      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.4
+      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
   fast_finish: true
 
 before_install:

CHANGELOG.md

@@ -9,6 +9,19 @@ All notable changes to `laravel-paddle` will be documented in this file
 ## 1.1.0 - 2020-03-03
 
 - Support for Laravel 7.0
+- Fix for the OrderDetails request URL
+
+## 1.0.6 - 2020-01-28
+
+- Added attribute existance check on the event webhook data
+
+## 1.0.5 - 2019-12-04
+
+- Added `OpenSSL` and `illuminate/validation` dependencies
+
+## 1.0.4 - 2019-12-03
+
+- Refactor
 
 ## 1.0.1 + 1.0.2 - 2019-12-02
 

README.md

@@ -11,7 +11,7 @@ This package provides an integration with [Paddle.com](https://paddle.com) for L
 * Super easy wrapper around the [Paddle.com API](https://developer.paddle.com/api-reference/intro)
 * Built-in support for Webhooks and Event handling
 * Blade directive to use [Paddle.js](https://paddle.com/docs/paddle-js-overlay-checkout/) in your front-end
-* Compatible with Laravel 5.8 and 6.0.
+* Compatible with Laravel 5.8, 6.0 and 7.0.
 * PHP 7.2, 7.3 or 7.4 required.
 
 ## Installation
@@ -183,6 +183,14 @@ Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recen
 
 Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
+## Other Laravel packages
+
+* [`Laravel Analytics Event Tracking`](https://github.com/pascalbaljetmedia/laravel-analytics-event-tracking): Laravel package to easily send events to Google Analytics.
+* [`Laravel Blade On Demand`](https://github.com/pascalbaljetmedia/laravel-blade-on-demand): Laravel package to compile Blade templates in memory.
+* [`Laravel FFMpeg`](https://github.com/pascalbaljetmedia/laravel-ffmpeg): This package provides an integration with FFmpeg for Laravel. The storage of the files is handled by Laravel's Filesystem.
+* [`Laravel Verify New Email`](https://github.com/pascalbaljetmedia/laravel-verify-new-email): This package adds support for verifying new email addresses: when a user updates its email address, it won't replace the old one until the new one is verified.
+* [`Laravel WebDAV`](https://github.com/pascalbaljetmedia/laravel-webdav): WebDAV driver for Laravel's Filesystem.
+
 ### Security
 
 If you discover any security related issues, please email [email protected] instead of using the issue tracker.

composer.json

@@ -18,13 +18,13 @@
     "require": {
         "php": "^7.2",
         "ext-openssl": "*",
-        "illuminate/support": "5.8.*|^6.0",
-        "illuminate/validation": "5.8.*|^6.0",
+        "illuminate/support": "5.8.* || ^6.0 || ^7.0",
+        "illuminate/validation": "5.8.* || ^6.0 || ^7.0",
         "egulias/email-validator": "^2.1.10",
         "kitetail/zttp": "^0.6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.8 || ^4.0"
+        "orchestra/testbench": "^3.8 || ^4.0 || ^5.0"
     },
     "autoload": {
         "psr-4": {
@@ -39,7 +39,6 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
     },
     "config": {
         "sort-packages": true
@@ -54,4 +53,4 @@
             }
         }
     }
-}
+}

src/Api/Checkout.php

@@ -9,7 +9,7 @@ class Checkout
      */
     public function getOrderDetails(array $data = [])
     {
-        return new Request('/1.0/order', $data, [], Request::METHOD_GET);
+        return new GetOrderDetailsRequest('/1.0/order', $data, [], Request::METHOD_GET);
     }
 
     /**

src/Api/GetOrderDetailsRequest.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace ProtoneMedia\LaravelPaddle\Api;
+
+class GetOrderDetailsRequest extends Request
+{
+    public function url(): string
+    {
+        return "https://checkout.paddle.com/api{$this->uri}";
+    }
+}

src/Api/Request.php

@@ -21,7 +21,7 @@ class Request
     /**
      * @var string
      */
-    private $uri;
+    protected $uri;
 
     /**
      * @var array

src/Events/Event.php

@@ -47,6 +47,17 @@ public function __get(string $key)
         return $value;
     }
 
+    /**
+     * Determine if an attribute exists on the webhook data.
+     *
+     * @param  string $key
+     * @return bool
+     */
+    public function __isset($key)
+    {
+        return isset($this->webhookData[$key]);
+    }
+
     /**
      * Generates the event class name with the 'alert_name' attribute from
      * the data and fires the event with the data.

tests/ApiTest.php

@@ -170,4 +170,12 @@ public function it_can_create_an_one_off_chrage()
 
         $this->assertEquals('https://vendors.paddle.com/api/2.0/subscription/123/charge', $request->url());
     }
+
+    /** @test */
+    public function it_has_a_custom_host_for_the_order_details_request()
+    {
+        $request = (new Api)->checkout()->getOrderDetails();
+
+        $this->assertEquals('https://checkout.paddle.com/api/1.0/order', $request->url());
+    }
 }

tests/EventTest.php

@@ -23,6 +23,19 @@ public function it_can_have_payload_that_is_accessible()
         $this->assertEquals(['team_id' => 20], $event->passthrough);
     }
 
+    /** @test */
+    public function it_can_check_if_payload_key_exists()
+    {
+        $event = new SubscriptionCreated([
+            'product_id' => 10,
+        ]);
+
+        $this->assertTrue(isset($event->product_id));
+        $this->assertFalse(empty($event->product_id));
+        $this->assertFalse(isset($event->dummy_key));
+        $this->assertTrue(empty($event->dummy_key));
+    }
+
     /** @test */
     public function it_can_fire_an_event_based_on_the_action_name()
     {