michaeluno / admin-page-framework

development/factory/admin_page/AdminPageFramework_View_Form.php

Spacing +19 added lines, -19 removed lines

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

development/factory/widget/AdminPageFramework_Widget_Factory.php

Spacing +29 added lines, -29 removed lines

@@ -26,7 +26,7 @@ 
      * @since       3.2.0
      * @return      void
      */
-	public function __construct( $oCaller, $sWidgetTitle, array $aArguments=array() ) {
+	public function __construct( $oCaller, $sWidgetTitle, array $aArguments = array() ) {
 		
         $aArguments = $aArguments 
             + array( 
@@ -35,8 +35,8 @@ 
             );
             
 		parent::__construct( 
-            $oCaller->oProp->sClassName,  // base id 
-            $sWidgetTitle,      // widget title
+            $oCaller->oProp->sClassName, // base id 
+            $sWidgetTitle, // widget title
             $aArguments         // widget arguments
         );
         $this->oCaller = $oCaller;
@@ -57,7 +57,7 @@ 
         
         $this->oCaller->oUtil->addAndDoActions( 
             $this->oCaller, 
-            'do_' . $this->oCaller->oProp->sClassName, 
+            'do_'.$this->oCaller->oProp->sClassName, 
             $this->oCaller
         );
        
@@ -88,7 +88,7 @@ 
          */
         private function _getTitle( array $aArguments, array $aFormData ) {
                 
-            if ( ! $this->oCaller->oProp->bShowWidgetTitle ) {
+            if ( !$this->oCaller->oProp->bShowWidgetTitle ) {
                 return '';
             }
             
@@ -102,12 +102,12 @@ 
                 $aFormData,
                 $this->id_base 
             );
-            if ( ! $_sTitle ) {
+            if ( !$_sTitle ) {
                 return '';
             }
-           return $aArguments['before_title'] 
+           return $aArguments[ 'before_title' ] 
                 . $_sTitle 
-            . $aArguments['after_title'];           
+            . $aArguments[ 'after_title' ];           
             
         }
             
@@ -123,7 +123,7 @@ 
             $this->oCaller, 
             "validation_{$this->oCaller->oProp->sClassName}", 
             call_user_func_array( 
-                array( $this->oCaller, 'validate' ),    // triggers __call()
+                array( $this->oCaller, 'validate' ), // triggers __call()
                 array( $aSubmittedFormData, $aSavedFormData, $this->oCaller ) // parameters
             ), // 3.5.3+                        
             $aSavedFormData,
@@ -172,8 +172,8 @@ 
         $this->oCaller->oForm   = new AdminPageFramework_Form_widget(
             array(
                 'register_if_action_already_done' => false, // do not register fields right away
-            ) + $this->oCaller->oProp->aFormArguments,  // form arguments  
-            $this->oCaller->oForm->aCallbacks,  // callbacks 
+            ) + $this->oCaller->oProp->aFormArguments, // form arguments  
+            $this->oCaller->oForm->aCallbacks, // callbacks 
             $this->oCaller->oMsg
         );
         // Reuse the data of the previous widget instance.
@@ -199,7 +199,7 @@ 
              * Call the load method only once per class. Also the added field registrations in the class also done once.
              * @since       3.7.9
              */ 
-            if ( $this->oCaller->oUtil->hasBeenCalled( '_widget_load_' . $this->oCaller->oProp->sClassName ) ) {
+            if ( $this->oCaller->oUtil->hasBeenCalled( '_widget_load_'.$this->oCaller->oProp->sClassName ) ) {
 
                 /**
                  * The saved option callback is done with the below load_... callback so for widget form instances called from the second time
@@ -217,7 +217,7 @@ 
             $this->oCaller->oUtil->addAndDoActions( 
                 $this->oCaller, 
                 array(
-                    'load_' . $this->oCaller->oProp->sClassName, 
+                    'load_'.$this->oCaller->oProp->sClassName, 
                 ),
                 $this->oCaller 
             );            
@@ -231,9 +231,9 @@ 
          */
         private function _getFormCallbacks() {
             return array( 
-                'hfID'          => array( $this, 'get_field_id' ),    // defined in the WP_Widget class.  
-                'hfTagID'       => array( $this, 'get_field_id' ),    // defined in the WP_Widget class.  
-                'hfName'        => array( $this, '_replyToGetFieldName' ),  // defined in the WP_Widget class.  
+                'hfID'          => array( $this, 'get_field_id' ), // defined in the WP_Widget class.  
+                'hfTagID'       => array( $this, 'get_field_id' ), // defined in the WP_Widget class.  
+                'hfName'        => array( $this, '_replyToGetFieldName' ), // defined in the WP_Widget class.  
                 'hfInputName'   => array( $this, '_replyToGetFieldInputName' ),
                 
                 'saved_data'    => array( $this, '_replyToGetSavedFormData' ),
@@ -249,8 +249,8 @@ 
     public function  _replyToGetSavedFormData() {
         return $this->oCaller->oUtil->addAndApplyFilter(
             $this->oCaller, // the caller factory object
-            'options_' . $this->oCaller->oProp->sClassName,
-            $this->oCaller->oProp->aOptions,      // subject value to be filtered
+            'options_'.$this->oCaller->oProp->sClassName,
+            $this->oCaller->oProp->aOptions, // subject value to be filtered
             $this->id   // 3.7.9+
         );        
     }    
@@ -280,25 +280,25 @@ 
          */
         private function _getNameAttributeDimensions( $aFieldset ) {
 
-            $_sNamePrefix   = 'widget-' . $this->id_base . '[' . $this->number . ']';
+            $_sNamePrefix = 'widget-'.$this->id_base.'['.$this->number.']';
 
             $_sDimensions = '';
             if ( $this->oCaller->isSectionSet( $aFieldset ) ) {
-                $_aSectionPath       = $aFieldset[ '_section_path_array' ];
-                foreach( $_aSectionPath as $_sDimension ) {
-                    $_sDimensions .= '[' . $_sDimension . ']';
+                $_aSectionPath = $aFieldset[ '_section_path_array' ];
+                foreach ( $_aSectionPath as $_sDimension ) {
+                    $_sDimensions .= '['.$_sDimension.']';
                 }
                 if ( isset( $aFieldset[ '_section_index' ] ) ) {
-                    $_sDimensions .= '[' . $aFieldset[ '_section_index' ] . ']';
+                    $_sDimensions .= '['.$aFieldset[ '_section_index' ].']';
                 }
             }
 
             // 3.8.18+ Support for nested fields. @see  https://github.com/michaeluno/admin-page-framework/issues/274
-            foreach( $aFieldset[ '_field_path_array' ] as $_sPathPart ) {
-                $_sDimensions .= '[' . $_sPathPart . ']';
+            foreach ( $aFieldset[ '_field_path_array' ] as $_sPathPart ) {
+                $_sDimensions .= '['.$_sPathPart.']';
             }
 
-            return $_sNamePrefix . $_sDimensions;
+            return $_sNamePrefix.$_sDimensions;
         }        
     
     /**
@@ -315,10 +315,10 @@ 
         $_sIndex        = $this->oCaller->oUtil->getAOrB(
             '0' !== $sIndex && empty( $sIndex ),
             '',
-            "[" . $sIndex . "]"
+            "[".$sIndex."]"
         );
-        $_sNamePrefix   = $this->_replyToGetFieldName( '', $aFieldset );
-        return $_sNamePrefix . $_sIndex;
+        $_sNamePrefix = $this->_replyToGetFieldName( '', $aFieldset );
+        return $_sNamePrefix.$_sIndex;
 
     }
   

admin-page-framework-loader.php

Spacing +22 added lines, -22 removed lines

@@ -16,9 +16,9 @@ 
  */
 class AdminPageFrameworkLoader_Registry_Base {
 
-    const VERSION        = '3.8.18b01';    // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
+    const VERSION        = '3.8.18b01'; // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
     const NAME           = 'Admin Page Framework - Loader'; // the name is not 'Admin Page Framework' because warning messages gets confusing.
-    const SHORTNAME      = 'Admin Page Framework';  // used for a menu title etc.
+    const SHORTNAME      = 'Admin Page Framework'; // used for a menu title etc.
     const DESCRIPTION    = 'Loads Admin Page Framework which facilitates WordPress plugin and theme development.';
     const URI            = 'http://admin-page-framework.michaeluno.jp/';
     const AUTHOR         = 'miunosoft (Michael Uno)';
@@ -55,14 +55,14 @@ 
      * @remark      This is also accessed from `uninstall.php` so do not remove.
      * @remark      Do not exceed 8 characters as a transient name allows 45 characters or less ( 40 for site transients ) so that md5 (32 characters) can be added.
      */
-    const TRANSIENT_PREFIX         = 'APFL_';
+    const TRANSIENT_PREFIX = 'APFL_';
 
     /**
      * The hook slug used for the prefix of action and filter hook names.
      * 
      * @remark      The ending underscore is not necessary.
      */
-    const HOOK_SLUG                = 'admin_page_framework_loader';
+    const HOOK_SLUG = 'admin_page_framework_loader';
 
     /**
      * The text domain slug and its path.
@@ -116,7 +116,7 @@ 
      */
     static public $aAdminPages = array(
         // key => 'page slug'
-        'about'     => 'apfl_about',        // the welcome page
+        'about'     => 'apfl_about', // the welcome page
         'addon'     => 'apfl_addons',
         'tool'      => 'apfl_tools',
         'help'      => 'apfl_contact',
@@ -154,12 +154,12 @@ 
      * @since       3.5.0
      * @return      string
      */
-    public static function getPluginURL( $sRelativePath='' ) {
+    public static function getPluginURL( $sRelativePath = '' ) {
         if ( isset( self::$_sPluginURLCache ) ) {
-            return self::$_sPluginURLCache . $sRelativePath;
+            return self::$_sPluginURLCache.$sRelativePath;
         }
         self::$_sPluginURLCache = trailingslashit( plugins_url( '', self::$sFilePath ) );
-        return self::$_sPluginURLCache . $sRelativePath;
+        return self::$_sPluginURLCache.$sRelativePath;
     }
         /**
          * @since       3.7.9
@@ -189,13 +189,13 @@ 
      * @since       3.5.0
      * @return      void
      */ 
-    static public function setAdminNotice( $sMessage, $sClassAttribute='error' ) {
-        if ( ! is_admin() ) {  
+    static public function setAdminNotice( $sMessage, $sClassAttribute = 'error' ) {
+        if ( !is_admin() ) {  
             return; 
         }
-        self::$_aAdminNotices[] = array(
+        self::$_aAdminNotices[ ] = array(
             'message'           => $sMessage,
-            'class_attribute'   => trim( $sClassAttribute ) . ' notice is-dismissible',
+            'class_attribute'   => trim( $sClassAttribute ).' notice is-dismissible',
         );
         add_action( 'admin_notices', array( __CLASS__, '_replyToSetAdminNotice' ) );
     }
@@ -205,12 +205,12 @@ 
          * @return      void
          */
         static public function _replyToSetAdminNotice() {
-            foreach( self::$_aAdminNotices as $_aAdminNotice ) {
-                echo "<div class='" . esc_attr( $_aAdminNotice['class_attribute'] ) . " notice is-dismissible'>"
+            foreach ( self::$_aAdminNotices as $_aAdminNotice ) {
+                echo "<div class='".esc_attr( $_aAdminNotice[ 'class_attribute' ] )." notice is-dismissible'>"
                         ."<p>"
                             . sprintf(
-                                '<strong>%1$s</strong>: ' . $_aAdminNotice['message'],
-                                self::NAME . ' ' . self::VERSION
+                                '<strong>%1$s</strong>: '.$_aAdminNotice[ 'message' ],
+                                self::NAME.' '.self::VERSION
                             )
                         . "</p>"
                     . "</div>";
@@ -222,7 +222,7 @@ 
 AdminPageFrameworkLoader_Registry::setUp( __FILE__ );
 
 // Initial checks. - Do no load if accessed directly, not exiting because the 'uninstall.php' and inclusion list generator will load this file.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( !defined( 'ABSPATH' ) ) {
     return;
 }
 if ( defined( 'DOING_UNINSTALL' ) && DOING_UNINSTALL ) {
@@ -234,8 +234,8 @@ 
 
     $_bFrameworkLoaded = class_exists( 'AdminPageFramework_Registry', false );
     if (
-        ! $_bFrameworkLoaded
-        || ! defined( 'AdminPageFramework_Registry::VERSION' ) // backward compatibility
+        !$_bFrameworkLoaded
+        || !defined( 'AdminPageFramework_Registry::VERSION' ) // backward compatibility
         || version_compare( AdminPageFramework_Registry::VERSION, AdminPageFrameworkLoader_Registry::VERSION, '<' )
     ) {
         AdminPageFrameworkLoader_Registry::setAdminNotice(
@@ -253,18 +253,18 @@ 
 add_action( 'admin_init', 'AdminPageFrameworkLoader_Warning' );
 
 // Include the library file - the development version will be available if you cloned the GitHub repository.
-$_sDevelopmentVersionPath = AdminPageFrameworkLoader_Registry::$sDirPath . '/development/admin-page-framework.php';
+$_sDevelopmentVersionPath = AdminPageFrameworkLoader_Registry::$sDirPath.'/development/admin-page-framework.php';
 $_bDebugMode              = defined( 'WP_DEBUG' ) && WP_DEBUG;
 $_bLoadDevelopmentVersion = $_bDebugMode && file_exists( $_sDevelopmentVersionPath );
 include(
     $_bLoadDevelopmentVersion
         ? $_sDevelopmentVersionPath
-        : AdminPageFrameworkLoader_Registry::$sDirPath . '/library/apf/admin-page-framework.php'
+        : AdminPageFrameworkLoader_Registry::$sDirPath.'/library/apf/admin-page-framework.php'
 );
 
 // Include the framework loader plugin components.
 include( AdminPageFramework_Registry::$aClassFiles[ 'AdminPageFramework_PluginBootstrap' ] );
-include( AdminPageFrameworkLoader_Registry::$sDirPath . '/include/class/AdminPageFrameworkLoader_Bootstrap.php' );
+include( AdminPageFrameworkLoader_Registry::$sDirPath.'/include/class/AdminPageFrameworkLoader_Bootstrap.php' );
 new AdminPageFrameworkLoader_Bootstrap(
     AdminPageFrameworkLoader_Registry::$sFilePath,
     AdminPageFrameworkLoader_Registry::HOOK_SLUG    // hook prefix