Merge 92e24d5 into eca627f

Author: renovate[bot]

clients/algoliasearch-client-kotlin/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 kotlin = "2.0.21"
-ktor = "2.3.12"
+ktor = "3.0.0"
 
 [libraries]
 # Kotlin

docs/guides/kotlin/build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     implementation("com.algolia:algoliasearch-client-kotlin")
-    implementation("io.ktor:ktor-client-okhttp:2.3.12")
+    implementation("io.ktor:ktor-client-okhttp:3.0.0")
     implementation("ch.qos.logback:logback-classic:1.5.10")
     implementation("io.github.cdimascio:dotenv-kotlin:6.4.2")
 }

docs/guides/kotlin/gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 kotlin = "2.0.21"
 coroutines = "1.7.3"
 serialization = "1.5.0"
-ktor = "2.3.12"
+ktor = "3.0.0"
 
 [libraries]
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" }

docs/snippets/kotlin/build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     implementation("com.algolia:algoliasearch-client-kotlin")
-    implementation("io.ktor:ktor-client-okhttp:2.3.12")
+    implementation("io.ktor:ktor-client-okhttp:3.0.0")
     implementation("ch.qos.logback:logback-classic:1.5.10")
     implementation("io.github.cdimascio:dotenv-kotlin:6.4.2")
 }

docs/snippets/kotlin/gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 kotlin = "2.0.21"
 coroutines = "1.7.3"
 serialization = "1.5.0"
-ktor = "2.3.12"
+ktor = "3.0.0"
 
 [libraries]
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" }

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

@@ -86,7 +86,12 @@ private void exploreGraph(OperationsMap operations) {
         }
       }
       for (CodegenParameter param : ope.allParams) {
-        CodegenModel paramType = getModel(param.baseType != null ? param.baseType : param.dataType);
+        String paramName = param.baseType != null ? param.baseType : param.dataType;
+        // php has a fully qualified name for the parameter type
+        if (paramName.contains("\\")) {
+          paramName = paramName.substring(paramName.lastIndexOf("\\") + 1);
+        }
+        CodegenModel paramType = getModel(paramName);
         if (paramType != null) {
           visitedModels.add(paramType.name);
         }
@@ -121,7 +126,8 @@ public static void removeOrphans(CodegenConfig config, OperationsMap operations,
     String templateName = config.modelTemplateFiles().keySet().iterator().next();
 
     for (String modelName : toRemove) {
-      String filename = config.modelFilename(templateName, modelName);
+      String suffix = config.modelTemplateFiles().get(templateName);
+      String filename = config.modelFileFolder() + "/" + config.toModelFilename(modelName) + suffix;
       File file = new File(filename);
       if (file.exists()) {
         file.delete();

playground/kotlin/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 
 dependencies {
     implementation("com.algolia:algoliasearch-client-kotlin")
-    implementation("io.ktor:ktor-client-okhttp:2.3.12")
+    implementation("io.ktor:ktor-client-okhttp:3.0.0")
     implementation("ch.qos.logback:logback-classic:1.5.10")
     implementation("io.github.cdimascio:dotenv-kotlin:6.4.2")
 }

specs/common/schemas/IndexSettings.yml

@@ -1035,7 +1035,6 @@ widgets:
 banners:
   description: banners defined in the merchandising studio for the given search.
   type: array
-  additionalProperties: false
   items:
     $ref: '#/banner'
 

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}}

tests/output/kotlin/gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 kotlin = "2.0.21"
 coroutines = "1.9.0"
 serialization = "1.5.0"
-ktor = "2.3.12"
+ktor = "3.0.0"
 
 [libraries]
 coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }

tests/output/kotlin/src/commonTest/kotlin/com/algolia/utils/HttpRequestBuilder.kt

@@ -3,6 +3,6 @@ package com.algolia.utils
 import io.ktor.client.plugins.*
 import io.ktor.client.request.*
 
-val HttpRequestBuilder.socketTimeout: Long? get() = getCapabilityOrNull(HttpTimeout)?.socketTimeoutMillis
+val HttpRequestBuilder.socketTimeout: Long? get() = getCapabilityOrNull(HttpTimeoutCapability)?.socketTimeoutMillis
 
-val HttpRequestBuilder.connectTimeout: Long? get() = getCapabilityOrNull(HttpTimeout)?.connectTimeoutMillis
+val HttpRequestBuilder.connectTimeout: Long? get() = getCapabilityOrNull(HttpTimeoutCapability)?.connectTimeoutMillis