Completed
Branch master (6ffb79)
by
unknown
05:36
created
development/factory/admin_page/AdminPageFramework.php 2 patches
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
      * @since       2.0.0
47 47
      * @see         http://codex.wordpress.org/Roles_and_Capabilities
48 48
      * @see         http://codex.wordpress.org/I18n_for_WordPress_Developers#Text_Domains
49
-     * @param       array|integer|string    $aisOptionKey    (optional) specifies the option key name to store in the options table. If this is not set, the instantiated class name will be used as default. 
49
+     * @param       array|integer|string    $isOptionKey    (optional) specifies the option key name to store in the options table. If this is not set, the instantiated class name will be used as default. 
50 50
      * [3.5.9+] If an integer is given, a transient will be used. If an array of option key arguments is given, the argument values will be set to the framework properties.
51 51
      * - type - either `options_table` or `transient`.
52 52
      * - key - the option key or the transient key
@@ -85,6 +85,7 @@  discard block
 block discarded – undo
85 85
         /**
86 86
          * Returns the script caller path.
87 87
          * @remark      It is important to find the caller script path here when separating the library into multiple files.
88
+         * @param string|null $sCallerPath
88 89
          * @return      null|string
89 90
          * @since       3.8.2
90 91
          */
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
      * @param       string                  $sCapability    (optional) sets the overall access level to the admin pages created by the framework. The used capabilities are listed <a href="http://codex.wordpress.org/Roles_and_Capabilities">here</a>. The capability can be set per page, tab, setting section, setting field. Default: `manage_options`
69 69
      * @param       string                  $sTextDomain    (optional) the <a href="http://codex.wordpress.org/I18n_for_WordPress_Developers#Text_Domains" target="_blank">text domain</a> used for the framework's system messages. Default: admin-page-framework.
70 70
      */
