gravityview / GravityView

future/includes/class-gv-settings.php

Doc Comments +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 * Set an setting.
 	 *
 	 * @param mixed $key The key in this setting to retrieve.
-	 * @param mixed $default A default in case the key is not set. 
+	 * @param false|null $default A default in case the key is not set. 
 	 *
 	 * @api
 	 * @since 2.0

future/includes/class-gv-shortcode-gravityview.php

Doc Comments -1 removed lines

@@ -174,7 +174,6 @@
 	 * @param \GV\View $view The View.
 	 * @param \GV\Entry_Collection $entries The calculated entries.
 	 * @param array $atts The shortcode attributes (with defaults).
-	 * @param array $view_atts A quirky compatibility parameter where we get the unaltered view atts.
 	 *
 	 * @return string The output.
 	 */

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
 			'page_size' => 20,
 		) );
 
-		$view = \GV\View::by_id( $atts['id'] ? : $atts['view_id'] );
+		$view = \GV\View::by_id( $atts[ 'id' ] ?: $atts[ 'view_id' ] );
 
 		if ( ! $view ) {
 			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $view->ID ) );
@@ -72,7 +72,7 @@ 
 			return get_the_password_form( $view->ID );
 		}
 
-		if ( ! $view->form  ) {
+		if ( ! $view->form ) {
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
 
 			/**
@@ -96,14 +96,14 @@ 
 		/**
 		 * View details.
 		 */
-		if ( $atts['detail'] ) {
+		if ( $atts[ 'detail' ] ) {
 			return $this->detail( $view, $entries, $atts );
 
 		/**
 		 * Editing a single entry.
 		 */
 		} else if ( ! $is_reembedded && ( $entry = $request->is_edit_entry() ) ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -114,7 +114,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -127,7 +127,7 @@ 
 		 * Viewing a single entry.
 		 */
 		} else if ( ! $is_reembedded && ( $entry = $request->is_entry() ) ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -138,7 +138,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -155,10 +155,10 @@ 
 				
 				// Mock the request with the actual View, not the global one
 				$mock_request = new \GV\Mock_Request();
-				$mock_request->returns['is_view'] = $view;
-				$mock_request->returns['is_entry'] = $request->is_entry();
-				$mock_request->returns['is_edit_entry'] = $request->is_edit_entry();
-				$mock_request->returns['is_search'] = $request->is_search();
+				$mock_request->returns[ 'is_view' ] = $view;
+				$mock_request->returns[ 'is_entry' ] = $request->is_entry();
+				$mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry();
+				$mock_request->returns[ 'is_search' ] = $request->is_search();
 
 				$request = $mock_request;
 			}
@@ -181,7 +181,7 @@ 
 	private function detail( $view, $entries, $atts ) {
 		$output = '';
 
-		switch ( $key = $atts['detail'] ):
+		switch ( $key = $atts[ 'detail' ] ):
 			case 'total_entries':
 				$output = number_format_i18n( $entries->total() );
 				break;

future/includes/class-gv-source-internal.php

Doc Comments -1 removed lines

@@ -24,7 +24,6 @@
 	/**
 	 * Get a \GV\Field by Field ID for this data source.
 	 *
-	 * @param int $field_id The internal field ID (custom content, etc.)
 	 *
 	 * @return \GV\Field|null The requested field or null if not found.
 	 */

future/includes/class-gv-template-entry-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 *
 	 * @param \GV\Field $field The field to be ouput.
 	 *
-	 * @return string|false The field output or false if "hide_empty" is set.
+	 * @return null|string The field output or false if "hide_empty" is set.
 	 */
 	public function the_field( \GV\Field $field ) {
 		$renderer = new Field_Renderer();

future/includes/class-gv-template-entry.php

Doc Comments -1 removed lines

@@ -63,7 +63,6 @@
 	 * Initializer.
 	 *
 	 * @param \GV\View $view The View connected to this template.
-	 * @param \GV\Entry_Collection $entries A collection of entries for this view.
 	 * @param \GV\Request $request The request context.
 	 */
 	public function __construct( Entry $entry, View $view, Request $request ) {

Spacing +9 added lines, -9 removed lines

@@ -113,18 +113,18 @@
 		global $post;
 
 		if ( ! $this->request->is_view() && $post ) {
-			$specifics []= sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
-			$specifics []= sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
-			$specifics []= sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
-			$specifics []= sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
 		}
 
-		$specifics []= sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
-		$specifics []= sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
-		$specifics []= sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
-		$specifics []= sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
 
-		$specifics []= sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
 
 		return array_merge( $specifics, $templates );
 	}

future/includes/class-gv-template-legacy-override.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 * @param \GV\Field $field The Field.
 	 * @param \GV\Request $request The request.
 	 *
-	 * @return void
+	 * @return string|null
 	 */
 	public function __construct( \GV\View $view, \GV\Entry $entry = null, \GV\Field $field = null, \GV\Request $request = null ) {
 		add_filter( $this->filter_prefix . '_get_template_part', array( $this, 'add_id_specific_templates' ), 10, 3 );

Spacing +12 added lines, -12 removed lines

@@ -98,15 +98,15 @@ 
 		$additional = array();
 
 		// form-19-table-body.php
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
 
 		// view-3-table-body.php
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
 
 		global $post;
 		if ( $post ) {
 			// page-19-table-body.php
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
 		}
 
 		// Combine with existing table-body.php and table.php
@@ -130,7 +130,7 @@ 
 		ob_start();
 
 		$request = new Mock_Request();
-		$request->returns['is_view'] = $this->view;
+		$request->returns[ 'is_view' ] = $this->view;
 
 		/**
 		 * You got one shot. One opportunity. To render all the widgets you have ever wanted.
@@ -144,17 +144,17 @@ 
 		foreach ( array( 'gravityview_before', 'gravityview_after' ) as $hook ) {
 			/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
 			if ( is_array( $wp_filter[ $hook ] ) ) {
-				if ( ! empty( $wp_filter[ $hook ][10] ) ) {
-					foreach ( $wp_filter[ $hook ][10] as $function_key => $callback ) {
+				if ( ! empty( $wp_filter[ $hook ][ 10 ] ) ) {
+					foreach ( $wp_filter[ $hook ][ 10 ] as $function_key => $callback ) {
 						if ( strpos( $function_key, 'render_widget_hooks' ) ) {
-							unset( $wp_filter[ $hook ][10][ $function_key ] );
+							unset( $wp_filter[ $hook ][ 10 ][ $function_key ] );
 						}
 					}
 				}
 			} else {
-				foreach ( $wp_filter[ $hook ]->callbacks[10] as $function_key => $callback ) {
+				foreach ( $wp_filter[ $hook ]->callbacks[ 10 ] as $function_key => $callback ) {
 					if ( strpos( $function_key, 'render_widget_hooks' ) ) {
-						unset( $wp_filter[ $hook ]->callbacks[10][ $function_key ] );
+						unset( $wp_filter[ $hook ]->callbacks[ 10 ][ $function_key ] );
 					}
 				}
 			}
@@ -165,7 +165,7 @@ 
 		 */
 		if ( $this->entry ) {
 
-			$request->returns['is_entry'] = $this->entry;
+			$request->returns[ 'is_entry' ] = $this->entry;
 
 			global $post;
 
@@ -209,8 +209,8 @@ 
 					'fields' => $this->view->fields->by_visible(),
 					'in_the_loop' => true,
 				), empty( $parameters ) ? array() : array(
-					'paging' => $parameters['paging'],
-					'sorting' => $parameters['sorting'],
+					'paging' => $parameters[ 'paging' ],
+					'sorting' => $parameters[ 'sorting' ],
 				), $post ? array() : array(
 					'post' => $post,
 				) ) );

future/includes/class-gv-template-view-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
 	 * Output a field cell.
 	 *
 	 * @param \GV\Field $field The field to be ouput.
-	 * @param \GV\Field $entry The entry this field is for.
+	 * @param Entry $entry The entry this field is for.
 	 *
 	 * @return void
 	 */

Indentation +21 added lines, -21 removed lines

@@ -115,15 +115,15 @@ 
 				 */
 				do_action( 'gravityview/template/table/cells/before', $context );
 
-                /**
-                 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
-                 * @since 1.0.7
+				/**
+				 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
+				 * @since 1.0.7
 				 * @param GravityView_View $this Current GravityView_View object
 				 * @deprecated Use `gravityview/template/table/cells/before`
-                 */
-                do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
+				 */
+				do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
 
-                foreach ( $fields->all() as $field ) {
+				foreach ( $fields->all() as $field ) {
 					$this->the_field( $field, $entry );
 				}
 
@@ -134,13 +134,13 @@ 
 				 */
 				do_action( 'gravityview/template/table/cells/after', $context );
 
-                /**
-                 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
-                 * @since 1.0.7
+				/**
+				 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
+				 * @since 1.0.7
 				 * @param GravityView_View $this Current GravityView_View object
 				 * @deprecated Use `gravityview/template/table/cells/after`
-                 */
-                do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
+				 */
+				do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
 
 				?>
 			</tr>
@@ -201,11 +201,11 @@ 
 		do_action( 'gravityview/template/table/body/before', $context );
 
 		/**
-		* @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/table/body/before`
-		* @since 1.0.7
-		* @param GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/table/body/before`
+		 * @since 1.0.7
+		 * @param GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ );
 	}
 
@@ -227,11 +227,11 @@ 
 		do_action( 'gravityview/template/table/body/after', $context );
 
 		/**
-		* @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/table/body/after`
-		* @since 1.0.7
-		* @param GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/table/body/after`
+		 * @since 1.0.7
+		 * @param GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ );
 	}
 

future/includes/class-gv-view.php

Doc Comments +1 added lines

@@ -595,6 +595,7 @@
 	 * Retrieve the entries for the current view and request.
 	 *
 	 * @param \GV\Request The request. Usued for now.
+	 * @param Request|null $request
 	 *
 	 * @return \GV\Entry_Collection The entries.
 	 */

Indentation -1 removed lines

@@ -62,7 +62,6 @@
 	 *
 	 * Internal static cache for gets, and whatnot.
 	 * This is not persistent, resets across requests.
-
 	 * @internal
 	 */
 	private static $cache = array();

Spacing +18 added lines, -19 removed lines

@@ -108,7 +108,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -282,7 +282,7 @@ 
 		 * Editing a single entry.
 		 */
 		if ( $entry = $request->is_edit_entry() ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -293,7 +293,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -306,7 +306,7 @@ 
 		 * Viewing a single entry.
 		 */
 		} else if ( $entry = $request->is_entry() ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -317,7 +317,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -365,11 +365,11 @@ 
 		if ( ! $view->form ) {
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
 				'view_id' => $view->ID,
-				'form_id' => $view->_gravityview_form_id ? : 0,
+				'form_id' => $view->_gravityview_form_id ?: 0,
 			) );
 		} else if ( gravityview()->plugin->supports( Plugin::FEATURE_JOINS ) ) {
 			/** And the connected joins. */
-			foreach( (array)get_post_meta( $view->ID, '_gravityview_form_joins', true ) as $_join ) {
+			foreach ( (array)get_post_meta( $view->ID, '_gravityview_form_joins', true ) as $_join ) {
 				if ( ! is_array( $_join ) || count( $_join ) != 4 ) {
 					continue;
 				}
@@ -381,7 +381,7 @@ 
 				$join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column );
 				$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $join_on_column );
 
-				$view->joins []= new Join( $join, $join_column, $join_on, $join_on_column );
+				$view->joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
 			}
 		}
 
@@ -609,21 +609,20 @@ 
 			if ( $request instanceof REST\Request ) {
 				$atts = $this->settings->as_atts();
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
-						'paging' => array( 'page_size' => $atts['page_size'] ),
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
 					) );
-				$parameters['paging'] = $paging_parameters['paging'];
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
 			}
 
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
 
 			if ( gravityview()->plugin->supports( Plugin::FEATURE_JOINS ) ) {
 				/**
 				 * New \GF_Query stuff :)
 				 */
-				$query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
+				$query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
 
-				$query->limit( $parameters['paging']['page_size'] )
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
 					->page( $page );
 
 				/**
@@ -664,15 +663,15 @@ 
 				} );
 			} else {
 				$entries = $this->form->entries
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
 					->offset( $this->settings->get( 'offset' ) )
-					->limit( $parameters['paging']['page_size'] )
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
 					->page( $page );
 
-				if ( ! empty( $parameters['sorting'] ) ) {
+				if ( ! empty( $parameters[ 'sorting' ] ) ) {
 					$field = new \GV\Field();
-					$field->ID = $parameters['sorting']['key'];
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
 				}
 			}

future/includes/class-gv-widget.php

Doc Comments +2 added lines, -2 removed lines

@@ -316,7 +316,7 @@ 
 	 *
 	 * @param array $widget_args The Widget shortcode args.
 	 * @param string $content The content.
-	 * @param string|\GV\Template_Context $context The context, if available.
+	 * @param string $context The context, if available.
 	 *
 	 * @return void
 	 */
@@ -375,7 +375,7 @@ 
 	 * @internal
 	 * @since 2.0
 	 *
-	 * @return \GV\Widget|null The widget implementation from configuration or none.
+	 * @return Widget The widget implementation from configuration or none.
 	 */
 	public static function from_configuration( $configuration ) {
 		$registered_widgets = self::registered();

Indentation +6 added lines, -6 removed lines

@@ -163,14 +163,14 @@
 		return $settings;
 	}
 
-    /**
+	/**
 	 * Get the Widget ID.
 	 *
-     * @return string The Widget ID.
-     */
-    public function get_widget_id() {
-        return $this->widget_id;
-    }
+	 * @return string The Widget ID.
+	 */
+	public function get_widget_id() {
+		return $this->widget_id;
+	}
 
 	/**
 	 * Get the widget settings

Spacing +6 added lines, -6 removed lines

@@ -151,7 +151,7 @@ 
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
 
 		if ( $enable_custom_class ) {
-			$settings['custom_class'] = array(
+			$settings[ 'custom_class' ] = array(
 				'type' => 'text',
 				'label' => __( 'Custom CSS Class:', 'gravityview' ),
 				'desc' => __( 'This class will be added to the widget container', 'gravityview' ),
@@ -203,8 +203,8 @@ 
 	 */
 	public static function get_default_widget_areas() {
 		$default_areas = array(
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ) , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ) , 'subtitle' => '' ) ) ),
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
 		);
 
 		/**
@@ -234,7 +234,7 @@ 
 		}
 
 		$widgets[ $this->get_widget_id() ] = array(
-			'label' => $this->widget_label ,
+			'label' => $this->widget_label,
 			'description' => $this->widget_description,
 			'subtitle' => $this->widget_subtitle,
 			'class' => get_called_class(),
@@ -255,7 +255,7 @@ 
 	 */
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
 		if ( $this->get_widget_id() === $widget ) {
-			if( $settings = $this->get_settings() ) {
+			if ( $settings = $this->get_settings() ) {
 				$options = array_merge( $options, $settings );
 			}
 		}
@@ -306,7 +306,7 @@ 
 			return;
 		}
 
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
 	}
 
 	/**