Inspection of "Daily Inspection: Merge branch '3.8.24b'" - michaeluno/admin-page-framework - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — master (7ff82b)

unknown

created 2020-11-14 18:10 UTC

Status

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
      *
      * @since       3.6.0
      */
-    public $sContext    = 'fieldset';
+    public $sContext = 'fieldset';
 
     /**
      * Returns an attribute array.
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
      */
     protected function _getAttributes() {
         return array(
-            'id'            => $this->sContext . '-' . $this->aArguments[ 'tag_id' ],
+            'id'            => $this->sContext.'-'.$this->aArguments[ 'tag_id' ],
             'class'         => implode(
                 ' ',
                 array(
-                    'admin-page-framework-' . $this->sContext,
+                    'admin-page-framework-'.$this->sContext,
                     $this->_getSelectorForChildFieldset()
                 )
             ),
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
                 return '';
             }
             if ( $this->aArguments[ '_nested_depth' ] == 1 ) {
-                return 'child-fieldset nested-depth-' . $this->aArguments[ '_nested_depth' ];
+                return 'child-fieldset nested-depth-'.$this->aArguments[ '_nested_depth' ];
             }
-            return 'child-fieldset multiple-nesting nested-depth-' . $this->aArguments[ '_nested_depth' ];
+            return 'child-fieldset multiple-nesting nested-depth-'.$this->aArguments[ '_nested_depth' ];
 
         }
 

Please login to merge, or discard this patch.

form/_view/resource/AdminPageFramework_Form_View__Resource__Head.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -30,7 +30,7 @@  discard block
 block discarded – undo
      * @param       object      $oForm
      * @param       string      $sHeadActionHook        The action hook triggered inside the `<head>` tag. For front-end forms, use `wp_head`.
      */