71
-    public function __construct( $isOptionKey=null, $sCallerPath=null, $sCapability='manage_options', $sTextDomain='admin-page-framework' ){
71
+    public function __construct( $isOptionKey = null, $sCallerPath = null, $sCapability = 'manage_options', $sTextDomain = 'admin-page-framework' ) {
72 72
 
73
-        if ( ! $this->_isInstantiatable() ) {
73
+        if ( !$this->_isInstantiatable() ) {
74 74
             return;
75 75
         }
76 76
                         
@@ -90,19 +90,19 @@  discard block
 block discarded – undo
90 90
          */
91 91
         private function _getCallerPath( $sCallerPath ) {
92 92
             
93
-            if ( $sCallerPath  ) {
93
+            if ( $sCallerPath ) {
94 94
                 return trim( $sCallerPath );
95 95
             }
96 96
             
97
-            if ( ! is_admin() ) {
97
+            if ( !is_admin() ) {
98 98
                 return null;
99 99
             }
100 100
             
101
-            if ( ! isset( $GLOBALS[ 'pagenow' ] ) ) {
101
+            if ( !isset( $GLOBALS[ 'pagenow' ] ) ) {
102 102
                 return null;
103 103
             }
104 104
             
105
-            $_sCalllerPath = in_array( $GLOBALS[ 'pagenow' ], array( 'plugins.php', ) ) || isset( $_GET[ 'page' ] )
105
+            $_sCalllerPath = in_array( $GLOBALS[ 'pagenow' ], array( 'plugins.php',) ) || isset( $_GET[ 'page' ] )
106 106
                 ? AdminPageFramework_Utility::getCallerScriptPath( __FILE__ ) // not using $oUtil as this method is caller earlier than the base constructor.
107 107
                 : null;
108 108
                 
Please login to merge, or discard this patch.
factory/_common/utility/base_utility/AdminPageFramework_Utility_Path.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
     static public function getRelativePath( $from, $to ) {
30 30
         
31 31
         // some compatibility fixes for Windows paths
32
-        $from = is_dir( $from ) ? rtrim( $from, '\/') . '/' : $from;
33
-        $to   = is_dir( $to )   ? rtrim( $to, '\/') . '/'   : $to;
32
+        $from = is_dir( $from ) ? rtrim( $from, '\/' ).'/' : $from;
33
+        $to   = is_dir( $to ) ? rtrim( $to, '\/' ).'/' : $to;
34 34
         $from = str_replace( '\\', '/', $from );
35 35
         $to   = str_replace( '\\', '/', $to );
36 36
 
@@ -38,21 +38,21 @@  discard block
 block discarded – undo
38 38
         $to       = explode( '/', $to );
39 39
         $relPath  = $to;
40 40
 
41
-        foreach( $from as $depth => $dir ) {
41
+        foreach ( $from as $depth => $dir ) {
42 42
             // find first non-matching dir
43
-            if( $dir === $to[ $depth ] ) {
43
+            if ( $dir === $to[ $depth ] ) {
44 44
                 // ignore this directory
45 45
                 array_shift( $relPath );
46 46
             } else {
47 47
                 // get number of remaining dirs to $from
48 48
                 $remaining = count( $from ) - $depth;
49
-                if( $remaining > 1 ) {
49
+                if ( $remaining > 1 ) {
50 50
                     // add traversals up to first matching dir
51 51
                     $padLength = ( count( $relPath ) + $remaining - 1 ) * -1;
52 52
                     $relPath = array_pad( $relPath, $padLength, '..' );
53 53
                     break;
54 54
                 } else {
55
-                    $relPath[ 0 ] = './' . $relPath[ 0 ];
55
+                    $relPath[ 0 ] = './'.$relPath[ 0 ];
56 56
                 }
57 57
             }
58 58
         }
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
                 6, // the second parameter: limit
82 82
             )
83 83
         );
84
-        foreach( $_aBackTrace as $_aDebugInfo )  {     
84
+        foreach ( $_aBackTrace as $_aDebugInfo ) {     
85 85
             $_sCallerFilePath = $_aDebugInfo[ 'file' ];
86 86
             if ( in_array( $_sCallerFilePath, $_aRedirectedFilePaths ) ) { 
87 87
                 continue; 
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,9 +81,9 @@
 block discarded – undo
81 81
                 6, // the second parameter: limit
82 82
             )
83 83
         );
84
-        foreach( $_aBackTrace as $_aDebugInfo )  {     
84
+        foreach( $_aBackTrace as $_aDebugInfo ) {
85 85
             $_sCallerFilePath = $_aDebugInfo[ 'file' ];
86
-            if ( in_array( $_sCallerFilePath, $_aRedirectedFilePaths ) ) { 
86
+            if ( in_array( $_sCallerFilePath, $_aRedirectedFilePaths ) ) {
87 87
                 continue; 
88 88
             }
89 89
             break; // catch the first found item.
Please login to merge, or discard this patch.
admin-page-framework-loader.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
  */
17 17
 class AdminPageFrameworkLoader_Registry_Base {
18 18
 
19
-    const VERSION        = '3.8.2';    // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
19
+    const VERSION        = '3.8.2'; // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
20 20
     const NAME           = 'Admin Page Framework - Loader'; // the name is not 'Admin Page Framework' because warning messages gets confusing.
21
-    const SHORTNAME      = 'Admin Page Framework';  // used for a menu title etc.
21
+    const SHORTNAME      = 'Admin Page Framework'; // used for a menu title etc.
22 22
     const DESCRIPTION    = 'Loads Admin Page Framework which facilitates WordPress plugin and theme development.';
23 23
     const URI            = 'http://admin-page-framework.michaeluno.jp/';
24 24
     const AUTHOR         = 'miunosoft (Michael Uno)';
@@ -55,14 +55,14 @@  discard block
 block discarded – undo
55 55
      * @remark      This is also accessed from `uninstall.php` so do not remove.
56 56
      * @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.
57 57
      */
58
-    const TRANSIENT_PREFIX         = 'APFL_';
58
+    const TRANSIENT_PREFIX = 'APFL_';
59 59
 
60 60
     /**
61 61
      * The hook slug used for the prefix of action and filter hook names.
62 62
      * 
63 63
      * @remark      The ending underscore is not necessary.
64 64
      */
65
-    const HOOK_SLUG                = 'admin_page_framework_loader';
65
+    const HOOK_SLUG = 'admin_page_framework_loader';
66 66
 
67 67
     /**
68 68
      * The text domain slug and its path.
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
      */
117 117
     static public $aAdminPages = array(
118 118
         // key => 'page slug'
119
-        'about'     => 'apfl_about',        // the welcome page
119
+        'about'     => 'apfl_about', // the welcome page
120 120
         'addon'     => 'apfl_addons',
121 121
         'tool'      => 'apfl_tools',
122 122
         'help'      => 'apfl_contact',
@@ -154,12 +154,12 @@  discard block
 block discarded – undo
154 154
      * @since       3.5.0
155 155
      * @return      string
156 156
      */
157
-    public static function getPluginURL( $sRelativePath='' ) {
157
+    public static function getPluginURL( $sRelativePath = '' ) {
158 158
         if ( isset( self::$_sPluginURLCache ) ) {
159
-            return self::$_sPluginURLCache . $sRelativePath;
159
+            return self::$_sPluginURLCache.$sRelativePath;
160 160
         }
161 161
         self::$_sPluginURLCache = trailingslashit( plugins_url( '', self::$sFilePath ) );
162
-        return self::$_sPluginURLCache . $sRelativePath;
162
+        return self::$_sPluginURLCache.$sRelativePath;
163 163
     }
164 164
         /**
165 165
          * @since       3.7.9
@@ -189,13 +189,13 @@  discard block
 block discarded – undo
189 189
      * @since       3.5.0
190 190
      * @return      void
191 191
      */ 
192
-    static public function setAdminNotice( $sMessage, $sClassAttribute='error' ) {
193
-        if ( ! is_admin() ) {  
192
+    static public function setAdminNotice( $sMessage, $sClassAttribute = 'error' ) {
193
+        if ( !is_admin() ) {  
194 194
             return; 
195 195
         }
196
-        self::$_aAdminNotices[] = array(
196
+        self::$_aAdminNotices[ ] = array(
197 197
             'message'           => $sMessage,
198
-            'class_attribute'   => trim( $sClassAttribute ) . ' notice is-dismissible',
198
+            'class_attribute'   => trim( $sClassAttribute ).' notice is-dismissible',
199 199
         );
200 200
         add_action( 'admin_notices', array( __CLASS__, '_replyToSetAdminNotice' ) );
201 201
     }
@@ -205,12 +205,12 @@  discard block
 block discarded – undo
205 205
          * @return      void
206 206
          */
207 207
         static public function _replyToSetAdminNotice() {
208
-            foreach( self::$_aAdminNotices as $_aAdminNotice ) {
209
-                echo "<div class='" . esc_attr( $_aAdminNotice['class_attribute'] ) . " notice is-dismissible'>"
208
+            foreach ( self::$_aAdminNotices as $_aAdminNotice ) {
209
+                echo "<div class='".esc_attr( $_aAdminNotice[ 'class_attribute' ] )." notice is-dismissible'>"
210 210
                         ."<p>"
211 211
                             . sprintf(
212
-                                '<strong>%1$s</strong>: ' . $_aAdminNotice['message'],
213
-                                self::NAME . ' ' . self::VERSION
212
+                                '<strong>%1$s</strong>: '.$_aAdminNotice[ 'message' ],
213
+                                self::NAME.' '.self::VERSION
214 214
                             )
215 215
                         . "</p>"
216 216
                     . "</div>";
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 AdminPageFrameworkLoader_Registry::setUp( __FILE__ );
223 223
 
224 224
 // Initial checks. - Do no load if accessed directly, not exiting because the 'uninstall.php' and inclusion list generator will load this file.
225
-if ( ! defined( 'ABSPATH' ) ) {
225
+if ( !defined( 'ABSPATH' ) ) {
226 226
     return;
227 227
 }
228 228
 if ( defined( 'DOING_UNINSTALL' ) ) {
@@ -234,8 +234,8 @@  discard block
 block discarded – undo
234 234
 
235 235
     $_bFrameworkLoaded = class_exists( 'AdminPageFramework_Registry', false );
236 236
     if (
237
-        ! $_bFrameworkLoaded
238
-        || ! defined( 'AdminPageFramework_Registry::VERSION' ) // backward compatibility
237
+        !$_bFrameworkLoaded
238
+        || !defined( 'AdminPageFramework_Registry::VERSION' ) // backward compatibility
239 239
         || version_compare( AdminPageFramework_Registry::VERSION, AdminPageFrameworkLoader_Registry::VERSION, '<' )
240 240
     ) {
241 241
         AdminPageFrameworkLoader_Registry::setAdminNotice(
@@ -253,18 +253,18 @@  discard block
 block discarded – undo
253 253
 add_action( 'admin_init', 'AdminPageFrameworkLoader_Warning' );
254 254
 
255 255
 // Include the library file - the development version will be available if you cloned the GitHub repository.
256
-$_sDevelopmentVersionPath = AdminPageFrameworkLoader_Registry::$sDirPath . '/development/admin-page-framework.php';
256
+$_sDevelopmentVersionPath = AdminPageFrameworkLoader_Registry::$sDirPath.'/development/admin-page-framework.php';
257 257
 $_bDebugMode              = defined( 'WP_DEBUG' ) && WP_DEBUG;
258 258
 $_bLoadDevelopmentVersion = $_bDebugMode && file_exists( $_sDevelopmentVersionPath );
259 259
 include(
260 260
     $_bLoadDevelopmentVersion
261 261
         ? $_sDevelopmentVersionPath
262
-        : AdminPageFrameworkLoader_Registry::$sDirPath . '/library/apf/admin-page-framework.php'
262
+        : AdminPageFrameworkLoader_Registry::$sDirPath.'/library/apf/admin-page-framework.php'
263 263
 );
264 264
 
265 265
 // Include the framework loader plugin components.
266 266
 include( AdminPageFramework_Registry::$aClassFiles[ 'AdminPageFramework_PluginBootstrap' ] );
267
-include( AdminPageFrameworkLoader_Registry::$sDirPath . '/include/class/AdminPageFrameworkLoader_Bootstrap.php' );
267
+include( AdminPageFrameworkLoader_Registry::$sDirPath.'/include/class/AdminPageFrameworkLoader_Bootstrap.php' );
268 268
 new AdminPageFrameworkLoader_Bootstrap(
269 269
     AdminPageFrameworkLoader_Registry::$sFilePath,
270 270
     AdminPageFrameworkLoader_Registry::HOOK_SLUG    // hook prefix
Please login to merge, or discard this patch.