Skip to content

Commit 39cf9c9

Browse files
committed
Merge branch '1.0-beta' into add-subscriber-to-form
# Conflicts: # src/ConvertKit_API.php
2 parents 522cfb6 + b6e0d29 commit 39cf9c9

File tree

5 files changed

+427
-110
lines changed

5 files changed

+427
-110
lines changed

.env.dist.testing

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CONVERTKIT_API_BROADCAST_ID="8697158"
12
CONVERTKIT_API_FORM_ID="2765139"
23
CONVERTKIT_API_LEGACY_FORM_URL="https://app.convertkit.com/landing_pages/470099"
34
CONVERTKIT_API_LANDING_PAGE_URL="https://cheerful-architect-3237.ck.page/cc5eb21744"

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ CONVERTKIT_API_KEY_NO_DATA=
22
CONVERTKIT_API_SECRET_NO_DATA=
33
CONVERTKIT_API_KEY=
44
CONVERTKIT_API_SECRET=
5+
CONVERTKIT_API_BROADCAST_ID="8697158"
56
CONVERTKIT_API_FORM_ID="2765139"
67
CONVERTKIT_API_LEGACY_FORM_URL="https://app.convertkit.com/landing_pages/470099"
78
CONVERTKIT_API_LANDING_PAGE_URL="https://cheerful-architect-3237.ck.page/cc5eb21744"

phpcs.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@
4242
<exclude name="Squiz.Commenting.ClosingDeclarationComment.Missing" />
4343
<exclude name="Squiz.Commenting.FileComment.IncorrectAuthor" />
4444
<exclude name="Squiz.Commenting.FileComment.MissingCopyrightTag" />
45+
<exclude name="Squiz.Commenting.PostStatementComment" />
4546

4647
<!-- Permit inline if statements -->
4748
<exclude name="Squiz.PHP.DisallowInlineIf.Found" />
49+
<exclude name="Squiz.PHP.DisallowComparisonAssignment" />
4850

4951
<!-- Don't require various newlines and spacing before and after functions -->
5052
<exclude name="Squiz.WhiteSpace.FunctionSpacing.AfterLast" />
@@ -57,5 +59,8 @@
5759

5860
<!-- Don't require break to align with switch -->
5961
<exclude name="Squiz.ControlStructures.SwitchDeclaration.BreakIndent" />
62+
63+
<!-- Allow use of is_null() -->
64+
<exclude name="Generic.PHP.ForbiddenFunctions" />
6065
</rule>
6166
</ruleset>

0 commit comments

Comments
 (0)