michaeluno / admin-page-framework

development/factory/_common/utility/base_utility/AdminPageFramework_Utility_Interpreter.php

Spacing +24 added lines, -24 removed lines

@@ -26,9 +26,9 @@ 
      */
     static public function getReadableListOfArray( array $aArray ) {
 
-        $_aOutput   = array();
-        foreach( $aArray as $_sKey => $_vValue ) {
-            $_aOutput[] = self::getReadableArrayContents( $_sKey, $_vValue, 32 ) . PHP_EOL;
+        $_aOutput = array();
+        foreach ( $aArray as $_sKey => $_vValue ) {
+            $_aOutput[ ] = self::getReadableArrayContents( $_sKey, $_vValue, 32 ).PHP_EOL;
         }
         return implode( PHP_EOL, $_aOutput );
 
@@ -40,37 +40,37 @@ 
      * @since       3.9.0       Moved from `AdminPageFramework_Utility_Array.php`.
      * @return      string      The generated human-readable array contents.
      */
-    static public function getReadableArrayContents( $sKey, $vValue, $sLabelCharLengths=16, $iOffset=0 ) {
+    static public function getReadableArrayContents( $sKey, $vValue, $sLabelCharLengths = 16, $iOffset = 0 ) {
 
         $_aOutput   = array();
-        $_aOutput[] = ( $iOffset
-                ? str_pad( ' ', $iOffset  )
+        $_aOutput[ ] = ( $iOffset
+                ? str_pad( ' ', $iOffset )
                 : ''
             )
             . ( $sKey
-                ? '[' . $sKey . ']'
+                ? '['.$sKey.']'
                 : ''
             );
 
-        if ( ! in_array( gettype( $vValue ), array( 'array', 'object' ) ) ) {
-            $_aOutput[] = $vValue;
+        if ( !in_array( gettype( $vValue ), array( 'array', 'object' ) ) ) {
+            $_aOutput[ ] = $vValue;
             return implode( PHP_EOL, $_aOutput );
         }
 
         foreach ( $vValue as $_sTitle => $_asDescription ) {
-            if ( ! in_array( gettype( $_asDescription ), array( 'array', 'object' ) ) ) {
-                $_aOutput[] = str_pad( ' ', $iOffset )
+            if ( !in_array( gettype( $_asDescription ), array( 'array', 'object' ) ) ) {
+                $_aOutput[ ] = str_pad( ' ', $iOffset )
                     . $_sTitle
                     . str_pad( ':', $sLabelCharLengths - self::getStringLength( $_sTitle ) )
                     . $_asDescription;
                 continue;
             }
-            $_aOutput[] = str_pad( ' ', $iOffset )
+            $_aOutput[ ] = str_pad( ' ', $iOffset )
                 . $_sTitle
                 . ": {"
                 . self::getReadableArrayContents( '', $_asDescription, 16, $iOffset + 4 )
                 . PHP_EOL
-                . str_pad( ' ', $iOffset ) . "}";
+                . str_pad( ' ', $iOffset )."}";
         }
         return implode( PHP_EOL, $_aOutput );
 
@@ -83,11 +83,11 @@ 
      * @return      string      The HTML list generated from the given array.
      */
     static public function getReadableListOfArrayAsHTML( array $aArray ) {
-        $_aOutput   = array();
-        foreach( $aArray as $_sKey => $_vValue ) {
-            $_aOutput[] = "<ul class='array-contents'>"
+        $_aOutput = array();
+        foreach ( $aArray as $_sKey => $_vValue ) {
+            $_aOutput[ ] = "<ul class='array-contents'>"
                     .  self::getReadableArrayContentsHTML( $_sKey, $_vValue )
-                . "</ul>" . PHP_EOL;
+                . "</ul>".PHP_EOL;
         }
         return implode( PHP_EOL, $_aOutput );
     }
@@ -105,25 +105,25 @@ 
         $_aOutput   = array();
 
         // Title - array key
-        $_aOutput[] = $sKey
-            ? "<h3 class='array-key'>" . $sKey . "</h3>"
+        $_aOutput[ ] = $sKey
+            ? "<h3 class='array-key'>".$sKey."</h3>"
             : "";
 
         // If it does not have a nested array or object,
-        if ( ! in_array( gettype( $vValue ), array( 'array', 'object' ), true ) ) {
-            $_aOutput[] = "<div class='array-value'>"
+        if ( !in_array( gettype( $vValue ), array( 'array', 'object' ), true ) ) {
+            $_aOutput[ ] = "<div class='array-value'>"
                     . html_entity_decode( nl2br( $vValue ), ENT_QUOTES )
                 . "</div>";
-            return "<li>" . implode( PHP_EOL, $_aOutput ) . "</li>";
+            return "<li>".implode( PHP_EOL, $_aOutput )."</li>";
         }
 
         // Now it is a nested item.
         foreach ( $vValue as $_sKey => $_vValue ) {
-            $_aOutput[] =  "<ul class='array-contents'>"
+            $_aOutput[ ] = "<ul class='array-contents'>"
                     . self::getReadableArrayContentsHTML( $_sKey, $_vValue )
                 . "</ul>";
         }
-        return implode( PHP_EOL, $_aOutput ) ;
+        return implode( PHP_EOL, $_aOutput );
 
     }
 

development/factory/_common/utility/base_utility/AdminPageFramework_Utility_InterpreterHTMLTable.php

Spacing +45 added lines, -45 removed lines

@@ -31,7 +31,7 @@ 
      * @return string
      * @since  3.9.0
      */
-    static public function getTableOfKeyValues( array $aArray, array $aAllAttributes=array(), array $aHeader=array(), array $aFooter=array(), $bEscape=true, $sCaption='' ) {
+    static public function getTableOfKeyValues( array $aArray, array $aAllAttributes = array(), array $aHeader = array(), array $aFooter = array(), $bEscape = true, $sCaption = '' ) {
         $_aAllAttributes = $aAllAttributes + array(
             'table'   => array(),
             'caption' => array(),
@@ -46,10 +46,10 @@ 
             'li'      => array(),
             'p'       => array(),
         );
-        return "<table " . self::getAttributes( self::getElementAsArray( $_aAllAttributes, 'table' ) ) . ">"
+        return "<table ".self::getAttributes( self::getElementAsArray( $_aAllAttributes, 'table' ) ).">"
                 . self::___getTableCaption( $sCaption, $_aAllAttributes, $bEscape )
                 . self::___getTableHeaderOfKeyValuePair( $aHeader, $aAllAttributes, $bEscape )
-                . "<tbody " . self::getAttributes( self::getElementAsArray( $_aAllAttributes, 'tbody' ) ) . ">"
+                . "<tbody ".self::getAttributes( self::getElementAsArray( $_aAllAttributes, 'tbody' ) ).">"
                     . self::___getRowsOfKeyValuePair( $aArray, $aAllAttributes, $bEscape )
                 . "</tbody>"
                 . self::___getTableFooterOfKeyValuePair( $aFooter, $aAllAttributes, $bEscape )
@@ -69,7 +69,7 @@ 
      * @return string
      * @since  3.9.0
      */
-    static public function getTableOfArray( array $aArray, array $aAllAttributes=array(), array $aHeader=array(), array $aFooter=array(), $bEscape=true, $sCaption='' ) {
+    static public function getTableOfArray( array $aArray, array $aAllAttributes = array(), array $aHeader = array(), array $aFooter = array(), $bEscape = true, $sCaption = '' ) {
 
         $_aAllAttributes = $aAllAttributes + array(
             'table'   => array(),
@@ -85,10 +85,10 @@ 
             'li'      => array(),
             'p'       => array(),
         );
-        return "<table " . self::getAttributes( self::getElementAsArray( $_aAllAttributes, 'table' ) ) . ">"
+        return "<table ".self::getAttributes( self::getElementAsArray( $_aAllAttributes, 'table' ) ).">"
                 . self::___getTableCaption( $sCaption, $_aAllAttributes, $bEscape )
                 . self::___getTableHeader( $aHeader, $_aAllAttributes, $bEscape )
-                . "<tbody " . self::getAttributes( self::getElementAsArray( $_aAllAttributes, 'tbody' ) ) . ">"
+                . "<tbody ".self::getAttributes( self::getElementAsArray( $_aAllAttributes, 'tbody' ) ).">"
                     . self::___getTableRows( $aArray, $_aAllAttributes, $bEscape )
                 . "</tbody>"
                 . self::___getTableFooter( $aFooter, $_aAllAttributes, $bEscape )
@@ -96,14 +96,14 @@ 
     }
         static private function ___getTableCaption( $sCaption, $aAllAttributes, $bEscape ) {
             $sCaption = ( string ) $sCaption;
-            if ( ! strlen( $sCaption ) ) {
+            if ( !strlen( $sCaption ) ) {
                 return '';
             }
             $_aCapAttr = self::getElementAsArray( $aAllAttributes, 'caption' );
             $_sCaption = $bEscape
                 ? htmlspecialchars( $sCaption )
                 : $sCaption;
-            return "<caption " . self::getAttributes( $_aCapAttr ) . ">"
+            return "<caption ".self::getAttributes( $_aCapAttr ).">"
                     . $_sCaption
                 . "</caption>";
         }
@@ -126,24 +126,24 @@ 
                 $_aTHAttr1 = self::getElementAsArray( $aAllAttributes, array( 'th', 0 ) ) + $_aTHAttr;
                 $_aTHAttr2 = self::getElementAsArray( $aAllAttributes, array( 'th', 1 ) ) + $_aTHAttr;
                 $_sOutput = '';
-                foreach( $aHeader as $_sKey => $_sValue ) {
-                    $_sOutput .= "<tr " . self::getAttributes( $_aTRAttr ) . ">"
-                            . "<th " . self::getAttributes( $_aTHAttr1 ) . ">" . self::___getHTMLEscaped( $_sKey, $bEscape ) . "</th>"
-                            . "<th " . self::getAttributes( $_aTHAttr2 ) . ">" . self::___getHTMLEscaped( $_sValue, $bEscape ) . "</th>"
+                foreach ( $aHeader as $_sKey => $_sValue ) {
+                    $_sOutput .= "<tr ".self::getAttributes( $_aTRAttr ).">"
+                            . "<th ".self::getAttributes( $_aTHAttr1 ).">".self::___getHTMLEscaped( $_sKey, $bEscape )."</th>"
+                            . "<th ".self::getAttributes( $_aTHAttr2 ).">".self::___getHTMLEscaped( $_sValue, $bEscape )."</th>"
                         . "</tr>";
                 }
-                return "<thead>" . $_sOutput . "</thead>";
+                return "<thead>".$_sOutput."</thead>";
             }
             static private function ___getTableHeaderOfMultiColumns( array $aHeader, array $aAllAttributes, $bEscape ) {
                 $_aTRAttr  = self::getElementAsArray( $aAllAttributes, 'tr' );
                 $_aTHAttr  = self::getElementAsArray( $aAllAttributes, 'th' );
-                $_sOutput  = "<tr " . self::getAttributes( $_aTRAttr ) . ">";
-                foreach( array_values( $aHeader ) as $_iIndex => $_sColumnName ) {
+                $_sOutput  = "<tr ".self::getAttributes( $_aTRAttr ).">";
+                foreach ( array_values( $aHeader ) as $_iIndex => $_sColumnName ) {
                     $_aTHAttrNth  = self::getElementAsArray( $aAllAttributes, array( 'th', $_iIndex ) ) + $_aTHAttr;
-                    $_sOutput    .= "<th " . self::getAttributes( $_aTHAttrNth ) . ">" . self::___getHTMLEscaped( ( string ) $_sColumnName, $bEscape ) . "</th>";
+                    $_sOutput    .= "<th ".self::getAttributes( $_aTHAttrNth ).">".self::___getHTMLEscaped( ( string ) $_sColumnName, $bEscape )."</th>";
                 }
                 $_sOutput .= "</tr>";
-                return "<thead>" . $_sOutput . "</thead>";
+                return "<thead>".$_sOutput."</thead>";
             }
         static private function ___getTableFooter( array $aFooter, array $aAllAttributes, $bEscape ) {
             if ( empty( $aFooter ) ) {
@@ -160,24 +160,24 @@ 
                 $_aTDAttr1 = self::getElementAsArray( $aAllAttributes, array( 'td', 0 ) ) + $_aTDAttr;
                 $_aTDAttr2 = self::getElementAsArray( $aAllAttributes, array( 'td', 1 ) ) + $_aTDAttr;
                 $_sOutput = '';
-                foreach( $aFooter as $_sKey => $_sValue ) {
-                    $_sOutput = "<tr " . self::getAttributes( $_aTRAttr ) . ">"
-                            . "<td " . self::getAttributes( $_aTDAttr1 ) . ">" . self::___getHTMLEscaped( $_sKey, $bEscape ) . "</td>"
-                            . "<td " . self::getAttributes( $_aTDAttr2 ) . ">" . self::___getHTMLEscaped( $_sValue, $bEscape ) . "</td>"
+                foreach ( $aFooter as $_sKey => $_sValue ) {
+                    $_sOutput = "<tr ".self::getAttributes( $_aTRAttr ).">"
+                            . "<td ".self::getAttributes( $_aTDAttr1 ).">".self::___getHTMLEscaped( $_sKey, $bEscape )."</td>"
+                            . "<td ".self::getAttributes( $_aTDAttr2 ).">".self::___getHTMLEscaped( $_sValue, $bEscape )."</td>"
                         . "</tr>";
                 }
-                return "<tfoot>" . $_sOutput . "</tfoot>";                
+                return "<tfoot>".$_sOutput."</tfoot>";                
             }
             static private function ___getTableFooterOfMultiColumns( array $aFooter, array $aAllAttributes, $bEscape ) {
                 $_aTRAttr  = self::getElementAsArray( $aAllAttributes, 'tr' );
                 $_aTDAttr  = self::getElementAsArray( $aAllAttributes, 'td' );
-                $_sOutput  = "<tr " . self::getAttributes( $_aTRAttr ) . ">";
-                foreach( array_values( $aFooter ) as $_iIndex => $_sColumnName ) {
+                $_sOutput  = "<tr ".self::getAttributes( $_aTRAttr ).">";
+                foreach ( array_values( $aFooter ) as $_iIndex => $_sColumnName ) {
                     $_aTDAttrNth  = self::getElementAsArray( $aAllAttributes, array( 'td', $_iIndex ) ) + $_aTDAttr;
-                    $_sOutput    .= "<td " . self::getAttributes( $_aTDAttrNth ) . ">" . self::___getHTMLEscaped( ( string ) $_sColumnName, $bEscape ) . "</td>";
+                    $_sOutput    .= "<td ".self::getAttributes( $_aTDAttrNth ).">".self::___getHTMLEscaped( ( string ) $_sColumnName, $bEscape )."</td>";
                 }
                 $_sOutput .= "</tr>";
-                return "<tfoot>" . $_sOutput . "</tfoot>";
+                return "<tfoot>".$_sOutput."</tfoot>";
             }            
         static private function ___getTableRows( array $aArray, array $aAllAttributes, $bEscape ) {
             if ( empty( $aArray ) ) {
@@ -214,10 +214,10 @@ 
                 $_aTDAttrFirst            = self::getElementAsArray( $aAllAttributes, array( 'td', 0 ) ) + $_aTDAttr;
                 $_aTDAttrFirst[ 'class' ] = self::getClassAttribute( 'column-key', self::getElement( $_aTDAttrFirst, array( 'class' ), '' ) );
                 $_sOutput = '';
-                foreach( $aItem as $_sColumnName => $_asValue ) {
-                    $_sOutput .= "<tr " . self::getAttributes( $_aTRAttr ) . ">";
-                    $_sOutput .= "<td " . self::getAttributes( $_aTDAttrFirst ) . ">"
-                            . "<p " . self::getAttributes( $_aPAttr )  . ">" . self::___getHTMLEscaped( $_sColumnName, $bEscape ) . "</p>"
+                foreach ( $aItem as $_sColumnName => $_asValue ) {
+                    $_sOutput .= "<tr ".self::getAttributes( $_aTRAttr ).">";
+                    $_sOutput .= "<td ".self::getAttributes( $_aTDAttrFirst ).">"
+                            . "<p ".self::getAttributes( $_aPAttr ).">".self::___getHTMLEscaped( $_sColumnName, $bEscape )."</p>"
                          . "</td>";
                     $_sOutput .= self::___getColumnValue( $_asValue, $aAllAttributes, $bEscape, 1 );
                     $_sOutput .= "</tr>";
@@ -231,15 +231,15 @@ 
             static private function ___getRowsOfMultiColumns( array $aArray, array $aAllAttributes, $bEscape ) {
                 $_aTRAttr = self::getElementAsArray( $aAllAttributes, 'tr' );
                 $_sOutput = '';
-                foreach( $aArray as $_iRowIndex => $_asValue ) {
+                foreach ( $aArray as $_iRowIndex => $_asValue ) {
                     if ( is_scalar( $_asValue ) ) {
-                        $_sOutput .= "<tr " . self::getAttributes( $_aTRAttr ) . ">"
+                        $_sOutput .= "<tr ".self::getAttributes( $_aTRAttr ).">"
                                 . self::___getColumnValue( $_asValue, $aAllAttributes, $bEscape, 0 )
                             . "</tr>";
                         continue;
                     }
                     $_aColumns = self::getAsArray( $_asValue );
-                    $_sOutput .= "<tr " . self::getAttributes( $_aTRAttr ) . ">"
+                    $_sOutput .= "<tr ".self::getAttributes( $_aTRAttr ).">"
                             . self::___getColumns( $_aColumns, $aAllAttributes, $bEscape )
                         . "</tr>";
                 }
@@ -247,7 +247,7 @@ 
             }
                 static private function ___getColumns( array $aColumns, $aAllAttributes, $bEscape ) {
                     $_sOutput = '';
-                    foreach( array_values( $aColumns ) as $_iIndex => $_asValue ) {
+                    foreach ( array_values( $aColumns ) as $_iIndex => $_asValue ) {
                         $_sOutput .= self::___getColumnValue( $_asValue, $aAllAttributes, $bEscape, $_iIndex );
                     }
                     return $_sOutput;
@@ -269,24 +269,24 @@ 
                 if ( is_null( $mValue ) ) {
                     $mValue = '(null)';
                 }
-                $_aPAttr        = self::getElementAsArray( $aAllAttributes, 'p' );
+                $_aPAttr = self::getElementAsArray( $aAllAttributes, 'p' );
                 if ( is_scalar( $mValue ) ) {
-                    return "<td " . self::getAttributes( $_aTDAttrNth ) . ">"
-                        . "<p " . self::getAttributes( $_aPAttr )  . ">" . self::___getHTMLEscaped( $mValue, $bEscape ) . "</p>"
+                    return "<td ".self::getAttributes( $_aTDAttrNth ).">"
+                        . "<p ".self::getAttributes( $_aPAttr ).">".self::___getHTMLEscaped( $mValue, $bEscape )."</p>"
                        . "</td>";
                 }
                 if ( is_array( $mValue ) ) {
                     return self::isAssociativeArray( $mValue ) || self::isMultiDimensional( $mValue )
-                        ? "<td " . self::getAttributes( $_aTDAttrNth ) . ">"
+                        ? "<td ".self::getAttributes( $_aTDAttrNth ).">"
                             . self::getTableOfKeyValues( $mValue, $aAllAttributes )
                         . "</td>"
-                        : "<td " . self::getAttributes( $_aTDAttrNth ) . ">"
+                        : "<td ".self::getAttributes( $_aTDAttrNth ).">"
                             // @todo may ought to be numeric-rows table
                             . self::___getList( $mValue, $aAllAttributes, $bEscape )
                         . "</td>";
                 }
-                return "<td " . self::getAttributes( $_aTDAttrNth ) . ">"
-                        . '(' . gettype( $mValue ) . ')' . ( is_object( $mValue ) ? get_class( $mValue ) : '' )
+                return "<td ".self::getAttributes( $_aTDAttrNth ).">"
+                        . '('.gettype( $mValue ).')'.( is_object( $mValue ) ? get_class( $mValue ) : '' )
                     . "</td>";
             }
                 /**
@@ -303,16 +303,16 @@ 
                     if ( empty( $aArray ) ) {
                         return '';
                     }
-                    $_sList   = "<ul " . self::getAttributes( $_aULAttr ) . ">";
-                    foreach( $aArray as $_asValue ) {
+                    $_sList = "<ul ".self::getAttributes( $_aULAttr ).">";
+                    foreach ( $aArray as $_asValue ) {
                         $_sItem  = is_array( $_asValue )
                             ? self::___getList( $_asValue, $aAllAttributes, $bEscape )
                             : self::___getHTMLEscaped( $_asValue, $bEscape );
-                        $_sList .= "<li " . self::getAttributes( $_aLIAttr ) . ">"
+                        $_sList .= "<li ".self::getAttributes( $_aLIAttr ).">"
                                 . $_sItem
                             . "</li>";
                     }
-                    $_sList  .= "</ul>";
+                    $_sList .= "</ul>";
                     return $_sList;
                 }
 

development/factory/_common/utility/base_utility/AdminPageFramework_Utility_Array.php

Spacing +5 added lines, -5 removed lines

@@ -27,9 +27,9 @@ 
      * @since  3.8.9
      * @since  3.8.32   Moved from `AdminPageFramework_Debug_Base` and renamed from `___getArrayMappedRecursive()` and made public as a part of the utility class.
      */
-    static public function getArrayMappedRecursive( $cCallback, $aArray, array $aArguments=array() ) {
+    static public function getArrayMappedRecursive( $cCallback, $aArray, array $aArguments = array() ) {
         $_aOutput = array();
-        foreach( $aArray as $_isKey => $_vValue ) {
+        foreach ( $aArray as $_isKey => $_vValue ) {
             if ( is_array( $_vValue ) ) {
                 $_aOutput[ $_isKey ] = self::getArrayMappedRecursive( $cCallback, $_vValue, $aArguments );
                 continue;
@@ -46,10 +46,10 @@ 
      * @return numeric
      * @since  3.7.4
      */
-    static public function getUnusedNumericIndex( $aArray, $nIndex, $iOffset=1 ) {
+    static public function getUnusedNumericIndex( $aArray, $nIndex, $iOffset = 1 ) {
 
         // Check if the order value is not used.
-        if ( ! isset( $aArray[ $nIndex ] ) ) {
+        if ( !isset( $aArray[ $nIndex ] ) ) {
             return $nIndex;
         }
 
@@ -64,7 +64,7 @@ 
      * @return boolean
      */
     static public function isAssociative( array $aArray ) {
-        return array_keys ( $aArray ) !== range( 0, count( $aArray ) - 1 );
+        return array_keys( $aArray ) !== range( 0, count( $aArray ) - 1 );
     }
 
     /**

development/factory/admin_page/AdminPageFramework_Controller_Menu.php

Spacing +6 added lines, -6 removed lines

@@ -73,7 +73,7 @@ 
      * </ul>
      * @param  string      (optional) the position number that is passed to the <var>$position</var> parameter of the <a href="http://codex.wordpress.org/Function_Reference/add_menu_page">add_menu_page()</a> function.
      */
-    public function setRootMenuPage( $sRootMenuLabel, $sIcon16x16=null, $iMenuPosition=null ) {
+    public function setRootMenuPage( $sRootMenuLabel, $sIcon16x16 = null, $iMenuPosition = null ) {
         $sRootMenuLabel = trim( $sRootMenuLabel );
         $_sSlug         = $this->___getBuiltInMenuSlugByLabel( $sRootMenuLabel ); // if true, this method returns the slug
         $this->oProp->aRootMenu = array(
@@ -255,16 +255,16 @@ 
     public function addSubMenuLink( array $aSubMenuLink ) {
         
         // If required keys are not set, return.
-        if ( ! isset( $aSubMenuLink[ 'href' ], $aSubMenuLink[ 'title' ] ) ) { 
+        if ( !isset( $aSubMenuLink[ 'href' ], $aSubMenuLink[ 'title' ] ) ) { 
             return; 
         }
         
         // If the set URL is not valid, return.
-        if ( ! filter_var( $aSubMenuLink[ 'href' ], FILTER_VALIDATE_URL ) ) { 
+        if ( !filter_var( $aSubMenuLink[ 'href' ], FILTER_VALIDATE_URL ) ) { 
             return; 
         }
 
-        $_oFormatter   = new AdminPageFramework_Format_SubMenuLink( 
+        $_oFormatter = new AdminPageFramework_Format_SubMenuLink( 
             $aSubMenuLink, 
             $this,
             count( $this->oProp->aPages ) + 1
@@ -322,11 +322,11 @@ 
      */ 
     public function addSubMenuPage( array $aSubMenuPage ) {
 
-        if ( ! isset( $aSubMenuPage[ 'page_slug' ] ) ) { 
+        if ( !isset( $aSubMenuPage[ 'page_slug' ] ) ) { 
             return; 
         }
             
-        $_oFormatter   = new AdminPageFramework_Format_SubMenuPage( 
+        $_oFormatter = new AdminPageFramework_Format_SubMenuPage( 
             $aSubMenuPage,
             $this,
             count( $this->oProp->aPages ) + 1

development/factory/admin_page/AdminPageFramework_Router.php

Spacing +21 added lines, -21 removed lines

@@ -34,11 +34,11 @@ 
      *
      * @since       3.3.0
      */
-    public function __construct( $sOptionKey=null, $sCallerPath=null, $sCapability='manage_options', $sTextDomain='admin-page-framework' ) {
+    public function __construct( $sOptionKey = null, $sCallerPath = null, $sCapability = 'manage_options', $sTextDomain = 'admin-page-framework' ) {
 
         $_sPropertyClassName = isset( $this->aSubClassNames[ 'oProp' ] )
             ? $this->aSubClassNames[ 'oProp' ]
-            : 'AdminPageFramework_Property_' . $this->_sStructureType;
+            : 'AdminPageFramework_Property_'.$this->_sStructureType;
 
         $this->oProp = new $_sPropertyClassName(
             $this,
@@ -55,12 +55,12 @@ 
         // if ( $this->oProp->bIsAdminAjax ) {
         //     return;
         // }
-        if ( ! $this->oProp->bIsAdmin ) {
+        if ( !$this->oProp->bIsAdmin ) {
             return;
         }
 
         add_action( 'wp_loaded', array( $this, '_replyToDetermineToLoad' ) );
-        add_action( 'set_up_' . $this->oProp->sClassName, array( $this, '_replyToLoadComponentsForAjax' ), 100 );
+        add_action( 'set_up_'.$this->oProp->sClassName, array( $this, '_replyToLoadComponentsForAjax' ), 100 );
 
     }
 
@@ -73,13 +73,13 @@ 
      */
     public function _replyToLoadComponentsForAjax() {
 
-        if ( ! $this->oProp->bIsAdminAjax ) {
+        if ( !$this->oProp->bIsAdminAjax ) {
             return;
         }
 
         new AdminPageFramework_Model_Menu__RegisterMenu( $this, 'pseudo_admin_menu' );
         do_action( 'pseudo_admin_menu', '' );
-        do_action( 'pseudo_current_screen' );       // @deprecated 3.8.22 Kept for backward-compatibility
+        do_action( 'pseudo_current_screen' ); // @deprecated 3.8.22 Kept for backward-compatibility
 
         $_sPageSlug = $this->oProp->getCurrentPageSlug();
         if ( $this->oProp->isPageAdded( $_sPageSlug ) ) {
@@ -125,7 +125,7 @@ 
      * @param    array  the argument array. The first element holds the parameters passed to the called method.
      * @return   mixed  depends on the called method. If the method name matches one of the hook prefixes, the redirected methods return value will be returned. Otherwise, none.
      */
-    public function __call( $sMethodName, $aArgs=null ) {
+    public function __call( $sMethodName, $aArgs = null ) {
 
         $_sPageSlug             = $this->oProp->getCurrentPageSlug();
         $_sTabSlug              = $this->oProp->getCurrentTabSlug( $_sPageSlug );
@@ -136,15 +136,15 @@ 
             'load_pre_',
         );
 
-        switch( $this->_getCallbackName( $sMethodName, $_sPageSlug, $_aKnownMethodPrefixes ) ) {
+        switch ( $this->_getCallbackName( $sMethodName, $_sPageSlug, $_aKnownMethodPrefixes ) ) {
 
             // add_settings_section() callback
             case 'section_pre_':
-                return $this->_renderSectionDescription( $sMethodName );    // defined in AdminPageFramework_Setting
+                return $this->_renderSectionDescription( $sMethodName ); // defined in AdminPageFramework_Setting
 
             // add_settings_field() callback
             case 'field_pre_':
-                return $this->_renderSettingField( $_mFirstArg, $_sPageSlug );  // defined in AdminPageFramework_Setting
+                return $this->_renderSettingField( $_mFirstArg, $_sPageSlug ); // defined in AdminPageFramework_Setting
 
             // load-{page} callback
             case 'load_pre_':
@@ -162,8 +162,8 @@ 
          * @since    3.5.3
          * @return   string      The found callback method name or the prefix of a known callback method name. An empty string if not found.
          */
-        private function _getCallbackName( $sMethodName, $sPageSlug, array $aKnownMethodPrefixes=array() ) {
-            foreach( $aKnownMethodPrefixes as $_sMethodPrefix ) {
+        private function _getCallbackName( $sMethodName, $sPageSlug, array $aKnownMethodPrefixes = array() ) {
+            foreach ( $aKnownMethodPrefixes as $_sMethodPrefix ) {
                 if ( $this->oUtil->hasPrefix( $_sMethodPrefix, $sMethodName ) ) {
                     return $_sMethodPrefix;
                 }
@@ -182,7 +182,7 @@ 
          */
         protected function _doPageLoadCall( $sMethodName, $sPageSlug, $sTabSlug, $oScreen ) {
 
-            if ( ! $this->_isPageLoadCall( $sMethodName, $sPageSlug, $oScreen ) ) {
+            if ( !$this->_isPageLoadCall( $sMethodName, $sPageSlug, $oScreen ) ) {
                 return;
             }
 
@@ -207,10 +207,10 @@ 
             // the tab slug will be empty unless an in-page tab is added.
             $sTabSlug = $this->oProp->getCurrentTabSlug( $sPageSlug );
             if ( strlen( $sTabSlug ) ) {
-                $this->_setShowDebugInfoProperty( $sPageSlug, $sTabSlug );  // 3.8.8+
+                $this->_setShowDebugInfoProperty( $sPageSlug, $sTabSlug ); // 3.8.8+
                 $this->oUtil->addAndDoActions(
                     $this, // the caller object
-                    array( "load_{$sPageSlug}_" . $sTabSlug ),
+                    array( "load_{$sPageSlug}_".$sTabSlug ),
                     $this // the admin page object - this lets third-party scripts use the framework methods.
                 );
                 add_filter( 'admin_title', array( $this, '_replyToSetAdminPageTitleForTab' ), 1, 2 );
@@ -235,10 +235,10 @@ 
              * And if the user wants to modify the property value manually, they can do so in the `load()` method.
              * @since  3.8.8
              */
-            private function _setShowDebugInfoProperty( $sPageSlug, $sTabSlug='' ) {
+            private function _setShowDebugInfoProperty( $sPageSlug, $sTabSlug = '' ) {
 
                 // For the page,
-                if ( ! strlen( $sTabSlug ) ) {
+                if ( !strlen( $sTabSlug ) ) {
                     $this->oProp->bShowDebugInfo = $this->oUtil->getElement(
                         $this->oProp->aPages,
                         array( $sPageSlug, 'show_debug_info' ),
@@ -283,7 +283,7 @@ 
                 if ( substr( $sMethodName, strlen( 'load_pre_' ) ) !== $sPageSlug ) {
                     return false;
                 }
-                if ( ! isset( $this->oProp->aPageHooks[ $sPageSlug ] ) ) {
+                if ( !isset( $this->oProp->aPageHooks[ $sPageSlug ] ) ) {
                     return false;
                 }
                 $_sPageHook = is_object( $osScreenORPageHook )
@@ -305,7 +305,7 @@ 
         if ( $this->_isWordPressCoreAjaxRequest() ) {
             return false;
         }
-        return ! is_network_admin();    // Nothing to do in the network admin area.
+        return !is_network_admin(); // Nothing to do in the network admin area.
     }
 
     /**
@@ -319,13 +319,13 @@ 
      */
     protected function _isInThePage() {
 
-        if ( ! $this->oProp->bIsAdmin ) {
+        if ( !$this->oProp->bIsAdmin ) {
             return false;
         }
 
         // If the `setUp()` method is not loaded yet, nothing can be checked
         // as there is no page is added.
-        if ( ! did_action( 'set_up_' . $this->oProp->sClassName ) ) {
+        if ( !did_action( 'set_up_'.$this->oProp->sClassName ) ) {
             return true;
         }
 

development/factory/admin_page/_model/format/AdminPageFramework_Format_SubMenuPage.php

Spacing +7 added lines, -7 removed lines

@@ -29,8 +29,8 @@ 
         'page_slug'                 => null, // (required)
         'type'                      => 'page', // this is used to compare with the link type.
         'title'                     => null,
-        'page_title'                => null,    // (optional) 3.3.0+ When the page title is different from the above 'title' argument, set this.
-        'menu_title'                => null,    // (optional) 3.3.0+ When the menu title is different from the above 'title' argument, set this.
+        'page_title'                => null, // (optional) 3.3.0+ When the page title is different from the above 'title' argument, set this.
+        'menu_title'                => null, // (optional) 3.3.0+ When the menu title is different from the above 'title' argument, set this.
         'screen_icon'               => null, // this will become either href_icon_32x32 or screen_icon_id
         'capability'                => null,
         'order'                     => null,
@@ -118,12 +118,12 @@ 
 
             $aSubMenuPage = $aSubMenuPage
                 + array(
-                    'show_page_title'           => $this->oFactory->oProp->bShowPageTitle,       // boolean
+                    'show_page_title'           => $this->oFactory->oProp->bShowPageTitle, // boolean
                     'show_page_heading_tabs'    => $this->oFactory->oProp->bShowPageHeadingTabs, // boolean
-                    'show_in_page_tabs'         => $this->oFactory->oProp->bShowInPageTabs,      // boolean
-                    'in_page_tab_tag'           => $this->oFactory->oProp->sInPageTabTag,        // string
-                    'page_heading_tab_tag'      => $this->oFactory->oProp->sPageHeadingTabTag,   // string
-                    'capability'                => $this->oFactory->oProp->sCapability,          // 3.6.0+
+                    'show_in_page_tabs'         => $this->oFactory->oProp->bShowInPageTabs, // boolean
+                    'in_page_tab_tag'           => $this->oFactory->oProp->sInPageTabTag, // string
+                    'page_heading_tab_tag'      => $this->oFactory->oProp->sPageHeadingTabTag, // string
+                    'capability'                => $this->oFactory->oProp->sCapability, // 3.6.0+
                 )
                 + self::$aStructure;
 

development/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Filter.php

Spacing +27 added lines, -27 removed lines

@@ -88,7 +88,7 @@ 
                     $this->oFactory
                 ),               
                 'aStoredTabDataWODynamicElements' => array(),
-                'aEmbeddedDataWODynamicElements'  => array(),   // stores page meta box field options. This will be updated inside the validation methods.
+                'aEmbeddedDataWODynamicElements'  => array(), // stores page meta box field options. This will be updated inside the validation methods.
                 'aSubmitInformation'    => $aSubmitInformation, // 3.5.0+
             );
             
@@ -103,7 +103,7 @@ 
                 call_user_func_array( 
                     array( $this->oFactory, 'validate' ), // triggers __call()
                     array( $_aData[ 'aInput' ], $_aData[ 'aStoredData' ], $this->oFactory, $_aData[ 'aSubmitInformation' ] )
-                ),    // 3.5.3+
+                ), // 3.5.3+
                 $_aData[ 'aStoredData' ],
                 $_aData[ 'aSubmitInformation' ] // 3.5.0+
             );
@@ -115,7 +115,7 @@ 
             
             // If everything fine, return the filtered input data. 
             $this->_bHasFieldErrors = $this->oFactory->hasFieldError();
-            if ( ! $this->_bHasFieldErrors ) {
+            if ( !$this->_bHasFieldErrors ) {
                 return $_aInput;
             }
             
@@ -129,7 +129,7 @@ 
             );            
                         
             // Go to the catch clause.
-            $_oException = new Exception( 'aReturn' );  // the property name to return from the catch clause.
+            $_oException = new Exception( 'aReturn' ); // the property name to return from the catch clause.
             $_oException->aReturn = $_aInput;
             throw $_oException;
 
@@ -153,22 +153,22 @@ 
              */
             private function ___validateEachField( array $aData, array $aInputsToParse ) {
 
-                foreach( $aInputsToParse as $_sID => $_aSectionOrFields ) { // $_sID is either a section id or a field id
+                foreach ( $aInputsToParse as $_sID => $_aSectionOrFields ) { // $_sID is either a section id or a field id
 
                     // For each section
                     if ( $this->oFactory->oForm->isSection( $_sID ) ) {
                         
                         // If the parsing item does not belong to the current page, do not call the validation callback method.
-                        if ( ! $this->___isValidSection( $_sID, $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] ) ) {
+                        if ( !$this->___isValidSection( $_sID, $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] ) ) {
                             continue;
                         }                             
                         
                         // Call the validation callback method.
-                        foreach( $_aSectionOrFields as $_sFieldID => $_aFields ) { // For fields
+                        foreach ( $_aSectionOrFields as $_sFieldID => $_aFields ) { // For fields
                             $aData[ 'aInput' ][ $_sID ][ $_sFieldID ] = $this->___getValidatedData(
                                 "validation_{$this->oFactory->oProp->sClassName}_{$_sID}_{$_sFieldID}", 
                                 $aData[ 'aInput' ][ $_sID ][ $_sFieldID ], 
-                                $this->getElement( $aData, array( 'aStoredData', $_sID, $_sFieldID ), null ),    // isset( $aData[ 'aStoredData' ][ $_sID ][ $_sFieldID ] ) ? $aData[ 'aStoredData' ][ $_sID ][ $_sFieldID ] : null,
+                                $this->getElement( $aData, array( 'aStoredData', $_sID, $_sFieldID ), null ), // isset( $aData[ 'aStoredData' ][ $_sID ][ $_sFieldID ] ) ? $aData[ 'aStoredData' ][ $_sID ][ $_sFieldID ] : null,
                                 $aData[ 'aSubmitInformation' ]    // 3.5.0+
                             );
                         }
@@ -189,7 +189,7 @@ 
                         $aData[ 'aInput' ][ $_sID ] = $this->___getValidatedData(
                             "validation_{$this->oFactory->oProp->sClassName}_{$_sID}", 
                             $_aSectionInput,
-                            $this->getElement( $aData, array( 'aStoredData', $_sID ), null ),    // isset( $aData[ 'aStoredData' ][ $_sID ] ) ? $aData[ 'aStoredData' ][ $_sID ] : null,
+                            $this->getElement( $aData, array( 'aStoredData', $_sID ), null ), // isset( $aData[ 'aStoredData' ][ $_sID ] ) ? $aData[ 'aStoredData' ][ $_sID ] : null,
                             $aData[ 'aSubmitInformation' ]
                         );     
                         
@@ -198,7 +198,7 @@ 
                     }
                                         
                     // Check if the parsing item (the default section) belongs to the current page; if not, do not call the validation callback method.
-                    if ( ! $this->___isValidSection( '_default', $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] ) ) {
+                    if ( !$this->___isValidSection( '_default', $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] ) ) {
                         continue;
                     }  
                     
@@ -206,7 +206,7 @@ 
                     $aData[ 'aInput' ][ $_sID ] = $this->___getValidatedData(
                         "validation_{$this->oFactory->oProp->sClassName}_{$_sID}",
                         $aData[ 'aInput' ][ $_sID ],
-                        $this->getElement( $aData, array( 'aStoredData', $_sID ), null ),    // isset( $aData[ 'aStoredData' ][ $_sID ] ) ? $aData[ 'aStoredData' ][ $_sID ] : null,
+                        $this->getElement( $aData, array( 'aStoredData', $_sID ), null ), // isset( $aData[ 'aStoredData' ][ $_sID ] ) ? $aData[ 'aStoredData' ][ $_sID ] : null,
                         $aData[ 'aSubmitInformation' ]
                     );
                     
@@ -248,22 +248,22 @@ 
              */
             private function ___validateTabFields( array $aData ) {
 
-                if ( ! $aData[ 'sTabSlug' ] || ! $aData[ 'sPageSlug' ] ) { 
+                if ( !$aData[ 'sTabSlug' ] || !$aData[ 'sPageSlug' ] ) { 
                     return $aData; 
                 }
 
-                $aData[ 'aStoredTabData' ]        = $this->oFactory->oForm->getTabOptions( 
+                $aData[ 'aStoredTabData' ] = $this->oFactory->oForm->getTabOptions( 
                     $aData[ 'aStoredData' ], 
                     $aData[ 'sPageSlug' ], 
                     $aData[ 'sTabSlug' ] 
                 ); // respects page meta box fields
-                $aData[ 'aStoredTabData' ]        = $this->addAndApplyFilter(
+                $aData[ 'aStoredTabData' ] = $this->addAndApplyFilter(
                     $this->oFactory, 
                     "validation_saved_options_{$aData[ 'sPageSlug' ]}_{$aData[ 'sTabSlug' ]}", 
                     $aData[ 'aStoredTabData' ], 
                     $this->oFactory 
                 );
-                $_aOtherTabOptions  = $this->oFactory->oForm->getOtherTabOptions( 
+                $_aOtherTabOptions = $this->oFactory->oForm->getOtherTabOptions( 
                     $aData[ 'aStoredData' ], 
                     $aData[ 'sPageSlug' ], 
                     $aData[ 'sTabSlug' ] 
@@ -317,7 +317,7 @@ 
              */
             private function ___validatePageFields( array $aData ) {
            
-                if ( ! $aData[ 'sPageSlug' ] ) { 
+                if ( !$aData[ 'sPageSlug' ] ) { 
                     return $aData[ 'aInput' ]; 
                 }
 
@@ -329,7 +329,7 @@ 
                 $_aPageOptionsWODynamicElements = $this->addAndApplyFilter( 
                     $this->oFactory, 
                     "validation_saved_options_without_dynamic_elements_{$aData[ 'sPageSlug' ]}", 
-                    $this->oFactory->oForm->getPageOptions( $aData[ 'aStoredDataWODynamicElements' ], $aData[ 'sPageSlug' ] ),     // united with the in-page tab specific data in order to override the page-specific dynamic elements.
+                    $this->oFactory->oForm->getPageOptions( $aData[ 'aStoredDataWODynamicElements' ], $aData[ 'sPageSlug' ] ), // united with the in-page tab specific data in order to override the page-specific dynamic elements.
                     $this->oFactory 
                 );                
 
@@ -342,15 +342,15 @@ 
                 // Validate the input data.
                 $aData[ 'aInput' ] = $this->___getValidatedData(
                     "validation_{$aData[ 'sPageSlug' ]}", 
-                    $aData[ 'aInput' ],                   // new values
-                    $_aPageOptions,                     // stored page options
+                    $aData[ 'aInput' ], // new values
+                    $_aPageOptions, // stored page options
                     $aData[ 'aSubmitInformation' ]        // submit information 3.5.0+
                 );
 
                 // If it's in a tab-page, drop the elements which belong to the tab so that arrayed-options will not be merged such as multiple select options.
-                $_aPageOptions = $aData[ 'sTabSlug' ] && ! empty( $aData[ 'aStoredTabData' ] ) 
+                $_aPageOptions = $aData[ 'sTabSlug' ] && !empty( $aData[ 'aStoredTabData' ] ) 
                     ? $this->invertCastArrayContents( $_aPageOptions, $aData[ 'aStoredTabData' ] ) 
-                    : ( ! $aData[ 'sTabSlug' ] // if the tab is not specified, do not merge the input array with the page options as the input array already includes the page options. This is for dynamic elements(repeatable sections).
+                    : ( !$aData[ 'sTabSlug' ] // if the tab is not specified, do not merge the input array with the page options as the input array already includes the page options. This is for dynamic elements(repeatable sections).
                         ? array()
                         : $_aPageOptions
                     );    
@@ -397,13 +397,13 @@ 
                  * @param       array       $aStoredData    The stored option.
                  * @param       array       $aSubmitInfo    [3.5.0+] The form submit information such as the field ID of the pressed submit field.
                  */
-                private function ___getValidatedData( $sFilterName, $aInputs, $aStoredData, $aSubmitInfo=array() ) {
+                private function ___getValidatedData( $sFilterName, $aInputs, $aStoredData, $aSubmitInfo = array() ) {
                     return $this->addAndApplyFilter( 
-                        $this->oFactory,          // caller
-                        $sFilterName,   // hook name
-                        $aInputs,        // 1st argument
-                        $aStoredData,   // 2nd argument
-                        $this->oFactory,          // 3rd argument
+                        $this->oFactory, // caller
+                        $sFilterName, // hook name
+                        $aInputs, // 1st argument
+                        $aStoredData, // 2nd argument
+                        $this->oFactory, // 3rd argument
                         $aSubmitInfo    // 4th argument 3.5.0+
                     );                    
                 }  

Braces +6 added lines, -4 removed lines

@@ -153,7 +153,8 @@ 
              */
             private function ___validateEachField( array $aData, array $aInputsToParse ) {
 
-                foreach( $aInputsToParse as $_sID => $_aSectionOrFields ) { // $_sID is either a section id or a field id
+                foreach( $aInputsToParse as $_sID => $_aSectionOrFields ) {
+// $_sID is either a section id or a field id
 
                     // For each section
                     if ( $this->oFactory->oForm->isSection( $_sID ) ) {
@@ -164,7 +165,8 @@ 
                         }                             
                         
                         // Call the validation callback method.
-                        foreach( $_aSectionOrFields as $_sFieldID => $_aFields ) { // For fields
+                        foreach( $_aSectionOrFields as $_sFieldID => $_aFields ) {
+// For fields
                             $aData[ 'aInput' ][ $_sID ][ $_sFieldID ] = $this->___getValidatedData(
                                 "validation_{$this->oFactory->oProp->sClassName}_{$_sID}_{$_sFieldID}", 
                                 $aData[ 'aInput' ][ $_sID ][ $_sFieldID ], 
@@ -248,7 +250,7 @@ 
              */
             private function ___validateTabFields( array $aData ) {
 
-                if ( ! $aData[ 'sTabSlug' ] || ! $aData[ 'sPageSlug' ] ) { 
+                if ( ! $aData[ 'sTabSlug' ] || ! $aData[ 'sPageSlug' ] ) {
                     return $aData; 
                 }
 
@@ -317,7 +319,7 @@ 
              */
             private function ___validatePageFields( array $aData ) {
            
-                if ( ! $aData[ 'sPageSlug' ] ) { 
+                if ( ! $aData[ 'sPageSlug' ] ) {
                     return $aData[ 'aInput' ]; 
                 }