Fix phpcs errors after wpcs update

Author: anttiviljami

classes/class-cpt-wplf-form.php

@@ -18,7 +18,7 @@ public static function init() {
   /**
    * Hook our actions, filters and such
    */
-  private function __construct() {
+  public function __construct() {
     // init custom post type
     add_action( 'init', array( $this, 'register_cpt' ) );
 
@@ -385,7 +385,7 @@ function meta_box_title_format( $post ) {
     $format = isset( $meta['_wplf_title_format'] ) ? $meta['_wplf_title_format'][0] : $default;
 ?>
 <p><?php esc_html_e( 'Submissions from this form will use this formatting in their title.', 'wp-libre-form' ); ?></p>
-<p><?php esc_html_e( 'You may use any field values enclosed in "%" markers.', 'wp-libre-form' );?></p>
+<p><?php esc_html_e( 'You may use any field values enclosed in "%" markers.', 'wp-libre-form' ); ?></p>
 <p>
   <input
     type="text"
@@ -540,10 +540,10 @@ class="libre-form libre-form-<?php echo esc_attr( $id . ' ' . $xclass ); ?>"
     ?>
       <p style="background:#f5f5f5;border-left:4px solid #dc3232;padding:6px 12px;">
         <strong style="color:#dc3232;">
-          <?php esc_html_e( 'This form preview URL is not public and cannot be shared.', 'wp-libre-form' ) ?>
+          <?php esc_html_e( 'This form preview URL is not public and cannot be shared.', 'wp-libre-form' ); ?>
         </strong>
         <br />
-        <?php esc_html_e( 'Non-logged in visitors will see a 404 error page instead.', 'wp-libre-form' ) ?>
+        <?php esc_html_e( 'Non-logged in visitors will see a 404 error page instead.', 'wp-libre-form' ); ?>
       </p>
     <?php endif; ?>
   <?php endif; ?>
@@ -554,7 +554,7 @@ class="libre-form libre-form-<?php echo esc_attr( $id . ' ' . $xclass ); ?>"
     // @codingStandardsIgnoreEnd
   ?>
   <input type="hidden" name="referrer" value="<?php the_permalink(); ?>">
-  <input type="hidden" name="_referrer_id" value="<?php echo esc_attr( get_the_id() ) ?>">
+  <input type="hidden" name="_referrer_id" value="<?php echo esc_attr( get_the_id() ); ?>">
   <input type="hidden" name="_form_id" value="<?php echo esc_attr( $id ); ?>">
 </form>
 <?php

classes/class-cpt-wplf-submission.php

@@ -18,7 +18,7 @@ public static function init() {
   /**
    * Hook our actions, filters and such
    */
-  private function __construct() {
+  public function __construct() {
     // init custom post type
     add_action( 'init', array( $this, 'register_cpt' ) );
 

classes/class-wplf-polylang.php

@@ -18,7 +18,7 @@ public static function init() {
     /**
      * Hook our actions, filters and such
      */
-    private function __construct() {
+    public function __construct() {
       add_filter( 'wplf_form', array( $this, 'render_form' ) );
       add_filter( 'save_post_wplf-form', array( $this, 'save_form' ), 10, 3 );
       add_action( 'after_setup_theme', array( $this, 'register_strings' ) );

phpcs.xml

@@ -100,6 +100,13 @@
     -->
     <exclude name="Squiz.Commenting.InlineComment.InvalidEndChar" />
 
+    <!-- <?php doesn't have to be on its own line -->
+    <exclude name="Squiz.PHP.EmbeddedPhp.ContentBeforeEnd" />
+    <exclude name="Squiz.PHP.EmbeddedPhp.ContentAfterOpen" />
+
+    <!-- Squiz.PHP.EmbeddedPhp.ContentBeforeEnd -->
+    <exclude name="Generic.ControlStructures.InlineControlStructure.NotAllowed" />
+
     <!-- These indentation rules are just wrong :) -->
     <exclude name="PEAR.Functions.FunctionCallSignature.Indent" />
 
@@ -118,5 +125,8 @@
     <!-- This would be nice to enforce, but plugin main file shouldn't be called class-something -->
     <exclude name="WordPress.Files.FileName.InvalidClassFileName" />
 
+    <!-- This one is just weird. -->
+    <exclude name="WordPress.Arrays.ArrayIndentation" />
+
   </rule>
 </ruleset>