Bump minor version to 0.4.0, decrease number of places with raw package version

Author: jlevers

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "highsidelabs/walmart-api",
-    "version": "0.3.2",
+    "version": "0.4.0",
     "description": "A PHP client for Walmart's Marketplace, Content Provider, Drop Ship Vendor, and Warehouse Supplier APIs.",
     "keywords": [
         "walmart",

resources/generator-config.json

@@ -1,5 +1,5 @@
 {
-  "artifactVersion": "0.3.2",
+  "artifactVersion": "0.4.0",
 
   "disallowAdditionalPropertiesIfNotPresent": false,
   "variableNamingConvention": "camelCase",
@@ -13,6 +13,11 @@
   "invokerPackage": "Walmart",
 
   "files": {
+    "Walmart.hbs": {
+      "folder": "src",
+      "destinationFilename": "Walmart.php",
+      "templateType": "SupportingFiles"
+    },
     "BaseApi.hbs": {
       "folder": "src/Apis",
       "destinationFilename": "BaseApi.php",

resources/templates/BaseApi.hbs

@@ -20,6 +20,7 @@ use GuzzleHttp\RequestOptions;
 use Ramsey\Uuid\Uuid;
 use {{invokerPackage}}\Configuration;
 use {{invokerPackage}}\HeaderSelector;
+use {{invokerPackage}}\Walmart;
 
 /**
  * BaseApi Class Doc Comment
@@ -83,7 +84,7 @@ class BaseApi
     protected function getDefaultHeaders(): array
     {
         return [
-            'WM_SVC.NAME' => 'highsidelabs/walmart-api/{{artifactVersion}}',
+            'WM_SVC.NAME' => 'highsidelabs/walmart-api/' . Walmart::VERSION,
             'WM_QOS.CORRELATION_ID' => Uuid::uuid4()->toString(),
             // These aren't required by every endpoint, but many use them and passing the when they're
             // not needed doesn't adversely affect the request

resources/templates/Configuration.hbs

@@ -93,7 +93,7 @@ class Configuration
      *
      * @var string
      */
-    protected string $userAgent = '{{{httpUserAgent}}}{{#unless httpUserAgent}}OpenAPI-Generator/{{{artifactVersion}}}{{#unless artifactVersion}}1.0.0{{/unless}}/PHP{{/unless}}';
+    protected string $userAgent = '{{{httpUserAgent}}}';
 
     /**
      * Debug switch (default set to false)

resources/templates/Walmart.hbs

@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * Walmart
+ * PHP version 7.4
+ *
+ * @category Class
+ * @package  {{invokerPackage}}
+ * @author   Jesse Evers
+ * @link     https://highsidelabs.co
+ */
+
+{{>partials/partial_header}}
+
+namespace {{invokerPackage}};
+
+use BadMethodCallException;
+use RuntimeException;
+use {{apiPackage}}\CP\ContentProviderApi;
+use {{apiPackage}}\DSV\DropShipVendorApi;
+use {{apiPackage}}\MP\MarketplaceApi;
+use {{apiPackage}}\WS\WarehouseSupplierApi;
+use {{invokerPackage}}\Configuration;
+
+abstract class Walmart
+{
+    public const VERSION = '{{artifactVersion}}';
+
+    /**
+     * The configuration for this client.
+     * @var Configuration
+     */
+    protected Configuration $config;
+
+    /**
+     * The country to API class map. This should be overwritten by every child class.
+     * @var array<string, string[]>
+     */
+    protected static array $countryApiMap;
+
+    /**
+     * Create a new Walmart client.
+     *
+     * @param Configuration $config The configuration for this client.
+     * @param ?string $country The country to use for this client.
+     */
+    public function __construct(Configuration $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Enable calling country-specific APIs as single methods on this class, without needing to
+     * specify the country outside $this->config or manually instantiate the API class.
+     *
+     * @param mixed $name The name of the method being called.
+     * @param mixed $arguments The arguments passed to the callee.
+     * @throws BadMethodCallException
+     * @throws RuntimeException
+     * @return mixed 
+     */
+    public function __call($name, $arguments)
+    {
+        // Don't override existing methods
+        if (method_exists(get_class($this), $name)) {
+            return $this->$name(...$arguments);
+        }
+
+        if (!array_key_exists($name, static::$countryApiMap)) {
+            throw new BadMethodCallException("Method $name does not exist");
+        }
+
+        if (!array_key_exists($this->config->getCountry(), static::$countryApiMap[$name])) {
+            $supportedCountriesStr = implode(', ', array_keys(static::$countryApiMap[$name]));
+            throw new RuntimeException(
+                "$name API is not supported in country {$this->config->getCountry()}. Supported country(ies): $supportedCountriesStr"
+            );
+        }
+
+        $apiClass = static::$countryApiMap[$name][$this->config->getCountry()];
+        return new $apiClass($this->config);
+    }
+
+    /**
+     * Return an instance of the Content Provider API provider.
+     *
+     * @param Configuration $config
+     * @return ContentProviderApi
+     */
+    public static function contentProvider(Configuration $config): ContentProviderApi
+    {
+        return new ContentProviderApi($config);
+    }
+
+    /**
+     * Return an instance of the Drop Ship Vendor API provider.
+     *
+     * @param Configuration $config
+     * @return DropShipVendorApi
+     */
+    public static function dropShipVendor(Configuration $config): DropShipVendorApi
+    {
+        return new DropShipVendorApi($config);
+    }
+
+    /**
+     * Return an instance of the Marketplace API provider.
+     *
+     * @param Configuration $config
+     * @return MarketplaceApi
+     */
+    public static function marketplace(Configuration $config): MarketplaceApi
+    {
+        return new MarketplaceApi($config);
+    }
+
+    /**
+     * Return an instance of the Warehouse Supplier API provider.
+     *
+     * @param Configuration $config
+     * @return WarehouseSupplierApi
+     */
+    public static function warehouseSupplier(Configuration $config): WarehouseSupplierApi
+    {
+        return new WarehouseSupplierApi($config);
+    }
+}

src/Apis/BaseApi.php

@@ -25,6 +25,7 @@
 use Ramsey\Uuid\Uuid;
 use Walmart\Configuration;
 use Walmart\HeaderSelector;
+use Walmart\Walmart;
 
 /**
  * BaseApi Class Doc Comment
@@ -88,7 +89,7 @@ public function getConfig()
     protected function getDefaultHeaders(): array
     {
         return [
-            'WM_SVC.NAME' => 'highsidelabs/walmart-api/0.3.2',
+            'WM_SVC.NAME' => 'highsidelabs/walmart-api/' . Walmart::VERSION,
             'WM_QOS.CORRELATION_ID' => Uuid::uuid4()->toString(),
             // These aren't required by every endpoint, but many use them and passing the when they're
             // not needed doesn't adversely affect the request

src/Configuration.php

@@ -98,7 +98,7 @@ class Configuration
      *
      * @var string
      */
-    protected string $userAgent = 'highsidelabs/walmart-api-php/0.3.2';
+    protected string $userAgent = 'highsidelabs/walmart-api-php/0.4.0';
 
     /**
      * Debug switch (default set to false)

src/Walmart.php

@@ -1,8 +1,23 @@
 <?php
 
-namespace Walmart;
+/**
+ * Walmart
+ * PHP version 7.4
+ *
+ * @category Class
+ * @package  Walmart
+ * @author   Jesse Evers
+ * @link     https://highsidelabs.co
+ */
+
+/**
+ * Authentication & Authorization Management
+ *
+ * This class is auto-generated by the OpenAPI generator v6.6.0 (https://openapi-generator.tech).
+ * Do not edit the class manually.
+ */
 
-require_once __DIR__ . '/../vendor/autoload.php';
+namespace Walmart;
 
 use BadMethodCallException;
 use RuntimeException;
@@ -14,6 +29,8 @@
 
 abstract class Walmart
 {
+    public const VERSION = '0.4.0';
+
     /**
      * The configuration for this client.
      * @var Configuration