michaeluno / admin-page-framework

development/factory/_common/form/AdminPageFramework_Form_Controller.php

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
      * @param       string      $sType If empty, the method will check if a message exists in all types. Otherwise, it checks the existence of a message of the specified type.
      * @return      boolean     True if a setting notice is set; otherwise, false.
      */
-    public function hasSubmitNotice( $sType='' ) {
+    public function hasSubmitNotice( $sType = '' ) {
         return $this->oSubmitNotice->hasNotice( $sType );
     }
     
@@ -71,7 +71,7 @@ 
      * @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 setSubmitNotice( $sMessage, $sType='error', $asAttributes=array(), $bOverride=true ) {
+    public function setSubmitNotice( $sMessage, $sType = 'error', $asAttributes = array(), $bOverride = true ) {
         $this->oSubmitNotice->set(
             $sMessage, 
             $sType, 
@@ -98,7 +98,7 @@ 
         
         $this->aSectionsets[ $aSectionset[ 'section_id' ] ] = $aSectionset;    
         $this->aFieldsets[ $aSectionset[ 'section_id' ] ]   = $this->getElement(
-            $this->aFieldsets,  // subject array
+            $this->aFieldsets, // subject array
             $aSectionset[ 'section_id' ], // key
             array()      // default
         );                                
@@ -113,7 +113,7 @@ 
      */
     public function removeSection( $sSectionID ) {
         
-        if ( '_default' === $sSectionID ){ 
+        if ( '_default' === $sSectionID ) { 
             return; 
         }
         unset( 
@@ -143,7 +143,7 @@ 
      * @return      void
      */
     public function addResource( $sKey, $sValue ) {
-        self::$_aResources[ $sKey ][] = $sValue;
+        self::$_aResources[ $sKey ][ ] = $sValue;
     }
     
     /**
@@ -166,7 +166,7 @@ 
     public function addField( $asFieldset ) {
 
         // If it is a target section, update the property and return.
-        if ( ! $this->_isFieldsetDefinition( $asFieldset ) ) {
+        if ( !$this->_isFieldsetDefinition( $asFieldset ) ) {
             $this->_asTargetSectionID = $this->_getTargetSectionID( $asFieldset );
             return $this->_asTargetSectionID;
         }
@@ -175,13 +175,13 @@ 
         
         // Set the target section ID
         $this->_asTargetSectionID = $this->getElement(
-            $_aFieldset,  // subject array
+            $_aFieldset, // subject array
             'section_id', // key
             $this->_asTargetSectionID // default
         );                               
 
         // Required Keys - 3.8.0+ Now 'type' can be omitted.
-        if ( ! isset( $_aFieldset[ 'field_id' ] ) ) { 
+        if ( !isset( $_aFieldset[ 'field_id' ] ) ) { 
             return null; 
         }         
                 
@@ -284,7 +284,7 @@ 
      */     
     public function removeField( $sFieldID ) {
                
-        foreach( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
 
             if ( array_key_exists( $sFieldID, $_aSubSectionsOrFields ) ) {
                 unset( $this->aFieldsets[ $_sSectionID ][ $sFieldID ] );

Braces +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
      */
     public function removeSection( $sSectionID ) {
         
-        if ( '_default' === $sSectionID ){ 
+        if ( '_default' === $sSectionID ) {
             return; 
         }
         unset( 
@@ -181,7 +181,7 @@ 
         );                               
 
         // Required Keys - 3.8.0+ Now 'type' can be omitted.
-        if ( ! isset( $_aFieldset[ 'field_id' ] ) ) { 
+        if ( ! isset( $_aFieldset[ 'field_id' ] ) ) {
             return null; 
         }         
                 

Doc Comments +2 added lines

@@ -148,6 +148,8 @@
     }
     /**
      * @since       3.7.0
+     * @param string $sKey
+     * @param string $sValue
      * @return      void
      */
     public function addResource( $sKey, $sValue ) {

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

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 call_user_func_array( 
                     $aFieldTypeDefinition[ 'hfFieldSetTypeSetter' ], 
                     array( $sStructureType ) 
-               );
+                );
             }
             
             if ( is_callable( $aFieldTypeDefinition[ 'hfFieldLoader' ] ) ) {

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

Braces +3 added lines, -3 removed lines

@@ -107,7 +107,7 @@ 
             foreach( $aFieldsets as $_sSectionPath => $_aItems ) {
 
                 // If the section is not set, skip.
-                if ( ! isset( $aSectionsets[ $_sSectionPath ] ) ) {               
+                if ( ! isset( $aSectionsets[ $_sSectionPath ] ) ) {
                     continue;
                 }
 
@@ -258,7 +258,7 @@ 
                 }
                 
                 $_aSortedFields = array();
-                foreach( $aSectionsets as $_sSectionPath => $_aSecitonset ) { 
+                foreach( $aSectionsets as $_sSectionPath => $_aSecitonset ) {
                     if ( isset( $aFieldsets[ $_sSectionPath ] ) ) {
                         $_aSortedFields[ $_sSectionPath ] = $aFieldsets[ $_sSectionPath ];
                     }
@@ -277,7 +277,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; 
                 }
                 

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/_model/formatter/AdminPageFramework_Form_Model___Format_EachField.php

Spacing +7 added lines, -7 removed lines

@@ -24,8 +24,8 @@ 
      * Represents the structure of the sub-field definition array.
      */
     static public $aStructure = array(
-        '_is_sub_field'                 => false,   // @todo change this key name as all the parsed field is technically a sub-field.
-        '_index'                        => 0,       // indicates the field index
+        '_is_sub_field'                 => false, // @todo change this key name as all the parsed field is technically a sub-field.
+        '_index'                        => 0, // indicates the field index
         '_is_multiple_fields'           => false,
         '_saved_value'                  => null,
         '_is_value_set_by_user'         => false,
@@ -39,8 +39,8 @@ 
         '_fields_container_id'          => '',
         '_fieldset_container_id'        => '',
         
-        '_field_object'                 => null,        // 3.6.0+
-        '_parent_field_object'          => null,        // 3.6.0+ Stores the parent field object to be accessed from the nested fields to generate id and name attribute models.
+        '_field_object'                 => null, // 3.6.0+
+        '_parent_field_object'          => null, // 3.6.0+ Stores the parent field object to be accessed from the nested fields to generate id and name attribute models.
     );
     
     /**
@@ -87,7 +87,7 @@ 
 
         $_aField = $this->aField + self::$aStructure;
         
-        $_aField[ '_is_sub_field' ]            = is_numeric( $this->isIndex ) && 0 < $this->isIndex;      // 3.5.3+
+        $_aField[ '_is_sub_field' ]            = is_numeric( $this->isIndex ) && 0 < $this->isIndex; // 3.5.3+
         $_aField[ '_index' ]                   = $this->isIndex;
 
         // 'input_id' - something like ({section id}_){field_id}__{index} e.g. my_section_id_my_field_id__0
@@ -134,8 +134,8 @@ 
                     'value'             => $_aField[ 'value' ],
                     'type'              => $_aField[ 'type' ], // text, password, etc.
                     'disabled'          => null,
-                    'data-id_model'     => $_aField[ '_input_id_model' ],    // 3.3.1+
-                    'data-name_model'   => $_aField[ '_input_name_model' ],  // 3.3.1+
+                    'data-id_model'     => $_aField[ '_input_id_model' ], // 3.3.1+
+                    'data-name_model'   => $_aField[ '_input_name_model' ], // 3.3.1+
                 )
             ),
             // this allows sub-fields with different field types to set the default key-values for the sub-field.

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

Spacing +12 added lines, -12 removed lines

@@ -33,23 +33,23 @@ 
      * @internal
      */ 
     static public $aStructure = array(       
-        '_section_index'            => null,    // 3.0.0+ - internally set to indicate the section index for repeatable sections.        
+        '_section_index'            => null, // 3.0.0+ - internally set to indicate the section index for repeatable sections.        
         
         'tag_id'                    => null,
-        '_tag_id_model'             => '',      // 3.6.0+   
+        '_tag_id_model'             => '', // 3.6.0+   
         
-        '_field_name'               => '',      // 3.6.0+   
-        '_field_name_model'         => '',      // 3.6.0+           
+        '_field_name'               => '', // 3.6.0+   
+        '_field_name_model'         => '', // 3.6.0+           
         
-        '_field_name_flat'          => '',      // 3.6.0+
-        '_field_name_flat_model'    => '',      // 3.6.0+   
+        '_field_name_flat'          => '', // 3.6.0+
+        '_field_name_flat_model'    => '', // 3.6.0+   
                 
-        '_field_address'            => '',      // 3.6.0+
-        '_field_address_model'      => '',      // 3.6.0+
+        '_field_address'            => '', // 3.6.0+
+        '_field_address_model'      => '', // 3.6.0+
                
-        '_parent_field_object'      => null,    // 3.6.0+   Assigned when a field creates a nested field.
+        '_parent_field_object'      => null, // 3.6.0+   Assigned when a field creates a nested field.
         
-        '_parent_tag_id'            => null,    // 3.8.0+   Set outside the class.
+        '_parent_tag_id'            => null, // 3.8.0+   Set outside the class.
         
     );        
     
@@ -92,7 +92,7 @@ 
         $_aFieldset = $this->aFieldset + self::$aStructure;
 
         // The section index must be set before generating a field tag id as it uses a section index.
-        $_aFieldset[ '_section_index' ]   = $this->iSectionIndex;
+        $_aFieldset[ '_section_index' ] = $this->iSectionIndex;
         $_oFieldTagIDGenerator = new AdminPageFramework_Form_View___Generate_FieldTagID( 
             $_aFieldset,
             $_aFieldset[ '_caller_object' ]->aCallbacks[ 'hfTagID' ]
@@ -126,7 +126,7 @@ 
         
         // 3.8.0+ Format nested fieldsets.
         if ( $this->hasFieldDefinitionsInContent( $_aFieldset ) ) {
-            foreach( $_aFieldset[ 'content' ] as &$_aNestedFieldset ) {
+            foreach ( $_aFieldset[ 'content' ] as &$_aNestedFieldset ) {
                 // The inline-mixed type has a string element.
                 if ( is_scalar( $_aNestedFieldset ) ) {
                     continue;

development/factory/_common/utility/admin_notice/AdminPageFramework_AdminNotice.php

Spacing +9 added lines, -9 removed lines

@@ -46,7 +46,7 @@ 
     public $sNotice     = '';    
     public $aAttributes = array();
     public $aCallbacks  = array(
-        'should_show'   => null,    // determines whether the admin notice should be displayed.
+        'should_show'   => null, // determines whether the admin notice should be displayed.
     );
     /**#@-*/     
      
@@ -62,7 +62,7 @@ 
      * </ul>
      * @since       3.5.0
      */
-    public function __construct( $sNotice, array $aAttributes=array( 'class' => 'error' ), array $aCallbacks=array() ) {
+    public function __construct( $sNotice, array $aAttributes = array( 'class' => 'error' ), array $aCallbacks = array() ) {
 
         $this->aAttributes            = $aAttributes + array(
             'class' => 'error', // 'updated' etc.
@@ -70,17 +70,17 @@ 
         $this->aAttributes[ 'class' ] = $this->getClassAttribute(
             $this->aAttributes[ 'class' ],
             'admin-page-framework-settings-notice-message',
-            'admin-page-framework-settings-notice-container',   // Moved from `AdminPageFramework_Factory_View`.
+            'admin-page-framework-settings-notice-container', // Moved from `AdminPageFramework_Factory_View`.
             'notice',
             'is-dismissible'    // 3.5.12+
         );
-        $this->aCallbacks             = $aCallbacks + $this->aCallbacks;
+        $this->aCallbacks = $aCallbacks + $this->aCallbacks;
   
         // Load resources.
         new AdminPageFramework_AdminNotice___Script;
         
         // An empty value may be set in oreder only to laode the fade-in script.
-        if ( ! $sNotice ) {
+        if ( !$sNotice ) {
             return;
         }
         
@@ -108,7 +108,7 @@ 
          */
         public function _replyToDisplayAdminNotice() {
             
-            if ( ! $this->_shouldProceed() ) {
+            if ( !$this->_shouldProceed() ) {
                 return;
             }
             
@@ -119,14 +119,14 @@ 
                 'display: none' 
             );
             
-            echo "<div " . $this->getAttributes( $_aAttributes ) . ">"
+            echo "<div ".$this->getAttributes( $_aAttributes ).">"
                     . "<p>"
                         . self::$_aNotices[ $this->sNotice ]
                     . "</p>"
                 . "</div>"
                 // Insert the same message except it is not hidden.
                 . "<noscript>"
-                    . "<div " . $this->getAttributes( $this->aAttributes ) . ">"
+                    . "<div ".$this->getAttributes( $this->aAttributes ).">"
                         . "<p>" 
                             . self::$_aNotices[ $this->sNotice ]
                         . "</p>"
@@ -144,7 +144,7 @@ 
              */
             private function _shouldProceed() {
                 
-                if ( ! is_callable( $this->aCallbacks[ 'should_show' ] ) ) {
+                if ( !is_callable( $this->aCallbacks[ 'should_show' ] ) ) {
                     return true;
                 }
                 return call_user_func_array(

development/factory/network_admin_page/_controller/AdminPageFramework_Link_network_admin_page.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
     /**
      * Sets up hooks and properties.
      */
-    public function __construct( $oProp, $oMsg=null ) {
+    public function __construct( $oProp, $oMsg = null ) {
     
         parent::__construct( $oProp, $oMsg );
         
@@ -31,13 +31,13 @@ 
             
             // This filter for non-network-admin action links is added in the parent constructor.
             remove_filter( 
-                'plugin_action_links_' . plugin_basename( $this->oProp->aScriptInfo['sPath'] ),
+                'plugin_action_links_'.plugin_basename( $this->oProp->aScriptInfo[ 'sPath' ] ),
                 array( $this, '_replyToAddSettingsLinkInPluginListingPage' ),
                 20
             );
             // Add the action link filter for the multi-site network admin.
             add_filter( 
-                'network_admin_plugin_action_links_' . plugin_basename( $this->oProp->aScriptInfo['sPath'] ), 
+                'network_admin_plugin_action_links_'.plugin_basename( $this->oProp->aScriptInfo[ 'sPath' ] ), 
                 array( $this, '_replyToAddSettingsLinkInPluginListingPage' ) 
             );
             

development/factory/term_meta/AdminPageFramework_TermMeta_View.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      * @return      string      the flat input name attribute
      */    
     public function _replyToGetFlatInputName( /* $sFlatNameAttribute, $aField, $sKey, $sSectionIndex */ ) {
-        $_aParams   = func_get_args() + array( null, null, null );
+        $_aParams = func_get_args() + array( null, null, null );
         return $_aParams[ 0 ];
     }
             

development/factory/term_meta/AdminPageFramework_TermMeta.php

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
      * @param       string          The text domain. Default: `admin-page-framework`.
      * @return      void
      */ 
-    public function __construct( $asTaxonomySlug, $sCapability='manage_options', $sTextDomain='admin-page-framework' ) {
+    public function __construct( $asTaxonomySlug, $sCapability = 'manage_options', $sTextDomain = 'admin-page-framework' ) {
         
         if ( empty( $asTaxonomySlug ) ) { 
             return; 
@@ -55,7 +55,7 @@ 
         // Properties 
         $_sProprtyClassName = isset( $this->aSubClassNames[ 'oProp' ] )
             ? $this->aSubClassNames[ 'oProp' ]
-            : 'AdminPageFramework_Property_' . $this->_sStructureType;        
+            : 'AdminPageFramework_Property_'.$this->_sStructureType;        
         $this->oProp        = new $_sProprtyClassName( 
             $this, 
             get_class( $this ), 
@@ -63,7 +63,7 @@ 
             $sTextDomain, 
             $this->_sStructureType 
         );     
-        $this->oProp->aTaxonomySlugs    = ( array ) $asTaxonomySlug;
+        $this->oProp->aTaxonomySlugs = ( array ) $asTaxonomySlug;
         
         parent::__construct( $this->oProp );
         

Braces +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
      */ 
     public function __construct( $asTaxonomySlug, $sCapability='manage_options', $sTextDomain='admin-page-framework' ) {
         
-        if ( empty( $asTaxonomySlug ) ) { 
+        if ( empty( $asTaxonomySlug ) ) {
             return; 
         }