Merge remote-tracking branch 'upstream/master' into resource-rate-limit-fix-pr

Author: andyexeter

lib/ApplicationCharge.php

@@ -21,4 +21,9 @@ class ApplicationCharge extends ShopifyResource
      * @inheritDoc
      */
     public $countEnabled = false;
-}
+    
+    // To activate ApplicationCharge
+    protected $customPostActions = array(
+       'activate',
+   );
+}

lib/CurlRequest.php

@@ -49,6 +49,7 @@ protected static function init($url, $httpHeaders = array())
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
         curl_setopt($ch, CURLOPT_HEADER, true);
+        curl_setopt($ch, CURLOPT_USERAGENT, 'PHPClassic/PHPShopify');
 
         $headers = array();
         foreach ($httpHeaders as $key => $value) {

lib/PriceRule.php

@@ -10,7 +10,7 @@
 namespace PHPShopify;
 
 
-/*
+/**
  * --------------------------------------------------------------------------
  * PriceRule -> Child Resources
  * --------------------------------------------------------------------------

lib/ShopifySDK.php

@@ -74,6 +74,7 @@
  * @property-read Customer $Customer
  * @property-read CustomerSavedSearch $CustomerSavedSearch
  * @property-read Discount $Discount
+ * @property-read PriceRule $PriceRule
  * @property-read Event $Event
  * @property-read FulfillmentService $FulfillmentService
  * @property-read GiftCard $GiftCard
@@ -107,6 +108,7 @@
  * @method Customer Customer(integer $id = null)
  * @method CustomerSavedSearch CustomerSavedSearch(integer $id = null)
  * @method Discount Discount(integer $id = null)
+ * @method PriceRule PriceRule(integer $id = null)
  * @method Event Event(integer $id = null)
  * @method FulfillmentService FulfillmentService(integer $id = null)
  * @method GiftCard GiftCard(integer $id = null)