michaeluno / admin-page-framework

development/factory/_common/_abstract/AdminPageFramework_Factory_Model.php

Doc Comments +1 added lines, -2 removed lines

@@ -203,6 +203,7 @@ 
          * Constructs a WordPress filter hook name.
          * @internal
          * @since       3.8.4
+         * @param string $sPrefix
          * @return      string
          */
         private function _getHookNameByFieldsetAndPrefix( $sPrefix, $aFieldset ) {
@@ -339,8 +340,6 @@ 
      * @since       3.7.0      Changed back the visibility scope to protected as there is the `getFieldErrors()` public method.
      * @access      protected
      * @internal
-     * @param       string      $sID        deprecated
-     * @param       boolean     $bDelete    whether or not the transient should be deleted after retrieving it. 
      * @return      array
      * @deprecated  3.7.0      Use `getFieldErrors()` instead. Kept for backward compatibility.
      */

Spacing +13 added lines, -13 removed lines

@@ -32,7 +32,7 @@ 
         
         add_filter(
             // 'field_types_admin_page_framework',
-            'field_types_' . $oProp->sClassName,
+            'field_types_'.$oProp->sClassName,
             array( $this, '_replyToFilterFieldTypeDefinitions' )
         );
         
@@ -65,7 +65,7 @@ 
             'title'      => null,
             'help_aside' => null,
         );
