Skip to content

Commit 366a9e7

Browse files
n7studiosn7studios
authored
Merge pull request #32 from ConvertKit/fix-get-resource
Improve `get_resource()`
2 parents 9ce7380 + 4cda118 commit 366a9e7

9 files changed

+557
-2508
lines changed

‎.env.dist.testing

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,8 @@
1-
CONVERTKIT_API_FORM_NAME="Page Form"
21
CONVERTKIT_API_FORM_ID="2765139"
3-
CONVERTKIT_API_FORM_FORMAT_MODAL_NAME="Modal Form"
4-
CONVERTKIT_API_FORM_FORMAT_MODAL_ID="2780977"
5-
CONVERTKIT_API_FORM_FORMAT_SLIDE_IN_NAME="Slide In Form"
6-
CONVERTKIT_API_FORM_FORMAT_STICKY_BAR_NAME="Sticky Bar Form"
7-
CONVERTKIT_API_LANDING_PAGE_NAME="Landing Page"
8-
CONVERTKIT_API_LANDING_PAGE_ID="2765196"
9-
CONVERTKIT_API_LANDING_PAGE_CHARACTER_ENCODING_NAME="Character Encoding"
10-
CONVERTKIT_API_LEGACY_FORM_NAME="Legacy Form"
11-
CONVERTKIT_API_LEGACY_FORM_ID="470099"
12-
CONVERTKIT_API_LEGACY_FORM_SHORTCODE="[convertkit form=5281783]"
13-
CONVERTKIT_API_LEGACY_LANDING_PAGE_NAME="Legacy Landing Page"
14-
CONVERTKIT_API_LEGACY_LANDING_PAGE_ID="470103"
2+
CONVERTKIT_API_LEGACY_FORM_URL="https://app.convertkit.com/landing_pages/470099"
3+
CONVERTKIT_API_LANDING_PAGE_URL="https://cheerful-architect-3237.ck.page/cc5eb21744"
154
CONVERTKIT_API_LEGACY_LANDING_PAGE_URL="https://app.convertkit.com/landing_pages/470103"
16-
CONVERTKIT_API_PRODUCT_NAME="Newsletter Subscription"
17-
CONVERTKIT_API_PRODUCT_ID="36377"
18-
CONVERTKIT_API_PRODUCT_URL="https://cheerful-architect-3237.ck.page/products/newsletter-subscription"
195
CONVERTKIT_API_SEQUENCE_ID="1030824"
20-
CONVERTKIT_API_TAG_NAME="wordpress"
216
CONVERTKIT_API_TAG_ID="2744672"
227
CONVERTKIT_API_SUBSCRIBER_EMAIL="[email protected]"
238
CONVERTKIT_API_SUBSCRIBER_ID="1579118532"
24-
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=eyJfcmFpbHMiOnsibWVzc2FnZSI6Ik1UVTNPVEV4T0RVek1nPT0iLCJleHAiOiIyMDIzLTA0LTA5VDEzOjQwOjUyLjc4MVoiLCJwdXIiOiJzdWJzY3JpYmVyIn19--418e0d2247825e721492d2155b2adff6f6a4d43c936b60deee715c7bd2256627
25-
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID_NO_ACCESS=eyJfcmFpbHMiOnsibWVzc2FnZSI6Ik1Ua3lNVFV6TkRjMk1nPT0iLCJleHAiOiIyMDIzLTA1LTA4VDEzOjQ0OjU0LjA4MFoiLCJwdXIiOiJzdWJzY3JpYmVyIn19--b35cf133da4d8e875589e02bae179729875c5edb893df122b6905f66c63acac8
26-
CONVERTKIT_API_THIRD_PARTY_INTEGRATIONS_FORM_NAME="Third Party Integrations Form"
27-
CONVERTKIT_API_THIRD_PARTY_INTEGRATIONS_FORM_ID="3003590"
28-
CONVERTKIT_API_COMMERCE_JS_URL="https://cheerful-architect-3237.ck.page/commerce.js"
29-
CONVERTKIT_API_BROADCAST_FIRST_URL="https://cheerful-architect-3237.ck.page/posts/paid-subscriber-broadcast"
30-
CONVERTKIT_API_BROADCAST_FIRST_TITLE="Paid Subscriber Broadcast"
31-
CONVERTKIT_API_BROADCAST_SECOND_URL="https://cheerful-architect-3237.ck.page/posts/broadcast-2"
32-
CONVERTKIT_API_BROADCAST_SECOND_TITLE="Broadcast 2"

