Completed
Branch dev (fb3707)
by Michael
07:57
created
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.
development/factory/_common/_abstract/AdminPageFramework_Factory_Model.php 3 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -203,6 +203,7 @@  discard block
 block discarded – undo
203 203
          * Constructs a WordPress filter hook name.
204 204
          * @internal
205 205
          * @since       3.8.4
206
+         * @param string $sPrefix
206 207
          * @return      string
207 208
          */
208 209
         private function _getHookNameByFieldsetAndPrefix( $sPrefix, $aFieldset ) {
@@ -339,8 +340,6 @@  discard block
 block discarded – undo
339 340
      * @since       3.7.0      Changed back the visibility scope to protected as there is the `getFieldErrors()` public method.
340 341
      * @access      protected
341 342
      * @internal
342
-     * @param       string      $sID        deprecated
343
-     * @param       boolean     $bDelete    whether or not the transient should be deleted after retrieving it. 
344 343
      * @return      array
345 344
      * @deprecated  3.7.0      Use `getFieldErrors()` instead. Kept for backward compatibility.
346 345
      */
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
         
33 33
         add_filter(
34 34
             // 'field_types_admin_page_framework',
35
-            'field_types_' . $oProp->sClassName,
35
+            'field_types_'.$oProp->sClassName,
36 36
             array( $this, '_replyToFilterFieldTypeDefinitions' )
37 37
         );
38 38
         
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
             'title'      => null,
66 66
             'help_aside' => null,
67 67
         );