-        if ( ! $aFieldset[ 'help' ] ) {
+        if ( !$aFieldset[ 'help' ] ) {
             return;
         }
         $this->oHelpPane->_addHelpTextForFormFields( 
@@ -85,9 +85,9 @@ 
     public function _replyToFilterFieldTypeDefinitions( $aFieldTypeDefinitions ) {
         
         // Not triggering `__call()` as the filter is fired manually in the form class.
-        if ( method_exists( $this, 'field_types_' . $this->oProp->sClassName ) ) {
+        if ( method_exists( $this, 'field_types_'.$this->oProp->sClassName ) ) {
             return call_user_func_array(
-                array( $this, 'field_types_' . $this->oProp->sClassName ),
+                array( $this, 'field_types_'.$this->oProp->sClassName ),
                 array( $aFieldTypeDefinitions )
             );
         }
@@ -108,7 +108,7 @@ 
     public function _replyToModifySectionsets( $aSectionsets ) {    
         
         return $this->oUtil->addAndApplyFilter( 
-            $this,  // caller factory object
+            $this, // caller factory object
             "sections_{$this->oProp->sClassName}", 
             $aSectionsets
         );
@@ -128,7 +128,7 @@ 
     public function _replyToModifyFieldsets( $aFieldsets, $aSectionsets ) {
 
         // Apply filters to added fieldsets
-        foreach( $aFieldsets as $_sSectionPath => $_aFields ) {
+        foreach ( $aFieldsets as $_sSectionPath => $_aFields ) {
             $_aSectionPath  = explode( '|', $_sSectionPath );
             $_sFilterSuffix = implode( '_', $_aSectionPath );
             $aFieldsets[ $_sSectionPath ] = $this->oUtil->addAndApplyFilter(
@@ -137,7 +137,7 @@ 
                 $_aFields
             ); 
         }
-        $aFieldsets =  $this->oUtil->addAndApplyFilter( 
+        $aFieldsets = $this->oUtil->addAndApplyFilter( 
             $this,
             "fields_{$this->oProp->sClassName}",
             $aFieldsets
@@ -207,14 +207,14 @@ 
          */
         private function _getHookNameByFieldsetAndPrefix( $sPrefix, $aFieldset ) {
             
-            $_sFieldPart    = '_' . implode( '_', $aFieldset[ '_field_path_array' ] );
+            $_sFieldPart    = '_'.implode( '_', $aFieldset[ '_field_path_array' ] );
             $_sSectionPart  = implode( '_', $aFieldset[ '_section_path_array' ] );
             $_sSectionPart  = $this->oUtil->getAOrB(
                 '_default' === $_sSectionPart,
                 '',
-                '_' . $_sSectionPart
+                '_'.$_sSectionPart
             );
-            return $sPrefix . $this->oProp->sClassName . $_sSectionPart . $_sFieldPart;
+            return $sPrefix.$this->oProp->sClassName.$_sSectionPart.$_sFieldPart;
             
         }
                
@@ -284,9 +284,9 @@ 
     public function _replyToGetSavedFormData() {
         
         // Must update the property with the filtered value.
-        $this->oProp->aOptions =  $this->oUtil->addAndApplyFilter(
+        $this->oProp->aOptions = $this->oUtil->addAndApplyFilter(
             $this, // the caller factory object
-            'options_' . $this->oProp->sClassName,
+            'options_'.$this->oProp->sClassName,
             $this->oProp->aOptions      // subject value to be filtered
         );
         return $this->oProp->aOptions;
@@ -366,7 +366,7 @@ 
          * An alias of `_setLastInputs()`.
          * @deprecated      3.7.0
          */
-        public function _setLastInput( $aLastInputs )  {
+        public function _setLastInput( $aLastInputs ) {
             return $this->setLastInputs( $aLastInputs );
         }    
 

Braces +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
      * but it requires to call the setUp() method in the overridden method so it's not that useful.
      * @internal
      */
-    protected function _setUp() { 
+    protected function _setUp() {
         $this->setUp();
     }    
     
@@ -105,7 +105,7 @@ 
      * @since       3.7.0
      * @return      array       The modified sectionsets definition array.
      */    
-    public function _replyToModifySectionsets( $aSectionsets ) {    
+    public function _replyToModifySectionsets( $aSectionsets ) {
         
         return $this->oUtil->addAndApplyFilter( 
             $this,  // caller factory object
@@ -366,7 +366,7 @@ 
          * An alias of `_setLastInputs()`.
          * @deprecated      3.7.0
          */
-        public function _setLastInput( $aLastInputs )  {
+        public function _setLastInput( $aLastInputs ) {
             return $this->setLastInputs( $aLastInputs );
         }    
 

admin-page-framework-loader.php

Spacing +22 added lines, -22 removed lines

@@ -16,9 +16,9 @@ 
  */
 class AdminPageFrameworkLoader_Registry_Base {
 
-    const VERSION        = '3.8.4b07';    // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
+    const VERSION        = '3.8.4b07'; // <--- 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' ) ) {
@@ -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

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

Spacing +27 added lines, -27 removed lines

@@ -60,7 +60,7 @@ 
         'after_label'       => null,    
         'before_field'      => null,
         'after_field'       => null,
-        'label_min_width'   => '',   // (string|integer) min-width applied to the input label in pixels. 3.8.0+ Changed the default value from 140 to 0 as it is now applied via embedded CSS. When this value is set by the user, it is set inline and the value will be overridden. [3.8.4+] Changed the value from `0`  to `''`.
+        'label_min_width'   => '', // (string|integer) min-width applied to the input label in pixels. 3.8.0+ Changed the default value from 140 to 0 as it is now applied via embedded CSS. When this value is set by the user, it is set inline and the value will be overridden. [3.8.4+] Changed the value from `0`  to `''`.
         'before_fieldset'   => null, // 3.1.1+
         'after_fieldset'    => null, // 3.1.1+
         
@@ -100,7 +100,7 @@ 
      * @param       object              $oMsg                   The framework message object.
      * @param       boolean             $bAutoRegister          Whether or not to register the field type(s).
      */
-    public function __construct( $asClassName='admin_page_framework', $asFieldTypeSlug=null, $oMsg=null, $bAutoRegister=true ) {
+    public function __construct( $asClassName = 'admin_page_framework', $asFieldTypeSlug = null, $oMsg = null, $bAutoRegister = true ) {
             
         $this->aFieldTypeSlugs  = empty( $asFieldTypeSlug ) 
             ? $this->aFieldTypeSlugs 
@@ -111,9 +111,9 @@ 
         
         // This automatically registers the field type. The build-in ones will be registered manually so it will be skipped.
         if ( $bAutoRegister ) {
-            foreach( ( array ) $asClassName as $_sClassName ) {
+            foreach ( ( array ) $asClassName as $_sClassName ) {
                 add_filter( 
-                    'field_types_' . $_sClassName, 
+                    'field_types_'.$_sClassName, 
                     array( $this, '_replyToRegisterInputFieldType' )
                 );
             }
@@ -159,8 +159,8 @@ 
         }
         return is_array( $asLabel ) // if the user stes multiple items
             ? $this->getElement( 
-                $asElement,         // subject
-                $this->getAsArray( $asKey, true /* preserve empty */ ),     // dimensional path 
+                $asElement, // subject
+                $this->getAsArray( $asKey, true /* preserve empty */ ), // dimensional path 
                 ''                  // default - if the element is not found, return an empty
             )
             : $asElement;
@@ -175,7 +175,7 @@ 
      */
     protected function getFieldOutput( array $aFieldset ) {
         
-        if ( ! is_object( $aFieldset[ '_caller_object' ] ) ) {
+        if ( !is_object( $aFieldset[ '_caller_object' ] ) ) {
             return '';
         }
 
@@ -183,14 +183,14 @@ 
         $aFieldset[ '_parent_field_object' ] = $aFieldset[ '_field_object' ]; // 3.6.0+
         
         // 3.7.0+ The caller object is no longer a factory object but a form object.
-        $_oCallerForm   = $aFieldset[ '_caller_object' ];
+        $_oCallerForm = $aFieldset[ '_caller_object' ];
 
         $_oFieldset = new AdminPageFramework_Form_View___Fieldset( 
-            $aFieldset,                          // the field definition array
-            $_oCallerForm->aSavedData,               // the stored form data
-            $_oCallerForm->getFieldErrors(),         // the field error array.
-            $_oCallerForm->aFieldTypeDefinitions,    // the field type definition array.
-            $_oCallerForm->oMsg,                     // the system message object
+            $aFieldset, // the field definition array
+            $_oCallerForm->aSavedData, // the stored form data
+            $_oCallerForm->getFieldErrors(), // the field error array.
+            $_oCallerForm->aFieldTypeDefinitions, // the field type definition array.
+            $_oCallerForm->oMsg, // the system message object
             $_oCallerForm->aCallbacks                // field output element callables.
         );           
         return $_oFieldset->get();
@@ -230,13 +230,13 @@ 
      * @since       3.0.3       Tweaked it to have better execution speed.
      * @internal
      */
-    public function getDefinitionArray( $sFieldTypeSlug='' ) {
+    public function getDefinitionArray( $sFieldTypeSlug = '' ) {
         
         // The uniteArrays() method resulted in somewhat being slow due to overhead on checking array keys for recursive array merges.
         $_aDefaultKeys = $this->aDefaultKeys + self::$_aDefaultKeys;
-        $_aDefaultKeys['attributes'] = isset( $this->aDefaultKeys['attributes'] ) && is_array( $this->aDefaultKeys['attributes'] )
-            ? $this->aDefaultKeys['attributes'] + self::$_aDefaultKeys['attributes'] 
-            : self::$_aDefaultKeys['attributes'];
+        $_aDefaultKeys[ 'attributes' ] = isset( $this->aDefaultKeys[ 'attributes' ] ) && is_array( $this->aDefaultKeys[ 'attributes' ] )
+            ? $this->aDefaultKeys[ 'attributes' ] + self::$_aDefaultKeys[ 'attributes' ] 
+            : self::$_aDefaultKeys[ 'attributes' ];
         
         return array(
             'sFieldTypeSlug'        => $sFieldTypeSlug,
@@ -274,7 +274,7 @@ 
      * @since       3.0.0
      * @internal
      */
-    public function _replyToFieldTypeSetter( $sFieldSetType='' ) {
+    public function _replyToFieldTypeSetter( $sFieldSetType = '' ) {
         $this->_sFieldSetType = $sFieldSetType;
     }
     
@@ -328,8 +328,8 @@ 
             wp_enqueue_script( 'media-upload' );    
         }
 
-        if ( in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php', ) ) ) {     
-            add_filter( 'gettext', array( $this, '_replyToReplaceThickBoxText' ) , 1, 2 );     
+        if ( in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php',) ) ) {     
+            add_filter( 'gettext', array( $this, '_replyToReplaceThickBoxText' ), 1, 2 );     
         }
         
     }
@@ -344,7 +344,7 @@ 
         public function _replyToReplaceThickBoxText( $sTranslated, $sText ) {
 
             // Replace the button label in the media thick box.
-            if ( ! in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php' ) ) ) { 
+            if ( !in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php' ) ) ) { 
                 return $sTranslated; 
             }
             if ( $sText !== 'Insert into Post' ) { 
@@ -354,8 +354,8 @@ 
                 return $sTranslated; 
             }
             
-            if ( isset( $_GET['button_label'] ) ) { 
-                return $_GET['button_label']; 
+            if ( isset( $_GET[ 'button_label' ] ) ) { 
+                return $_GET[ 'button_label' ]; 
             }
 
             return $this->oProp->sThickBoxButtonUseThis 
@@ -374,12 +374,12 @@ 
          */
         public function _replyToRemovingMediaLibraryTab( $aTabs ) {
             
-            if ( ! isset( $_REQUEST['enable_external_source'] ) ) { 
+            if ( !isset( $_REQUEST[ 'enable_external_source' ] ) ) { 
                 return $aTabs; 
             }
             
-            if ( ! $_REQUEST['enable_external_source'] ) {
-                unset( $aTabs['type_url'] ); // removes the 'From URL' tab in the thick box.
+            if ( !$_REQUEST[ 'enable_external_source' ] ) {
+                unset( $aTabs[ 'type_url' ] ); // removes the 'From URL' tab in the thick box.
             }
             return $aTabs;
             
@@ -393,7 +393,7 @@ 
      * @since       3.8.0
      * @return      string
      */
-    protected function getLabelContainerAttributes( array $aField, $asClassAttributes, array $aAttributes=array() ) {
+    protected function getLabelContainerAttributes( array $aField, $asClassAttributes, array $aAttributes = array() ) {
 
         $aAttributes[ 'class' ] = $this->getClassAttribute( $asClassAttributes, $this->getElement( $aAttributes, 'class' ) );
         $aAttributes[ 'style' ] = $this->getStyleAttribute(

development/factory/_common/utility/base_utility/AdminPageFramework_Utility_String.php

Spacing +10 added lines, -10 removed lines

@@ -36,16 +36,16 @@ 
      * @since       3.8.4   When non-true value is passed, `0px` will be returned.
      * @return      string
      */
-    static public function getLengthSanitized( $sLength, $sUnit='px' ) {       
+    static public function getLengthSanitized( $sLength, $sUnit = 'px' ) {       
         $sLength = $sLength ? $sLength : 0;
         return is_numeric( $sLength ) 
-            ? $sLength . $sUnit
+            ? $sLength.$sUnit
             : $sLength;
     }    
         /**
          * @deprecated  3.8.0       Use `getLengthSanitized()` instead.
          */
-        static public function sanitizeLength( $sLength, $sUnit='px' ) {
+        static public function sanitizeLength( $sLength, $sUnit = 'px' ) {
             return self::getLengthSanitized( $sLength, $sUnit );
         }
   
@@ -88,9 +88,9 @@ 
      * @since       2.0.0
      * @return      string|integer      A numeric value will be returned. 
      */ 
-    static public function fixNumber( $nToFix, $nDefault, $nMin='', $nMax='' ) {
+    static public function fixNumber( $nToFix, $nDefault, $nMin = '', $nMax = '' ) {
 
-        if ( ! is_numeric( trim( $nToFix ) ) ) { 
+        if ( !is_numeric( trim( $nToFix ) ) ) { 
             return $nDefault; 
         }
         if ( $nMin !== '' && $nToFix < $nMin ) { 
@@ -112,7 +112,7 @@ 
      */
     static public function getCSSMinified( $sCSSRules ) {
         return str_replace( 
-            array( "\r\n", "\r", "\n", "\t", '  ', '    ', '    '),  // remove line breaks, tab, and white sspaces.
+            array( "\r\n", "\r", "\n", "\t", '  ', '    ', '    ' ), // remove line breaks, tab, and white sspaces.
             '', 
             preg_replace( '!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $sCSSRules ) // remove comments
         );
@@ -122,7 +122,7 @@ 
          */
         static public function minifyCSS( $sCSSRules ) {
             trigger_error( 
-                AdminPageFramework_Registry::NAME . ': ' . sprintf(
+                AdminPageFramework_Registry::NAME.': '.sprintf(
                     'The method, %1$s, is deprecated. Use %2$s instead.',
                     'minifyCSS()',
                     'getCSSMinified()'
@@ -151,8 +151,8 @@ 
      */     
     static public function getNumberOfReadableSize( $nSize ) {
         
-        $_nReturn     = substr( $nSize, 0, -1 );
-        switch( strtoupper( substr( $nSize, -1 ) ) ) {
+        $_nReturn = substr( $nSize, 0, -1 );
+        switch ( strtoupper( substr( $nSize, -1 ) ) ) {
             case 'P':
                 $_nReturn *= 1024;
             case 'T':
@@ -178,7 +178,7 @@ 
         $_nLog      = log( $nBytes, 1024 );
         $_iPower    = ( int ) $_nLog;
         $_iSize     = pow( 1024, $_nLog - $_iPower );
-        return $_iSize . $_aUnits[ $_iPower ];
+        return $_iSize.$_aUnits[ $_iPower ];
     }
 
     /**

Braces +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
      * @since       3.8.4   When non-true value is passed, `0px` will be returned.
      * @return      string
      */
-    static public function getLengthSanitized( $sLength, $sUnit='px' ) {       
+    static public function getLengthSanitized( $sLength, $sUnit='px' ) {
         $sLength = $sLength ? $sLength : 0;
         return is_numeric( $sLength ) 
             ? $sLength . $sUnit
@@ -90,13 +90,13 @@ 
      */ 
     static public function fixNumber( $nToFix, $nDefault, $nMin='', $nMax='' ) {
 
-        if ( ! is_numeric( trim( $nToFix ) ) ) { 
+        if ( ! is_numeric( trim( $nToFix ) ) ) {
             return $nDefault; 
         }
-        if ( $nMin !== '' && $nToFix < $nMin ) { 
+        if ( $nMin !== '' && $nToFix < $nMin ) {
             return $nMin; 
         }
-        if ( $nMax !== '' && $nToFix > $nMax ) { 
+        if ( $nMax !== '' && $nToFix > $nMax ) {
             return $nMax; 
         }
         return $nToFix;

development/factory/admin_page/_model/AdminPageFramework_Property_admin_page.php

Spacing +15 added lines, -15 removed lines

@@ -218,7 +218,7 @@ 
      */
     public $aDisallowedQueryKeys = array( 
         'settings-updated', 
-        'confirmation',     // 3.3.0+
+        'confirmation', // 3.3.0+
         'field_errors'      // 3.4.1+
     );
         
@@ -264,7 +264,7 @@ 
      * Stores the cache lifetime of the transient used for the form options when the user passes an integer to the option key parameter.
      * @since       3.5.9
      */
-    public $iOptionTransientDuration  = 0; 
+    public $iOptionTransientDuration = 0; 
      
     /**
      * Constructs the instance of AdminPageFramework_Property_admin_page class object.
@@ -273,10 +273,10 @@ 
      * @since       2.0.0
      * @since       2.1.5   The $oCaller parameter was added.
      */ 
-    public function __construct( $oCaller, $sCallerPath, $sClassName, $aisOptionKey, $sCapability='manage_options', $sTextDomain='admin-page-framework' ) {
+    public function __construct( $oCaller, $sCallerPath, $sClassName, $aisOptionKey, $sCapability = 'manage_options', $sTextDomain = 'admin-page-framework' ) {
 
         // 3.7.0+ This must be set before the parent constructor. As the form arguments array uses this value.
-        $this->_sFormRegistrationHook = 'load_after_' . $sClassName;
+        $this->_sFormRegistrationHook = 'load_after_'.$sClassName;
 
         parent::__construct( 
             $oCaller, 
@@ -352,7 +352,7 @@ 
                 }
                 // The user want to save options in a transient.
                 if ( in_array( $_sType, array( 'integer' ) ) ) {
-                    return 'apf_' . md5( site_url() . '_' . $sClassName . '_' . get_current_user_id() );
+                    return 'apf_'.md5( site_url().'_'.$sClassName.'_'.get_current_user_id() );
                 }
                 
                 // Unknown type - maybe the user is trying to do something advanced.
@@ -379,7 +379,7 @@ 
          */
         protected function _isAdminPage() {
             
-            if ( ! is_admin() ) {
+            if ( !is_admin() ) {
                 return false;
             }
             return isset( $_GET[ 'page' ] );
@@ -419,7 +419,7 @@ 
                 case 'transient':
                     return $this->getAsArray(
                         $this->getTransient( 
-                            $this->sOptionKey,  // transient key
+                            $this->sOptionKey, // transient key
                             array() // default
                         )
                     );
@@ -433,7 +433,7 @@ 
      * @since       3.1.1       Made it return a value.
      * @return      boolean     True if saved; otherwise, false.
      */
-    public function updateOption( $aOptions=null ) {
+    public function updateOption( $aOptions = null ) {
 
         if ( $this->_bDisableSavingOptions ) {
             return false;
@@ -461,7 +461,7 @@ 
                     );
                 case 'transient':
                     return $this->setTransient( 
-                        $this->sOptionKey,  // transient key
+                        $this->sOptionKey, // transient key
                         $aOptions,
                         $this->iOptionTransientDuration
                     );
@@ -476,7 +476,7 @@ 
      * @since       2.1.0       Set the default value to the parameter and if the parameter value is empty, it applies the current $_GET[ 'page' ] value.
      * @return      boolean     Returns true if it is of framework's added page; otherwise, false.
      */
-    public function isPageAdded( $sPageSlug='' ) {    
+    public function isPageAdded( $sPageSlug = '' ) {    
         
         $sPageSlug = trim( $sPageSlug );
         $sPageSlug = $sPageSlug 
@@ -495,7 +495,7 @@ 
      */
     public function getCurrentPageSlug() {
         return $this->getElement( 
-            $_GET,  // subject array
+            $_GET, // subject array
             'page', // key
             ''      // default
         );            
@@ -513,7 +513,7 @@ 
      * @return      string      The found tab slug. An empty string if not found.
      * @remark      Do not return `null` when not found as some framework methods check the returned value with `isset()` and if null is given, `isset()` yields `false` while it does `true` for an empty string ('').
      */    
-    public function getCurrentTabSlug( $sCurrentPageSlug='' ) {
+    public function getCurrentTabSlug( $sCurrentPageSlug = '' ) {
         
         // It is possible that the tab slug is not set if it is the default tab.
         $_sTabSlug = $this->getElement( $_GET, 'tab' );
@@ -533,7 +533,7 @@ 
          * 
          * @deprecated  3.5.3
          */
-        public function getCurrentTab( $sCurrentPageSlug='' ) {
+        public function getCurrentTab( $sCurrentPageSlug = '' ) {
             return $this->getCurrentTabSlug( $sCurrentPageSlug );            
         }
     
@@ -548,11 +548,11 @@ 
      */         
     public function getDefaultInPageTab( $sPageSlug ) {
     
-        if ( ! $sPageSlug ) { 
+        if ( !$sPageSlug ) { 
             return ''; 
         }
         return $this->getElement( 
-            $this->aDefaultInPageTabs,  // subject array
+            $this->aDefaultInPageTabs, // subject array
             $sPageSlug, // key
             ''    // default
         );

include/class/admin/admin-page-framework/tool/generator/AdminPageFrameworkLoader_AdminPage_Tool_Generator_CustomFieldTypes.php

Spacing +32 added lines, -32 removed lines

@@ -88,7 +88,7 @@ 
                     'class_name'           => 'AceCustomFieldType',
                     'label'                => __( 'ACE', 'admin-page-framework-loader' ),
                     'description'          => __( 'provides code syntax highlighting in a text area field.', 'admin-page-framework-loader' ),
-                    'directory_path'       => AdminPageFrameworkLoader_Registry::$sDirPath . '/example/library/ace-custom-field-type',
+                    'directory_path'       => AdminPageFrameworkLoader_Registry::$sDirPath.'/example/library/ace-custom-field-type',
                     'archive_file_path'    => 'custom-field-types/ace-custom-field-type/AceCustomFieldType.php',
                     'archive_dir_path'     => 'custom-field-types/ace-custom-field-type',
                     'text_domain'          => 'admin-page-framework',
@@ -97,7 +97,7 @@ 
                     'class_name'           => 'GitHubCustomFieldType',
                     'label'                => __( 'GitHub Buttons', 'admin-page-framework-loader' ),
                     'description'          => __( 'allows you to display GitHub buttons in a field.', 'admin-page-framework-loader' ),
-                    'directory_path'       => AdminPageFrameworkLoader_Registry::$sDirPath . '/include/library/github-custom-field-type',
+                    'directory_path'       => AdminPageFrameworkLoader_Registry::$sDirPath.'/include/library/github-custom-field-type',
                     'archive_file_path'    => 'custom-field-types/github-custom-field-type/GitHubCustomFieldType.php',
                     'archive_dir_path'     => 'custom-field-types/github-custom-field-type',
                     'text_domain'          => 'admin-page-framework',
@@ -106,7 +106,7 @@ 
                     'class_name'           => 'PathCustomFieldType',
                     'label'                => __( 'Path', 'admin-page-framework-loader' ),
                     'description'          => __( 'allows you to display GitHub buttons in a field.', 'admin-page-framework-loader' ),
-                    'directory_path'       => AdminPageFrameworkLoader_Registry::$sDirPath . '/example/library/path-custom-field-type',
+                    'directory_path'       => AdminPageFrameworkLoader_Registry::$sDirPath.'/example/library/path-custom-field-type',
                     'archive_file_path'    => 'custom-field-types/path-custom-field-type/PathCustomFieldType.php',
                     'archive_dir_path'     => 'custom-field-types/path-custom-field-type',
                     'text_domain'          => 'admin-page-framework',
@@ -115,13 +115,13 @@ 
                 
             // Let third-party scripts add custom field types.
             $this->aCustomFieldTypes = apply_filters(
-                AdminPageFrameworkLoader_Registry::HOOK_SLUG . '_filter_generator_custom_field_types',
+                AdminPageFrameworkLoader_Registry::HOOK_SLUG.'_filter_generator_custom_field_types',
                 $this->aCustomFieldTypes
             );                    
             
-            foreach( $this->aCustomFieldTypes as $_sKey => $_aCustomFieldType ) {
+            foreach ( $this->aCustomFieldTypes as $_sKey => $_aCustomFieldType ) {
                 $this->aCustomFieldTypeLabels[ $_sKey ] = $_aCustomFieldType[ 'label' ]
-                    . ' - <span class="description">' . $_aCustomFieldType[ 'description' ] . '</span>';
+                    . ' - <span class="description">'.$_aCustomFieldType[ 'description' ].'</span>';
             }
      
         }
@@ -137,10 +137,10 @@ 
 
                 // Check the file extension.
                 $_aAllowedExtensions = apply_filters(
-                    AdminPageFrameworkLoader_Registry::HOOK_SLUG . '_filter_generator_allowed_file_extensions',
+                    AdminPageFrameworkLoader_Registry::HOOK_SLUG.'_filter_generator_allowed_file_extensions',
                     array( 'php', 'css', 'js' )
                 );                
-                if ( ! in_array( pathinfo( $sPathInArchive, PATHINFO_EXTENSION ), $_aAllowedExtensions ) ) {
+                if ( !in_array( pathinfo( $sPathInArchive, PATHINFO_EXTENSION ), $_aAllowedExtensions ) ) {
                     return $sFileContents;
                 }            
                 
@@ -170,7 +170,7 @@ 
                 private function _getModifiedInclusionList( $sFileContents ) {
                     return str_replace(
                         ');', // search
-                        $this->_getClassListOfCustomFieldTypes() . ');', // replace - @todo insert the selected class list here
+                        $this->_getClassListOfCustomFieldTypes().');', // replace - @todo insert the selected class list here
                         $sFileContents // subject
                     );
                 }
@@ -187,18 +187,18 @@ 
                             $_POST,
                             array( 
                                 $this->oFactory->oProp->sOptionKey, 
-                                'generator',    // section id
+                                'generator', // section id
                                 'class_prefix'  // field id
                             ),
                             ''
                         );
                         $_aOutput = array();
-                        foreach( $_aCheckedCustomFieldTypes as $_sClassName => $_aCustomFieldType ) {
-                            $_aOutput[] = '    "' . $_sClassPrefix . $_sClassName . '"'
+                        foreach ( $_aCheckedCustomFieldTypes as $_sClassName => $_aCustomFieldType ) {
+                            $_aOutput[ ] = '    "'.$_sClassPrefix.$_sClassName.'"'
                                 . ' => ' 
-                                . 'AdminPageFramework_Registry::$sDirPath . ' . '"/' . ltrim( $_aCustomFieldType[ 'archive_file_path' ], '/' ) . '",';
+                                . 'AdminPageFramework_Registry::$sDirPath . '.'"/'.ltrim( $_aCustomFieldType[ 'archive_file_path' ], '/' ).'",';
                         }
-                        return implode( PHP_EOL, $_aOutput ) . PHP_EOL;
+                        return implode( PHP_EOL, $_aOutput ).PHP_EOL;
                     
                     }
 
@@ -216,7 +216,7 @@ 
                         $this->aCustomFieldTypes // ArchiveFilePaths
                     );
                     $_aArchiveFilePaths = array();
-                    foreach( $_aSelectedCustomFieldTypes as $_sClassName => $_aCustomFieldType ) {
+                    foreach ( $_aSelectedCustomFieldTypes as $_sClassName => $_aCustomFieldType ) {
                         $_aArchiveFilePaths[ $_sClassName ] = $this->oFactory->oUtil->getElement(
                             $_aCustomFieldType,
                             'archive_file_path',
@@ -268,17 +268,17 @@ 
                         array( $sParsingClassName, 'text_domain' )
                     );
                     if ( $_sFieldTypeTextDomain ) {                        
-                        $_aSearches[] = $_sFieldTypeTextDomain;
-                        $_aReplaces[] = $_sUserTextDomain;
+                        $_aSearches[ ] = $_sFieldTypeTextDomain;
+                        $_aReplaces[ ] = $_sUserTextDomain;
                     }
                     
-                    $_aSearches[] = 'admin-page-framework';
-                    $_aReplaces[] = $_sUserTextDomain;
+                    $_aSearches[ ] = 'admin-page-framework';
+                    $_aReplaces[ ] = $_sUserTextDomain;
                     
                     // Return the converted string.
                     return str_replace(
-                        $_aSearches,    // search
-                        $_aReplaces,    // replace
+                        $_aSearches, // search
+                        $_aReplaces, // replace
                         $sFileContents  // subject
                     );
                     
@@ -296,8 +296,8 @@ 
                         );
                                                 
                         return preg_replace(
-                            $this->_getClassPrefixRegexPatterns( $_aSelectedFieldTypeClassNames ),    // search
-                            $this->_getClassPrefixRegexReplacements( $_aSelectedFieldTypeClassNames ),    // replace
+                            $this->_getClassPrefixRegexPatterns( $_aSelectedFieldTypeClassNames ), // search
+                            $this->_getClassPrefixRegexReplacements( $_aSelectedFieldTypeClassNames ), // replace
                             $sFileContents  // subject
                         );
                         
@@ -310,8 +310,8 @@ 
                         private function _getClassPrefixRegexPatterns( array $aSelectedFieldTypeClassNames ) {
 
                             $_aPregSearches = array();
-                            foreach( $aSelectedFieldTypeClassNames as $_sClassName ) {
-                                $_aPregSearches[] = '/(?<=[^a-zA-Z0-9])(' . $_sClassName . ')/';
+                            foreach ( $aSelectedFieldTypeClassNames as $_sClassName ) {
+                                $_aPregSearches[ ] = '/(?<=[^a-zA-Z0-9])('.$_sClassName.')/';
                             }
                             return $_aPregSearches;
                         
@@ -323,9 +323,9 @@ 
                          */
                         private function _getClassPrefixRegexReplacements( array $aSelectedFieldTypeClassNames ) {
 
-                            $_aPrefixedClassNames          = $aSelectedFieldTypeClassNames;
+                            $_aPrefixedClassNames = $aSelectedFieldTypeClassNames;
                             array_walk(
-                                $_aPrefixedClassNames,  // passed by reference
+                                $_aPrefixedClassNames, // passed by reference
                                 array( $this, '_replyToSetPrefix' ),
                                 $this->oFactory->oUtil->getElement(
                                     $_POST,
@@ -346,8 +346,8 @@ 
                              * @callback    function    array_walk
                              * @return      string
                              */
-                            public function _replyToSetPrefix( &$sClassName, $sKey, $sPrefix='' ) {
-                                $sClassName = $sPrefix . '$0';
+                            public function _replyToSetPrefix( &$sClassName, $sKey, $sPrefix = '' ) {
+                                $sClassName = $sPrefix.'$0';
                             }
                                     
  
@@ -368,12 +368,12 @@ 
              */
             public function replyToSetAdditionalDirectoriesForGenerator( $aDirPaths ) {
                                 
-                $_aCheckedCustomFieldTypes        = $this->_getSelectedCustomFieldTypes(
+                $_aCheckedCustomFieldTypes = $this->_getSelectedCustomFieldTypes(
                     $this->aCustomFieldTypes
                 );
                 
                 $_aDirPathInfo = array();
-                foreach( $_aCheckedCustomFieldTypes as $_sKey => $_aCheckedCustomFieldType ) {
+                foreach ( $_aCheckedCustomFieldTypes as $_sKey => $_aCheckedCustomFieldType ) {
                     
                     $_sArchiveDirPath = $this->oFactory->oUtil->getElement( $_aCheckedCustomFieldType, 'archive_dir_path' );
                     $_sSourceDirPath  = $this->oFactory->oUtil->getElement( $_aCheckedCustomFieldType, 'directory_path' );
@@ -389,7 +389,7 @@ 
                  * @return      array       The array keys of the checked items.
                  * @since       3.6.0
                  */
-                private function _getSelectedCustomFieldTypes( array $aSubject=array() ) {
+                private function _getSelectedCustomFieldTypes( array $aSubject = array() ) {
                     
                     $_aCheckedCustomFieldTypes = $this->oFactory->oUtil->getElementAsArray(
                         $_POST,