michaeluno / admin-page-framework

development/factory/_common/form/_view/attribute/AdminPageFramework_Form_View___Attribute_FieldContainer_Base.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
             $this->aAttributes + $this->_getAttributes()
         );
                     
-        $_aAttributes[ 'class' ]   = $this->getClassAttribute(
+        $_aAttributes[ 'class' ] = $this->getClassAttribute(
             $this->getElement( $_aAttributes, 'class', array() ),
             $this->getElement( $this->aArguments, array( 'class', $this->sContext ), array() )
         );

development/factory/_common/form/_view/script/AdminPageFramework_Form_View___Script_CollapsibleSection.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
         
         $_aParams               = func_get_args() + array( null );
         $_oMsg                  = $_aParams[ 0 ];
-        $_sToggleAllButtonHTML  = '"' . self::_getToggleAllButtonHTML( $_oMsg ) . '"';
+        $_sToggleAllButtonHTML  = '"'.self::_getToggleAllButtonHTML( $_oMsg ).'"';
            
         return <<<JAVASCRIPTS
 ( function( $ ) {
@@ -212,19 +212,19 @@ 
             $_sLabelToggleAll           = $oMsg->get( 'toggle_all' );
             $_sLabelToggleAllSections   = $oMsg->get( 'toggle_all_collapsible_sections' );
             $_sDashIconSort             = self::getAOrB(
-                version_compare( $GLOBALS['wp_version'], '3.8', '<' ),  // evaluate
+                version_compare( $GLOBALS[ 'wp_version' ], '3.8', '<' ), // evaluate
                 '', // true
                 'dashicons dashicons-sort' // false
             );
-            $_sText                     = self::getAOrB(
+            $_sText = self::getAOrB(
                 $_sDashIconSort, // evaluate
                 '', // true
                 $_sLabelToggleAll // false
             );
 
             return "<div class='admin-page-framework-collapsible-toggle-all-button-container'>"
-                    . "<span class='admin-page-framework-collapsible-toggle-all-button button " . $_sDashIconSort . "'"
-                        . " title='" . esc_attr( $_sLabelToggleAllSections )
+                    . "<span class='admin-page-framework-collapsible-toggle-all-button button ".$_sDashIconSort."'"
+                        . " title='".esc_attr( $_sLabelToggleAllSections )
                     . "'>"
                         . $_sText
                     . "</span>"

development/factory/_common/form/_view/sectionset/AdminPageFramework_Form_View___CollapsibleSectionTitle.php

Spacing +8 added lines, -8 removed lines

@@ -18,17 +18,17 @@ 
  */
 class AdminPageFramework_Form_View___CollapsibleSectionTitle extends AdminPageFramework_Form_View___SectionTitle {
             
-    public $aArguments      = array(
+    public $aArguments = array(
         'title'             => null,
         'tag'               => null,
         'section_index'     => null,
         'collapsible'       => array(),
         'container_type'    => 'section', // section or sections
 
-        'sectionset'        => array(),  // 3.7.0+ sectionset definition array
+        'sectionset'        => array(), // 3.7.0+ sectionset definition array
 
     );
-    public $aFieldsets               = array();
+    public $aFieldsets = array();
     public $aSavedData              = array();
     public $aFieldErrors            = array();
     public $aFieldTypeDefinitions   = array();
@@ -63,7 +63,7 @@ 
          * @param       array|boolean   $aCollapsible       The collapsible argument.
          * @param       string          $sContainer          The position context. Accepts either 'sections' or 'section'. If the set position in the argument array does not match this value, the method will return an empty string.
          */
-        private function _getCollapsibleSectionTitleBlock( array $aCollapsible, $sContainer='sections', $iSectionIndex=null ) {
+        private function _getCollapsibleSectionTitleBlock( array $aCollapsible, $sContainer = 'sections', $iSectionIndex = null ) {
 
             if ( $sContainer !== $aCollapsible[ 'container' ] ) {
                 return '';
@@ -79,10 +79,10 @@ 
             );
             
             $_aSectionset        = $this->aArguments[ 'sectionset' ];
-            $_sSectionTitleTagID = str_replace( '|', '_', $_aSectionset[ '_section_path' ]  ) . '_' . $iSectionIndex;
+            $_sSectionTitleTagID = str_replace( '|', '_', $_aSectionset[ '_section_path' ] ).'_'.$iSectionIndex;
             
             return $this->_getCollapsibleSectionsEnablerScript()
-                . "<div " . $this->getAttributes(
+                . "<div ".$this->getAttributes(
                     array(
                         'id'    => $_sSectionTitleTagID,
                         'class' => $this->getClassAttribute(
@@ -103,11 +103,11 @@ 
                                 'collapsed',
                                 ''
                             ),
-                            'admin-page-framework-collapsible-type-' . $aCollapsible[ 'type' ]
+                            'admin-page-framework-collapsible-type-'.$aCollapsible[ 'type' ]
                         ),
                     )
                     + $this->getDataAttributeArray( $aCollapsible )
-                ) . ">"
+                ).">"
                         . $_sSectionTitle
                     . "</div>";
             

development/factory/_common/form/_view/sectionset/AdminPageFramework_Form_View___Section_Base.php

Spacing +2 added lines, -2 removed lines

@@ -56,13 +56,13 @@
     public function getFieldsetOutput( $aFieldset ) {
 
         // Check if the field is visible
-        if ( ! $this->isFieldsetVisible( $aFieldset ) ) {
+        if ( !$this->isFieldsetVisible( $aFieldset ) ) {
             return '';
         }
 
         $_oFieldset = new AdminPageFramework_Form_View___Fieldset(
             $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->oMsg,

development/factory/_common/form/_view/sectionset/AdminPageFramework_Form_View___Sectionsets.php

Indentation +1 added lines, -1 removed lines

@@ -556,7 +556,7 @@
                  * @return      string      The generated section tab list as HTML.
                  */
                 private function _getSectionTabList( $sSectionTabSlug, array $aSectionTabList ) {
-                   return $sSectionTabSlug
+                    return $sSectionTabSlug
                         ? "<ul class='admin-page-framework-section-tabs nav-tab-wrapper'>"
                             . implode( PHP_EOL, $aSectionTabList )
                             . "</ul>"

Doc Comments +4 added lines, -1 removed lines

@@ -164,6 +164,7 @@ 
     }
         /**
          * @since       3.7.0
+         * @param string $_sOutput
          * @return      string
          */
         private function _getSpinnerOutput( $_sOutput ) {
@@ -298,7 +299,7 @@ 
              * @param       array       $_aOutputs      Holds output elements - contents, section tab list, count of subsections.
              * @param       string      $_sSectionsID   The container id of sections.
              * @param       array       $_aSection
-             * @param       array       $_aFieldsInSections     A field-sets array already divided by section tab.
+             * @param       array       $aFieldsInSections     A field-sets array already divided by section tab.
              * @return      array       The updated sections table output array.
              */
             private function _getSectionsetTable( $_aOutputs, $_sSectionsID, array $_aSection, array $aFieldsInSections ) {
@@ -353,6 +354,7 @@ 
                  * Returns the output of sub-sections for repeatable and sortable sections.
                  *
                  * @since       3.7.0
+                 * @param string $_sSectionsID
                  * @return      array
                  */
                 private function _getSubSections( $_aOutputs, $_sSectionsID, $_aSection, $_aSubSections ) {
@@ -499,6 +501,7 @@ 
              * @since       3.5.3
              * @since       3.6.0       Removed the `$sSectionID` parameter. Added the `$aSectionset` parameter.
              * @since       3.7.0       Moved from `AdminPageFramework_FormPart_Table`.
+             * @param string $sSectionsID
              * @return      string      The formatted sections table HTML output.
              */
             private function _getFormattedSectionsTablesOutput( array $aOutputs, $aSectionset, $sSectionsID, array $aCollapsible, $sSectionTabSlug ) {

Spacing +44 added lines, -44 removed lines

@@ -126,16 +126,16 @@ 
      */
     public function get() {
 
-        $_oFormatSectionsetsByTab  = new AdminPageFramework_Form_View___Format_SectionsetsByTab(
+        $_oFormatSectionsetsByTab = new AdminPageFramework_Form_View___Format_SectionsetsByTab(
             $this->aStructure[ 'sectionsets' ],
             $this->aStructure[ 'fieldsets' ],
             $this->aArguments[ 'nested_depth' ]
         );
 
-        $_aOutput     = array();
-        foreach( $_oFormatSectionsetsByTab->getTabs() as $_sSectionTabSlug ) {
+        $_aOutput = array();
+        foreach ( $_oFormatSectionsetsByTab->getTabs() as $_sSectionTabSlug ) {
 
-            $_aOutput[] = $this->_getFormOutput(
+            $_aOutput[ ] = $this->_getFormOutput(
                 $_oFormatSectionsetsByTab->getSectionsets( $_sSectionTabSlug ),
                 $_oFormatSectionsetsByTab->getFieldsets( $_sSectionTabSlug ),
                 $_sSectionTabSlug,
@@ -152,7 +152,7 @@ 
 
         // Generate id for this output
         $_sOutput    = implode( PHP_EOL, $_aOutput );
-        $_sElementID = "admin-page-framework-sectionsets-" . uniqid();
+        $_sElementID = "admin-page-framework-sectionsets-".uniqid();
         return $this->_getSpinnerOutput( $_sOutput )
             .   "<div id='{$_sElementID}' class='admin-page-framework-sctionsets admin-page-framework-form-js-on'>"
                 . $_sOutput
@@ -187,17 +187,17 @@ 
 
             // A sectionset is a set of sections.
             $_sSectionSet = $this->_getSectionsetsTables(
-                $aSectionsets,  // section-set definition (already divided by section tab)
-                $aFieldsets,    // field-set definitions (already divided by section tab)
+                $aSectionsets, // section-set definition (already divided by section tab)
+                $aFieldsets, // field-set definitions (already divided by section tab)
                 $aCallbacks
             );
             return $_sSectionSet
-                ? "<div " . $this->getAttributes(
+                ? "<div ".$this->getAttributes(
                         array(
                             'class' => 'admin-page-framework-sectionset',
-                            'id'    => "sectionset-{$sSectionTabSlug}_" . md5( serialize( $aSectionsets ) ),
+                            'id'    => "sectionset-{$sSectionTabSlug}_".md5( serialize( $aSectionsets ) ),
                         )
-                    ) . ">"
+                    ).">"
                         . $_sSectionSet
                     . "</div>"
                 : '';
@@ -229,7 +229,7 @@ 
              * If there is no field overall to the section and its section tab, return an empty string.
              * Otherwise, the section-sets container gets rendered and its CSS rules such as margins give unwanted results.
              */
-            if ( ! count( $aFieldsets ) ) {
+            if ( !count( $aFieldsets ) ) {
                 return '';
             }
 
@@ -241,13 +241,13 @@ 
             );
             $_sSectionTabSlug   = $_aFirstSectionset[ 'section_tab_slug' ];
             $_sThisSectionID    = $_aFirstSectionset[ 'section_id' ];
-            $_sSectionsID       = 'sections-' . $_sThisSectionID;
+            $_sSectionsID       = 'sections-'.$_sThisSectionID;
             $_aCollapsible      = $this->_getCollapsibleArgumentForSections(
                 $_aFirstSectionset
             );
 
-            foreach( $aSectionsets as $_aSectionset ) {
-                $_aOutputs          = $this->_getSectionsetTable(
+            foreach ( $aSectionsets as $_aSectionset ) {
+                $_aOutputs = $this->_getSectionsetTable(
                     $_aOutputs,
                     $_sSectionsID,
                     $_aSectionset,
@@ -275,7 +275,7 @@ 
              * Changed the visibility scope to private. Changed the 1st parameter from `$aSection`.
              * @return      array
              */
-            private function _getCollapsibleArgumentForSections( array $aSectionset=array() ) {
+            private function _getCollapsibleArgumentForSections( array $aSectionset = array() ) {
 
                 $_oArgumentFormater = new AdminPageFramework_Form_Model___Format_CollapsibleSection(
                     $aSectionset[ 'collapsible' ],
@@ -303,19 +303,19 @@ 
              */
             private function _getSectionsetTable( $_aOutputs, $_sSectionsID, array $_aSection, array $aFieldsInSections ) {
 
-                if ( ! $this->isSectionsetVisible( $_aSection ) ) {
+                if ( !$this->isSectionsetVisible( $_aSection ) ) {
                     return $_aOutputs;
                 }
 
                 // If the 'save' argument is false, insert a flag that disables saving the section inputs.
-                $_aOutputs[ 'section_contents' ][] = $this->_getUnsetFlagSectionInputTag( $_aSection );
+                $_aOutputs[ 'section_contents' ][ ] = $this->_getUnsetFlagSectionInputTag( $_aSection );
 
                 // For repeatable sections - sub-sections are divided field definition arrays by sub-section index,
                 // not section definition arrays.
-                $_aSubSections      = $this->getIntegerKeyElements(
+                $_aSubSections = $this->getIntegerKeyElements(
                     $this->getElementAsArray(
                         $aFieldsInSections, // subject array
-                        $_aSection[ '_section_path' ],  // dimensional path
+                        $_aSection[ '_section_path' ], // dimensional path
                         array() // default
                     )
                 );
@@ -358,28 +358,28 @@ 
                 private function _getSubSections( $_aOutputs, $_sSectionsID, $_aSection, $_aSubSections ) {
 
                     // Add the repeatable sections enabler script.
-                    if ( ! empty( $_aSection[ 'repeatable' ] ) ) {
-                        $_aOutputs[ 'section_contents' ][] = AdminPageFramework_Form_View___Script_RepeatableSection::getEnabler(
+                    if ( !empty( $_aSection[ 'repeatable' ] ) ) {
+                        $_aOutputs[ 'section_contents' ][ ] = AdminPageFramework_Form_View___Script_RepeatableSection::getEnabler(
                             $_sSectionsID,
                             $_aOutputs[ 'count_subsections' ],
                             $_aSection[ 'repeatable' ],
                             $this->oMsg
                         );
-                        $_aOutputs[ 'section_contents' ][] = $this->_getRepeatableSectionFlagTag( $_aSection );
+                        $_aOutputs[ 'section_contents' ][ ] = $this->_getRepeatableSectionFlagTag( $_aSection );
                     }
                     // Add the sortable sections enabler script. 3.6.0+
-                    if ( ! empty( $_aSection[ 'sortable' ] ) ) {
-                        $_aOutputs[ 'section_contents' ][] = AdminPageFramework_Form_View___Script_SortableSection::getEnabler(
+                    if ( !empty( $_aSection[ 'sortable' ] ) ) {
+                        $_aOutputs[ 'section_contents' ][ ] = AdminPageFramework_Form_View___Script_SortableSection::getEnabler(
                             $_sSectionsID,
                             $_aSection[ 'sortable' ],
                             $this->oMsg
                         );
-                        $_aOutputs[ 'section_contents' ][] = $this->_getSortableSectionFlagTag( $_aSection );
+                        $_aOutputs[ 'section_contents' ][ ] = $this->_getSortableSectionFlagTag( $_aSection );
                     }
 
                     // Get the section tables.
                     $_aSubSections = $this->numerizeElements( $_aSubSections ); // will include the main section as well.
-                    foreach( $_aSubSections as $_iIndex => $_aFields ) {
+                    foreach ( $_aSubSections as $_iIndex => $_aFields ) {
 
                         $_oEachSectionArguments = new AdminPageFramework_Form_Model___Format_EachSection(
                             $_aSection,
@@ -409,8 +409,8 @@ 
                         array(
                             'class'                     => 'element-address',
                             'type'                      => 'hidden',
-                            'name'                      => '__repeatable_elements_' . $aSection[ '_structure_type' ]
-                                . '[' . $aSection[ 'section_id' ] . ']',
+                            'name'                      => '__repeatable_elements_'.$aSection[ '_structure_type' ]
+                                . '['.$aSection[ 'section_id' ].']',
                             // @todo examine whether this value should include a section index.
                             'value' => $aSection[ 'section_id' ],
                         )
@@ -428,8 +428,8 @@ 
                         array(
                             'class'                     => 'element-address',
                             'type'                      => 'hidden',
-                            'name'                      => '__sortable_elements_' . $aSection[ '_structure_type' ]
-                                . '[' . $aSection[ 'section_id' ] . ']',
+                            'name'                      => '__sortable_elements_'.$aSection[ '_structure_type' ]
+                                . '['.$aSection[ 'section_id' ].']',
                             // @todo examine whether this value should include a section index.
                             'value' => $aSection[ 'section_id' ],
                         )
@@ -451,8 +451,8 @@ 
                         'input',
                         array(
                             'type'  => 'hidden',
-                            'name'  => '__unset_' .  $aSection[ '_structure_type' ] . '[' . $aSection[ 'section_id' ] . ']',
-                            'value' => "__dummy_option_key|" . $aSection[ 'section_id' ],
+                            'name'  => '__unset_'.$aSection[ '_structure_type' ].'['.$aSection[ 'section_id' ].']',
+                            'value' => "__dummy_option_key|".$aSection[ 'section_id' ],
                             'class' => 'unset-element-names element-address',
                         )
                     );
@@ -468,7 +468,7 @@ 
                 private function _getSectionTableWithTabList( array $_aOutputs, array $aSectionset, $aFieldsetsPerSection ) {
 
                     // Tab list
-                    $_aOutputs[ 'section_tab_list' ][] = $this->_getTabList(
+                    $_aOutputs[ 'section_tab_list' ][ ] = $this->_getTabList(
                         $aSectionset,
                         $aFieldsetsPerSection,
                         $this->aCallbacks[ 'fieldset_output' ]
@@ -476,7 +476,7 @@ 
 
                     // Section container
                     $_oSectionTable = new AdminPageFramework_Form_View___Section(
-                        $this->aArguments,  // for nested sections
+                        $this->aArguments, // for nested sections
                         $aSectionset,
                         $this->aStructure,
                         $aFieldsetsPerSection,
@@ -486,7 +486,7 @@ 
                         $this->aCallbacks,
                         $this->oMsg
                     );
-                    $_aOutputs[ 'section_contents' ][] = $_oSectionTable->get();
+                    $_aOutputs[ 'section_contents' ][ ] = $_oSectionTable->get();
 
                     return $_aOutputs;
 
@@ -514,9 +514,9 @@ 
                         'section_index'     => null,
                         'collapsible'       => $aCollapsible,
                         'container_type'    => 'sections', // section or sections
-                        'sectionset'        => $aSectionset,    // 3.7.0+ for tooltip
+                        'sectionset'        => $aSectionset, // 3.7.0+ for tooltip
                     ),
-                    array(),            // fieldsets
+                    array(), // fieldsets
                     $this->aSavedData,
                     $this->aFieldErrors,
                     $this->aStructure[ 'field_type_definitions' ],
@@ -533,7 +533,7 @@ 
                     $aOutputs[ 'count_subsections' ]
                 );
                 return $_oCollapsibleSectionTitle->get()
-                    . "<div " . $_oSectionsTablesContainerAttributes->get() . ">"
+                    . "<div ".$_oSectionsTablesContainerAttributes->get().">"
                         . $this->_getSectionTabList( $sSectionTabSlug, $aOutputs[ 'section_tab_list' ] )
                         . implode( PHP_EOL, $aOutputs[ 'section_contents' ] )
                     . "</div>";
@@ -564,21 +564,21 @@ 
              */
             private function _getTabList( array $aSection, array $aFields, $hfFieldCallback ) {
 
-                if ( ! $aSection[ 'section_tab_slug' ] ) {
+                if ( !$aSection[ 'section_tab_slug' ] ) {
                     return '';
                 }
 
                 $iSectionIndex      = $aSection[ '_index' ];
 
-                $_sSectionTagID     = 'section-' . $aSection[ 'section_id' ] . '__' . $iSectionIndex;
+                $_sSectionTagID     = 'section-'.$aSection[ 'section_id' ].'__'.$iSectionIndex;
                 $_aTabAttributes    = $aSection[ 'attributes' ][ 'tab' ]
                     + array(
                         'class' => 'admin-page-framework-section-tab nav-tab',
                         'id'    => "section_tab-{$_sSectionTagID}",
                         'style' => null
                     );
-                $_aTabAttributes[ 'class' ] = $this->getClassAttribute( $_aTabAttributes[ 'class' ], $aSection[ 'class' ][ 'tab' ] );  // 3.3.1+
-                $_aTabAttributes[ 'style' ] = $this->getStyleAttribute( $_aTabAttributes[ 'style' ], $aSection[ 'hidden' ] ? 'display:none' : null );  // 3.3.1+
+                $_aTabAttributes[ 'class' ] = $this->getClassAttribute( $_aTabAttributes[ 'class' ], $aSection[ 'class' ][ 'tab' ] ); // 3.3.1+
+                $_aTabAttributes[ 'style' ] = $this->getStyleAttribute( $_aTabAttributes[ 'style' ], $aSection[ 'hidden' ] ? 'display:none' : null ); // 3.3.1+
 
                 $_oSectionTitle = new AdminPageFramework_Form_View___SectionTitle(
                     array(
@@ -586,7 +586,7 @@ 
                         'tag'           => 'h4',
                         'section_index' => $iSectionIndex,
 
-                        'sectionset'    => $aSection,   // 3.7.0+      for tooltip
+                        'sectionset'    => $aSection, // 3.7.0+      for tooltip
                     ),
                     $aFields,
                     $this->aSavedData,
@@ -596,7 +596,7 @@ 
                     $this->aCallbacks // field output element callables.
                 );
 
-                return "<li " . $this->getAttributes( $_aTabAttributes ) . ">"
+                return "<li ".$this->getAttributes( $_aTabAttributes ).">"
                     . "<a href='#{$_sSectionTagID}'>"
                         . $_oSectionTitle->get()
                     ."</a>"

development/factory/_common/form/input/AdminPageFramework_Input_radio.php

Spacing +10 added lines, -10 removed lines

@@ -36,12 +36,12 @@ 
         
         // Output
         return
-            "<{$this->aOptions['input_container_tag']} " . $this->getAttributes( $this->aOptions['input_container_attributes'] ) . ">"
-                . "<input " . $this->getAttributes( $_aAttributes ) . " />"
-            . "</{$this->aOptions['input_container_tag']}>"
-            . "<{$this->aOptions['label_container_tag']} " . $this->getAttributes( $this->aOptions['label_container_attributes'] ) . ">"
+            "<{$this->aOptions[ 'input_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ).">"
+                . "<input ".$this->getAttributes( $_aAttributes )." />"
+            . "</{$this->aOptions[ 'input_container_tag' ]}>"
+            . "<{$this->aOptions[ 'label_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'label_container_attributes' ] ).">"
                 . $_sLabel
-            . "</{$this->aOptions['label_container_tag']}>"
+            . "</{$this->aOptions[ 'label_container_tag' ]}>"
             ;
         
     }
@@ -58,22 +58,22 @@ 
     public function getAttributesByKey( /* $sKey */ ) {
         
         // Parameters
-        $_aParams       = func_get_args() + array( 0 => '', );
-        $_sKey           = $_aParams[ 0 ];
+        $_aParams = func_get_args() + array( 0 => '',);
+        $_sKey = $_aParams[ 0 ];
         
         // Result
         return $this->getElementAsArray( $this->aAttributes, $_sKey, array() )
             + array(
                 'type'          => 'radio',
-                'checked'       => isset( $this->aAttributes['value'] ) && $this->aAttributes['value'] == $_sKey
+                'checked'       => isset( $this->aAttributes[ 'value' ] ) && $this->aAttributes[ 'value' ] == $_sKey
                     ? 'checked'
                     : null,
                 'value'         => $_sKey,
                 // 'id'            => $this->aField['input_id'] . '_' . $_sKey,
-                'id'            => $this->getAttribute( 'id' ) . '_' . $_sKey,
+                'id'            => $this->getAttribute( 'id' ).'_'.$_sKey,
                 // 'data-default'  => $this->aField['default'],        // refered by the repeater script
                 // 'data-id'       => $this->aField['input_id'],       // refered by the JavaScript scripts such as the revealer script.
-                'data-id'       => $this->getAttribute( 'id' ),       // refered by the JavaScript scripts such as the revealer script.
+                'data-id'       => $this->getAttribute( 'id' ), // refered by the JavaScript scripts such as the revealer script.
             )
             + $this->aAttributes;
             

Doc Comments -4 removed lines

@@ -20,8 +20,6 @@ 
      * Returns the output of the input element.
      *
      * @since       3.4.0
-     * @param       string      $sLabel         The label text.
-     * @param       array       $aAttributes    (optional) The attribute array. If set, it will be merged with the attribute set in the constructor.
      */
     public function get( /* $sLabel, $aAttributes=array() */ ) {
 
@@ -51,8 +49,6 @@ 
      *
      * @return      array       The updated attribute array.
      * @since       3.5.3
-     * @param       string      $sKey       The array element key of the radio button.
-     * It is assumed that there is an array that holds multiple radio buttons and each of them has an array key.
      */
     public function getAttributesByKey( /* $sKey */ ) {
 

development/factory/admin_page/AdminPageFramework_Model_Page.php

Spacing +5 added lines, -5 removed lines

@@ -37,13 +37,13 @@ 
      */
     public function _replyToFinalizeInPageTabs() {
 
-        if ( ! $this->oProp->isPageAdded() ) {
+        if ( !$this->oProp->isPageAdded() ) {
             return;
         }
 
-        foreach( $this->oProp->aPages as $_sPageSlug => $_aPage ) {
+        foreach ( $this->oProp->aPages as $_sPageSlug => $_aPage ) {
             
-            if ( ! isset( $this->oProp->aInPageTabs[ $_sPageSlug ] ) ) {
+            if ( !isset( $this->oProp->aInPageTabs[ $_sPageSlug ] ) ) {
                 continue;
             }
             
@@ -80,8 +80,8 @@ 
          * @since       3.6.0
          */
         private function _getDefaultInPageTab( $sPageSlug, $aInPageTabs ) {
-            foreach( $aInPageTabs as $_aInPageTab ) {
-                if ( ! isset( $_aInPageTab[ 'tab_slug' ] ) ) {
+            foreach ( $aInPageTabs as $_aInPageTab ) {
+                if ( !isset( $_aInPageTab[ 'tab_slug' ] ) ) {
                     continue;
                 }
                 // Regardless of whether it's a hidden tab, it is stored as the default in-page tab.

development/factory/admin_page/_controller/AdminPageFramework_Resource_admin_page.php

Braces +2 added lines, -1 removed lines

@@ -333,7 +333,8 @@
         $sTabSlug           = $aEnqueueItem['sTabSlug'];
 
         // If the page slug is not specified and the currently loading page is one of the pages that is added by the framework,
-        if ( ! $sPageSlug && $this->oProp->isPageAdded( $sCurrentPageSlug ) ) { // means script-global(among pages added by the framework)
+        if ( ! $sPageSlug && $this->oProp->isPageAdded( $sCurrentPageSlug ) ) {
+// means script-global(among pages added by the framework)
             return $this->_enqueueSRC( $aEnqueueItem );
         }
                 

Spacing +25 added lines, -25 removed lines

@@ -44,7 +44,7 @@ 
 
         // tab
         if ( $_sPageSlug && $_sTabSlug ) {
-            $this->oProp->sStyle     = $this->addAndApplyFilters(
+            $this->oProp->sStyle = $this->addAndApplyFilters(
                 $_oCaller,
                 "style_{$_sPageSlug}_{$_sTabSlug}",
                 $this->oProp->sStyle
@@ -53,7 +53,7 @@ 
 
         // page
         if ( $_sPageSlug ) {
-            $this->oProp->sStyle     = $this->addAndApplyFilters(
+            $this->oProp->sStyle = $this->addAndApplyFilters(
                 $_oCaller,
                 "style_{$_sPageSlug}",
                 $this->oProp->sStyle
@@ -87,7 +87,7 @@ 
          * @return      string      The tab slug if the tab has been added.
          */
         private function _getCurrentTabSlugForFilter( $sPageSlug ) {
-            $_sTabSlug  = $this->oProp->getCurrentTabSlug( $sPageSlug );
+            $_sTabSlug = $this->oProp->getCurrentTabSlug( $sPageSlug );
             return isset( $this->oProp->aInPageTabs[ $sPageSlug ][ $_sTabSlug ] )
                 ? $_sTabSlug
                 : '';
@@ -115,7 +115,7 @@ 
 
         // tab
         if ( $_sPageSlug && $_sTabSlug ) {
-            $this->oProp->sScript     = $this->addAndApplyFilters(
+            $this->oProp->sScript = $this->addAndApplyFilters(
                 $_oCaller,
                 "script_{$_sPageSlug}_{$_sTabSlug}",
                 $this->oProp->sScript
@@ -124,7 +124,7 @@ 
 
         // page
         if ( $_sPageSlug ) {
-            $this->oProp->sScript     = $this->addAndApplyFilters(
+            $this->oProp->sScript = $this->addAndApplyFilters(
                 $_oCaller,
                 "script_{$_sPageSlug}",
                 $this->oProp->sScript
@@ -142,11 +142,11 @@ 
      * @since 2.1.5
      * @internal
      */
-    public function _enqueueStyles( $aSRCs, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function _enqueueStyles( $aSRCs, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
 
         $_aHandleIDs = array();
-        foreach( ( array ) $aSRCs as $_sSRC ) {
-            $_aHandleIDs[] = $this->_enqueueStyle( $_sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
+        foreach ( ( array ) $aSRCs as $_sSRC ) {
+            $_aHandleIDs[ ] = $this->_enqueueStyle( $_sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
         }
         return $_aHandleIDs;
 
@@ -172,7 +172,7 @@ 
      * @return      string  The script handle ID. If the passed url is not a valid url string, an empty string will be returned.
      * @internal
      */
-    public function _enqueueStyle( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function _enqueueStyle( $sSRC, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
         return $this->_enqueueResourceByType( $sSRC, $sPageSlug, $sTabSlug, $aCustomArgs, 'style' );
     }
 
@@ -181,11 +181,11 @@ 
      *
      * @since 2.1.5
      */
-    public function _enqueueScripts( $aSRCs, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function _enqueueScripts( $aSRCs, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
 
         $_aHandleIDs = array();
-        foreach( ( array ) $aSRCs as $_sSRC ) {
-            $_aHandleIDs[] = $this->_enqueueScript( $_sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
+        foreach ( ( array ) $aSRCs as $_sSRC ) {
+            $_aHandleIDs[ ] = $this->_enqueueScript( $_sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
         }
         return $_aHandleIDs;
 
@@ -212,7 +212,7 @@ 
      * @return      string      The script handle ID. If the passed url is not a valid url string, an empty string will be returned.
      * @internal
      */
-    public function _enqueueScript( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function _enqueueScript( $sSRC, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
         return $this->_enqueueResourceByType( $sSRC, $sPageSlug, $sTabSlug, $aCustomArgs, 'script' );
     }
         /**
@@ -225,20 +225,20 @@ 
          * @param       array       $aCustomArgs    A custom argument array.
          * @param       string      $sType          Accepts 'style' or 'script'
          */
-        private function _enqueueResourceByType( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array(), $sType='style' ) {
+        private function _enqueueResourceByType( $sSRC, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array(), $sType = 'style' ) {
 
-            $sSRC       = trim( $sSRC );
+            $sSRC = trim( $sSRC );
             if ( empty( $sSRC ) ) {
                 return '';
             }
-            $sSRC       = $this->getResolvedSRC( $sSRC );
+            $sSRC = $this->getResolvedSRC( $sSRC );
 
             // Get the property name for the type
             $_sContainerPropertyName     = $this->_getContainerPropertyNameByType( $sType );
             $_sEnqueuedIndexPropertyName = $this->_getEnqueuedIndexPropertyNameByType( $sType );
 
             // setting the key based on the url prevents duplicate items
-            $_sSRCHash  = md5( $sSRC );
+            $_sSRCHash = md5( $sSRC );
             if ( isset( $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ] ) ) {
                 return '';
             }
@@ -249,13 +249,13 @@ 
                     'sTabSlug'  => $sTabSlug,
                     'sSRC'      => $sSRC,
                     'sType'     => $sType,
-                    'handle_id' => $sType . '_' . $this->oProp->sClassName . '_' .  ( ++$this->oProp->{$_sEnqueuedIndexPropertyName} ),
+                    'handle_id' => $sType.'_'.$this->oProp->sClassName.'_'.( ++$this->oProp->{$_sEnqueuedIndexPropertyName} ),
                 )
                 + self::$_aStructure_EnqueuingResources
                 ;
 
             // Store the attributes in another container by url.
-            $this->oProp->aResourceAttributes[ $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ]['handle_id'] ] = $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ]['attributes'];
+            $this->oProp->aResourceAttributes[ $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ][ 'handle_id' ] ] = $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ][ 'attributes' ];
 
             return $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ][ 'handle_id' ];
 
@@ -295,7 +295,7 @@ 
      * @since       3.0.0
      * @internal
      */
-    public function _forceToEnqueueStyle( $sSRC, $aCustomArgs=array() ) {
+    public function _forceToEnqueueStyle( $sSRC, $aCustomArgs = array() ) {
         return $this->_enqueueStyle( $sSRC, '', '', $aCustomArgs );
     }
     /**
@@ -305,7 +305,7 @@ 
      * @since       3.0.0
      * @internal
      */
-    public function _forceToEnqueueScript( $sSRC, $aCustomArgs=array() ) {
+    public function _forceToEnqueueScript( $sSRC, $aCustomArgs = array() ) {
         return $this->_enqueueScript( $sSRC, '', '', $aCustomArgs );
     }
 
@@ -322,11 +322,11 @@ 
 
         $sCurrentPageSlug   = $this->oProp->getCurrentPageSlug();
         $sCurrentTabSlug    = $this->oProp->getCurrentTabSlug( $sCurrentPageSlug );
-        $sPageSlug          = $aEnqueueItem['sPageSlug'];
-        $sTabSlug           = $aEnqueueItem['sTabSlug'];
+        $sPageSlug          = $aEnqueueItem[ 'sPageSlug' ];
+        $sTabSlug           = $aEnqueueItem[ 'sTabSlug' ];
 
         // If the page slug is not specified and the currently loading page is one of the pages that is added by the framework,
-        if ( ! $sPageSlug && $this->oProp->isPageAdded( $sCurrentPageSlug ) ) { // means script-global(among pages added by the framework)
+        if ( !$sPageSlug && $this->oProp->isPageAdded( $sCurrentPageSlug ) ) { // means script-global(among pages added by the framework)
             return $this->_enqueueSRC( $aEnqueueItem );
         }
 
@@ -341,7 +341,7 @@ 
         // If the tab slug is not specified and the page slug is specified,
         // and if the current loading page slug and the specified one matches,
         if (
-            ( $sPageSlug && ! $sTabSlug )
+            ( $sPageSlug && !$sTabSlug )
             && ( $sCurrentPageSlug == $sPageSlug )
         ) {
             return $this->_enqueueSRC( $aEnqueueItem );

development/factory/admin_page/_model/delegate/AdminPageFramework_Model_Menu__RegisterMenu.php

Braces +1 added lines, -1 removed lines

@@ -400,7 +400,7 @@
                  * @since       3.1.1       Moved from `AdminPageFramework_Menu`. Chagned the return type.
                  * @return      array       removed menu item.
                  */
-                private function _removePageSubmenuItem( $nSubMenuPageIndex, $sMenuSlug, $sPageSlug, $sMenuTitle ){
+                private function _removePageSubmenuItem( $nSubMenuPageIndex, $sMenuSlug, $sPageSlug, $sMenuTitle ) {
  
                     $_aRemovedMenuItem = $this->_removePageSubMenuItemByIndex(
                         $nSubMenuPageIndex,

Doc Comments +5 added lines, -1 removed lines

@@ -26,6 +26,7 @@ 
      * Sets up hooks
      *
      * @internal
+     * @param AdminPageFramework_Router $oFactory
      */
     public function __construct( $oFactory, $sActionHook='admin_menu' ) {
 
@@ -253,6 +254,7 @@ 
              * @since       3.3.0
              * @since       3.1.1       Moved from `AdminPageFramework_Menu`.
              * @since       3.7.4       Added the `$nOrder` parameter.
+             * @param string $sMenuSlug
              * @return      string      The page hook of the added page.
              */
             private function _addPageSubmenuItem( $sRootPageSlug, $sMenuSlug, $sPageSlug, $sPageTitle, $sMenuTitle, $sCapability, $bShowInMenu, $nOrder ) {
@@ -354,6 +356,7 @@ 
                 /**
                  * Sets up hooks for the page.
                  * @since       3.7.4
+                 * @param false|string $sPageHook
                  */
                 private function _setPageHooks( $sPageHook, $sPageSlug ) {
 
@@ -405,7 +408,7 @@ 
                 /**
                  * @since       3.7.4
                  * @return      void
-                 * @param       numeric     $$nOrder            A user set order (menu position, index).
+                 * @param       numeric     $nOrder            A user set order (menu position, index).
                  * @param       array       $aSubMenuItem       The sub menu item array set in the global `$submenu` array.
                  */
                 private function _setSubMenuPageByIndex( $nOrder, $aSubMenuItem, $sMenuSlug ) {
@@ -529,6 +532,7 @@ 
              * @since       3.1.1       Moved from `AdminPageFramework_Menu`.
              * @since       3.5.3       Added the `$bShowInMenu` parameter.
              * @since       3.7.4       Added the `$nOrder` parameter.
+             * @param string $sMenuSlug
              * @return      void
              */
             private function _addLinkSubmenuItem( $sMenuSlug, $sTitle, $sCapability, $sHref, $bShowInMenu, $nOrder ) {

Spacing +51 added lines, -51 removed lines

@@ -27,7 +27,7 @@ 
      *
      * @internal
      */
-    public function __construct( $oFactory, $sActionHook='admin_menu' ) {
+    public function __construct( $oFactory, $sActionHook = 'admin_menu' ) {
 
         $this->oFactory = $oFactory;
         add_action(
@@ -74,7 +74,7 @@ 
     public function _replyToRegisterRootMenu() {
 
         // If the root menu label is not set but the slug is set,
-        if ( ! $this->oFactory->oProp->aRootMenu[ 'fCreateRoot' ] ) {
+        if ( !$this->oFactory->oProp->aRootMenu[ 'fCreateRoot' ] ) {
             return;
         }
         $this->_registerRootMenuPage();
@@ -96,12 +96,12 @@ 
             }
 
             $this->oFactory->oProp->aRootMenu[ '_page_hook' ] = add_menu_page(
-                $this->oFactory->oProp->sClassName,                 // Page title - will be invisible anyway
-                $this->oFactory->oProp->aRootMenu[ 'sTitle' ],      // Menu title - should be the root page title.
-                $this->oFactory->oProp->sCapability,                // Capability - access right
-                $this->oFactory->oProp->aRootMenu[ 'sPageSlug' ],   // Menu ID
-                '',                                       // Callback function for the page content output - the root page will be removed so no need to register a function.
-                $this->oFactory->oProp->aRootMenu[ 'sIcon16x16' ],  // icon path
+                $this->oFactory->oProp->sClassName, // Page title - will be invisible anyway
+                $this->oFactory->oProp->aRootMenu[ 'sTitle' ], // Menu title - should be the root page title.
+                $this->oFactory->oProp->sCapability, // Capability - access right
+                $this->oFactory->oProp->aRootMenu[ 'sPageSlug' ], // Menu ID
+                '', // Callback function for the page content output - the root page will be removed so no need to register a function.
+                $this->oFactory->oProp->aRootMenu[ 'sIcon16x16' ], // icon path
                 $this->getElement(
                     $this->oFactory->oProp->aRootMenu,
                     'iPosition',
@@ -123,8 +123,8 @@ 
 
         // Let external scripts add sub-menu pages.
         $_aPages = $this->addAndApplyFilter(
-            $this->oFactory,    // caller object
-            "pages_{$this->oFactory->oProp->sClassName}",   // filter
+            $this->oFactory, // caller object
+            "pages_{$this->oFactory->oProp->sClassName}", // filter
             $this->oFactory->oProp->aPages  // arguments
         );
 
@@ -134,7 +134,7 @@ 
         // Format the `$aPages` property and register the pages.
         $_iParsedIndex    = 0;
         $_aFormattedPages = array();
-        foreach( $_aPages as $_aSubMenuItem ) {
+        foreach ( $_aPages as $_aSubMenuItem ) {
 
             // needs to be sanitized because there are hook filters applied to this array.
             $_oFormatter = new AdminPageFramework_Format_SubMenuItem(
@@ -169,8 +169,8 @@ 
          */
         private function _getDefaultPageSlug( array $aPages ) {
 
-            foreach( $aPages as $_aPage ) {
-                if ( ! isset( $_aPage[ 'page_slug' ] ) ) {
+            foreach ( $aPages as $_aPage ) {
+                if ( !isset( $_aPage[ 'page_slug' ] ) ) {
                     continue;
                 }
                 return $_aPage[ 'page_slug' ];
@@ -192,7 +192,7 @@ 
          */
         private function _registerSubMenuItem( array $aArgs ) {
 
-            if ( ! current_user_can( $aArgs[ 'capability' ] ) ) {
+            if ( !current_user_can( $aArgs[ 'capability' ] ) ) {
                 return '';
             }
 
@@ -256,14 +256,14 @@ 
              */
             private function _addPageSubmenuItem( $sRootPageSlug, $sMenuSlug, $sPageSlug, $sPageTitle, $sMenuTitle, $sCapability, $bShowInMenu, $nOrder ) {
 
-                if ( ! $sPageSlug ) {
+                if ( !$sPageSlug ) {
                     return '';
                 }
                 $_sPageHook = $this->___addSubMenuPage(
-                    $sRootPageSlug,         // the root (parent) page slug
-                    $sPageTitle,            // page title
-                    $sMenuTitle,            // menu title
-                    $sCapability,           // capability
+                    $sRootPageSlug, // the root (parent) page slug
+                    $sPageTitle, // page title
+                    $sMenuTitle, // menu title
+                    $sCapability, // capability
                     $sPageSlug              // menu slug
                 );
 
@@ -291,14 +291,14 @@ 
                 $_aRemovedMenuItem = $this->_removePageSubmenuItem( $_nSubMenuPageIndex, $sMenuSlug, $sPageSlug, $sMenuTitle );
 
                 // If the visibility option is `false`, remove the one just added from the sub-menu global array
-                if ( ! $bShowInMenu && ! $this->_isCurrentPage( $sPageSlug ) ) {
+                if ( !$bShowInMenu && !$this->_isCurrentPage( $sPageSlug ) ) {
                     return $_sPageHook;
                 }
 
                 // Set the order index in the element of the `submenu` global array.
                 $this->_setSubMenuPageByIndex(
-                    $nOrder,                // user-set order
-                    $_aRemovedMenuItem,     // will be reassign with a new index
+                    $nOrder, // user-set order
+                    $_aRemovedMenuItem, // will be reassign with a new index
                     $sMenuSlug
                 );
 
@@ -319,21 +319,21 @@ 
                  * @uses        add_submenu_page
                  */
                 private function ___addSubMenuPage(
-                    $sRootPageSlug,         // the root (parent) page slug
-                    $sPageTitle,            // page title
-                    $sMenuTitle,            // menu title
-                    $sCapability,           // capability
+                    $sRootPageSlug, // the root (parent) page slug
+                    $sPageTitle, // page title
+                    $sMenuTitle, // menu title
+                    $sCapability, // capability
                     $sPageSlug              // menu slug
                 ) {
                     if ( $this->oFactory->oProp->bIsAdminAjax ) {
                         return $sPageSlug;
                     }
                     return add_submenu_page(
-                        $sRootPageSlug,         // the root (parent) page slug
-                        $sPageTitle,            // page title
-                        $sMenuTitle,            // menu title
-                        $sCapability,           // capability
-                        $sPageSlug,             // menu slug
+                        $sRootPageSlug, // the root (parent) page slug
+                        $sPageTitle, // page title
+                        $sMenuTitle, // menu title
+                        $sCapability, // capability
+                        $sPageSlug, // menu slug
                         array( $this->oFactory, '_replyToRenderPage' )  // callback 3.7.10+
                     );
                 }
@@ -367,7 +367,7 @@ 
                      */
                     add_action(
                         'current_screen',
-                        array( $this->oFactory, "load_pre_" . $sPageSlug ),
+                        array( $this->oFactory, "load_pre_".$sPageSlug ),
                         20
                     );
                     /**
@@ -382,15 +382,15 @@ 
                      * Set a low priority because the user may add in-page tabs in their callback method of this action hook.
                      * @since       3.6.3
                      */
-                    add_action( "load_" . $sPageSlug, array( $this->oFactory, '_replyToFinalizeInPageTabs' ), 9999 );
+                    add_action( "load_".$sPageSlug, array( $this->oFactory, '_replyToFinalizeInPageTabs' ), 9999 );
 
                     // 3.6.3+
-                    add_action( "load_after_" . $sPageSlug, array( $this->oFactory, '_replyToEnqueuePageAssets' ) );
-                    add_action( "load_after_" . $sPageSlug, array( $this->oFactory, '_replyToEnablePageMetaBoxes' ) );  // 3.7.10+
+                    add_action( "load_after_".$sPageSlug, array( $this->oFactory, '_replyToEnqueuePageAssets' ) );
+                    add_action( "load_after_".$sPageSlug, array( $this->oFactory, '_replyToEnablePageMetaBoxes' ) ); // 3.7.10+
 
                     $this->oFactory->oProp->aPageHooks[ $sPageSlug ] = $this->getAOrB(
                         is_network_admin(),
-                        $sPageHook . '-network',
+                        $sPageHook.'-network',
                         $sPageHook
                     );
 
@@ -407,7 +407,7 @@ 
 
                     $_nNewIndex = $this->getUnusedNumericIndex(
                         $this->getElementAsArray( $GLOBALS, array( 'submenu', $sMenuSlug ) ), // subject array to parser
-                        $nOrder,    // a desired menu position
+                        $nOrder, // a desired menu position
                         5           // offset
                     );
 
@@ -421,9 +421,9 @@ 
                  */
                 private function _getSubMenuPageIndex( $sMenuSlug, $sMenuTitle, $sPageTitle, $sPageSlug ) {
 
-                    foreach( $this->getElementAsArray( $GLOBALS, array( 'submenu', $sMenuSlug ) ) as $_iIndex => $_aSubMenu ) {
+                    foreach ( $this->getElementAsArray( $GLOBALS, array( 'submenu', $sMenuSlug ) ) as $_iIndex => $_aSubMenu ) {
 
-                        if ( ! isset( $_aSubMenu[ 3 ] ) ) {
+                        if ( !isset( $_aSubMenu[ 3 ] ) ) {
                             continue;
                         }
 
@@ -455,7 +455,7 @@ 
                  * @since       3.1.1       Moved from `AdminPageFramework_Menu`. Chagned the return type.
                  * @return      array       removed menu item.
                  */
-                private function _removePageSubmenuItem( $nSubMenuPageIndex, $sMenuSlug, $sPageSlug, $sMenuTitle ){
+                private function _removePageSubmenuItem( $nSubMenuPageIndex, $sMenuSlug, $sPageSlug, $sMenuTitle ) {
 
                     $_aRemovedMenuItem = $this->_removePageSubMenuItemByIndex(
                         $nSubMenuPageIndex,
@@ -528,7 +528,7 @@ 
              */
             private function _addLinkSubmenuItem( $sMenuSlug, $sTitle, $sCapability, $sHref, $bShowInMenu, $nOrder ) {
 
-                if ( ! $bShowInMenu ) {
+                if ( !$bShowInMenu ) {
                     return;
                 }
 
@@ -543,9 +543,9 @@ 
                     5   // offset
                 );
                 $_aSubMenuItems[ $_nIndex ] = array(
-                    $sTitle,        // 0
-                    $sCapability,   // 1
-                    $sHref,         // 2
+                    $sTitle, // 0
+                    $sCapability, // 1
+                    $sHref, // 2
                 );
                 $GLOBALS[ 'submenu' ][ $sMenuSlug ] = $_aSubMenuItems;
 
@@ -562,17 +562,17 @@ 
      */
     public function _replyToLoadPageForAjax() {
         $_sCurrentPageSlug = $this->oFactory->oProp->getCurrentPageSlugIfAdded();
-        if ( ! $_sCurrentPageSlug ) {
+        if ( !$_sCurrentPageSlug ) {
             return;
         }
-        $_sCurrentTabSlug  = $this->oFactory->oProp->getCurrentInPageTabSlugIfAdded( $_sCurrentPageSlug );
+        $_sCurrentTabSlug = $this->oFactory->oProp->getCurrentInPageTabSlugIfAdded( $_sCurrentPageSlug );
         if (
-            ! empty( $this->oFactory->oProp->aInPageTabs )      // it means at least one in-page tab is added
-            && ! $_sCurrentTabSlug // the current tab could not be retrieved
+            !empty( $this->oFactory->oProp->aInPageTabs )      // it means at least one in-page tab is added
+            && !$_sCurrentTabSlug // the current tab could not be retrieved
         ) {
             return;
         }
-        call_user_func_array( array( $this->oFactory, "load_pre_" . $_sCurrentPageSlug ), array() );
+        call_user_func_array( array( $this->oFactory, "load_pre_".$_sCurrentPageSlug ), array() );
     }
 
     /**
@@ -585,7 +585,7 @@ 
     public function _replyToRemoveRootMenuPage() {
 
         // After adding the sub menus, if the root menu is created, remove the page that is automatically created when registering the root menu.
-        if ( ! $this->oFactory->oProp->aRootMenu[ 'fCreateRoot' ] ) {
+        if ( !$this->oFactory->oProp->aRootMenu[ 'fCreateRoot' ] ) {
             return;
         }
         if ( $this->oFactory->oProp->bIsAdminAjax ) {
@@ -596,7 +596,7 @@ 
          * Namespace slugs have backslashes but the registered slugs backslashes are all converted to forward-slashes.
          * @since       3.5.16
          */
-        $_sMenuSlug =             str_replace(
+        $_sMenuSlug = str_replace(
             '\\',
             '/',
             $this->oFactory->oProp->aRootMenu[ 'sPageSlug' ]