Merge branch 'master' into feature/html-template-import

Author: rask

.travis.yml

@@ -18,4 +18,4 @@ script:
   - composer install -o --prefer-dist --no-interaction
 
   # Check project with phps
-  - ./vendor/bin/phpcs -n -p .
+  - composer run lint

classes/class-cpt-wplf-form.php

@@ -105,7 +105,7 @@ public static function register_cpt() {
   /**
    * Modify post.php permalink html to show notice if form isn't publicly visible.
    */
-  function modify_permalink_html( $html, $post_id ) {
+  public function modify_permalink_html( $html, $post_id ) {
     $publicly_visible = $this->get_publicly_visible_state( $post_id );
 
     if ( get_post_type( $post_id ) === 'wplf-form' && ! $publicly_visible ) {
@@ -120,7 +120,7 @@ function modify_permalink_html( $html, $post_id ) {
   /**
    * Disable TinyMCE editor for forms, which are simple HTML things
    */
-  function disable_tinymce( $default ) {
+  public function disable_tinymce( $default ) {
     global $post;
 
     // only for this cpt
@@ -134,7 +134,7 @@ function disable_tinymce( $default ) {
   /**
    * Include custom JS and CSS on the edit screen
    */
-  function admin_post_scripts_cpt( $hook ) {
+  public function admin_post_scripts_cpt( $hook ) {
     global $post;
 
     // make sure we're on the correct view
@@ -160,7 +160,7 @@ function admin_post_scripts_cpt( $hook ) {
   /**
    * Pre-populate form editor with default content
    */
-  function default_content_cpt( $content ) {
+  public function default_content_cpt( $content ) {
     global $pagenow;
 
     // only on post.php screen
@@ -211,7 +211,7 @@ function remove_row_actions( $actions, $post ) {
   /**
    * Custom columns in edit.php for Forms
    */
-  function custom_columns_cpt( $columns ) {
+  public function custom_columns_cpt( $columns ) {
     $new_columns = array(
       'cb' => $columns['cb'],
       'title' => $columns['title'],
@@ -226,7 +226,7 @@ function custom_columns_cpt( $columns ) {
   /**
    * Custom column display for Form CPT in edit.php
    */
-  function custom_columns_display_cpt( $column, $post_id ) {
+  public function custom_columns_display_cpt( $column, $post_id ) {
     if ( 'shortcode' === $column ) {
 ?>
 <input type="text" class="code" value='[libre-form id="<?php echo intval( $post_id ); ?>"]' readonly>
@@ -253,7 +253,7 @@ function custom_columns_display_cpt( $column, $post_id ) {
   /**
    * Add meta box to show fields in form
    */
-  function add_meta_boxes_cpt() {
+  public function add_meta_boxes_cpt() {
     // Shortcode meta box
     add_meta_box(
       'wplf-shortcode',
@@ -307,7 +307,7 @@ function add_meta_boxes_cpt() {
   /**
    * Meta box callback for shortcode meta box
    */
-  function metabox_shortcode( $post ) {
+  public function metabox_shortcode( $post ) {
 ?>
 <p><input type="text" class="code" value='[libre-form id="<?php echo esc_attr( $post->ID ); ?>"]' readonly></p>
 <?php
@@ -339,7 +339,7 @@ function metabox_thank_you( $post ) {
   /**
    * Meta box callback for form fields meta box
    */
-  function metabox_form_fields() {
+  public function metabox_form_fields() {
 ?>
 <p><?php esc_html_e( 'Fields marked with * are required', 'wp-libre-form' ); ?></p>
 <div class="wplf-form-field-container">
@@ -353,7 +353,7 @@ function metabox_form_fields() {
   /**
    * Meta box callback for submit email meta box
    */
-  function metabox_submit_email( $post ) {
+  public function metabox_submit_email( $post ) {
     // get post meta
     $meta = get_post_meta( $post->ID );
     $email_enabled = isset( $meta['_wplf_email_copy_enabled'] ) ? $meta['_wplf_email_copy_enabled'][0] : true;
@@ -444,7 +444,7 @@ function metabox_submit_email( $post ) {
   /**
    * Meta box callback for submission title format
    */
-  function meta_box_title_format( $post ) {
+  public function meta_box_title_format( $post ) {
     // get post meta
     $meta = get_post_meta( $post->ID );
     $default = '%name% <%email%>'; // default submission title format
@@ -602,7 +602,7 @@ protected function maybe_persist_override_template( $template, $form_id, $force
   /**
    * Handles saving our post meta
    */
-  function save_cpt( $post_id ) {
+  public function save_cpt( $post_id ) {
     // verify nonce
     if ( ! isset( $_POST['wplf_form_meta_nonce'] ) ) {
       return;
@@ -716,15 +716,15 @@ function save_cpt( $post_id ) {
    *
    * We apply <form> via the shortcode, you can't have nested forms anyway
    */
-  function strip_form_tags( $content ) {
+  public function strip_form_tags( $content ) {
     return preg_replace( '/<\/?form.*>/i', '', $content );
   }
 
 
   /**
    * The function we display the form with
    */
-  function wplf_form( $id, $content = '', $xclass = '', $attributes = [] ) {
+  public function wplf_form( $id, $content = '', $xclass = '', $attributes = [] ) {
     global $post;
     $preview = ! empty( $_GET['preview'] ) ? $_GET['preview'] : false;
 
@@ -803,7 +803,7 @@ class="libre-form libre-form-<?php echo esc_attr( $id . ' ' . $xclass ); ?>"
   /**
    * Enqueue the front end JS
    */
-  function maybe_enqueue_frontend_script() {
+  public function maybe_enqueue_frontend_script() {
     global $post;
 
     // register the script, but only enqueue it if the current post contains a form in it
@@ -827,7 +827,7 @@ function maybe_enqueue_frontend_script() {
   /**
    * Shortcode for displaying a Form
    */
-  function shortcode( $shortcode_atts, $content = null ) {
+  public function shortcode( $shortcode_atts, $content = null ) {
     $attributes = shortcode_atts( array(
       'id' => null,
       'xclass' => '',
@@ -849,7 +849,7 @@ function shortcode( $shortcode_atts, $content = null ) {
   /**
    * Use the shortcode for previewing forms
    */
-  function use_shortcode_for_preview( $content ) {
+  public function use_shortcode_for_preview( $content ) {
     global $post;
     if ( ! isset( $post->post_type ) || $post->post_type !== 'wplf-form' ) {
       return $content;
@@ -861,7 +861,7 @@ function use_shortcode_for_preview( $content ) {
    * Set and show 404 page for visitors trying to see single form.
    * And yes, it is a global $post. That's right.
    */
-  function maybe_set_404_for_single_form() {
+  public function maybe_set_404_for_single_form() {
     global $post;
 
     if ( ! is_singular( 'wplf-form' ) ) {
@@ -882,14 +882,14 @@ function maybe_set_404_for_single_form() {
   /**
    * Wrapper function to check if form is publicly visible.
    */
-  function get_publicly_visible_state( $id ) {
+  public function get_publicly_visible_state( $id ) {
     return apply_filters( 'wplf-form-publicly-visible', false, $id );
   }
 
   /**
    * A very simple uglify. Just removes line breaks from html
    */
-  function minify_html( $html ) {
+  public function minify_html( $html ) {
     return str_replace( array( "\n", "\r" ), ' ', $html );
   }
 }

classes/class-cpt-wplf-submission.php

@@ -78,7 +78,7 @@ public static function register_cpt() {
   /**
    * Custom column display for Submission CPT in edit.php
    */
-  function custom_columns_display_cpt( $column, $post_id ) {
+  public function custom_columns_display_cpt( $column, $post_id ) {
     if ( 'referrer' === $column ) {
       if ( $referrer = get_post_meta( $post_id, 'referrer', true ) ) {
         echo '<a href="' . esc_url_raw( $referrer ) . '">' . esc_url( $referrer ) . '</a>';
@@ -97,7 +97,7 @@ function custom_columns_display_cpt( $column, $post_id ) {
   /**
    * Custom columns in edit.php for Forms
    */
-  function custom_columns_cpt( $columns ) {
+  public function custom_columns_cpt( $columns ) {
     $new_columns = array(
       'cb' => $columns['cb'],
       'title' => $columns['title'],
@@ -111,7 +111,7 @@ function custom_columns_cpt( $columns ) {
   /**
    * Show a form filter in the edit.php view
    */
-  function form_filter_dropdown() {
+  public function form_filter_dropdown() {
     global $pagenow;
 
     $allowed = array( 'wplf-submission' ); // show filter on these post types (currently only one?)
@@ -152,7 +152,7 @@ function form_filter_dropdown() {
   /**
    * Filter by form in the edit.php view
    */
-  function filter_by_form( $query ) {
+  public function filter_by_form( $query ) {
     global $pagenow;
 
     if ( 'edit.php' !== $pagenow ) {
@@ -171,12 +171,12 @@ function filter_by_form( $query ) {
     return $query;
   }
 
-  function register_wplf_submission_bulk_actions( $bulk_actions ) {
+  public function register_wplf_submission_bulk_actions( $bulk_actions ) {
     $bulk_actions['wplf_resend_copy'] = __( 'Resend email copy', 'wp-libre-form' );
     return $bulk_actions;
   }
 
-  function wplf_submission_bulk_action_handler( $redirect_to, $doaction, $post_ids ) {
+  public function wplf_submission_bulk_action_handler( $redirect_to, $doaction, $post_ids ) {
     if ( $doaction !== 'wplf_resend_copy' ) {
       return $redirect_to;
     }
@@ -192,7 +192,7 @@ function wplf_submission_bulk_action_handler( $redirect_to, $doaction, $post_ids
     return $redirect_to;
   }
 
-  function wplf_submission_bulk_action_admin_notice() {
+  public function wplf_submission_bulk_action_admin_notice() {
     if ( ! empty( $_REQUEST['wplf_resent'] ) ) {
       $count = intval( $_REQUEST['wplf_resent'] );
       printf(
@@ -213,7 +213,7 @@ function wplf_submission_bulk_action_admin_notice() {
   /**
    * Add meta box to show fields in form
    */
-  function add_meta_boxes_cpt() {
+  public function add_meta_boxes_cpt() {
     // Shortcode meta box
     add_meta_box(
       'wplf-shortcode',
@@ -228,7 +228,7 @@ function add_meta_boxes_cpt() {
   /**
    * The submission metabox callback
    */
-  function metabox_submission() {
+  public function metabox_submission() {
     global $post;
     $postmeta = get_post_meta( $post->ID );
     $fields = array_keys( $postmeta );

classes/class-wplf-polylang.php

@@ -42,7 +42,7 @@ public function render_form( $form_content ) {
       return $form_content;
     }
 
-    function save_form( $post_id, $post, $update ) {
+    public function save_form( $post_id, $post, $update ) {
       unset( $post_id, $update ); // not used here so shut up linter!
 
       preg_match_all( $this->regular_expression, $post->post_content, $matches );

composer.json

@@ -16,5 +16,8 @@
   "require-dev": {
     "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
     "wp-coding-standards/wpcs": "0.12.0"
+  },
+  "scripts": {
+    "lint": "./vendor/bin/phpcs --standard=./phpcs.xml -n -p ."
   }
 }