bah super php

Author: millotp

clients/algoliasearch-client-php/lib/Algolia.php

@@ -3,12 +3,8 @@
 namespace Algolia\AlgoliaSearch;
 
 use Algolia\AlgoliaSearch\Cache\NullCacheDriver;
-use Algolia\AlgoliaSearch\Http\CurlHttpClient;
-use Algolia\AlgoliaSearch\Http\GuzzleHttpClient;
 use Algolia\AlgoliaSearch\Http\HttpClientInterface;
 use Algolia\AlgoliaSearch\Log\DebugLogger;
-use GuzzleHttp\Client;
-use GuzzleHttp\ClientInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
@@ -19,19 +15,19 @@ final class Algolia
     /**
      * Holds an instance of the simple cache repository (PSR-16).
      *
-     * @var null|CacheInterface
+     * @var null|\Psr\SimpleCache\CacheInterface
      */
     private static $cache;
 
     /**
      * Holds an instance of the logger (PSR-3).
      *
-     * @var null|LoggerInterface
+     * @var null|\Psr\Log\LoggerInterface
      */
     private static $logger;
 
     /**
-     * @var HttpClientInterface
+     * @var \Algolia\AlgoliaSearch\Http\HttpClientInterface
      */
     private static $httpClient;
 
@@ -47,7 +43,7 @@ public static function isCacheEnabled()
     /**
      * Gets the cache instance.
      *
-     * @return CacheInterface
+     * @return \Psr\SimpleCache\CacheInterface
      */
     public static function getCache()
     {
@@ -69,7 +65,7 @@ public static function setCache(CacheInterface $cache)
     /**
      * Gets the logger instance.
      *
-     * @return LoggerInterface
+     * @return \Psr\Log\LoggerInterface
      */
     public static function getLogger()
     {
@@ -94,23 +90,23 @@ public static function getHttpClient()
         if (interface_exists('\GuzzleHttp\ClientInterface')) {
             if (defined('\GuzzleHttp\ClientInterface::VERSION')) {
                 $guzzleVersion = (int) mb_substr(
-                    Client::VERSION,
+                    \GuzzleHttp\Client::VERSION,
                     0,
                     1
                 );
             } else {
-                $guzzleVersion = ClientInterface::MAJOR_VERSION;
+                $guzzleVersion = \GuzzleHttp\ClientInterface::MAJOR_VERSION;
             }
         }
 
         if (null === self::$httpClient) {
             if (class_exists('\GuzzleHttp\Client') && 6 <= $guzzleVersion) {
                 self::setHttpClient(
-                    new GuzzleHttpClient()
+                    new \Algolia\AlgoliaSearch\Http\GuzzleHttpClient()
                 );
             } else {
                 self::setHttpClient(
-                    new CurlHttpClient()
+                    new \Algolia\AlgoliaSearch\Http\CurlHttpClient()
                 );
             }
         }

generators/src/main/java/com/algolia/codegen/utils/ModelPruner.java

@@ -86,7 +86,7 @@ private void exploreGraph(OperationsMap operations) {
         }
       }
       for (CodegenParameter param : ope.allParams) {
-        CodegenModel paramType = getModel(param.baseType != null ? param.baseType : param.dataType);
+        CodegenModel paramType = getModel(param.baseType != null ? param.baseType : param.getSchema().getOpenApiType());
         if (paramType != null) {
           visitedModels.add(paramType.name);
         }

templates/php/api.mustache

@@ -181,7 +181,7 @@ use Algolia\AlgoliaSearch\Exceptions\NotFoundException;
 {{/x-acl}}
 {{/vendorExtensions}}
 {{#allParams}}
-     * @param {{#isString}}string{{/isString}}{{#isLong}}int{{/isLong}}{{#isInteger}}int{{/isInteger}}{{#isBoolean}}bool{{/isBoolean}}{{^isString}}{{^isLong}}{{^isInteger}}{{^isBoolean}}array{{/isBoolean}}{{/isInteger}}{{/isLong}}{{/isString}} ${{paramName}}{{#description}} {{.}}{{/description}}{{^description}} {{paramName}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}}
+     * @param {{#isString}}string{{/isString}}{{#isLong}}int{{/isLong}}{{#isInteger}}int{{/isInteger}}{{#isBoolean}}bool{{/isBoolean}}{{^isString}}{{^isLong}}{{^isInteger}}{{^isBoolean}}array{{/isBoolean}}{{/isInteger}}{{/isLong}}{{/isString}} ${{paramName}}{{#description}} {{{.}}}{{/description}}{{^description}} {{paramName}}{{/description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}}
 {{#isModel}}
     {{#vars}}
      * - ${{paramName}}{{> arrayParam}}