Skip to content

Commit ce11d4a

Browse files
committed
Merge branch 'master' into test-php8.5
2 parents 3652f02 + c049c6b commit ce11d4a

File tree

7 files changed

+407
-90
lines changed

7 files changed

+407
-90
lines changed

.env.dist.testing

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CONVERTKIT_API_BROADCAST_ID="8697158"
2+
CONVERTKIT_API_CUSTOM_FIELD_ID="264073"
23
CONVERTKIT_API_FORM_ID="2765139"
34
CONVERTKIT_API_FORM_ID_2="2780977"
45
CONVERTKIT_API_LEGACY_FORM_URL="https://app.convertkit.com/landing_pages/470099"

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ CONVERTKIT_OAUTH_CLIENT_ID=
1111
CONVERTKIT_OAUTH_CLIENT_SECRET=
1212
CONVERTKIT_OAUTH_REDIRECT_URI="https://convertkit-github.local/wp-admin/options-general.php?page=_wp_convertkit_settings"
1313
CONVERTKIT_API_BROADCAST_ID="8697158"
14+
CONVERTKIT_API_CUSTOM_FIELD_ID="264073"
1415
CONVERTKIT_API_FORM_ID="2765139"
1516
CONVERTKIT_API_FORM_ID_2="2780977"
1617
CONVERTKIT_API_LEGACY_FORM_URL="https://app.convertkit.com/landing_pages/470099"

phpcs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<!-- Permit slightly longer line lengths -->
7373
<rule ref="Generic.Files.LineLength">
7474
<properties>
75-
<property name="lineLimit" value="150"/>
75+
<property name="lineLimit" value="160"/>
7676
<property name="absoluteLineLimit" value="0"/>
7777
</properties>
7878
</rule>

src/ConvertKit_API.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,13 +348,13 @@ public function get_resource(string $url)
348348
/**
349349
* Performs an API request using Guzzle.
350350
*
351-
* @param string $endpoint API Endpoint.
352-
* @param string $method Request method.
353-
* @param array<string, bool|integer|float|string|null|array<int|string, float|integer|string|array<string|string>>> $args Request arguments.
351+
* @param string $endpoint API Endpoint.
352+
* @param string $method Request method.
353+
* @param array<string, bool|integer|float|string|null|array<int|string, bool|integer|float|string|array<mixed>>> $args Request arguments.
354354
*
355355
* @throws \Exception If JSON encoding arguments failed.
356356
*
357-
* @return mixed|object
357+
* @return false|mixed
358358
*/
359359
public function request(string $endpoint, string $method, array $args = [])
360360
{

0 commit comments

Comments
 (0)