-    public function __construct( $oForm, $sHeadActionHook='admin_head' ) {
+    public function __construct( $oForm, $sHeadActionHook = 'admin_head' ) {
 
         $this->oForm = $oForm;
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
          * as multiple instances of the factory class is loaded among separate pages,
          * one gets denied here and if it can load earlier than the one which should insert the below script.
          */
-        if ( ! $this->oForm->isInThePage() ) {
+        if ( !$this->oForm->isInThePage() ) {
             return;
         }
 
@@ -77,8 +77,8 @@  discard block
 block discarded – undo
         private function _getScripts_RequiredInHead() {
             return 'document.write( "<style class=\'admin-page-framework-js-embedded-internal-style\'>'
                     . str_replace(
-                        '\\n',   // search
-                        '',     // replace
+                        '\\n', // search
+                        '', // replace
                         esc_js( $this->_getInternalCSS() )    // subject
                     )
                 . '</style>" );';

Please login to merge, or discard this patch.

_common/form/_view/resource/AdminPageFramework_Form_View__Resource.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -40,7 +40,7 @@
 block discarded – undo
         // Widgets can be called multiple times for the number of user-created widget instances for one class instance
         // so make sure it is processed only once per page.
         if ( $this->hasBeenCalled( 'resource_' . $oForm->aArguments[ 'caller_id' ] ) ) {
-             return;
+                return;
         }
 
         $this->_setHooks();

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 
         // Widgets can be called multiple times for the number of user-created widget instances for one class instance
         // so make sure it is processed only once per page.
-        if ( $this->hasBeenCalled( 'resource_' . $oForm->aArguments[ 'caller_id' ] ) ) {
+        if ( $this->hasBeenCalled( 'resource_'.$oForm->aArguments[ 'caller_id' ] ) ) {
              return;
         }
 
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
      * @since       3.7.0
      */
     public function _replyToEnqueueScripts() {
-        if ( ! $this->oForm->isInThePage() ) {
+        if ( !$this->oForm->isInThePage() ) {
             return;
         }
-        foreach( $this->oForm->getResources( 'src_scripts' ) as $_isIndex => $_asEnqueue ) {
+        foreach ( $this->oForm->getResources( 'src_scripts' ) as $_isIndex => $_asEnqueue ) {
             $this->_enqueueScript( $_asEnqueue );
-            $this->oForm->unsetResources( array( 'src_scripts', $_isIndex ) );  // no longer needed
+            $this->oForm->unsetResources( array( 'src_scripts', $_isIndex ) ); // no longer needed
         }
     }
         /**
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
             private function _getFormattedEnqueueScript( $asEnqueue ) {
                 static $_iCallCount = 1;
                 $_aEnqueueItem = $this->getAsArray( $asEnqueue ) + array(
-                    'handle_id'     => 'script_form_' . $this->oForm->aArguments[ 'caller_id' ] . '_' . $_iCallCount,
+                    'handle_id'     => 'script_form_'.$this->oForm->aArguments[ 'caller_id' ].'_'.$_iCallCount,
                     'src'           => null,
                     'dependencies'  => null,
                     'version'       => null,
@@ -187,10 +187,10 @@  discard block
 block discarded – undo
      */
     public function _replyToEnqueueStyles() {
 
-        if ( ! $this->oForm->isInThePage() ) {
+        if ( !$this->oForm->isInThePage() ) {
             return;
         }
-        foreach( $this->oForm->getResources( 'src_styles' ) as $_isIndex => $_asEnqueueItem ) {
+        foreach ( $this->oForm->getResources( 'src_styles' ) as $_isIndex => $_asEnqueueItem ) {
             $this->_enqueueStyle( $_asEnqueueItem );
             $this->oForm->unsetResources( array( 'src_styles', $_isIndex ) ); // no longer needed
         }
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
             private function _getFormattedEnqueueStyle( $asEnqueue ) {
                 static $_iCallCount = 1;
                 $_aEnqueueItem = $this->getAsArray( $asEnqueue ) + array(
-                    'handle_id'     => 'style_form_' . $this->oForm->aArguments[ 'caller_id' ] . '_' . $_iCallCount,
+                    'handle_id'     => 'style_form_'.$this->oForm->aArguments[ 'caller_id' ].'_'.$_iCallCount,
                     'src'           => null,
                     'dependencies'  => null,
                     'version'       => null,
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
      */
     public function _replyToAddStyle() {
 
-        if ( ! $this->oForm->isInThePage() ) {
+        if ( !$this->oForm->isInThePage() ) {
             return;
         }
         $_sCSSRules = $this->_getFormattedInternalStyles(
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
      */
     public function _replyToAddScript() {
 
-        if ( ! $this->oForm->isInThePage() ) {
+        if ( !$this->oForm->isInThePage() ) {
             return;
         }
 

Please login to merge, or discard this patch.

_common/form/_view/css/AdminPageFramework_Form_View___CSS_Section.php 1 patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -23,13 +23,13 @@
 block discarded – undo
     protected function _get() {
         return $this->_getFormSectionRules();
     }
-         /**
-         * Returns the CSS rules for form fields.
-         *
-         * @since       3.4.0
-         * @since       3.7.0      Moved from `AdminPageFramework_CSS`.
-         * @internal
-         */
+            /**
+             * Returns the CSS rules for form fields.
+             *
+             * @since       3.4.0
+             * @since       3.7.0      Moved from `AdminPageFramework_CSS`.
+             * @internal
+             */
         private function _getFormSectionRules() {
             $_sCSSRules = <<<CSSRULES
 /* Section Table */

Please login to merge, or discard this patch.

_common/form/_view/sectionset/AdminPageFramework_Form_View___Section.php 2 patches

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -77,15 +77,15 @@  discard block
 block discarded – undo
         $_oSectionTableBodyAttributes = new AdminPageFramework_Form_View___Attribute_SectionTableBody( $this->aSectionset );
 
         $_aOutput       = array();
-        $_aOutput[]     = "<table " . $_oSectionTableAttributes->get() . ">"
+        $_aOutput[ ]     = "<table ".$_oSectionTableAttributes->get().">"
                 . $_oTableCaption->get()
-                . "<tbody " . $_oSectionTableBodyAttributes->get() . ">"
+                . "<tbody ".$_oSectionTableBodyAttributes->get().">"
                     . $this->_getSectionContent( $_iSectionIndex )
                 . "</tbody>"
             . "</table>";
 
-        $_oSectionTableContainerAttributes  = new AdminPageFramework_Form_View___Attribute_SectionTableContainer( $this->aSectionset );
-        return "<div " . $_oSectionTableContainerAttributes->get() . ">"
+        $_oSectionTableContainerAttributes = new AdminPageFramework_Form_View___Attribute_SectionTableContainer( $this->aSectionset );
+        return "<div ".$_oSectionTableContainerAttributes->get().">"
                 . implode( PHP_EOL, $_aOutput )
             . "</div>";
 
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
                 // Retrieve the formatted sectionsets of the content.
                 $_sSectionPath = $this->aSectionset[ '_section_path' ];
                 $_aSectionsets = $this->aStructure[ 'sectionsets' ];
-                if ( ! isset( $_aSectionsets[ $_sSectionPath ] ) ) {    // @todo    not sure what this check is for
+                if ( !isset( $_aSectionsets[ $_sSectionPath ] ) ) {    // @todo    not sure what this check is for
                     return '';
                 }
 
@@ -190,22 +190,22 @@  discard block
 block discarded – undo
                     $_aNestedSectionPaths = array();
 
                     // List the section paths of the direct children
-                    foreach( $aNestedSctionsets as $_aNestedSectionset ) {
+                    foreach ( $aNestedSctionsets as $_aNestedSectionset ) {
 
                         // 3.7.6+ There were cases non array gets passed (like the FAQ page in the demo)
                         // and caused warnings in PHP 7.
-                        if ( ! is_array( $_aNestedSectionset ) ) {
+                        if ( !is_array( $_aNestedSectionset ) ) {
                             continue;
                         }
 
-                        $_sThisSectionPath = $sSubjectSectionPath . '|' . $_aNestedSectionset[ 'section_id' ];
+                        $_sThisSectionPath = $sSubjectSectionPath.'|'.$_aNestedSectionset[ 'section_id' ];
                         $_aNestedSectionPaths[ $_sThisSectionPath ] = $_sThisSectionPath;
 
                     }
 
                     // Now we need children's children.
                     $_aChildSectionPaths = array();
-                    foreach( $_aNestedSectionPaths as $_sNestedSectionPath ) {
+                    foreach ( $_aNestedSectionPaths as $_sNestedSectionPath ) {
                         $_aNestedSectionsets = $this->getElementAsArray(
                             $aSectionsets,
                             array( $_sNestedSectionPath, 'content' )

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -135,7 +135,8 @@
 block discarded – undo
                 // Retrieve the formatted sectionsets of the content.
                 $_sSectionPath = $this->aSectionset[ '_section_path' ];
                 $_aSectionsets = $this->aStructure[ 'sectionsets' ];
-                if ( ! isset( $_aSectionsets[ $_sSectionPath ] ) ) {    // @todo    not sure what this check is for
+                if ( ! isset( $_aSectionsets[ $_sSectionPath ] ) ) {
+// @todo    not sure what this check is for
                     return '';
                 }
 

Please login to merge, or discard this patch.

format/AdminPageFramework_Form_View___Format_SectionsetsByTab.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
      *
      * Only one depth at a time will be parsed.
      */
-    public $iNestedDepth  = 0;
+    public $iNestedDepth = 0;
 
     /**
      * Stores the generated section tab slugs.
@@ -121,11 +121,11 @@  discard block
 block discarded – undo
             $_aFieldsBySectionTab   = array();
             $_iIndex                = 0;
 
-            foreach( $aSectionsets as $_sSectionPath => $_aSectionset ) {
+            foreach ( $aSectionsets as $_sSectionPath => $_aSectionset ) {
 
                 // If no fields for the section, no need to add the section
                 // unless the custom sectionset output is defined.
-                if ( ! isset( $aFieldsets[ $_sSectionPath ] ) && ! $this->_isCustomContentSet( $_aSectionset ) ) {
+                if ( !isset( $aFieldsets[ $_sSectionPath ] ) && !$this->_isCustomContentSet( $_aSectionset ) ) {
                     continue;
                 }
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
                 $_sSectionTaqbSlug = $this->getAOrB(
                     $_aSectionset[ 'section_tab_slug' ],
                     $_aSectionset[ 'section_tab_slug' ],
-                    '_default_' . $this->iNestedDepth . '_' . ( ++$_iIndex )
+                    '_default_'.$this->iNestedDepth.'_'.( ++$_iIndex )
                 );
                 $_aSectionsBySectionTab[ $_sSectionTaqbSlug ][ $_sSectionPath ] = $_aSectionset;
                 $_aFieldsBySectionTab[ $_sSectionTaqbSlug ][ $_sSectionPath ]   = $this->getElement(
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
              * @since       3.7.0      Moved from `AdminPageFramework_FormPart_Table`.
              * @return      boolean     True if a custom content value is set.
              */
-            private function _isCustomContentSet( array $aSectionset, array $aKeys=array( 'content' ) ) {
+            private function _isCustomContentSet( array $aSectionset, array $aKeys = array( 'content' ) ) {
                 return isset( $aSectionset[ 'content' ] );
                 // @deprecated
                 // foreach( $aKeys as $_sKey ) {

Please login to merge, or discard this patch.

_common/form/_view/sectionset/AdminPageFramework_Form_View___FieldTitle.php 2 patches

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -215,7 +215,7 @@
 block discarded – undo
                     $aField[ '_structure_type' ],
                     array( 'widget', 'post_meta_box', 'page_meta_box' )
                 )
-            ){
+            ) {
                 return "<span class='title-colon'>:</span>" ;
             }
 

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@  discard block
 block discarded – undo
 
         $aField = $this->aFieldset;
 
-        if ( ! $aField[ 'show_title_column' ] ) {
+        if ( !$aField[ 'show_title_column' ] ) {
             return '';
         }
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
             'for'   => $_oInputTagIDGenerator->get(),
         );
         $_sOutput .= $aField[ 'title' ]
-            ? "<label " . $this->getAttributes( $_aLabelAttributes ) . "'>"
+            ? "<label ".$this->getAttributes( $_aLabelAttributes )."'>"
                     . "<a id='{$aField[ 'field_id' ]}'></a>"  // to allow the browser to link to the element.
                     . "<span title='"
                             . esc_attr(
@@ -113,12 +113,12 @@  discard block
 block discarded – undo
          */
         private function _getFieldOutputsInFieldTitleAreaFromNestedFields( $aField ) {
 
-            if ( ! $this->hasNestedFields( $aField ) ) {
+            if ( !$this->hasNestedFields( $aField ) ) {
                 return '';
             }
 
             $_sOutput = '';
-            foreach( $aField[ 'content' ] as $_aNestedField ) {
+            foreach ( $aField[ 'content' ] as $_aNestedField ) {
 
                 if ( 'field_title' !== $_aNestedField[ 'placement' ] ) {
                     continue;
@@ -126,13 +126,13 @@  discard block
 block discarded – undo
 
                 $_oFieldset = new AdminPageFramework_Form_View___Fieldset(
                     $_aNestedField,
-                    $this->aSavedData,    // passed by reference. @todo: examine why it needs to be passed by reference.
+                    $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
                     $this->aFieldErrors,
                     $this->aFieldTypeDefinitions,
                     $this->oMsg,
                     $this->aCallbacks // field output element callables.
                 );
-                $_sOutput   .= $_oFieldset->get(); // field output
+                $_sOutput .= $_oFieldset->get(); // field output
 
             }
             return $_sOutput;
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
          * @since       3.7.0
          */
         private function _getToolTip( $asTip, $sElementID ) {
-            $_oToolTip           = new AdminPageFramework_Form_View___ToolTip(
+            $_oToolTip = new AdminPageFramework_Form_View___ToolTip(
                 $asTip,
                 $sElementID
             );
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
          */
         private function _getTitleColon( $aField ) {
 
-            if ( ! isset( $aField[ 'title' ] ) || '' === $aField[ 'title' ] ) {
+            if ( !isset( $aField[ 'title' ] ) || '' === $aField[ 'title' ] ) {
                 return '';
             }
             if (
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
                     $aField[ '_structure_type' ],
                     array( 'widget', 'post_meta_box', 'page_meta_box' )
                 )
-            ){
-                return "<span class='title-colon'>:</span>" ;
+            ) {
+                return "<span class='title-colon'>:</span>";
             }
 
         }

Please login to merge, or discard this patch.

form/_view/sectionset/AdminPageFramework_Form_View___FieldsetTableRow.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 
         $_aParameters = func_get_args() + array(
             $this->aFieldset,
-            $this->aSavedData,    // passed by reference. @todo: examine why it needs to be passed by reference.
+            $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
             $this->aFieldErrors,
             $this->aFieldTypeDefinitions,
             $this->aCallbacks, // field output element callables.
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
 
         $aFieldset = $this->aFieldset;
 
-        if ( ! $this->isNormalPlacement( $aFieldset ) ) {
+        if ( !$this->isNormalPlacement( $aFieldset ) ) {
             return '';
         }
 
-        $_oFieldrowAttribute   = new AdminPageFramework_Form_View___Attribute_Fieldrow(
+        $_oFieldrowAttribute = new AdminPageFramework_Form_View___Attribute_Fieldrow(
             $aFieldset,
             array(
-                'id'        => 'fieldrow-' . $aFieldset[ 'tag_id' ],
+                'id'        => 'fieldrow-'.$aFieldset[ 'tag_id' ],
                 'valign'    => 'top',
                 'class'     => 'admin-page-framework-fieldrow',
             )
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
         return $this->_getFieldByContainer(
             $aFieldset,
             array(
-                'open_container'    => "<tr " . $_oFieldrowAttribute->get() . ">",
+                'open_container'    => "<tr ".$_oFieldrowAttribute->get().">",
                 'close_container'   => "</tr>",
                 'open_title'        => "<th>",
                 'close_title'       => "</th>",
@@ -125,13 +125,13 @@  discard block
 block discarded – undo
                 $this->aCallbacks,
                 $this->oMsg
             );
-            $_aOutput   = array();
+            $_aOutput = array();
             if ( $aFieldset[ 'show_title_column' ] ) {
-                $_aOutput[] = $aOpenCloseTags[ 'open_title' ]
+                $_aOutput[ ] = $aOpenCloseTags[ 'open_title' ]
                         . $_oFieldTitle->get()
                     . $aOpenCloseTags[ 'close_title' ];
             }
-            $_aOutput[] = $aOpenCloseTags[ 'open_main' ]
+            $_aOutput[ ] = $aOpenCloseTags[ 'open_main' ]
                     // . call_user_func_array( $hfCallback, array( $aFieldset ) )
                     . $this->getFieldsetOutput( $aFieldset )
                 . $aOpenCloseTags[ 'close_main' ];

Please login to merge, or discard this patch.

form/_view/sectionset/AdminPageFramework_Form_View___FieldsetRow.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -31,7 +31,7 @@  discard block
 block discarded – undo
 
         $_aParameters = func_get_args() + array(
             $this->aFieldset,
-            $this->aSavedData,    // passed by reference. @todo: examine why it needs to be passed by reference.
+            $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
             $this->aFieldErrors,
             $this->aFieldTypeDefinitions,
             $this->aCallbacks, // field output element callables.
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 
         $aFieldset = $this->aFieldset;
 
-        if ( ! $this->isNormalPlacement( $aFieldset ) ) {
+        if ( !$this->isNormalPlacement( $aFieldset ) ) {
             return '';
         }
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
         return $this->_getFieldByContainer(
             $aFieldset,
             array(
-                'open_main'     => "<div " . $_oFieldrowAttribute->get() . ">",
+                'open_main'     => "<div ".$_oFieldrowAttribute->get().">",
                 'close_main'    => "</div>",
             )
         );

Please login to merge, or discard this patch.

		@@ -77,15 +77,15 @@ discard block
		block discarded – undo
77	77	$_oSectionTableBodyAttributes = new AdminPageFramework_Form_View___Attribute_SectionTableBody( $this->aSectionset );
78	78
79	79	$_aOutput = array();
80		- $_aOutput[] = "<table " . $_oSectionTableAttributes->get() . ">"
	80	+ $_aOutput[ ] = "<table ".$_oSectionTableAttributes->get().">"
81	81	. $_oTableCaption->get()
82		- . "<tbody " . $_oSectionTableBodyAttributes->get() . ">"
	82	+ . "<tbody ".$_oSectionTableBodyAttributes->get().">"
83	83	. $this->_getSectionContent( $_iSectionIndex )
84	84	. "</tbody>"
85	85	. "</table>";
86	86
87		- $_oSectionTableContainerAttributes = new AdminPageFramework_Form_View___Attribute_SectionTableContainer( $this->aSectionset );
88		- return "<div " . $_oSectionTableContainerAttributes->get() . ">"
	87	+ $_oSectionTableContainerAttributes = new AdminPageFramework_Form_View___Attribute_SectionTableContainer( $this->aSectionset );
	88	+ return "<div ".$_oSectionTableContainerAttributes->get().">"
89	89	. implode( PHP_EOL, $_aOutput )
90	90	. "</div>";
91	91
		@@ -135,7 +135,7 @@ discard block
		block discarded – undo
135	135	// Retrieve the formatted sectionsets of the content.
136	136	$_sSectionPath = $this->aSectionset[ '_section_path' ];
137	137	$_aSectionsets = $this->aStructure[ 'sectionsets' ];
138		- if ( ! isset( $_aSectionsets[ $_sSectionPath ] ) ) { // @todo not sure what this check is for
	138	+ if ( !isset( $_aSectionsets[ $_sSectionPath ] ) ) { // @todo not sure what this check is for
139	139	return '';
140	140	}
141	141
		@@ -190,22 +190,22 @@ discard block
		block discarded – undo
190	190	$_aNestedSectionPaths = array();
191	191
192	192	// List the section paths of the direct children
193		- foreach( $aNestedSctionsets as $_aNestedSectionset ) {
	193	+ foreach ( $aNestedSctionsets as $_aNestedSectionset ) {
194	194
195	195	// 3.7.6+ There were cases non array gets passed (like the FAQ page in the demo)
196	196	// and caused warnings in PHP 7.
197		- if ( ! is_array( $_aNestedSectionset ) ) {
	197	+ if ( !is_array( $_aNestedSectionset ) ) {
198	198	continue;
199	199	}
200	200
201		- $_sThisSectionPath = $sSubjectSectionPath . '\|' . $_aNestedSectionset[ 'section_id' ];
	201	+ $_sThisSectionPath = $sSubjectSectionPath.'\|'.$_aNestedSectionset[ 'section_id' ];
202	202	$_aNestedSectionPaths[ $_sThisSectionPath ] = $_sThisSectionPath;
203	203
204	204	}
205	205
206	206	// Now we need children's children.
207	207	$_aChildSectionPaths = array();
208		- foreach( $_aNestedSectionPaths as $_sNestedSectionPath ) {
	208	+ foreach ( $_aNestedSectionPaths as $_sNestedSectionPath ) {
209	209	$_aNestedSectionsets = $this->getElementAsArray(
210	210	$aSectionsets,
211	211	array( $_sNestedSectionPath, 'content' )

		@@ -215,7 +215,7 @@
		block discarded – undo
215	215	$aField[ '_structure_type' ],
216	216	array( 'widget', 'post_meta_box', 'page_meta_box' )
217	217	)
218		- ){
	218	+ ) {
219	219	return "<span class='title-colon'>:</span>" ;
220	220	}
221	221

		@@ -69,7 +69,7 @@ discard block
		block discarded – undo
69	69
70	70	$aField = $this->aFieldset;
71	71
72		- if ( ! $aField[ 'show_title_column' ] ) {
	72	+ if ( !$aField[ 'show_title_column' ] ) {
73	73	return '';
74	74	}
75	75
		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83	'for' => $_oInputTagIDGenerator->get(),
84	84	);
85	85	$_sOutput .= $aField[ 'title' ]
86		- ? "<label " . $this->getAttributes( $_aLabelAttributes ) . "'>"
	86	+ ? "<label ".$this->getAttributes( $_aLabelAttributes )."'>"
87	87	. "<a id='{$aField[ 'field_id' ]}'></a>" // to allow the browser to link to the element.
88	88	. "<span title='"
89	89	. esc_attr(
		@@ -113,12 +113,12 @@ discard block
		block discarded – undo
113	113	*/
114	114	private function _getFieldOutputsInFieldTitleAreaFromNestedFields( $aField ) {
115	115
116		- if ( ! $this->hasNestedFields( $aField ) ) {
	116	+ if ( !$this->hasNestedFields( $aField ) ) {
117	117	return '';
118	118	}
119	119
120	120	$_sOutput = '';
121		- foreach( $aField[ 'content' ] as $_aNestedField ) {
	121	+ foreach ( $aField[ 'content' ] as $_aNestedField ) {
122	122
123	123	if ( 'field_title' !== $_aNestedField[ 'placement' ] ) {
124	124	continue;
		@@ -126,13 +126,13 @@ discard block
		block discarded – undo
126	126
127	127	$_oFieldset = new AdminPageFramework_Form_View___Fieldset(
128	128	$_aNestedField,
129		- $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
	129	+ $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
130	130	$this->aFieldErrors,
131	131	$this->aFieldTypeDefinitions,
132	132	$this->oMsg,
133	133	$this->aCallbacks // field output element callables.
134	134	);
135		- $_sOutput .= $_oFieldset->get(); // field output
	135	+ $_sOutput .= $_oFieldset->get(); // field output
136	136
137	137	}
138	138	return $_sOutput;
		@@ -144,7 +144,7 @@ discard block
		block discarded – undo
144	144	* @since 3.7.0
145	145	*/
146	146	private function _getToolTip( $asTip, $sElementID ) {
147		- $_oToolTip = new AdminPageFramework_Form_View___ToolTip(
	147	+ $_oToolTip = new AdminPageFramework_Form_View___ToolTip(
148	148	$asTip,
149	149	$sElementID
150	150	);
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157	*/
158	158	private function _getTitleColon( $aField ) {
159	159
160		- if ( ! isset( $aField[ 'title' ] ) \|\| '' === $aField[ 'title' ] ) {
	160	+ if ( !isset( $aField[ 'title' ] ) \|\| '' === $aField[ 'title' ] ) {
161	161	return '';
162	162	}
163	163	if (
		@@ -165,8 +165,8 @@ discard block
		block discarded – undo
165	165	$aField[ '_structure_type' ],
166	166	array( 'widget', 'post_meta_box', 'page_meta_box' )
167	167	)
168		- ){
169		- return "<span class='title-colon'>:</span>" ;
	168	+ ) {
	169	+ return "<span class='title-colon'>:</span>";
170	170	}
171	171
172	172	}

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	*
25	25	* @since 3.6.0
26	26	*/
27		- public $sContext = 'fieldset';
	27	+ public $sContext = 'fieldset';
28	28
29	29	/**
30	30	* Returns an attribute array.
		@@ -32,11 +32,11 @@ discard block
		block discarded – undo
32	32	*/
33	33	protected function _getAttributes() {
34	34	return array(
35		- 'id' => $this->sContext . '-' . $this->aArguments[ 'tag_id' ],
	35	+ 'id' => $this->sContext.'-'.$this->aArguments[ 'tag_id' ],
36	36	'class' => implode(
37	37	' ',
38	38	array(
39		- 'admin-page-framework-' . $this->sContext,
	39	+ 'admin-page-framework-'.$this->sContext,
40	40	$this->_getSelectorForChildFieldset()
41	41	)
42	42	),
		@@ -67,9 +67,9 @@ discard block
		block discarded – undo
67	67	return '';
68	68	}
69	69	if ( $this->aArguments[ '_nested_depth' ] == 1 ) {
70		- return 'child-fieldset nested-depth-' . $this->aArguments[ '_nested_depth' ];
	70	+ return 'child-fieldset nested-depth-'.$this->aArguments[ '_nested_depth' ];
71	71	}
72		- return 'child-fieldset multiple-nesting nested-depth-' . $this->aArguments[ '_nested_depth' ];
	72	+ return 'child-fieldset multiple-nesting nested-depth-'.$this->aArguments[ '_nested_depth' ];
73	73
74	74	}
75	75

		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30	* @param object $oForm
31	31	* @param string $sHeadActionHook The action hook triggered inside the `<head>` tag. For front-end forms, use `wp_head`.
32	32	*/
33		- public function __construct( $oForm, $sHeadActionHook='admin_head' ) {
	33	+ public function __construct( $oForm, $sHeadActionHook = 'admin_head' ) {
34	34
35	35	$this->oForm = $oForm;
36	36
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	* as multiple instances of the factory class is loaded among separate pages,
55	55	* one gets denied here and if it can load earlier than the one which should insert the below script.
56	56	*/
57		- if ( ! $this->oForm->isInThePage() ) {
	57	+ if ( !$this->oForm->isInThePage() ) {
58	58	return;
59	59	}
60	60
		@@ -77,8 +77,8 @@ discard block
		block discarded – undo
77	77	private function _getScripts_RequiredInHead() {
78	78	return 'document.write( "<style class=\'admin-page-framework-js-embedded-internal-style\'>'
79	79	. str_replace(
80		- '\\n', // search
81		- '', // replace
	80	+ '\\n', // search
	81	+ '', // replace
82	82	esc_js( $this->_getInternalCSS() ) // subject
83	83	)
84	84	. '</style>" );';

		@@ -40,7 +40,7 @@
		block discarded – undo
40	40	// Widgets can be called multiple times for the number of user-created widget instances for one class instance
41	41	// so make sure it is processed only once per page.
42	42	if ( $this->hasBeenCalled( 'resource_' . $oForm->aArguments[ 'caller_id' ] ) ) {
43		- return;
	43	+ return;
44	44	}
45	45
46	46	$this->_setHooks();

		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39
40	40	// Widgets can be called multiple times for the number of user-created widget instances for one class instance
41	41	// so make sure it is processed only once per page.
42		- if ( $this->hasBeenCalled( 'resource_' . $oForm->aArguments[ 'caller_id' ] ) ) {
	42	+ if ( $this->hasBeenCalled( 'resource_'.$oForm->aArguments[ 'caller_id' ] ) ) {
43	43	return;
44	44	}
45	45
		@@ -112,12 +112,12 @@ discard block
		block discarded – undo
112	112	* @since 3.7.0
113	113	*/
114	114	public function _replyToEnqueueScripts() {
115		- if ( ! $this->oForm->isInThePage() ) {
	115	+ if ( !$this->oForm->isInThePage() ) {
116	116	return;
117	117	}
118		- foreach( $this->oForm->getResources( 'src_scripts' ) as $_isIndex => $_asEnqueue ) {
	118	+ foreach ( $this->oForm->getResources( 'src_scripts' ) as $_isIndex => $_asEnqueue ) {
119	119	$this->_enqueueScript( $_asEnqueue );
120		- $this->oForm->unsetResources( array( 'src_scripts', $_isIndex ) ); // no longer needed
	120	+ $this->oForm->unsetResources( array( 'src_scripts', $_isIndex ) ); // no longer needed
121	121	}
122	122	}
123	123	/**
		@@ -164,7 +164,7 @@ discard block
		block discarded – undo
164	164	private function _getFormattedEnqueueScript( $asEnqueue ) {
165	165	static $_iCallCount = 1;
166	166	$_aEnqueueItem = $this->getAsArray( $asEnqueue ) + array(
167		- 'handle_id' => 'script_form_' . $this->oForm->aArguments[ 'caller_id' ] . '_' . $_iCallCount,
	167	+ 'handle_id' => 'script_form_'.$this->oForm->aArguments[ 'caller_id' ].'_'.$_iCallCount,
168	168	'src' => null,
169	169	'dependencies' => null,
170	170	'version' => null,
		@@ -187,10 +187,10 @@ discard block
		block discarded – undo
187	187	*/
188	188	public function _replyToEnqueueStyles() {
189	189
190		- if ( ! $this->oForm->isInThePage() ) {
	190	+ if ( !$this->oForm->isInThePage() ) {
191	191	return;
192	192	}
193		- foreach( $this->oForm->getResources( 'src_styles' ) as $_isIndex => $_asEnqueueItem ) {
	193	+ foreach ( $this->oForm->getResources( 'src_styles' ) as $_isIndex => $_asEnqueueItem ) {
194	194	$this->_enqueueStyle( $_asEnqueueItem );
195	195	$this->oForm->unsetResources( array( 'src_styles', $_isIndex ) ); // no longer needed
196	196	}
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212	private function _getFormattedEnqueueStyle( $asEnqueue ) {
213	213	static $_iCallCount = 1;
214	214	$_aEnqueueItem = $this->getAsArray( $asEnqueue ) + array(
215		- 'handle_id' => 'style_form_' . $this->oForm->aArguments[ 'caller_id' ] . '_' . $_iCallCount,
	215	+ 'handle_id' => 'style_form_'.$this->oForm->aArguments[ 'caller_id' ].'_'.$_iCallCount,
216	216	'src' => null,
217	217	'dependencies' => null,
218	218	'version' => null,
		@@ -236,7 +236,7 @@ discard block
		block discarded – undo
236	236	*/
237	237	public function _replyToAddStyle() {
238	238
239		- if ( ! $this->oForm->isInThePage() ) {
	239	+ if ( !$this->oForm->isInThePage() ) {
240	240	return;
241	241	}
242	242	$_sCSSRules = $this->_getFormattedInternalStyles(
		@@ -278,7 +278,7 @@ discard block
		block discarded – undo
278	278	*/
279	279	public function _replyToAddScript() {
280	280
281		- if ( ! $this->oForm->isInThePage() ) {
	281	+ if ( !$this->oForm->isInThePage() ) {
282	282	return;
283	283	}
284	284

		@@ -23,13 +23,13 @@
		block discarded – undo
23	23	protected function _get() {
24	24	return $this->_getFormSectionRules();
25	25	}
26		- /**
27		- * Returns the CSS rules for form fields.
28		- *
29		- * @since 3.4.0
30		- * @since 3.7.0 Moved from `AdminPageFramework_CSS`.
31		- * @internal
32		- */
	26	+ /**
	27	+ * Returns the CSS rules for form fields.
	28	+ *
	29	+ * @since 3.4.0
	30	+ * @since 3.7.0 Moved from `AdminPageFramework_CSS`.
	31	+ * @internal
	32	+ */
33	33	private function _getFormSectionRules() {
34	34	$_sCSSRules = <<<CSSRULES
35	35	/* Section Table */

		@@ -135,7 +135,8 @@
		block discarded – undo
135	135	// Retrieve the formatted sectionsets of the content.
136	136	$_sSectionPath = $this->aSectionset[ '_section_path' ];
137	137	$_aSectionsets = $this->aStructure[ 'sectionsets' ];
138		- if ( ! isset( $_aSectionsets[ $_sSectionPath ] ) ) { // @todo not sure what this check is for
	138	+ if ( ! isset( $_aSectionsets[ $_sSectionPath ] ) ) {
	139	+// @todo not sure what this check is for
139	140	return '';
140	141	}
141	142

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	*
26	26	* Only one depth at a time will be parsed.
27	27	*/
28		- public $iNestedDepth = 0;
	28	+ public $iNestedDepth = 0;
29	29
30	30	/**
31	31	* Stores the generated section tab slugs.
		@@ -121,11 +121,11 @@ discard block
		block discarded – undo
121	121	$_aFieldsBySectionTab = array();
122	122	$_iIndex = 0;
123	123
124		- foreach( $aSectionsets as $_sSectionPath => $_aSectionset ) {
	124	+ foreach ( $aSectionsets as $_sSectionPath => $_aSectionset ) {
125	125
126	126	// If no fields for the section, no need to add the section
127	127	// unless the custom sectionset output is defined.
128		- if ( ! isset( $aFieldsets[ $_sSectionPath ] ) && ! $this->_isCustomContentSet( $_aSectionset ) ) {
	128	+ if ( !isset( $aFieldsets[ $_sSectionPath ] ) && !$this->_isCustomContentSet( $_aSectionset ) ) {
129	129	continue;
130	130	}
131	131
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	$_sSectionTaqbSlug = $this->getAOrB(
138	138	$_aSectionset[ 'section_tab_slug' ],
139	139	$_aSectionset[ 'section_tab_slug' ],
140		- '_default_' . $this->iNestedDepth . '_' . ( ++$_iIndex )
	140	+ '_default_'.$this->iNestedDepth.'_'.( ++$_iIndex )
141	141	);
142	142	$_aSectionsBySectionTab[ $_sSectionTaqbSlug ][ $_sSectionPath ] = $_aSectionset;
143	143	$_aFieldsBySectionTab[ $_sSectionTaqbSlug ][ $_sSectionPath ] = $this->getElement(
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	* @since 3.7.0 Moved from `AdminPageFramework_FormPart_Table`.
159	159	* @return boolean True if a custom content value is set.
160	160	*/
161		- private function _isCustomContentSet( array $aSectionset, array $aKeys=array( 'content' ) ) {
	161	+ private function _isCustomContentSet( array $aSectionset, array $aKeys = array( 'content' ) ) {
162	162	return isset( $aSectionset[ 'content' ] );
163	163	// @deprecated
164	164	// foreach( $aKeys as $_sKey ) {

		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32
33	33	$_aParameters = func_get_args() + array(
34	34	$this->aFieldset,
35		- $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
	35	+ $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
36	36	$this->aFieldErrors,
37	37	$this->aFieldTypeDefinitions,
38	38	$this->aCallbacks, // field output element callables.
		@@ -60,14 +60,14 @@ discard block
		block discarded – undo
60	60
61	61	$aFieldset = $this->aFieldset;
62	62
63		- if ( ! $this->isNormalPlacement( $aFieldset ) ) {
	63	+ if ( !$this->isNormalPlacement( $aFieldset ) ) {
64	64	return '';
65	65	}
66	66
67		- $_oFieldrowAttribute = new AdminPageFramework_Form_View___Attribute_Fieldrow(
	67	+ $_oFieldrowAttribute = new AdminPageFramework_Form_View___Attribute_Fieldrow(
68	68	$aFieldset,
69	69	array(
70		- 'id' => 'fieldrow-' . $aFieldset[ 'tag_id' ],
	70	+ 'id' => 'fieldrow-'.$aFieldset[ 'tag_id' ],
71	71	'valign' => 'top',
72	72	'class' => 'admin-page-framework-fieldrow',
73	73	)
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	return $this->_getFieldByContainer(
77	77	$aFieldset,
78	78	array(
79		- 'open_container' => "<tr " . $_oFieldrowAttribute->get() . ">",
	79	+ 'open_container' => "<tr ".$_oFieldrowAttribute->get().">",
80	80	'close_container' => "</tr>",
81	81	'open_title' => "<th>",
82	82	'close_title' => "</th>",
		@@ -125,13 +125,13 @@ discard block
		block discarded – undo
125	125	$this->aCallbacks,
126	126	$this->oMsg
127	127	);
128		- $_aOutput = array();
	128	+ $_aOutput = array();
129	129	if ( $aFieldset[ 'show_title_column' ] ) {
130		- $_aOutput[] = $aOpenCloseTags[ 'open_title' ]
	130	+ $_aOutput[ ] = $aOpenCloseTags[ 'open_title' ]
131	131	. $_oFieldTitle->get()
132	132	. $aOpenCloseTags[ 'close_title' ];
133	133	}
134		- $_aOutput[] = $aOpenCloseTags[ 'open_main' ]
	134	+ $_aOutput[ ] = $aOpenCloseTags[ 'open_main' ]
135	135	// . call_user_func_array( $hfCallback, array( $aFieldset ) )
136	136	. $this->getFieldsetOutput( $aFieldset )
137	137	. $aOpenCloseTags[ 'close_main' ];

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31
32	32	$_aParameters = func_get_args() + array(
33	33	$this->aFieldset,
34		- $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
	34	+ $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
35	35	$this->aFieldErrors,
36	36	$this->aFieldTypeDefinitions,
37	37	$this->aCallbacks, // field output element callables.
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59
60	60	$aFieldset = $this->aFieldset;
61	61
62		- if ( ! $this->isNormalPlacement( $aFieldset ) ) {
	62	+ if ( !$this->isNormalPlacement( $aFieldset ) ) {
63	63	return '';
64	64	}
65	65
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	return $this->_getFieldByContainer(
71	71	$aFieldset,
72	72	array(
73		- 'open_main' => "<div " . $_oFieldrowAttribute->get() . ">",
	73	+ 'open_main' => "<div ".$_oFieldrowAttribute->get().">",
74	74	'close_main' => "</div>",
75	75	)
76	76	);

michaeluno / admin-page-framework

Branch — master (7ff82b)

Status

Category

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch