michaeluno / admin-page-framework

development/factory/_common/form/AdminPageFramework_Form_Utility.php

Spacing +19 added lines, -19 removed lines

@@ -43,15 +43,15 @@ 
      * For the `admin_page` fields type, an option key is prepended.
      * For `page_meta_box`, no prepended element and it starts with the section or field ID.
      */
-    static public function getInputsUnset( array $aInputs, $sFieldsType, $iSkipDepth=0 ) {
+    static public function getInputsUnset( array $aInputs, $sFieldsType, $iSkipDepth = 0 ) {
 
-        $_sUnsetKey = '__unset_' . $sFieldsType;
-        if ( ! isset( $_POST[ $_sUnsetKey ] ) ) {
+        $_sUnsetKey = '__unset_'.$sFieldsType;
+        if ( !isset( $_POST[ $_sUnsetKey ] ) ) {
             return $aInputs;
         }
 
         $_aUnsetElements = array_unique( $_POST[ $_sUnsetKey ] );
-        foreach( $_aUnsetElements as $_sFlatInputName ) {
+        foreach ( $_aUnsetElements as $_sFlatInputName ) {
 
             $_aDimensionalKeys = explode( '|', $_sFlatInputName );
 
@@ -61,7 +61,7 @@ 
             }
 
             // The first element is the option key for the `admin_page` field type and section or field dimensional keys follow.
-            for ( $_i = 0; $_i < $iSkipDepth; $_i++) {
+            for ( $_i = 0; $_i < $iSkipDepth; $_i++ ) {
                 unset( $_aDimensionalKeys[ $_i ] );
             }
 
@@ -118,7 +118,7 @@ 
      */
     static public function hasNestedFields( $aFieldset ) {
         
-        if ( ! self::hasFieldDefinitionsInContent( $aFieldset ) ) {
+        if ( !self::hasFieldDefinitionsInContent( $aFieldset ) ) {
             return false;
         }
         // At this point, the `content` argument contains either the definition of nested fields or inline-mixed fields.
@@ -140,7 +140,7 @@ 
      */
     static public function hasFieldDefinitionsInContent( $aFieldset ) {
         
-        if ( ! isset( $aFieldset[ 'content' ] ) ) {
+        if ( !isset( $aFieldset[ 'content' ] ) ) {
             return false;
         }
         if ( empty( $aFieldset[ 'content' ] ) ) {
@@ -175,10 +175,10 @@ 
      * @since       3.8.13
      */
     static public function isDynamicField( $aField ) {
-        if ( ! empty( $aField[ 'repeatable' ] ) ) {
+        if ( !empty( $aField[ 'repeatable' ] ) ) {
             return true;
         }
-        if ( ! empty( $aField[ 'sortable' ] ) ) {
+        if ( !empty( $aField[ 'sortable' ] ) ) {
             return true;
         }
         return false;
@@ -207,7 +207,7 @@ 
         if ( empty( $sString ) ) {
             return $sString;
         }
-        return $sString . '|';
+        return $sString.'|';
     }
 
     /**
@@ -223,17 +223,17 @@ 
      */
     static public function getFieldsetReformattedBySubFieldIndex( $aFieldset, $iSubFieldIndex, $bHasSubFields, $aParentFieldset ) {
 
-        $_oCallerForm   = $aFieldset[ '_caller_object' ];
+        $_oCallerForm = $aFieldset[ '_caller_object' ];
 
         // Add sub-field index to the parent field path for repeated nested items.
-        $aFieldset[ '_parent_field_path' ]   = self::getAOrB(
+        $aFieldset[ '_parent_field_path' ] = self::getAOrB(
             $bHasSubFields,
-            $aFieldset[ '_parent_field_path' ] . '|' . $iSubFieldIndex,
+            $aFieldset[ '_parent_field_path' ].'|'.$iSubFieldIndex,
             $aFieldset[ '_parent_field_path' ]
         );
-        $aFieldset[ '_parent_tag_id' ]       = self::getAOrB(
+        $aFieldset[ '_parent_tag_id' ] = self::getAOrB(
             $bHasSubFields,
-            $aParentFieldset[ 'tag_id' ] . '__' . $iSubFieldIndex,
+            $aParentFieldset[ 'tag_id' ].'__'.$iSubFieldIndex,
             $aParentFieldset[ 'tag_id' ]
         );
 
@@ -242,7 +242,7 @@ 
             $aFieldset,
             $aFieldset[ '_structure_type' ],
             $aFieldset[ 'capability' ],
-            ( integer ) $iSubFieldIndex + 1,   // 1-based count (not index)
+            ( integer ) $iSubFieldIndex + 1, // 1-based count (not index)
             $aFieldset[ '_subsection_index' ],
             $aFieldset[ '_is_section_repeatable' ],
             $aFieldset[ '_caller_object' ]
@@ -251,7 +251,7 @@ 
 
         $_oFieldsetOutputFormatter = new AdminPageFramework_Form_Model___Format_FieldsetOutput(
             $aFieldset,
-            $aFieldset[ '_section_index' ],    // `_section_index` is defined in the ...FieldsetOutput class. Since this is a nested item, it should be already set.
+            $aFieldset[ '_section_index' ], // `_section_index` is defined in the ...FieldsetOutput class. Since this is a nested item, it should be already set.
             $_oCallerForm->aFieldTypeDefinitions
         );
         return $_oFieldsetOutputFormatter->get();
@@ -288,12 +288,12 @@ 
         if ( empty( $aArguments ) ) {
             return '';
         }
-        if ( self::hasBeenCalled( 'disabled_repeatable_elements_modal_' . $sBoxElementID ) ) {
+        if ( self::hasBeenCalled( 'disabled_repeatable_elements_modal_'.$sBoxElementID ) ) {
             return '';
         }
         add_thickbox(); // to display a message to the user.
         return "<div id='{$sBoxElementID}' style='display:none'>"
-                . "<p>" . $aArguments[ 'message' ] . "</p>"
+                . "<p>".$aArguments[ 'message' ]."</p>"
             . "</div>";
 
     }

Indentation +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 
             // For form sections, a dummy key is set
             if ( '__dummy_option_key' === $_aDimensionalKeys[ 0 ] ) {
-                 array_shift( $_aDimensionalKeys );
+                    array_shift( $_aDimensionalKeys );
             }
 
             // The first element is the option key for the `admin_page` field type and section or field dimensional keys follow.
@@ -129,7 +129,7 @@ 
         }
         
         // If the first element is a string, it is an inline mixed field definition.
-       return is_array( self::getElement( $aFieldset[ 'content' ], 0 ) );
+        return is_array( self::getElement( $aFieldset[ 'content' ], 0 ) );
        
     }  
 

development/factory/widget/AdminPageFramework_Widget.php

Spacing +13 added lines, -13 removed lines

@@ -75,13 +75,13 @@ 
 
             $_sPropertyClassName = isset( $this->aSubClassNames[ 'oProp' ] )
                 ? $this->aSubClassNames[ 'oProp' ]
-                : 'AdminPageFramework_Property_' . $this->_sStructureType;
+                : 'AdminPageFramework_Property_'.$this->_sStructureType;
             $this->oProp         = new $_sPropertyClassName(
-                $this,                  // caller object
-                null,                   // the caller script path
-                $sThisClassName,        // class name
-                $sCapability,           // capability
-                $sTextDomain,           // text domain
+                $this, // caller object
+                null, // the caller script path
+                $sThisClassName, // class name
+                $sCapability, // capability
+                $sTextDomain, // text domain
                 $this->_sStructureType  // fields type
             );
 
@@ -103,22 +103,22 @@ 
          * @since       3.8.17
          */
         private function ___getConstructorParametersUsedForThisClassName( $sClassName ) {
-            if ( ! isset( $GLOBALS[ 'wp_widget_factory' ] ) ) {
+            if ( !isset( $GLOBALS[ 'wp_widget_factory' ] ) ) {
                 return array();
             }
-            if ( ! is_object( $GLOBALS[ 'wp_widget_factory' ] ) ) {
+            if ( !is_object( $GLOBALS[ 'wp_widget_factory' ] ) ) {
                 return array();
             }
-            if ( ! isset( $GLOBALS[ 'wp_widget_factory' ]->widgets[ $sClassName ] ) ) {
+            if ( !isset( $GLOBALS[ 'wp_widget_factory' ]->widgets[ $sClassName ] ) ) {
                 return array();
             }
             // At this point, the widget of the given name is already registered.
             $_oWPWidget = $GLOBALS[ 'wp_widget_factory' ]->widgets[ $sClassName ];
             return array(
-                $_oWPWidget->oCaller->oProp->sWidgetTitle,      // 1. widget title,
-                $_oWPWidget->oCaller->oProp->aWidgetArguments,  // 2. widget arguments
-                $_oWPWidget->oCaller->oProp->sCapability,       // 3. capability
-                $_oWPWidget->oCaller->oProp->sTextDomain,       // 4. text domain
+                $_oWPWidget->oCaller->oProp->sWidgetTitle, // 1. widget title,
+                $_oWPWidget->oCaller->oProp->aWidgetArguments, // 2. widget arguments
+                $_oWPWidget->oCaller->oProp->sCapability, // 3. capability
+                $_oWPWidget->oCaller->oProp->sTextDomain, // 4. text domain
             );
         }
 

development/factory/admin_page/AdminPageFramework_View_Form.php

Spacing +19 added lines, -19 removed lines

@@ -27,17 +27,17 @@ 
      */
     public function _replyToGetSectionName( /* $sAttribute, $aSectionset */ ) {
 
-        $_aParams            = func_get_args() + array( null, null, );
+        $_aParams            = func_get_args() + array( null, null,);
         $sNameAttribute      = $_aParams[ 0 ];
         $aSectionset         = $_aParams[ 1 ];        
         $_aSectionPath       = $aSectionset[ '_section_path_array' ];
         $_aDimensionalKeys   = array( $this->oProp->sOptionKey );   
-        foreach( $_aSectionPath as $_sDimension ) {
-            $_aDimensionalKeys[] = '[' . $_sDimension . ']';
+        foreach ( $_aSectionPath as $_sDimension ) {
+            $_aDimensionalKeys[ ] = '['.$_sDimension.']';
         }
         
         if ( isset( $aSectionset[ '_index' ] ) ) {
-            $_aDimensionalKeys[] = '[' . $aSectionset[ '_index' ] . ']';
+            $_aDimensionalKeys[ ] = '['.$aSectionset[ '_index' ].']';
         }
         
         return implode( '', $_aDimensionalKeys );
@@ -50,25 +50,25 @@ 
      */
     public function _replyToGetFieldNameAttribute( /* $sAttribute, $aFieldset */ ) {
         
-        $_aParams           = func_get_args() + array( null, null,  );
+        $_aParams           = func_get_args() + array( null, null,);
         $sNameAttribute     = $_aParams[ 0 ];
         $aFieldset          = $_aParams[ 1 ];
         $_aDimensionalKeys  = array( 
             $this->oProp->sOptionKey    // Use `$this->oProp->sOptionKey` instead of `$aFieldset[ 'option_key' ]` which is not set for nested items.
         );        
         if ( $this->isSectionSet( $aFieldset ) ) {
-            $_aSectionPath       = $aFieldset[ '_section_path_array' ];
-            foreach( $_aSectionPath as $_sDimension ) {
-                $_aDimensionalKeys[] = '[' . $_sDimension . ']';
+            $_aSectionPath = $aFieldset[ '_section_path_array' ];
+            foreach ( $_aSectionPath as $_sDimension ) {
+                $_aDimensionalKeys[ ] = '['.$_sDimension.']';
             }
             if ( isset( $aFieldset[ '_section_index' ] ) ) {
-                $_aDimensionalKeys[] = '[' . $aFieldset[ '_section_index' ] . ']';
+                $_aDimensionalKeys[ ] = '['.$aFieldset[ '_section_index' ].']';
             }
         }
         
         // 3.8.0+ Support for nested fields.
-        foreach( $aFieldset[ '_field_path_array' ] as $_sPathPart ) {
-            $_aDimensionalKeys[] = '[' . $_sPathPart . ']';
+        foreach ( $aFieldset[ '_field_path_array' ] as $_sPathPart ) {
+            $_aDimensionalKeys[ ] = '['.$_sPathPart.']';
         }
 
         return implode( '', $_aDimensionalKeys );
@@ -81,7 +81,7 @@ 
      */
     public function _replyToGetFlatFieldName( /* $sAttribute, $aFieldset */ ) {
 
-        $_aParams           = func_get_args() + array( null, null,  );
+        $_aParams           = func_get_args() + array( null, null,);
         $sNameAttribute     = $_aParams[ 0 ];
         $aFieldset          = $_aParams[ 1 ];        
         
@@ -89,11 +89,11 @@ 
             $this->oProp->sOptionKey    // Use `$this->oProp->sOptionKey` instead of `$aFieldset[ 'option_key' ]` which is not set for nested items.
         );
         if ( $this->isSectionSet( $aFieldset ) ) {
-            foreach( $aFieldset[ '_section_path_array' ] as $_sDimension ) {
-                $_aDimensionalKeys[] = $_sDimension; // $aFieldset[ 'section_id' ];
+            foreach ( $aFieldset[ '_section_path_array' ] as $_sDimension ) {
+                $_aDimensionalKeys[ ] = $_sDimension; // $aFieldset[ 'section_id' ];
             }
             if ( isset( $aFieldset[ '_section_index' ] ) ) {
-                $_aDimensionalKeys[] = $aFieldset[ '_section_index' ];    
+                $_aDimensionalKeys[ ] = $aFieldset[ '_section_index' ];    
             }
         }
 
@@ -122,8 +122,8 @@ 
             "[{$sKey}]"
         );   
 
-        $_sNamePrefix   = $this->_replyToGetFieldNameAttribute( '', $aField );
-        return $_sNamePrefix . $sKey;
+        $_sNamePrefix = $this->_replyToGetFieldNameAttribute( '', $aField );
+        return $_sNamePrefix.$sKey;
         
     }
     /**
@@ -141,10 +141,10 @@ 
         $_sKey              = $this->oUtil->getAOrB(
             '0' !== $_sKey && empty( $_sKey ),
             '',
-            "|" . $_sKey
+            "|".$_sKey
         );        
         
-        return $this->_replyToGetFlatFieldName( '', $aField ) . $_sKey;
+        return $this->_replyToGetFlatFieldName( '', $aField ).$_sKey;
 
     }
             

development/factory/_common/_abstract/_model/AdminPageFramework_Property_Base.php

Doc Comments +2 added lines

@@ -399,6 +399,8 @@
      * Sets up necessary property values.
      *
      * @remark      This class gets instantiated in every factory class so the constructor should be lightest as possible.
+     * @param string $sCapability
+     * @param string $sTextDomain
      */
     public function __construct( $oCaller, $sCallerPath, $sClassName, $sCapability, $sTextDomain, $sStructureType ) {
 

Spacing +14 added lines, -14 removed lines

@@ -330,14 +330,14 @@ 
      * @since       3.7.0
      */
     public $aFormCallbacks = array(
-        'hfID'              => null,    // the input id attribute
-        'hfTagID'           => null,    // the field container id attribute
-        'hfName'            => null,    // the field name attribute
-        'hfNameFlat'        => null,    // the flat field name attribute
+        'hfID'              => null, // the input id attribute
+        'hfTagID'           => null, // the field container id attribute
+        'hfName'            => null, // the field name attribute
+        'hfNameFlat'        => null, // the flat field name attribute
         // @todo Document the differences between `hfName` and `hfInputName`
-        'hfInputName'       => null,    // 3.6.0+   the field input name attribute
-        'hfInputNameFlat'   => null,    // 3.6.0+   the flat field input name
-        'hfClass'           => null,    // the class attribute
+        'hfInputName'       => null, // 3.6.0+   the field input name attribute
+        'hfInputNameFlat'   => null, // 3.6.0+   the flat field input name
+        'hfClass'           => null, // the class attribute
     );
 
     /**
@@ -464,7 +464,7 @@ 
              */
             private function ___getURLQuery() {
 
-                if ( ! $this->bIsAdminAjax ) {
+                if ( !$this->bIsAdminAjax ) {
                     return $_GET;
                 }
                 parse_str(
@@ -480,7 +480,7 @@ 
          * @since       3.7.9
          */
         private function ___setGlobals() {
-            if ( ! isset( $GLOBALS[ 'aAdminPageFramework' ] ) ) {
+            if ( !isset( $GLOBALS[ 'aAdminPageFramework' ] ) ) {
                 $GLOBALS[ 'aAdminPageFramework' ] = array(
                     'aFieldFlags' => array()
                 );
@@ -551,8 +551,8 @@ 
             'hfTagID'                           => array( $this->oCaller, '_replyToGetInputTagIDAttribute' ), // the fields & fieldset & field row container id attribute
             'hfName'                            => array( $this->oCaller, '_replyToGetFieldNameAttribute' ), // the input name attribute
             'hfNameFlat'                        => array( $this->oCaller, '_replyToGetFlatFieldName' ), // the flat input name attribute
-            'hfInputName'                       => array( $this->oCaller, '_replyToGetInputNameAttribute' ),    // 3.6.0+   the field input name attribute
-            'hfInputNameFlat'                   => array( $this->oCaller, '_replyToGetFlatInputName' ),    // 3.6.0+   the flat field input name
+            'hfInputName'                       => array( $this->oCaller, '_replyToGetInputNameAttribute' ), // 3.6.0+   the field input name attribute
+            'hfInputNameFlat'                   => array( $this->oCaller, '_replyToGetFlatInputName' ), // 3.6.0+   the flat field input name
             'hfClass'                           => array( $this->oCaller, '_replyToGetInputClassAttribute' ), // the class attribute
             'hfSectionName'                     => array( $this->oCaller, '_replyToGetSectionName' ), // 3.6.0+
         ) + $this->aFormCallbacks;
@@ -626,7 +626,7 @@ 
      * @remark      The information can be used to embed into the footer etc.
      * @return      array       The information of the script.
      */
-    protected function getCallerInfo( $sCallerPath='' ) {
+    protected function getCallerInfo( $sCallerPath = '' ) {
 
         if ( isset( self::$_aScriptDataCaches[ $sCallerPath ] ) ) {
             return self::$_aScriptDataCaches[ $sCallerPath ];
@@ -744,11 +744,11 @@ 
 
         // 3.7.9 Moved from the constructor to make it lighter.
         if ( 'sClassHash' === $sName ) {
-            $this->sClassHash       = md5( $this->sClassName );
+            $this->sClassHash = md5( $this->sClassName );
             return $this->sClassHash;
         }
         if ( 'sScriptType' === $sName ) {
-            $this->sScriptType      = $this->_getCallerType( $this->sCallerPath );    // 3.7.6+
+            $this->sScriptType = $this->_getCallerType( $this->sCallerPath ); // 3.7.6+
             return $this->sScriptType;
         }
         if ( 'oUtil' === $sName ) {

development/factory/_common/form/_model/AdminPageFramework_Form_Model___LastInput.php

Doc Comments -1 removed lines

@@ -110,7 +110,6 @@
      * Retrieves the settings error array set by the user in the validation callback.
      *
      * @since       3.7.8
-     * @param       boolean     $bDelete    whether or not the transient should be deleted after retrieving it.
      * @return      array
      */
     public function get() {

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
             $_sPageSlug = $this->getElement( $_GET, 'page', '' );
             $_sTabSlug  = $this->getElement( $_GET, 'tab', '' );
             $_sUserID   = get_current_user_id();
-            return "apf_li_" . md5(
+            return "apf_li_".md5(
                 $_sPageNow
                 . $_sPageSlug
                 . $_sTabSlug
@@ -94,13 +94,13 @@ 
          * @return      void
          */
         public function _replyToSave() {
-            if ( ! isset( self::$_aLastInputs ) ) {
+            if ( !isset( self::$_aLastInputs ) ) {
                 return;
             }
             $this->setTransient(
                 $this->sTransientKey,
                 self::$_aLastInputs,
-                60*60     // store it for 1 hour
+                60 * 60     // store it for 1 hour
             );
         }
 
@@ -120,9 +120,9 @@ 
             $_aLastInputs = self::$_aCaches[ $this->sTransientKey ];
         } else {
             $_aLastInputs = $this->getTransient( $this->sTransientKey );
-            self::$_aCaches[ $this->sTransientKey ]  = $_aLastInputs;
+            self::$_aCaches[ $this->sTransientKey ] = $_aLastInputs;
             if ( false !== $_aLastInputs ) {
-                $this->delete();    // deletes at the end of the script.
+                $this->delete(); // deletes at the end of the script.
             }
         }
 

development/factory/_common/form/_model/formatter/AdminPageFramework_Form_Model___FormatFieldsets.php

Doc Comments +2 added lines

@@ -99,6 +99,7 @@ 
          * @since       3.1.1       Added a parameter. Changed to return the formatted sections array.
          * @since       3.7.0      Moved from `AdminPageFramework_FormDefinition`. Changed the name from `formatFields()`.
          * Added the `$aSectionsets` parameter.
+         * @param string $sCapability
          * @return      array
          */
         private function _getFieldsetsFormatted( array $aFieldsets, array $aSectionsets, $sCapability ) {
@@ -278,6 +279,7 @@ 
              *
              * @since       3.0.0
              * @since       3.7.0          Moved from `AdminPageFramework_FormDefinition`. Changed the name from `formatField()`.
+             * @param integer $iCountOfElements
              * @return      array|void      An array of formatted field definition array. If required keys are not set, nothing will be returned.
              */
             private function _getFieldsetFormatted( $aFieldset, $aSectionsets, $sCapability, $iCountOfElements, $iSubSectionIndex, $bIsSectionRepeatable, $oCallerObject ) {

Spacing +13 added lines, -13 removed lines

@@ -113,10 +113,10 @@ 
             );
 
             $_aNewFieldsets = array();
-            foreach( $aFieldsets as $_sSectionPath => $_aItems ) {
+            foreach ( $aFieldsets as $_sSectionPath => $_aItems ) {
 
                 // If the section is not set, skip.
-                if ( ! isset( $aSectionsets[ $_sSectionPath ] ) ) {
+                if ( !isset( $aSectionsets[ $_sSectionPath ] ) ) {
                     continue;
                 }
 
@@ -125,7 +125,7 @@ 
                     $_aItems,
                     $this->getElement(  // 3.6.0+ Get the section's capability
                         $aSectionsets,
-                        array( $_sSectionPath, 'capability', ),
+                        array( $_sSectionPath, 'capability',),
                         $sCapability
                     ),
                     $aSectionsets
@@ -182,16 +182,16 @@ 
                  */
                 private function _getNormalFieldsetsFormatted( $aItems, $sCapability, $aSectionsets, $_abSectionRepeatable ) {
 
-                    $_aNewItems     = array();
-                    foreach( $aItems as $_sFieldID => $_aFieldset ) {
+                    $_aNewItems = array();
+                    foreach ( $aItems as $_sFieldID => $_aFieldset ) {
 
                         // Insert the formatted field definition array. The fields count is needed to set each order value.
-                        $_aFieldset        = $this->_getFieldsetFormatted(
+                        $_aFieldset = $this->_getFieldsetFormatted(
                             $_aFieldset,
                             $aSectionsets,
                             $sCapability,
                             count( $_aNewItems ), // index of elements - zero based
-                            null,   // sub-section index
+                            null, // sub-section index
                             $_abSectionRepeatable,
                             $this->oCallerForm
                         );
@@ -210,7 +210,7 @@ 
                  * @return      boolean
                  */
                 private function _isSubSections( $aItems, $_abSectionRepeatable ) {
-                    if ( ! empty( $_abSectionRepeatable ) ) {
+                    if ( !empty( $_abSectionRepeatable ) ) {
                         return true;
                     }
                     return ( boolean ) count( $this->getIntegerKeyElements( $aItems ) );
@@ -221,9 +221,9 @@ 
                 private function _getSubSectionsFormatted( $aItems, $sCapability, $aSectionsets, $_abSectionRepeatable ) {
 
                     $_aNewFieldset = array();
-                    foreach( $this->numerizeElements( $aItems ) as $_iSubSectionIndex => $_aFieldsets ) {
+                    foreach ( $this->numerizeElements( $aItems ) as $_iSubSectionIndex => $_aFieldsets ) {
 
-                        foreach( $_aFieldsets as $_aFieldset ) {
+                        foreach ( $_aFieldsets as $_aFieldset ) {
                             $_iCountElement = count( $this->getElementAsArray( $_aNewFieldset, $_iSubSectionIndex ) );
                             $_aFieldset     = $this->_getFieldsetFormatted(
                                 $_aFieldset,
@@ -237,7 +237,7 @@ 
                             if ( empty( $_aFieldset ) ) {
                                 continue;
                             }
-                            $_aNewFieldset[ $_iSubSectionIndex ][ $_aFieldset['field_id'] ] = $_aFieldset;
+                            $_aNewFieldset[ $_iSubSectionIndex ][ $_aFieldset[ 'field_id' ] ] = $_aFieldset;
                         }
                         uasort( $_aNewFieldset[ $_iSubSectionIndex ], array( $this, 'sortArrayByKey' ) );
 
@@ -264,7 +264,7 @@ 
                 }
 
                 $_aSortedFields = array();
-                foreach( $aSectionsets as $_sSectionPath => $_aSecitonset ) {
+                foreach ( $aSectionsets as $_sSectionPath => $_aSecitonset ) {
                     if ( isset( $aFieldsets[ $_sSectionPath ] ) ) {
                         $_aSortedFields[ $_sSectionPath ] = $aFieldsets[ $_sSectionPath ];
                     }
@@ -283,7 +283,7 @@ 
             private function _getFieldsetFormatted( $aFieldset, $aSectionsets, $sCapability, $iCountOfElements, $iSubSectionIndex, $bIsSectionRepeatable, $oCallerObject ) {
 
                 // 3.8.0+ Dropped the check for $aFieldset[ 'type' ] to allow it to be omitted.
-                if ( ! isset( $aFieldset[ 'field_id' ] ) ) {
+                if ( !isset( $aFieldset[ 'field_id' ] ) ) {
                     return;
                 }
 

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

Doc Comments -1 removed lines

@@ -30,7 +30,6 @@
      * Returns the field container attribute array.
      *
      * @remark      Formatting each sub-field should be performed prior to calling this method.
-     * @param       array       $aField     The (sub-)field definition array. This should have been formatted already.
      * @return      array       The generated field container attribute array.
      * @internal
      * @since       3.5.3

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
      *
      * @since       3.6.0
      */
-    public $sContext    = 'field';
+    public $sContext = 'field';
 
     /**
      * Returns the field container attribute array.
@@ -40,7 +40,7 @@ 
     protected function _getAttributes() {
 
         // 3.8.0+ Supports omitting the `type` argument.
-        $_sFieldTypeSelector   = $this->getAOrB(
+        $_sFieldTypeSelector = $this->getAOrB(
             $this->aArguments[ 'type' ],
             " admin-page-framework-field-{$this->aArguments[ 'type' ]}",
             ''
@@ -65,7 +65,7 @@ 
 
         return array(
             'id'            => $this->aArguments[ '_field_container_id' ],
-            'data-type'     => $this->aArguments[ 'type' ],   // referred by the repeatable field JavaScript script.
+            'data-type'     => $this->aArguments[ 'type' ], // referred by the repeatable field JavaScript script.
             'class'         => "admin-page-framework-field{$_sFieldTypeSelector}{$_sNestedFieldSelector}{$_sMixedFieldSelector}{$_sChildFieldSelector}"
                 . $this->getAOrB(
                     $this->aArguments[ 'attributes' ][ 'disabled' ],

development/factory/_common/form/_view/fieldset/AdminPageFramework_Form_View___Fieldset.php

Doc Comments +2 added lines

@@ -126,6 +126,7 @@ 
                  * Retrieves a field output.
                  *
                  * @since       3.8.0
+                 * @param boolean $bIsLastElement
                  * @return      string
                  */
                 private function _getFieldOutput( $sContent, $aField, $bIsLastElement ) {
@@ -204,6 +205,7 @@ 
          * Returns the final fields output.
          *
          * @since       3.1.0
+         * @param integer $iFieldsCount
          * @return      string
          */
         private function _getFinalOutput( $aFieldset, array $aFieldsOutput, $iFieldsCount ) {

Spacing +31 added lines, -31 removed lines

@@ -37,7 +37,7 @@ 
             $this->aFieldset[ '_field_path_array' ],
             $this->aFieldset[ 'error_message' ]
         );
-        $_aOutputs[]     = $_oFieldError->get();
+        $_aOutputs[ ] = $_oFieldError->get();
 
         // 2. Construct fields array for sub-fields.
         $_oFieldsFormatter = new AdminPageFramework_Form_Model___Format_Fields(
@@ -47,7 +47,7 @@ 
         $_aFields = $_oFieldsFormatter->get();
 
         // 3. Get the field and its sub-fields output.
-        $_aOutputs[] = $this->_getFieldsOutput(
+        $_aOutputs[ ] = $this->_getFieldsOutput(
             $this->aFieldset,
             $_aFields,
             $this->aCallbacks
@@ -70,11 +70,11 @@ 
          * @since   3.8.0   Added the `$aFieldset` parameter
          * @return  string
          */
-        private function _getFieldsOutput( $aFieldset, array $aFields, array $aCallbacks=array() ) {
+        private function _getFieldsOutput( $aFieldset, array $aFields, array $aCallbacks = array() ) {
 
             $_aOutput = array();
-            foreach( $aFields as $_isIndex => $_aField ) {
-                $_aOutput[] = $this->_getEachFieldOutput(
+            foreach ( $aFields as $_isIndex => $_aField ) {
+                $_aOutput[ ] = $this->_getEachFieldOutput(
                     $_aField,
                     $_isIndex,
                     $aCallbacks,
@@ -93,11 +93,11 @@ 
              * @since       3.5.3
              * @return      string      the HTML output of the given field.
              */
-            private function _getEachFieldOutput( $aField, $isIndex, array $aCallbacks, $bIsLastElement=false ) {
+            private function _getEachFieldOutput( $aField, $isIndex, array $aCallbacks, $bIsLastElement = false ) {
 
                 // Field type definition - allows mixed field types in sub-fields
                 $_aFieldTypeDefinition = $this->_getFieldTypeDefinition( $aField[ 'type' ] );
-                if ( ! is_callable( $_aFieldTypeDefinition[ 'hfRenderField' ] ) ) {
+                if ( !is_callable( $_aFieldTypeDefinition[ 'hfRenderField' ] ) ) {
                     return '';
                 }
 
@@ -131,7 +131,7 @@ 
                 private function _getFieldOutput( $sContent, $aField, $bIsLastElement ) {
                     $_oFieldAttribute = new AdminPageFramework_Form_View___Attribute_Field( $aField );
                     return $aField[ 'before_field' ]
-                        . "<div " . $_oFieldAttribute->get() . ">"
+                        . "<div ".$_oFieldAttribute->get().">"
                             . $sContent
                             . $this->_getUnsetFlagFieldInputTag( $aField )
                             . $this->_getDelimiter( $aField, $bIsLastElement )
@@ -153,7 +153,7 @@ 
                         'input',
                         array(
                             'type'  => 'hidden',
-                            'name'  => '__unset_' . $aField[ '_fields_type' ] . '[' . $aField[ '_input_name_flat' ] . ']',
+                            'name'  => '__unset_'.$aField[ '_fields_type' ].'['.$aField[ '_input_name_flat' ].']',
                             'value' => $aField[ '_input_name_flat' ],
                             'class' => 'unset-element-names element-address',
                         )
@@ -184,7 +184,7 @@ 
                  */
                 private function _getDelimiter( $aField, $bIsLastElement ) {
                     return $aField[ 'delimiter' ]
-                        ? "<div " . $this->getAttributes(
+                        ? "<div ".$this->getAttributes(
                                 array(
                                     'class' => 'delimiter',
                                     'id'    => "delimiter-{$aField[ 'input_id' ]}",
@@ -194,7 +194,7 @@ 
                                         ""
                                     ),
                                 )
-                            ) . ">"
+                            ).">"
                                 . $aField[ 'delimiter' ]
                             . "</div>"
                         : '';
@@ -208,9 +208,9 @@ 
          */
         private function _getFinalOutput( $aFieldset, array $aFieldsOutput, $iFieldsCount ) {
 
-            $_oFieldsetAttributes   = new AdminPageFramework_Form_View___Attribute_Fieldset( $aFieldset );
+            $_oFieldsetAttributes = new AdminPageFramework_Form_View___Attribute_Fieldset( $aFieldset );
             return $aFieldset[ 'before_fieldset' ]
-                . "<fieldset " . $_oFieldsetAttributes->get() . ">"
+                . "<fieldset ".$_oFieldsetAttributes->get().">"
                     . $this->_getEmbeddedFieldTitle( $aFieldset )
                     . $this->_getChildFieldTitle( $aFieldset )
                     . $this->_getFieldsetContent( $aFieldset, $aFieldsOutput, $iFieldsCount )
@@ -227,7 +227,7 @@ 
              */
             private function _getEmbeddedFieldTitle( $aFieldset ) {
 
-                if ( ! $aFieldset[ '_is_title_embedded' ] ) {
+                if ( !$aFieldset[ '_is_title_embedded' ] ) {
                     return '';
                 }
 
@@ -252,7 +252,7 @@ 
              */
             private function _getChildFieldTitle( $aFieldset ) {
 
-                if ( ! $aFieldset[ '_nested_depth' ] ) {
+                if ( !$aFieldset[ '_nested_depth' ] ) {
                     return '';
                 }
                 if ( $aFieldset[ '_is_title_embedded' ] ) {
@@ -281,12 +281,12 @@ 
                     return $aFieldset[ 'content' ];
                 }
 
-                $_oFieldsAttributes     = new AdminPageFramework_Form_View___Attribute_Fields(
+                $_oFieldsAttributes = new AdminPageFramework_Form_View___Attribute_Fields(
                     $aFieldset,
-                    array(),    // attribute array
+                    array(), // attribute array
                     $iFieldsCount
                 );
-                return "<div " . $_oFieldsAttributes->get() . ">"
+                return "<div ".$_oFieldsAttributes->get().">"
                         . $aFieldset[ 'before_fields' ]
                             . implode( PHP_EOL, $aFieldsOutput )
                         . $aFieldset[ 'after_fields' ]
@@ -309,13 +309,13 @@ 
                     $aField[ 'description' ],
                     'admin-page-framework-fields-description'   // class selector
                 );
-                $_aOutput[] = $_oFieldDescription->get();
+                $_aOutput[ ] = $_oFieldDescription->get();
 
                 // Dimensional keys of repeatable and sortable fields
-                $_aOutput[] = $this->_getDynamicElementFlagFieldInputTag( $aField );
+                $_aOutput[ ] = $this->_getDynamicElementFlagFieldInputTag( $aField );
 
                 // Repeatable and sortable scripts
-                $_aOutput[] = $this->_getFieldScripts( $aField, $iFieldsCount );
+                $_aOutput[ ] = $this->_getFieldScripts( $aField, $iFieldsCount );
 
                 return implode( PHP_EOL, array_filter( $_aOutput ) );
 
@@ -327,10 +327,10 @@ 
                  */
                 private function _getDynamicElementFlagFieldInputTag( $aFieldset ) {
 
-                    if ( ! empty( $aFieldset[ 'repeatable' ] ) ) {
+                    if ( !empty( $aFieldset[ 'repeatable' ] ) ) {
                         return $this->_getRepeatableFieldFlagTag( $aFieldset );
                     }
-                    if ( ! empty( $aFieldset[ 'sortable' ] ) ) {
+                    if ( !empty( $aFieldset[ 'sortable' ] ) ) {
                         return $this->_getSortableFieldFlagTag( $aFieldset );
                     }
                     return '';
@@ -345,8 +345,8 @@ 
                             'input',
                             array(
                                 'type'                      => 'hidden',
-                                'name'                      => '__repeatable_elements_' . $aFieldset[ '_structure_type' ]
-                                    . '[' . $aFieldset[ '_field_address' ] . ']',
+                                'name'                      => '__repeatable_elements_'.$aFieldset[ '_structure_type' ]
+                                    . '['.$aFieldset[ '_field_address' ].']',
                                 'class'                     => 'element-address',
                                 'value'                     => $aFieldset[ '_field_address' ],
                                 'data-field_address_model'  => $aFieldset[ '_field_address_model' ],
@@ -362,8 +362,8 @@ 
                             'input',
                             array(
                                 'type'                      => 'hidden',
-                                'name'                      => '__sortable_elements_' . $aFieldset[ '_structure_type' ]
-                                    . '[' . $aFieldset[ '_field_address' ] . ']',
+                                'name'                      => '__sortable_elements_'.$aFieldset[ '_structure_type' ]
+                                    . '['.$aFieldset[ '_field_address' ].']',
                                 'class'                     => 'element-address',
                                 'value'                     => $aFieldset[ '_field_address' ],
                                 'data-field_address_model'  => $aFieldset[ '_field_address_model' ],
@@ -382,14 +382,14 @@ 
                     $_aOutput   = array();
 
                     // Add the repeater script
-                    $_aOutput[] = ! empty( $aField[ 'repeatable' ] )
-                        ? $this->_getRepeaterFieldEnablerScript( 'fields-' . $aField[ 'tag_id' ], $iFieldsCount, $aField[ 'repeatable' ] )
+                    $_aOutput[ ] = !empty( $aField[ 'repeatable' ] )
+                        ? $this->_getRepeaterFieldEnablerScript( 'fields-'.$aField[ 'tag_id' ], $iFieldsCount, $aField[ 'repeatable' ] )
                         : '';
 
                     // Add the sortable script - if the number of fields is only one, no need to sort the field.
                     // Repeatable fields can make the number increase so here it checks the repeatability.
-                    $_aOutput[] = ! empty( $aField[ 'sortable' ] ) && ( $iFieldsCount > 1 || ! empty( $aField[ 'repeatable' ] ) )
-                        ? $this->_getSortableFieldEnablerScript( 'fields-' . $aField[ 'tag_id' ] )
+                    $_aOutput[ ] = !empty( $aField[ 'sortable' ] ) && ( $iFieldsCount > 1 || !empty( $aField[ 'repeatable' ] ) )
+                        ? $this->_getSortableFieldEnablerScript( 'fields-'.$aField[ 'tag_id' ] )
                         : '';
 
                     return implode( PHP_EOL, $_aOutput );

development/factory/_common/form/error/AdminPageFramework_Form___FieldError.php

Doc Comments -5 removed lines

@@ -80,10 +80,6 @@ 
      * `
      * @since        3.7.0
      * @access       public
-     * @param        string      $sMessage       the text message to be displayed.
-     * @param        string      $sType          (optional) the type of the message, either "error" or "updated"  is used.
-     * @param        array       $asAttributes   (optional) the tag attribute array applied to the message container HTML element. If a string is given, it is used as the ID attribute value.
-     * @param        boolean     $bOverride      (optional) If true, only one message will be shown in the next page load. false: do not override when there is a message of the same id. true: override the previous one.
      * @return       void
      */
     public function set( $aErrors ) {
@@ -128,7 +124,6 @@ 
      * Retrieves the settings error array set by the user in the validation callback.
      *
      * @since       3.7.0
-     * @param       boolean     $bDelete    whether or not the transient should be deleted after retrieving it.
      * @return      array
      */
     public function get() {

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
             $_sPageSlug = $this->getElement( $_GET, 'page', '' );
             $_sTabSlug  = $this->getElement( $_GET, 'tab', '' );
             $_sUserID   = get_current_user_id();
-            return "apf_fe_" . md5(
+            return "apf_fe_".md5(
                 $_sPageNow
                 . $_sPageSlug
                 . $_sTabSlug
@@ -134,7 +134,7 @@ 
     public function get() {
 
         // Use a cache if exists.
-        self::$_aFieldErrorCaches[ $this->sTransientKey ]  = isset( self::$_aFieldErrorCaches[ $this->sTransientKey ] )
+        self::$_aFieldErrorCaches[ $this->sTransientKey ] = isset( self::$_aFieldErrorCaches[ $this->sTransientKey ] )
             ? self::$_aFieldErrorCaches[ $this->sTransientKey ]
             : $this->getTransient( $this->sTransientKey );
 
@@ -151,7 +151,7 @@ 
      * @since       3.7.0
      */
     public function delete() {
-        if ( $this->hasBeenCalled( 'delete_' . $this->sTransientKey ) ) {
+        if ( $this->hasBeenCalled( 'delete_'.$this->sTransientKey ) ) {
             return;
         }
         add_action( 'shutdown', array( $this, '_replyToDelete' ) );