Merge branch '1.0-beta' into add-subscriber-to-form

# Conflicts:
#	src/ConvertKit_API.php

Author: n7studios

.env.dist.testing

@@ -1,3 +1,4 @@
+CONVERTKIT_API_BROADCAST_ID="8697158"
 CONVERTKIT_API_FORM_ID="2765139"
 CONVERTKIT_API_LEGACY_FORM_URL="https://app.convertkit.com/landing_pages/470099"
 CONVERTKIT_API_LANDING_PAGE_URL="https://cheerful-architect-3237.ck.page/cc5eb21744"

.env.example

@@ -2,6 +2,7 @@ CONVERTKIT_API_KEY_NO_DATA=
 CONVERTKIT_API_SECRET_NO_DATA=
 CONVERTKIT_API_KEY=
 CONVERTKIT_API_SECRET=
+CONVERTKIT_API_BROADCAST_ID="8697158"
 CONVERTKIT_API_FORM_ID="2765139"
 CONVERTKIT_API_LEGACY_FORM_URL="https://app.convertkit.com/landing_pages/470099"
 CONVERTKIT_API_LANDING_PAGE_URL="https://cheerful-architect-3237.ck.page/cc5eb21744"

phpcs.xml

@@ -42,9 +42,11 @@
         <exclude name="Squiz.Commenting.ClosingDeclarationComment.Missing" />
         <exclude name="Squiz.Commenting.FileComment.IncorrectAuthor" />
         <exclude name="Squiz.Commenting.FileComment.MissingCopyrightTag" />
+        <exclude name="Squiz.Commenting.PostStatementComment" />
 
         <!-- Permit inline if statements -->
         <exclude name="Squiz.PHP.DisallowInlineIf.Found" />
+        <exclude name="Squiz.PHP.DisallowComparisonAssignment" />
 
         <!-- Don't require various newlines and spacing before and after functions -->
         <exclude name="Squiz.WhiteSpace.FunctionSpacing.AfterLast" />
@@ -57,5 +59,8 @@
 
         <!-- Don't require break to align with switch -->
         <exclude name="Squiz.ControlStructures.SwitchDeclaration.BreakIndent" />
+
+        <!-- Allow use of is_null() -->
+        <exclude name="Generic.PHP.ForbiddenFunctions" />
     </rule>
 </ruleset>