‎.env.example

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,11 @@ CONVERTKIT_API_KEY_NO_DATA=
22
CONVERTKIT_API_SECRET_NO_DATA=
33
CONVERTKIT_API_KEY=
44
CONVERTKIT_API_SECRET=
5-
CONVERTKIT_API_FORM_NAME="Page Form"
65
CONVERTKIT_API_FORM_ID="2765139"
7-
CONVERTKIT_API_FORM_FORMAT_MODAL_NAME="Modal Form"
8-
CONVERTKIT_API_FORM_FORMAT_MODAL_ID="2780977"
9-
CONVERTKIT_API_FORM_FORMAT_SLIDE_IN_NAME="Slide In Form"
10-
CONVERTKIT_API_FORM_FORMAT_STICKY_BAR_NAME="Sticky Bar Form"
11-
CONVERTKIT_API_LANDING_PAGE_NAME="Landing Page"
12-
CONVERTKIT_API_LANDING_PAGE_ID="2765196"
13-
CONVERTKIT_API_LANDING_PAGE_CHARACTER_ENCODING_NAME="Character Encoding"
14-
CONVERTKIT_API_LEGACY_FORM_NAME="Legacy Form"
15-
CONVERTKIT_API_LEGACY_FORM_ID="470099"
16-
CONVERTKIT_API_LEGACY_FORM_SHORTCODE="[convertkit form=5281783]"
17-
CONVERTKIT_API_LEGACY_LANDING_PAGE_NAME="Legacy Landing Page"
18-
CONVERTKIT_API_LEGACY_LANDING_PAGE_ID="470103"
6+
CONVERTKIT_API_LEGACY_FORM_URL="https://app.convertkit.com/landing_pages/470099"
7+
CONVERTKIT_API_LANDING_PAGE_URL="https://cheerful-architect-3237.ck.page/cc5eb21744"
198
CONVERTKIT_API_LEGACY_LANDING_PAGE_URL="https://app.convertkit.com/landing_pages/470103"
20-
CONVERTKIT_API_PRODUCT_NAME="Newsletter Subscription"
21-
CONVERTKIT_API_PRODUCT_ID="36377"
22-
CONVERTKIT_API_PRODUCT_URL="https://cheerful-architect-3237.ck.page/products/newsletter-subscription"
239
CONVERTKIT_API_SEQUENCE_ID="1030824"
24-
CONVERTKIT_API_TAG_NAME="wordpress"
2510
CONVERTKIT_API_TAG_ID="2744672"
2611
CONVERTKIT_API_SUBSCRIBER_EMAIL="[email protected]"
2712
CONVERTKIT_API_SUBSCRIBER_ID="1579118532"
28-
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=eyJfcmFpbHMiOnsibWVzc2FnZSI6Ik1UVTNPVEV4T0RVek1nPT0iLCJleHAiOiIyMDIzLTA0LTA5VDEzOjQwOjUyLjc4MVoiLCJwdXIiOiJzdWJzY3JpYmVyIn19--418e0d2247825e721492d2155b2adff6f6a4d43c936b60deee715c7bd2256627
29-
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID_NO_ACCESS=eyJfcmFpbHMiOnsibWVzc2FnZSI6Ik1Ua3lNVFV6TkRjMk1nPT0iLCJleHAiOiIyMDIzLTA1LTA4VDEzOjQ0OjU0LjA4MFoiLCJwdXIiOiJzdWJzY3JpYmVyIn19--b35cf133da4d8e875589e02bae179729875c5edb893df122b6905f66c63acac8
30-
CONVERTKIT_API_THIRD_PARTY_INTEGRATIONS_FORM_NAME="Third Party Integrations Form"
31-
CONVERTKIT_API_THIRD_PARTY_INTEGRATIONS_FORM_ID="3003590"
32-
CONVERTKIT_API_COMMERCE_JS_URL="https://cheerful-architect-3237.ck.page/commerce.js"
33-
CONVERTKIT_API_BROADCAST_FIRST_URL="https://cheerful-architect-3237.ck.page/posts/paid-subscriber-broadcast"
34-
CONVERTKIT_API_BROADCAST_FIRST_TITLE="Paid Subscriber Broadcast"
35-
CONVERTKIT_API_BROADCAST_SECOND_URL="https://cheerful-architect-3237.ck.page/posts/broadcast-2"
36-
CONVERTKIT_API_BROADCAST_SECOND_TITLE="Broadcast 2"

