michaeluno / admin-page-framework

development/factory/_abstract/model/format/AdminPageFramework_Format_Base.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         $_aParameters = func_get_args() + array( 
             $this->aSubject, 
         );
-        $this->aSubject  = $_aParameters[ 0 ];        
+        $this->aSubject = $_aParameters[ 0 ];        
         
     }
     

development/factory/_abstract/model/format/AdminPageFramework_Format_EachField.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
      */
     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
+        '_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.
     );
     
     /**
@@ -83,7 +83,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
@@ -127,7 +127,7 @@ 
         // ); 
                             
         // used in the attribute below plus it is also used in the sample custom field type.
-        $_aField[ '_field_container_id' ]      = "field-{$_aField[ 'input_id' ]}";
+        $_aField[ '_field_container_id' ] = "field-{$_aField[ 'input_id' ]}";
 
 // @todo for issue #158 https://github.com/michaeluno/admin-page-framework/issues/158               
 // These models are for generating ids and names dynamically.
@@ -165,8 +165,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/_abstract/model/format/AdminPageFramework_Format_EachSection.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
     /**
      * Stores the section definition.
      */
-    public $aSection            = array();
+    public $aSection = array();
     
     /**
      * Indicates the sub section index.
@@ -91,8 +91,8 @@ 
         
         $_aSection[ '_is_collapsible' ]    = $_aSection[ 'collapsible' ] && 'section' === $_aSection[ 'collapsible' ][ 'container' ];
         
-        $_aSection[ '_tag_id' ]            = 'section-' . $_aSection[ 'section_id' ] . '__' . $this->iIndex;
-        $_aSection[ '_tag_id_model' ]      = 'section-' . $_aSection[ 'section_id' ] . '__' . '___i___';
+        $_aSection[ '_tag_id' ]            = 'section-'.$_aSection[ 'section_id' ].'__'.$this->iIndex;
+        $_aSection[ '_tag_id_model' ]      = 'section-'.$_aSection[ 'section_id' ].'__'.'___i___';
         
         return $_aSection;
         

development/factory/_abstract/model/format/AdminPageFramework_Format_Fields.php

Indentation +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
             // $aSubFields gets updated in the method
             $this->_fillRepeatableElements( $aField, $aSubFields, $mSavedValue );
                             
-             // $aSubFields gets updated in the method
+                // $aSubFields gets updated in the method
             $this->_fillSubFields( $aSubFields, $aFirstField );
 
             // Put them together

Spacing +28 added lines, -28 removed lines

@@ -53,7 +53,7 @@ 
     public function get() {
 
         // Get the set value(s)
-        $_mSavedValue    = $this->_getStoredInputFieldValue( 
+        $_mSavedValue = $this->_getStoredInputFieldValue( 
             $this->aField, 
             $this->aOptions 
         );
@@ -113,9 +113,9 @@ 
              * @return      void
              */
             private function _divideMainAndSubFields( array $aField, array &$aFirstField, array &$aSubFields ) {
-                foreach( $aField as $_nsIndex => $_mFieldElement ) {
+                foreach ( $aField as $_nsIndex => $_mFieldElement ) {
                     if ( is_numeric( $_nsIndex ) ) {
-                        $aSubFields[] = $_mFieldElement;
+                        $aSubFields[ ] = $_mFieldElement;
                     } else {
                         $aFirstField[ $_nsIndex ] = $_mFieldElement;
                     }
@@ -133,12 +133,12 @@ 
              * @return      void
              */
             private function _fillRepeatableElements( array $aField, array &$aSubFields, $mSavedValue ) {
-                if ( ! $aField['repeatable'] ) {
+                if ( !$aField[ 'repeatable' ] ) {
                     return;
                 }
                 $_aSavedValues = ( array ) $mSavedValue;
                 unset( $_aSavedValues[ 0 ] );
-                foreach( $_aSavedValues as $_iIndex => $vValue ) {
+                foreach ( $_aSavedValues as $_iIndex => $vValue ) {
                     $aSubFields[ $_iIndex - 1 ] = isset( $aSubFields[ $_iIndex - 1 ] ) && is_array( $aSubFields[ $_iIndex - 1 ] ) 
                         ? $aSubFields[ $_iIndex - 1 ] 
                         : array();     
@@ -153,7 +153,7 @@ 
              */
             private function _fillSubFields( array &$aSubFields, array $aFirstField ) {
                         
-                foreach( $aSubFields as &$_aSubField ) {
+                foreach ( $aSubFields as &$_aSubField ) {
                     
                     // Evacuate the label element which should not be merged.
                     $_aLabel = $this->getElement( 
@@ -166,7 +166,7 @@ 
                     $_aSubField = $this->uniteArrays( $_aSubField, $aFirstField ); 
                     
                     // Restore the label element.
-                    $_aSubField['label'] = $_aLabel;
+                    $_aSubField[ 'label' ] = $_aLabel;
                     
                 }
             }
@@ -180,16 +180,16 @@ 
         private function _setSavedFieldsValue( array &$aFields, $mSavedValue, $aField ) {
          
             // Determine whether the elements are saved in an array.
-            $_bHasSubFields = count( $aFields ) > 1 || $aField['repeatable'] || $aField['sortable'];
-            if ( ! $_bHasSubFields ) {
-                $aFields[ 0 ]['_saved_value'] = $mSavedValue;
-                $aFields[ 0 ]['_is_multiple_fields'] = false;
+            $_bHasSubFields = count( $aFields ) > 1 || $aField[ 'repeatable' ] || $aField[ 'sortable' ];
+            if ( !$_bHasSubFields ) {
+                $aFields[ 0 ][ '_saved_value' ] = $mSavedValue;
+                $aFields[ 0 ][ '_is_multiple_fields' ] = false;
                 return;                    
             }
      
-            foreach( $aFields as $_iIndex => &$_aThisField ) {
-                $_aThisField['_saved_value'] = $this->getElement( $mSavedValue, $_iIndex, null );
-                $_aThisField['_is_multiple_fields'] = true;
+            foreach ( $aFields as $_iIndex => &$_aThisField ) {
+                $_aThisField[ '_saved_value' ] = $this->getElement( $mSavedValue, $_iIndex, null );
+                $_aThisField[ '_is_multiple_fields' ] = true;
             }
     
         } 
@@ -201,9 +201,9 @@ 
          * @since       3.6.0       Moved from `AdminPageFramework_FieldDefinition`.
          */
         private function _setFieldsValue( array &$aFields ) {
-            foreach( $aFields as &$_aField ) {
-                $_aField['_is_value_set_by_user'] = isset( $_aField['value'] );
-                $_aField['value']                 = $this->_getSetFieldValue( $_aField );
+            foreach ( $aFields as &$_aField ) {
+                $_aField[ '_is_value_set_by_user' ] = isset( $_aField[ 'value' ] );
+                $_aField[ 'value' ]                 = $this->_getSetFieldValue( $_aField );
             }
         }
         /**
@@ -214,14 +214,14 @@ 
          */
         private function _getSetFieldValue( array $aField ) {
             
-            if ( isset( $aField['value'] ) ) {
-                return $aField['value'];
+            if ( isset( $aField[ 'value' ] ) ) {
+                return $aField[ 'value' ];
             }
-            if ( isset( $aField['_saved_value'] ) ) {
-                return $aField['_saved_value'];
+            if ( isset( $aField[ '_saved_value' ] ) ) {
+                return $aField[ '_saved_value' ];
             }
-            if ( isset( $aField['default'] ) ) {
-                return $aField['default'];
+            if ( isset( $aField[ 'default' ] ) ) {
+                return $aField[ 'default' ];
             }
             return null;                  
             
@@ -241,10 +241,10 @@ 
         private function _getStoredInputFieldValue( $aField, $aOptions ) {    
 
             // If a section is not set, check the first dimension element.
-            if ( ! isset( $aField['section_id'] ) || '_default' === $aField['section_id'] ) {
+            if ( !isset( $aField[ 'section_id' ] ) || '_default' === $aField[ 'section_id' ] ) {
                 return $this->getElement( 
                     $aOptions, 
-                    $aField['field_id'],
+                    $aField[ 'field_id' ],
                     null
                 );
             }
@@ -252,10 +252,10 @@ 
             // At this point, the section dimension is set.
             
             // If it belongs to a sub section,
-            if ( isset( $aField['_section_index'] ) ) {
+            if ( isset( $aField[ '_section_index' ] ) ) {
                 return $this->getElement(
                     $aOptions,
-                    array( $aField['section_id'], $aField['_section_index'], $aField['field_id'] ),
+                    array( $aField[ 'section_id' ], $aField[ '_section_index' ], $aField[ 'field_id' ] ),
                     null
                 );
             }
@@ -263,7 +263,7 @@ 
             // Otherwise, return the second dimension element.
             return $this->getElement(
                 $aOptions,
-                array( $aField['section_id'], $aField['field_id'] ),
+                array( $aField[ 'section_id' ], $aField[ 'field_id' ] ),
                 null
             );
                                             

Braces +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
          * @since       3.6.0       Moved from `AdminPageFramework_FieldDefinition`.
          * @since       DEVVER      Changed the `_field_type` element to `_structure_type`.
          */
-        private function _getStoredInputFieldValue( $aField, $aOptions ) {    
+        private function _getStoredInputFieldValue( $aField, $aOptions ) {
 
             // If a section is not set, check the first dimension element.
             if ( ! isset( $aField[ 'section_id' ] ) || '_default' === $aField[ 'section_id' ] ) {

development/factory/_abstract/model/format/AdminPageFramework_Format_Fieldset.php

Spacing +23 added lines, -23 removed lines

@@ -34,31 +34,31 @@ 
         'section_id'                => null,
 
         // Optional Keys        
-        'section_title'             => null,    // This will be assigned automatically in the formatting method.
-        'page_slug'                 => null,    // This will be assigned automatically in the formatting method.
-        'tab_slug'                  => null,    // This will be assigned automatically in the formatting method.
-        'option_key'                => null,    // This will be assigned automatically in the formatting method.
-        'class_name'                => null,    // Stores the instantiated class name. Used by the export field type. Also a third party custom field type uses it.
+        'section_title'             => null, // This will be assigned automatically in the formatting method.
+        'page_slug'                 => null, // This will be assigned automatically in the formatting method.
+        'tab_slug'                  => null, // This will be assigned automatically in the formatting method.
+        'option_key'                => null, // This will be assigned automatically in the formatting method.
+        'class_name'                => null, // Stores the instantiated class name. Used by the export field type. Also a third party custom field type uses it.
         'capability'                => null,        
         'title'                     => null,    
         'tip'                       => null,    
         'description'               => null,    
-        'error_message'             => null,    // error message for the field
+        'error_message'             => null, // error message for the field
         'before_label'              => null,    
         'after_label'               => null,    
         'if'                        => true,    
-        'order'                     => null,    // do not set the default number here for this key.     
+        'order'                     => null, // do not set the default number here for this key.     
         'default'                   => null,
         'value'                     => null,
-        'help'                      => null,    // 2.1.0+
-        'help_aside'                => null,    // 2.1.0+
-        'repeatable'                => null,    // 2.1.3+
-        'sortable'                  => null,    // 2.1.3+
-        'show_title_column'         => true,    // 3.0.0+
-        'hidden'                    => null,    // 3.0.0+
+        'help'                      => null, // 2.1.0+
+        'help_aside'                => null, // 2.1.0+
+        'repeatable'                => null, // 2.1.3+
+        'sortable'                  => null, // 2.1.3+
+        'show_title_column'         => true, // 3.0.0+
+        'hidden'                    => null, // 3.0.0+
 
         // @todo    Examine why an array is not set but null here for the attributes argument.
-        'attributes'                => null,    // 3.0.0+ - the array represents the attributes of input tag
+        'attributes'                => null, // 3.0.0+ - the array represents the attributes of input tag
         'class'                     => array(   // 3.3.1+
             'fieldrow'  =>  array(),
             'fieldset'  =>  array(),
@@ -66,16 +66,16 @@ 
             'field'     =>  array(),
         ), 
 
-        'save'                      => true,    // 3.6.0+
-        'content'                   => null,     // 3.6.1+ - (string) An overriding field-set output.
+        'save'                      => true, // 3.6.0+
+        'content'                   => null, // 3.6.1+ - (string) An overriding field-set output.
         
         // Internal Keys
-        '_fields_type'              => null,    // 3.0.0+ - an internal key that indicates the fields type such as page, meta box for pages, meta box for posts, or taxonomy.
-        '_caller_object'            => null,    // 3.4.0+ - (object) stores the object of the caller class. The object is referenced when creating nested fields.
-        '_nested_depth'             => 0,       // 3.4.0+ - (integer) stores the level of the nesting depth. This is mostly used for debugging by checking if the field is a nested field or not.
+        '_fields_type'              => null, // 3.0.0+ - an internal key that indicates the fields type such as page, meta box for pages, meta box for posts, or taxonomy.
+        '_caller_object'            => null, // 3.4.0+ - (object) stores the object of the caller class. The object is referenced when creating nested fields.
+        '_nested_depth'             => 0, // 3.4.0+ - (integer) stores the level of the nesting depth. This is mostly used for debugging by checking if the field is a nested field or not.
                 
 // @todo deprecate this and use the '_parent_field_object' to generate field input names and ids.
-'_parent_field_name_flat'   => '',      // 3.6.0+ - for nested fields. 
+'_parent_field_name_flat'   => '', // 3.6.0+ - for nested fields. 
     );        
     
     /**
@@ -150,7 +150,7 @@ 
         $_aFieldset = $this->uniteArrays(
             array( 
                 '_fields_type'          => $this->sFieldsType,
-                '_caller_object'        => $this->oCallerObject,  // 3.4.1+ Stores the caller framework factory object. 
+                '_caller_object'        => $this->oCallerObject, // 3.4.1+ Stores the caller framework factory object. 
             )
             + $this->aFieldset,
             array( 
@@ -165,14 +165,14 @@ 
         $_aFieldset[ 'section_id' ]  = $this->sanitizeSlug( $_aFieldset[ 'section_id' ] );     
         $_aFieldset[ 'tip' ]         = esc_attr( strip_tags(
             $this->getElement(
-                $_aFieldset,  // subject array
+                $_aFieldset, // subject array
                 'tip', // key
                 is_array( $_aFieldset[ 'description' ] )     // default
                     ? implode( '
', $_aFieldset[ 'description' ] ) 
                     : $_aFieldset[ 'description' ] 
             )
         ) );
-        $_aFieldset[ 'order' ]       = $this->getAOrB(
+        $_aFieldset[ 'order' ] = $this->getAOrB(
             is_numeric( $_aFieldset[ 'order' ] ),
             $_aFieldset[ 'order' ],
             $this->iCountOfElements + 10

development/factory/_abstract/model/format/AdminPageFramework_Format_FieldsetOutput.php

Spacing +10 added lines, -10 removed lines

@@ -32,21 +32,21 @@ 
      * @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.
         
     );        
     
@@ -89,7 +89,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,

development/factory/_abstract/model/format/AdminPageFramework_Format_FormField_Base.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     protected function _isSectionSet( array $aField ) {
         return isset( $aField[ 'section_id' ] ) 
             && $aField[ 'section_id' ] 
-            && '_default' !== $aField['section_id'];
+            && '_default' !== $aField[ 'section_id' ];
     }       
            
 }
\ No newline at end of file

development/factory/_abstract/model/format/AdminPageFramework_Format_Sectionset.php

Spacing +14 added lines, -14 removed lines

@@ -35,36 +35,36 @@
         // Optional
         'page_slug'         => null,
         'tab_slug'          => null,
-        'section_tab_slug'  => null,    // 3.0.0+
+        'section_tab_slug'  => null, // 3.0.0+
         'title'             => null,
         'description'       => null,
         'capability'        => null,
         'if'                => true,    
-        'order'             => null,    // do not set the default number here because incremented numbers will be added when registering the sections.
+        'order'             => null, // do not set the default number here because incremented numbers will be added when registering the sections.
         'help'              => null,
         'help_aside'        => null,
-        'repeatable'        => false,   // (boolean|array) 3.0.0+
-        'sortable'          => false,   // (boolean|array) 3.6.0+
+        'repeatable'        => false, // (boolean|array) 3.0.0+
+        'sortable'          => false, // (boolean|array) 3.6.0+
         'attributes'        => array(   // 3.3.1+
-            'class'         => null,    // set null to avoid undefined index warnings.
-            'style'         => null,    // set null to avoid undefined index warnings.
+            'class'         => null, // set null to avoid undefined index warnings.
+            'style'         => null, // set null to avoid undefined index warnings.
             'tab'           => array(),
         ),
         'class'             => array(    // 3.3.1+
             'tab'           => array(),
         ),
-        'hidden'            => false,    // 3.3.1+
-        'collapsible'       => false,    // 3.4.0+ (boolean|array) For the array structure see the $aStructure_CollapsibleArguments property.
-        'save'              => true,     // 3.6.0+
+        'hidden'            => false, // 3.3.1+
+        'collapsible'       => false, // 3.4.0+ (boolean|array) For the array structure see the $aStructure_CollapsibleArguments property.
+        'save'              => true, // 3.6.0+
         
-        'content'           => null,     // 3.6.1+  (string) An overriding section-set output.
+        'content'           => null, // 3.6.1+  (string) An overriding section-set output.
         
         // Internal
-        '_fields_type'      => null,     // 3.0.0+ - same as the one of the field definition array. Used to insert debug info at the bottom of sections.        
-        '_is_first_index'   => false,    // 3.4.0+ (boolean) indicates whether it is the first item of the sub-sections (for repeatable sections).
-        '_is_last_index'    => false,    // 3.4.0+ (boolean) indicates whether it is the last item of the sub-sections (for repeatable sections).
+        '_fields_type'      => null, // 3.0.0+ - same as the one of the field definition array. Used to insert debug info at the bottom of sections.        
+        '_is_first_index'   => false, // 3.4.0+ (boolean) indicates whether it is the first item of the sub-sections (for repeatable sections).
+        '_is_last_index'    => false, // 3.4.0+ (boolean) indicates whether it is the last item of the sub-sections (for repeatable sections).
         
-        '_caller_object'    => null,     // 3.6.0+ - (object) the caller framework factory object. This allows the framework to access the factory property when rendering the section.
+        '_caller_object'    => null, // 3.6.0+ - (object) the caller framework factory object. This allows the framework to access the factory property when rendering the section.
     );        
     
     /**

development/factory/_abstract/model/modifier/AdminPageFramework_Modifier_FilterRepeatableElements.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
                 array( $this, '_replyToAddPostTypeQueryInEditPostLink' ), 
                 10, 
                 3 
-           );
+            );
         }        
     }
 

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      * @return      array       The formatted definition array.
      */
     public function get() {
-        foreach( $this->aDimensionalKeys as $_sFlatFieldAddress ) {
+        foreach ( $this->aDimensionalKeys as $_sFlatFieldAddress ) {
             $this->unsetDimensionalArrayElement( 
                 $this->aSubject, 
                 explode( '|', $_sFlatFieldAddress )