68
-        if ( ! $aFieldset[ 'help' ] ) {
68
+        if ( !$aFieldset[ 'help' ] ) {
69 69
             return;
70 70
         }
71 71
         $this->oHelpPane->_addHelpTextForFormFields( 
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
     public function _replyToFilterFieldTypeDefinitions( $aFieldTypeDefinitions ) {
86 86
         
87 87
         // Not triggering `__call()` as the filter is fired manually in the form class.
88
-        if ( method_exists( $this, 'field_types_' . $this->oProp->sClassName ) ) {
88
+        if ( method_exists( $this, 'field_types_'.$this->oProp->sClassName ) ) {
89 89
             return call_user_func_array(
90
-                array( $this, 'field_types_' . $this->oProp->sClassName ),
90
+                array( $this, 'field_types_'.$this->oProp->sClassName ),
91 91
                 array( $aFieldTypeDefinitions )
92 92
             );
93 93
         }
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
     public function _replyToModifySectionsets( $aSectionsets ) {    
109 109
         
110 110
         return $this->oUtil->addAndApplyFilter( 
111
-            $this,  // caller factory object
111
+            $this, // caller factory object
112 112
             "sections_{$this->oProp->sClassName}", 
113 113
             $aSectionsets
114 114
         );
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
     public function _replyToModifyFieldsets( $aFieldsets, $aSectionsets ) {
129 129
 
130 130
         // Apply filters to added fieldsets
131
-        foreach( $aFieldsets as $_sSectionPath => $_aFields ) {
131
+        foreach ( $aFieldsets as $_sSectionPath => $_aFields ) {
132 132
             $_aSectionPath  = explode( '|', $_sSectionPath );
133 133
             $_sFilterSuffix = implode( '_', $_aSectionPath );
134 134
             $aFieldsets[ $_sSectionPath ] = $this->oUtil->addAndApplyFilter(
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                 $_aFields
138 138
             ); 
139 139
         }
140
-        $aFieldsets =  $this->oUtil->addAndApplyFilter( 
140
+        $aFieldsets = $this->oUtil->addAndApplyFilter( 
141 141
             $this,
142 142
             "fields_{$this->oProp->sClassName}",
143 143
             $aFieldsets
@@ -207,14 +207,14 @@  discard block
 block discarded – undo
207 207
          */
208 208
         private function _getHookNameByFieldsetAndPrefix( $sPrefix, $aFieldset ) {
209 209
             
210
-            $_sFieldPart    = '_' . implode( '_', $aFieldset[ '_field_path_array' ] );
210
+            $_sFieldPart    = '_'.implode( '_', $aFieldset[ '_field_path_array' ] );
211 211
             $_sSectionPart  = implode( '_', $aFieldset[ '_section_path_array' ] );
212 212
             $_sSectionPart  = $this->oUtil->getAOrB(
213 213
                 '_default' === $_sSectionPart,
214 214
                 '',
215
-                '_' . $_sSectionPart
215
+                '_'.$_sSectionPart
216 216
             );
217
-            return $sPrefix . $this->oProp->sClassName . $_sSectionPart . $_sFieldPart;
217
+            return $sPrefix.$this->oProp->sClassName.$_sSectionPart.$_sFieldPart;
218 218
             
219 219
         }
220 220
                
@@ -284,9 +284,9 @@  discard block
 block discarded – undo
284 284
     public function _replyToGetSavedFormData() {
285 285
         
286 286
         // Must update the property with the filtered value.
287
-        $this->oProp->aOptions =  $this->oUtil->addAndApplyFilter(
287
+        $this->oProp->aOptions = $this->oUtil->addAndApplyFilter(
288 288
             $this, // the caller factory object
289
-            'options_' . $this->oProp->sClassName,
289
+            'options_'.$this->oProp->sClassName,
290 290
             $this->oProp->aOptions      // subject value to be filtered
291 291
         );
292 292
         return $this->oProp->aOptions;
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
          * An alias of `_setLastInputs()`.
367 367
          * @deprecated      3.7.0
368 368
          */
369
-        public function _setLastInput( $aLastInputs )  {
369
+        public function _setLastInput( $aLastInputs ) {
370 370
             return $this->setLastInputs( $aLastInputs );
371 371
         }    
372 372
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
      * but it requires to call the setUp() method in the overridden method so it's not that useful.
47 47
      * @internal
48 48
      */
49
-    protected function _setUp() { 
49
+    protected function _setUp() {
50 50
         $this->setUp();
51 51
     }    
52 52
     
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
      * @since       3.7.0
106 106
      * @return      array       The modified sectionsets definition array.
107 107
      */    
108
-    public function _replyToModifySectionsets( $aSectionsets ) {    
108
+    public function _replyToModifySectionsets( $aSectionsets ) {
109 109
         
110 110
         return $this->oUtil->addAndApplyFilter( 
111 111
             $this,  // caller factory object
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
          * An alias of `_setLastInputs()`.
367 367
          * @deprecated      3.7.0
368 368
          */
369
-        public function _setLastInput( $aLastInputs )  {
369
+        public function _setLastInput( $aLastInputs ) {
370 370
             return $this->setLastInputs( $aLastInputs );
371 371
         }    
372 372
 
Please login to merge, or discard this patch.
form/_view/sectionset/AdminPageFramework_Form_View___FieldsetTableRow.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
         $_aParameters = func_get_args() + array( 
35 35
             $this->aFieldset, 
36
-            $this->aSavedData,    // passed by reference. @todo: examine why it needs to be passed by reference.
36
+            $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
37 37
             $this->aFieldErrors, 
38 38
             $this->aFieldTypeDefinitions, 
39 39
             $this->aCallbacks, // field output element callables.        
@@ -61,14 +61,14 @@  discard block
 block discarded – undo
61 61
         
62 62
         $aFieldset = $this->aFieldset;
63 63
 
64
-        if ( ! $this->isNormalPlacement( $aFieldset ) ) {
64
+        if ( !$this->isNormalPlacement( $aFieldset ) ) {
65 65
             return '';
66 66
         }
67 67
 
68
-        $_oFieldrowAttribute   = new AdminPageFramework_Form_View___Attribute_Fieldrow( 
68
+        $_oFieldrowAttribute = new AdminPageFramework_Form_View___Attribute_Fieldrow( 
69 69
             $aFieldset,
70 70
             array( 
71
-                'id'        => 'fieldrow-' . $aFieldset[ 'tag_id' ],
71
+                'id'        => 'fieldrow-'.$aFieldset[ 'tag_id' ],
72 72
                 'valign'    => 'top',
73 73
                 'class'     => 'admin-page-framework-fieldrow',
74 74
             )                
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         return $this->_getFieldByContainer( 
78 78
             $aFieldset, 
79 79
             array(
80
-                'open_container'    => "<tr " . $_oFieldrowAttribute->get() . ">",
80
+                'open_container'    => "<tr ".$_oFieldrowAttribute->get().">",
81 81
                 'close_container'   => "</tr>",
82 82
                 'open_title'        => "<th>",
83 83
                 'close_title'       => "</th>",
@@ -126,13 +126,13 @@  discard block
 block discarded – undo
126 126
                 $this->aCallbacks,
127 127
                 $this->oMsg
128 128
             );
129
-            $_aOutput   = array();
129
+            $_aOutput = array();
130 130
             if ( $aFieldset[ 'show_title_column' ] ) {
131
-                $_aOutput[] = $aOpenCloseTags[ 'open_title' ]
131
+                $_aOutput[ ] = $aOpenCloseTags[ 'open_title' ]
132 132
                         . $_oFieldTitle->get()
133 133
                     . $aOpenCloseTags[ 'close_title' ];
134 134
             }
135
-            $_aOutput[] = $aOpenCloseTags[ 'open_main' ]
135
+            $_aOutput[ ] = $aOpenCloseTags[ 'open_main' ]
136 136
                     // . call_user_func_array( $hfCallback, array( $aFieldset ) )
137 137
                     . $this->getFieldsetOutput( $aFieldset )
138 138
                 . $aOpenCloseTags[ 'close_main' ];
Please login to merge, or discard this patch.