‎.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ jobs:
6464
- name: Build PHP Autoloader
6565
run: composer dump-autoload
6666

67+
# Run Coding Standards.
68+
- name: Run Coding Standards
69+
run: php vendor/bin/phpcs --standard=phpcs.xml
70+
6771
# Run Coding Standards on Tests.
6872
- name: Run Coding Standards on Tests
6973
run: php vendor/bin/phpcs --standard=phpcs.tests.xml

‎composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@
2828
"autoload": {
2929
"psr-4": {
3030
"ConvertKit_API\\": "src/"
31-
},
32-
"classmap": [
33-
"src/lib/"
34-
]
31+
}
3532
},
3633
"minimum-stability": "dev",
3734
"prefer-stable": true

‎phpcs.xml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0"?>
2+
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer" xsi:noNamespaceSchemaLocation="phpcs.xsd">
3+
<description>Coding Standards</description>
4+
5+
<!-- Inspect files in the /src folder -->
6+
<file>src</file>
7+
8+
<!-- Run in verbose mode and specify the precise rule that failed in output -->
9+
<arg value="sv"/>
10+
<arg name="colors"/>
11+
12+
<!-- Use PSR-12 -->
13+
<rule ref="PSR12">
14+
<!-- Exclude function not in camel caps format, to avoid breaking changes -->
15+
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
16+
17+
<!-- Don't require spacing after header block -->
18+
<exclude name="PSR12.Files.FileHeader.SpacingAfterBlock" />
19+
20+
<!-- Permit else if over elseif -->
21+
<exclude name="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed" />
22+
</rule>
23+
24+
<!-- Use Squiz -->
25+
<rule ref="Squiz">
26+
<!-- Exclude "Class found in ".php" file; use ".inc" extension instead" -->
27+
<exclude name="Squiz.Files.FileExtension.ClassFound" />
28+
29+
<!-- Exclude PascalCase format for class name, to avoid breaking changes -->
30+
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
31+
32+
<!-- Exclude variable naming, to avoid breaking changes -->
33+
<exclude name="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps" />
34+
<exclude name="Squiz.NamingConventions.ValidVariableName.NotCamelCaps" />
35+
<exclude name="Squiz.NamingConventions.ValidFunctionName.ScopeNotCamelCaps" />
36+
37+
<!-- Allow implicit true and false comparisons -->
38+
<exclude name="Squiz.Operators.ComparisonOperatorUsage.ImplicitTrue" />
39+
<exclude name="Squiz.Operators.ComparisonOperatorUsage.NotAllowed" />
40+
41+
<!-- Don't require // end comments after each function, or Author / Copyright tags -->
42+
<exclude name="Squiz.Commenting.ClosingDeclarationComment.Missing" />
43+
<exclude name="Squiz.Commenting.FileComment.IncorrectAuthor" />
44+
<exclude name="Squiz.Commenting.FileComment.MissingCopyrightTag" />
45+
46+
<!-- Permit inline if statements -->
47+
<exclude name="Squiz.PHP.DisallowInlineIf.Found" />
48+
49+
<!-- Don't require various newlines and spacing before and after functions -->
50+
<exclude name="Squiz.WhiteSpace.FunctionSpacing.AfterLast" />
51+
<exclude name="Squiz.WhiteSpace.FunctionSpacing.After" />
52+
<exclude name="Squiz.WhiteSpace.FunctionClosingBraceSpace.SpacingBeforeClose" />
53+
<exclude name="Squiz.WhiteSpace.MemberVarSpacing.FirstIncorrect" />
54+
55+
<!-- Permit padding surrounding a concat operator -->
56+
<exclude name="Squiz.Strings.ConcatenationSpacing.PaddingFound" />
57+
</rule>
58+
</ruleset>

0 commit comments

Comments
 (0)