Move createService to AbstractApi (#41)

robwittman · Oct 21, 2019 · cddb678 · cddb678
1 parent 500adc8
commit cddb678
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/AbstractApi.php b/src/AbstractApi.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use Psr\Log\LoggerInterface;
+use Shopify\Service\AbstractService;
 
 abstract class AbstractApi implements ApiInterface
 {
@@ -146,6 +147,17 @@ public function getApiVersion()
  return $this->api_version;
  }
 
+ /**
+ * Helper function to create new service instances
+ *
+ * @param $serviceClass Fully Qualified Service className
+ * @return AbstractService
+ */
+ public function createService($serviceClass)
+ {
+ return new $serviceClass($this);
+ }
+
  /**
  * Initialize our Client, using settings based on the app type
  *

diff --git a/src/Api.php b/src/Api.php
@@ -2,12 +2,10 @@
 
 namespace Shopify;
 
-use Shopify\Service\AbstractService;
 use Shopify\Storage\PersistentStorageInterface;
 use Shopify\Storage\SessionStorage;
 use Shopify\Helper\OAuthHelper;
 use GuzzleHttp\Client;
-use Psr\Log\LoggerInterface;
 
 class Api extends AbstractApi
 {
@@ -146,17 +144,6 @@ public function getOAuthHelper()
  return new OAuthHelper($this, $this->getStorageInterface());
  }
 
- /**
- * Helper function to create new service instances
- *
- * @param $serviceClass Fully Qualified Service className
- * @return AbstractService
- */
- public function createService($serviceClass)
- {
- return new $serviceClass($this);
- }
-
  public function loadApiKeyFromEnv()
  {
  $this->api_key = getenv(self::SHOPIFY_API_KEY_NAME);