michaeluno / admin-page-framework

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

@@ -58,7 +58,7 @@ 
             $_sTabSlug  = $this->getElement( $_GET, 'tab', '' );
             $_sTabSlug  = sanitize_text_field( $_sTabSlug );
             $_sUserID   = get_current_user_id();
-            return "apf_li_" . md5(
+            return "apf_li_".md5(
                 $_sPageNow
                 . $_sPageSlug
                 . $_sTabSlug
@@ -96,13 +96,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
             );
         }
 
@@ -122,9 +122,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

@@ -48,7 +48,7 @@ 
             $_sTabSlug  = $this->getElement( $_GET, 'tab', '' );
             $_sTabSlug  = sanitize_text_field( $_sTabSlug );
             $_sUserID   = get_current_user_id();
-            return "apf_fe_" . md5(
+            return "apf_fe_".md5(
                 $_sPageNow
                 . $_sPageSlug
                 . $_sTabSlug
@@ -136,7 +136,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 );
 
@@ -153,7 +153,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' ) );

development/factory/_common/form/field_type/AdminPageFramework_FieldType_size.php

Doc Comments +2 added lines

@@ -211,6 +211,7 @@ 
              * Returns the HTML output of the number input part.
              *
              * @since       3.5.3
+             * @param boolean $bMultiLabels
              * @return      string      The number input output.
              * @internal
              */
@@ -265,6 +266,7 @@ 
              * Returns the HTML output of the unit select input part.
              *
              * @since       3.5.3
+             * @param boolean $bMultiLabels
              * @return      string      The unit select input output.
              * @internal
              */

Spacing +29 added lines, -29 removed lines

@@ -64,7 +64,7 @@ 
     /**
      * Defines the field type slugs used for this field type.
      */
-    public $aFieldTypeSlugs = array( 'size', );
+    public $aFieldTypeSlugs = array( 'size',);
 
     /**
      * Defines the default key-values of this field type.
@@ -73,7 +73,7 @@ 
      */
     protected $aDefaultKeys = array(
         'is_multiple'           => false, // indicates whether the select tag alloes multiple selections.
-        'units'                 => null,  // do not define units here since this will be merged with the user defined field array.
+        'units'                 => null, // do not define units here since this will be merged with the user defined field array.
         'attributes'            => array(
             'size'      => array(
                 'min'           => null,
@@ -101,7 +101,7 @@ 
      */
     protected $aDefaultUnits = array(
         'px'    => 'px', // pixel
-        '%'     => '%',  // percentage
+        '%'     => '%', // percentage
         'em'    => 'em', // font size
         'ex'    => 'ex', // font height
         'in'    => 'in', // inch
@@ -161,8 +161,8 @@ 
         );
 
         $_aOutput = array();
-        foreach( ( array ) $aField[ 'label' ] as $_isKey => $_sLabel ) {
-            $_aOutput[] = $this->_getFieldOutputByLabel(
+        foreach ( ( array ) $aField[ 'label' ] as $_isKey => $_sLabel ) {
+            $_aOutput[ ] = $this->_getFieldOutputByLabel(
                 $_isKey,
                 $_sLabel,
                 $aField
@@ -185,8 +185,8 @@ 
 
             $_aBaseAttributes   = $_bMultiLabels
                 ? array(
-                        'name'  => $aField[ 'attributes' ][ 'name' ] . "[{$isKey}]",
-                        'id'    => $aField[ 'attributes' ][ 'id' ] . "_{$isKey}",
+                        'name'  => $aField[ 'attributes' ][ 'name' ]."[{$isKey}]",
+                        'id'    => $aField[ 'attributes' ][ 'id' ]."_{$isKey}",
                         'value' => $aField[ 'value' ],
                     )
                     + $aField[ 'attributes' ]
@@ -198,9 +198,9 @@ 
 
             $_aOutput = array(
                 $this->getElementByLabel( $aField[ 'before_label' ], $isKey, $aField[ 'label' ] ),
-                    "<div " . $this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-container admin-page-framework-select-label' ) . ">",
-                        $this->_getNumberInputPart( $aField, $_aBaseAttributes, $isKey, is_array( $aField[ 'label' ] ) ),  // The size (number) part
-                        $this->_getUnitSelectInput( $aField, $_aBaseAttributes, $isKey, is_array( $aField[ 'label' ] ) ),  // The unit (select) part
+                    "<div ".$this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-container admin-page-framework-select-label' ).">",
+                        $this->_getNumberInputPart( $aField, $_aBaseAttributes, $isKey, is_array( $aField[ 'label' ] ) ), // The size (number) part
+                        $this->_getUnitSelectInput( $aField, $_aBaseAttributes, $isKey, is_array( $aField[ 'label' ] ) ), // The unit (select) part
                     "</div>",
                 $this->getElementByLabel( $aField[ 'after_label' ], $isKey, $aField[ 'label' ] )
             );
@@ -217,7 +217,7 @@ 
             private function _getNumberInputPart( array $aField, array $aBaseAttributes, $isKey, $bMultiLabels ) {
 
                 // Size and Size Label
-                $_aSizeAttributes       = $this->_getSizeAttributes(
+                $_aSizeAttributes = $this->_getSizeAttributes(
                     $aField,
                     $aBaseAttributes,
                     $bMultiLabels
@@ -225,32 +225,32 @@ 
                         : ''
                 );
 
-                $_aSizeLabelAttributes  = array(
+                $_aSizeLabelAttributes = array(
                     'for'   => $_aSizeAttributes[ 'id' ],
                     'class' => $_aSizeAttributes[ 'disabled' ]
                         ? 'disabled'
                         : null,
                 );
 
-                $_sLabel                = $this->getElementByLabel(
+                $_sLabel = $this->getElementByLabel(
                     $aField[ 'label' ],
                     $isKey,
                     $aField[ 'label' ]
                 );
-                return "<label " . $this->getAttributes( $_aSizeLabelAttributes ) . ">"
+                return "<label ".$this->getAttributes( $_aSizeLabelAttributes ).">"
                     . $this->getElement(
                         $aField,
                         $bMultiLabels
                             ? array( 'before_label', $isKey, 'size' )
                             : array( 'before_label', 'size' )
                     )
-                    . ( $aField[ 'label' ] && ! $aField[ 'repeatable' ]
-                        ? "<span " . $this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ) . ">"
+                    . ( $aField[ 'label' ] && !$aField[ 'repeatable' ]
+                        ? "<span ".$this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ).">"
                                 . $_sLabel
                             . "</span>"
                         : ""
                     )
-                    . "<input " . $this->getAttributes( $_aSizeAttributes ) . " />"
+                    . "<input ".$this->getAttributes( $_aSizeAttributes )." />"
                     . $this->getElement(
                         $aField,
                         $bMultiLabels
@@ -293,7 +293,7 @@ 
                     )
                     : $aField[ 'units' ];
 
-                return "<label " . $this->getAttributes(
+                return "<label ".$this->getAttributes(
                         array(
                             'for'       => $_aUnitAttributes[ 'id' ],
                             'class'     => $_aUnitAttributes[ 'disabled' ]
@@ -325,9 +325,9 @@ 
                  * @return      array       an unit attribute array
                  * @internal
                  */
-                private function _getUnitAttributes( array $aField, array $aBaseAttributes, $isLabelKey='' ) {
+                private function _getUnitAttributes( array $aField, array $aBaseAttributes, $isLabelKey = '' ) {
 
-                    $_bIsMultiple    = $aField[ 'is_multiple' ]
+                    $_bIsMultiple = $aField[ 'is_multiple' ]
                         ? true
                         : $this->getElement(
                             $aField,
@@ -339,13 +339,13 @@ 
 
                     $_aSelectAttributes = array(
                         'type'      => 'select',
-                        'id'        => $aField[ 'input_id' ] . ( '' === $isLabelKey ? '' : '_' . $isLabelKey ) . '_' . 'unit',
+                        'id'        => $aField[ 'input_id' ].( '' === $isLabelKey ? '' : '_'.$isLabelKey ).'_'.'unit',
                         'multiple'  => $_bIsMultiple
                             ? 'multiple'
                             : null,
                         'name'      => $_bIsMultiple
-                            ? "{$aField['_input_name']}" . ( '' === $isLabelKey ? '' : '[' . $isLabelKey . ']' ) . "[unit][]"
-                            : "{$aField['_input_name']}" . ( '' === $isLabelKey ? '' : '[' . $isLabelKey . ']' ) . "[unit]",
+                            ? "{$aField[ '_input_name' ]}".( '' === $isLabelKey ? '' : '['.$isLabelKey.']' )."[unit][]"
+                            : "{$aField[ '_input_name' ]}".( '' === $isLabelKey ? '' : '['.$isLabelKey.']' )."[unit]",
                         'value'     => $this->getElement(
                             $aField,
                             array( 'value', 'unit' ),
@@ -357,7 +357,7 @@ 
                         '' === $isLabelKey
                             ? array( 'attributes', 'unit' )
                             : array( 'attributes', $isLabelKey, 'unit' ),
-                        $this->aDefaultKeys['attributes']['unit']
+                        $this->aDefaultKeys[ 'attributes' ][ 'unit' ]
                     )
                     + $aBaseAttributes;
                     return $_aSelectAttributes;
@@ -371,15 +371,15 @@ 
              * @return      array       an size attribute array
              * @internal
              */
-            private function _getSizeAttributes( array $aField, array $aBaseAttributes, $sLabelKey='' ) {
+            private function _getSizeAttributes( array $aField, array $aBaseAttributes, $sLabelKey = '' ) {
 
                 return array(
                         'type'  => 'number',
-                        'id'    => $aField['input_id'] . '_' . ( '' !== $sLabelKey ? $sLabelKey . '_' : '' ) . 'size',
-                        'name'  => $aField[ '_input_name' ] . ( '' !== $sLabelKey ? "[{$sLabelKey}]" : '' ) . '[size]',
+                        'id'    => $aField[ 'input_id' ].'_'.( '' !== $sLabelKey ? $sLabelKey.'_' : '' ).'size',
+                        'name'  => $aField[ '_input_name' ].( '' !== $sLabelKey ? "[{$sLabelKey}]" : '' ).'[size]',
                         'value' => $this->getElement(
-                            $aField,        // subject
-                            array( 'value', 'size' ),   // dimensional keys
+                            $aField, // subject
+                            array( 'value', 'size' ), // dimensional keys
                             ''  // default
                         ),
                     )

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

Doc Comments -2 removed lines

@@ -27,8 +27,6 @@
      * Returns the output of the input element.
      *
      * @since       3.4.0
-     * @param       string      $sLabel         The label text.
-     * @param       array       $aAttributes    (optional) The attribute array. If set, it will be merged with the attribute set in the constructor.
      */
     public function get( /* $sLabel, $aAttributes=array() */ ) {
 

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
         // Output
         return
-           "<{$this->aOptions[ 'input_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ) . ">"
+            "<{$this->aOptions[ 'input_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ) . ">"
                 . $this->_getInputElements( $_aAttributes, $this->aOptions )
             . "</{$this->aOptions[ 'input_container_tag' ]}>"
             . "<{$this->aOptions[ 'label_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'label_container_attributes' ] ) . ">"

Spacing +13 added lines, -13 removed lines

@@ -33,11 +33,11 @@ 
     public function get( /* $sLabel, $aAttributes=array() */ ) {
 
         // Parameters
-        $_aParams       = func_get_args() + array(
-            0 => '',            // 1st parameter
+        $_aParams = func_get_args() + array(
+            0 => '', // 1st parameter
             1 => array()        // 2nd parameter
         );
-        $_sLabel        = $_aParams[ 0 ];       // first parameter
+        $_sLabel        = $_aParams[ 0 ]; // first parameter
 
         // Attributes
         $_aAttributes   = $this->uniteArrays(   // second parameter
@@ -47,10 +47,10 @@ 
 
         // Output
         return
-           "<{$this->aOptions[ 'input_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ) . ">"
+           "<{$this->aOptions[ 'input_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ).">"
                 . $this->_getInputElements( $_aAttributes, $this->aOptions )
             . "</{$this->aOptions[ 'input_container_tag' ]}>"
-            . "<{$this->aOptions[ 'label_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'label_container_attributes' ] ) . ">"
+            . "<{$this->aOptions[ 'label_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'label_container_attributes' ] ).">"
                 . $_sLabel
             . "</{$this->aOptions[ 'label_container_tag' ]}>"
         ;
@@ -64,16 +64,16 @@ 
         private function _getInputElements( $aAttributes, $aOptions ) {
             $_sOutput = $this->aOptions[ 'save_unchecked' ]
                 // the unchecked value must be set prior to the checkbox input field.
-                ? "<input " . $this->getAttributes(
+                ? "<input ".$this->getAttributes(
                     array(
                         'type'      => 'hidden',
                         'class'     => $aAttributes[ 'class' ],
                         'name'      => $aAttributes[ 'name' ],
                         'value'     => '0',
                     )
-                ) . " />"
+                )." />"
                 : '';
-            $_sOutput .= "<input " . $this->getAttributes( $aAttributes ) . " />";
+            $_sOutput .= "<input ".$this->getAttributes( $aAttributes )." />";
             return $_sOutput;
         }
 
@@ -86,7 +86,7 @@ 
     public function getAttributesByKey( /* $sKey */ ) {
 
         // Parameters
-        $_aParams       = func_get_args() + array( 0 => '', );
+        $_aParams       = func_get_args() + array( 0 => '',);
         $_sKey          = $_aParams[ 0 ];
         $_bIsMultiple   = '' !== $_sKey;
 
@@ -98,13 +98,13 @@ 
             // The type needs to be specified since the postytpe field type extends this class. If not set, the 'posttype' will be passed to the type attribute.
             + array(
                 'type'      => 'checkbox',
-                'id'        => $this->aAttributes[ 'id' ] . '_' . $_sKey,
+                'id'        => $this->aAttributes[ 'id' ].'_'.$_sKey,
                 'checked'   => $this->_getCheckedAttributeValue( $_sKey ),
-                'value'     => 1,   // this must be always 1 because the key value can be zero. In that case, the value always will be false and unchecked.
+                'value'     => 1, // this must be always 1 because the key value can be zero. In that case, the value always will be false and unchecked.
                 'name'      => $_bIsMultiple
                     ? "{$this->aAttributes[ 'name' ]}[{$_sKey}]"
                     : $this->aAttributes[ 'name' ],
-                'data-id'   => $this->aAttributes[ 'id' ],       // referenced by the JavaScript scripts such as the revealer script.
+                'data-id'   => $this->aAttributes[ 'id' ], // referenced by the JavaScript scripts such as the revealer script.
             )
             + $this->aAttributes
             ;
@@ -121,7 +121,7 @@ 
                 : array( 'value', $_sKey );
             return $this->getElement( $this->aAttributes, $_aValueDimension )
                 ? 'checked'
-                : null;    // to not to set, pass null. An empty value '' will still set the attribute.
+                : null; // to not to set, pass null. An empty value '' will still set the attribute.
 
         }
 

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

Doc Comments +3 added lines, -1 removed lines

@@ -121,7 +121,7 @@ 
          * @internal
          * @param       string      $sInputID           The input ID that will be the base of each generated option tag ID.
          * @param       array       $aLabels            The array holding labels.
-         * @param       array       $aAttributes        The attribute arrays. Accepts the following arguments.
+         * @param       array       $aBaseAttributes        The attribute arrays. Accepts the following arguments.
          * - optgroup
          * - option
          */
@@ -159,6 +159,7 @@ 
             /**
              * Returns an HTML output of optgroup tag.
              * @since       3.5.3
+             * @param string $sInputID
              * @return      string      an HTML output of optgroup tag.
              */
             private function _getOptGroup( array $aBaseAttributes, $sInputID, $sKey, $asLabel ) {
@@ -178,6 +179,7 @@ 
             /**
              *
              * @since        3.5.3
+             * @param string $sInputID
              */
             private function _getOptionTagAttributes( array $aBaseAttributes, $sInputID, $sKey, $aValues ) {
 

Spacing +14 added lines, -14 removed lines

@@ -68,14 +68,14 @@ 
         );
 
         return
-            "<{$this->aOptions[ 'input_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ) . ">"
-                . "<select " . $this->getAttributes( $this->_getSelectAttributes( $_aAttributes ) ) . " >"
+            "<{$this->aOptions[ 'input_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ).">"
+                . "<select ".$this->getAttributes( $this->_getSelectAttributes( $_aAttributes ) )." >"
                     . $this->_getDropDownList(
                         $this->getAttribute( 'id' ),
                         $this->getAsArray(
                             isset( $_aLabels )
                                 ? $_aLabels
-                                : $this->aField[ 'label' ],    // backward compatibility
+                                : $this->aField[ 'label' ], // backward compatibility
                             true
                         ),
                         $_aAttributes
@@ -103,9 +103,9 @@ 
                         ? 'multiple'
                         : null,
                     'name'      => $_bIsMultiple
-                        ? $this->getAttribute( 'name' ) . '[]'
+                        ? $this->getAttribute( 'name' ).'[]'
                         : $this->getAttribute( 'name' ),
-                    'data-id'   => $this->getAttribute( 'id' ),       // referenced by the JavaScript scripts such as the revealer script.
+                    'data-id'   => $this->getAttribute( 'id' ), // referenced by the JavaScript scripts such as the revealer script.
                 )
             );
 
@@ -127,12 +127,12 @@ 
          */
         private function _getDropDownList( $sInputID, array $aLabels, array $aBaseAttributes ) {
 
-            $_aOutput   = array();
-            foreach( $aLabels as $__sKey => $__asLabel ) {
+            $_aOutput = array();
+            foreach ( $aLabels as $__sKey => $__asLabel ) {
 
                 // For an optgroup tag,
                 if ( is_array( $__asLabel ) ) {
-                    $_aOutput[] = $this->_getOptGroup(
+                    $_aOutput[ ] = $this->_getOptGroup(
                         $aBaseAttributes,
                         $sInputID,
                         $__sKey,
@@ -142,8 +142,8 @@ 
                 }
 
                 // A normal option tag,
-                $_aOutput[] = $this->_getOptionTag(
-                    $__asLabel,   // the text label the user sees to be selected
+                $_aOutput[ ] = $this->_getOptionTag(
+                    $__asLabel, // the text label the user sees to be selected
                     $this->_getOptionTagAttributes(
                         $aBaseAttributes,
                         $sInputID,
@@ -169,7 +169,7 @@ 
                 $_aOptGroupAttributes = array(
                     'label' => $sKey,
                 ) + $_aOptGroupAttributes;
-                return "<optgroup " . $this->getAttributes( $_aOptGroupAttributes ) . ">"
+                return "<optgroup ".$this->getAttributes( $_aOptGroupAttributes ).">"
                         . $this->_getDropDownList( $sInputID, $asLabel, $aBaseAttributes )
                     . "</optgroup>";
 
@@ -187,7 +187,7 @@ 
                     $aValues
                 );
                 return array(
-                        'id'        => $sInputID . '_' . $sKey,
+                        'id'        => $sInputID.'_'.$sKey,
                         'value'     => $sKey,
                         'selected'  => in_array( ( string ) $sKey, $aValues )
                             ? 'selected'
@@ -203,8 +203,8 @@ 
              * @sicne       3.4.0
              * @return      string      The generated option tag HTML output.
              */
-            private function _getOptionTag( $sLabel, array $aOptionTagAttributes=array() ) {
-                return "<option " . $this->getAttributes( $aOptionTagAttributes ) . " >"
+            private function _getOptionTag( $sLabel, array $aOptionTagAttributes = array() ) {
+                return "<option ".$this->getAttributes( $aOptionTagAttributes )." >"
                         . $sLabel
                     . "</option>";
             }

development/factory/_common/utility/AdminPageFramework_ArrayHandler.php

Doc Comments -14 removed lines

@@ -83,12 +83,6 @@ 
      * Returns the specified option value.
      *
      * @since       3.6.0
-     * @param       string|array        $sKey1|$aKeys       The dimensional key or keys of an array of the element to extract its value.
-     * If a string is set to the first parameter, the second parameter is also expected to be a string serving as a second dimensional key.
-     * For example, there is a multi-dimensional array, `array( 'a' => array( 'b' => 'bbb' ) )` to extract the value of the 'b' element in the second depth,
-     * set the parameter as follows. `get( 'a', 'b' )` or `get( array( 'a', 'b' ) );`
-     * @param       string|variant      $sKey2|$vDefault    The second dimensional key or the default value in case the value is not set.
-     * @param       string              $sKey3              The third dimensional key and so on.
      */
     public function get( /* $sKey1, $sKey2, $sKey3, ... OR $aKeys, $vDefault */ ) {
 
@@ -138,10 +132,6 @@ 
      *
      * @since       3.6.0
      * @return      void
-     * @param       string|array        $asKeys       The key or keys of an array of the element to set its value.
-     * If a string is passed, it specifies the element with the set key. If an array is passed, it specifies the element with the dimensional keys.
-     * For example, `set( 'a', 'aaa' )` will set a value, `array( 'a' => 'aaa' )` and `set( array( 'a', 'b' ), 'bbb' )` will set `array( 'a' => array( 'b' => 'bbb' ) )`.
-     * @param       variant             $mValue       The value to be set.
      */
     public function set( /* $asKeys, $mValue */ ) {
 
@@ -167,10 +157,6 @@ 
      * Removes an element by dimensional keys.
      * @since       3.6.0
      * @return      void
-     * @param       string|array        $asKeys       The key or keys of an array of the element to set its value.
-     * If a string is passed, it specifies the element with the set key. If an array is passed, it specifies the element with the dimensional keys.
-     * For example, `delete( 'a' )` will unset an element of `a` in `array( 'a' => 'some value' )` so it becomes `array()`.
-     * `delete( array( 'a', 'b' ) )` will unset the element of `b` in `array( 'a' => array( 'b' => 'bbb' ) )`.
      */
     public function delete( /* $sKey1, $sKey2, $sKey3 ... OR $aKeys */ ) {
 

Spacing +9 added lines, -9 removed lines

@@ -51,14 +51,14 @@ 
      * @since       3.6.0
      * @var         array
      */
-    public $aData            = array();
+    public $aData = array();
 
     /**
      * Stores the default values.
      * @since       3.6.0
      * @var         array
      */
-    public $aDefault         = array();
+    public $aDefault = array();
     /**#@-*/
 
     /**
@@ -96,7 +96,7 @@ 
         $_aKeys     = func_get_args() + array( null );
 
         // If no key is specified, return the whole array.
-        if ( ! isset( $_aKeys[ 0 ] ) ) {
+        if ( !isset( $_aKeys[ 0 ] ) ) {
             return $this->uniteArrays(
                 $this->aData,
                 $this->aDefault
@@ -111,8 +111,8 @@ 
 
         // Now either the section ID or field ID is given.
         return $this->getArrayValueByArrayKeys(
-            $this->aData,   // subject array
-            $_aKeys,        // dimensional keys
+            $this->aData, // subject array
+            $_aKeys, // dimensional keys
             $this->_getDefaultValue( // default value
                 $_mDefault,
                 $_aKeys
@@ -145,8 +145,8 @@ 
      */
     public function set( /* $asKeys, $mValue */ ) {
 
-        $_aParameters   = func_get_args();
-        if ( ! isset( $_aParameters[ 0 ], $_aParameters[ 1 ] ) ) {
+        $_aParameters = func_get_args();
+        if ( !isset( $_aParameters[ 0 ], $_aParameters[ 1 ] ) ) {
             return;
         }
         $_asKeys        = $_aParameters[ 0 ];
@@ -174,8 +174,8 @@ 
      */
     public function delete( /* $sKey1, $sKey2, $sKey3 ... OR $aKeys */ ) {
 
-        $_aParameters   = func_get_args();
-        if ( ! isset( $_aParameters[ 0 ], $_aParameters[ 1 ] ) ) {
+        $_aParameters = func_get_args();
+        if ( !isset( $_aParameters[ 0 ], $_aParameters[ 1 ] ) ) {
             return;
         }
         $_asKeys        = $_aParameters[ 0 ];