@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @return AliasLoader |
| 40 | 40 | */ |
| 41 | - public static function getInstance( array $aliases = [] ) |
|
| 41 | + public static function getInstance( array $aliases = [ ] ) |
|
| 42 | 42 | { |
| 43 | - if( is_null( static::$instance )) { |
|
| 43 | + if( is_null( static::$instance ) ) { |
|
| 44 | 44 | return static::$instance = new static( $aliases ); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -60,8 +60,8 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | public function load( $alias ) |
| 62 | 62 | { |
| 63 | - if( isset( $this->aliases[$alias] )) { |
|
| 64 | - return class_alias( $this->aliases[$alias], $alias ); |
|
| 63 | + if( isset( $this->aliases[ $alias ] ) ) { |
|
| 64 | + return class_alias( $this->aliases[ $alias ], $alias ); |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | public function register() |
| 74 | 74 | { |
| 75 | 75 | if( !$this->registered ) { |
| 76 | - spl_autoload_register( [$this, 'load'], true, true ); |
|
| 76 | + spl_autoload_register( [ $this, 'load' ], true, true ); |
|
| 77 | 77 | $this->registered = true; |
| 78 | 78 | } |
| 79 | 79 | } |
@@ -21,14 +21,14 @@ discard block |
||
| 21 | 21 | * |
| 22 | 22 | * @var array |
| 23 | 23 | */ |
| 24 | - protected $services = []; |
|
| 24 | + protected $services = [ ]; |
|
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * The container's bucket items |
| 28 | 28 | * |
| 29 | 29 | * @var array |
| 30 | 30 | */ |
| 31 | - protected $bucket = []; |
|
| 31 | + protected $bucket = [ ]; |
|
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * Set the globally available instance of the container. |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public static function getInstance() |
| 39 | 39 | { |
| 40 | - if( is_null( static::$instance )) { |
|
| 40 | + if( is_null( static::$instance ) ) { |
|
| 41 | 41 | static::$instance = new static; |
| 42 | 42 | } |
| 43 | 43 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function bind( $alias, $concrete ) |
| 56 | 56 | { |
| 57 | - $this->services[$alias] = $concrete; |
|
| 57 | + $this->services[ $alias ] = $concrete; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -68,14 +68,14 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function make( $abstract ) |
| 70 | 70 | { |
| 71 | - $service = isset( $this->services[$abstract] ) |
|
| 72 | - ? $this->services[$abstract] |
|
| 71 | + $service = isset( $this->services[ $abstract ] ) |
|
| 72 | + ? $this->services[ $abstract ] |
|
| 73 | 73 | : $this->addNamespace( $abstract ); |
| 74 | 74 | |
| 75 | - if( is_callable( $service )) { |
|
| 76 | - return call_user_func_array( $service, [$this] ); |
|
| 75 | + if( is_callable( $service ) ) { |
|
| 76 | + return call_user_func_array( $service, [ $this ] ); |
|
| 77 | 77 | } |
| 78 | - if( is_object( $service )) { |
|
| 78 | + if( is_object( $service ) ) { |
|
| 79 | 79 | return $service; |
| 80 | 80 | } |
| 81 | 81 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | public function singleton( $abstract, $concrete ) |
| 94 | 94 | { |
| 95 | - $this->bind( $abstract, $this->make( $concrete )); |
|
| 95 | + $this->bind( $abstract, $this->make( $concrete ) ); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
@@ -104,8 +104,8 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public function __get( $item ) |
| 106 | 106 | { |
| 107 | - return isset( $this->bucket[$item] ) |
|
| 108 | - ? $this->bucket[$item] |
|
| 107 | + return isset( $this->bucket[ $item ] ) |
|
| 108 | + ? $this->bucket[ $item ] |
|
| 109 | 109 | : null; |
| 110 | 110 | } |
| 111 | 111 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | public function __set( $item, $value ) |
| 121 | 121 | { |
| 122 | - $this->bucket[$item] = $value; |
|
| 122 | + $this->bucket[ $item ] = $value; |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | /** |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | protected function addNamespace( $abstract ) |
| 143 | 143 | { |
| 144 | - if( strpos( $abstract, __NAMESPACE__ ) === false && !class_exists( $abstract )) { |
|
| 144 | + if( strpos( $abstract, __NAMESPACE__ ) === false && !class_exists( $abstract ) ) { |
|
| 145 | 145 | $abstract = __NAMESPACE__ . "\\$abstract"; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | return $this->notInstantiable( $concrete ); |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - if( is_null(( $constructor = $reflector->getConstructor() ))) { |
|
| 186 | + if( is_null( ( $constructor = $reflector->getConstructor() ) ) ) { |
|
| 187 | 187 | return new $concrete; |
| 188 | 188 | } |
| 189 | 189 | |
@@ -218,11 +218,11 @@ discard block |
||
| 218 | 218 | */ |
| 219 | 219 | protected function resolveDependencies( array $dependencies ) |
| 220 | 220 | { |
| 221 | - $results = []; |
|
| 221 | + $results = [ ]; |
|
| 222 | 222 | |
| 223 | 223 | foreach( $dependencies as $dependency ) { |
| 224 | 224 | // If the class is null, the dependency is a string or some other primitive type |
| 225 | - $results[] = !is_null( $class = $dependency->getClass() ) |
|
| 225 | + $results[ ] = !is_null( $class = $dependency->getClass() ) |
|
| 226 | 226 | ? $this->resolveClass( $dependency ) |
| 227 | 227 | : null; |
| 228 | 228 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public static function clearResolvedInstances() |
| 50 | 50 | { |
| 51 | - static::$resolvedInstance = []; |
|
| 51 | + static::$resolvedInstance = [ ]; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | protected static function resolveFacadeInstance( $name ) |
| 104 | 104 | { |
| 105 | - if( is_object( $name )) { |
|
| 105 | + if( is_object( $name ) ) { |
|
| 106 | 106 | return $name; |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - if( isset( static::$resolvedInstance[$name] )) { |
|
| 110 | - return static::$resolvedInstance[$name]; |
|
| 109 | + if( isset( static::$resolvedInstance[ $name ] ) ) { |
|
| 110 | + return static::$resolvedInstance[ $name ]; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - return static::$resolvedInstance[$name] = static::$app->make( $name ); |
|
| 113 | + return static::$resolvedInstance[ $name ] = static::$app->make( $name ); |
|
| 114 | 114 | } |
| 115 | 115 | } |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | public function buildClassName( $name, $path = '' ) |
| 15 | 15 | { |
| 16 | - $className = array_map( 'ucfirst', array_map( 'strtolower', preg_split( '/[-_]/', $name ))); |
|
| 16 | + $className = array_map( 'ucfirst', array_map( 'strtolower', preg_split( '/[-_]/', $name ) ) ); |
|
| 17 | 17 | $className = implode( '', $className ); |
| 18 | 18 | return !empty( $path ) |
| 19 | - ? str_replace( '\\\\', '\\', sprintf( '%s\%s', $path, $className )) |
|
| 19 | + ? str_replace( '\\\\', '\\', sprintf( '%s\%s', $path, $className ) ) |
|
| 20 | 20 | : $className; |
| 21 | 21 | } |
| 22 | 22 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | public function buildMethodName( $name, $prefix = 'get' ) |
| 29 | 29 | { |
| 30 | - return lcfirst( $this->buildClassName( $prefix . '-' . $name )); |
|
| 30 | + return lcfirst( $this->buildClassName( $prefix . '-' . $name ) ); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function startsWith( $needle, $haystack ) |
| 78 | 78 | { |
| 79 | - return substr( $haystack, 0, strlen( $needle )) === $needle; |
|
| 79 | + return substr( $haystack, 0, strlen( $needle ) ) === $needle; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
@@ -16,19 +16,19 @@ discard block |
||
| 16 | 16 | * @param string $metaKey |
| 17 | 17 | * @return mixed |
| 18 | 18 | */ |
| 19 | - public function get( $metaKey, array $args = [] ) |
|
| 19 | + public function get( $metaKey, array $args = [ ] ) |
|
| 20 | 20 | { |
| 21 | - if( empty( $metaKey ))return; |
|
| 21 | + if( empty( $metaKey ) )return; |
|
| 22 | 22 | |
| 23 | 23 | $args = $this->normalize( $args ); |
| 24 | - $metaKey = $this->buildMetaKey( $metaKey, $args['prefix'] ); |
|
| 25 | - $metaValue = get_post_meta( $args['id'], $metaKey, $args['single'] ); |
|
| 24 | + $metaKey = $this->buildMetaKey( $metaKey, $args[ 'prefix' ] ); |
|
| 25 | + $metaValue = get_post_meta( $args[ 'id' ], $metaKey, $args[ 'single' ] ); |
|
| 26 | 26 | |
| 27 | - if( is_string( $metaValue )) { |
|
| 27 | + if( is_string( $metaValue ) ) { |
|
| 28 | 28 | $metaValue = trim( $metaValue ); |
| 29 | 29 | } |
| 30 | 30 | return empty( $metaValue ) |
| 31 | - ? $args['fallback'] |
|
| 31 | + ? $args[ 'fallback' ] |
|
| 32 | 32 | : $metaValue; |
| 33 | 33 | } |
| 34 | 34 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | protected function buildMetaKey( $metaKey, $prefix ) |
| 41 | 41 | { |
| 42 | - return ( substr( $metaKey, 0, 1 ) == '_' && !empty( $prefix )) |
|
| 42 | + return ( substr( $metaKey, 0, 1 ) == '_' && !empty( $prefix ) ) |
|
| 43 | 43 | ? sprintf( '_%s%s', rtrim( $prefix, '_' ), $metaKey ) |
| 44 | 44 | : $prefix . $metaKey; |
| 45 | 45 | } |
@@ -55,6 +55,6 @@ discard block |
||
| 55 | 55 | 'single' => true, |
| 56 | 56 | 'prefix' => Application::prefix(), |
| 57 | 57 | ]; |
| 58 | - return shortcode_atts( $defaults, array_change_key_case( $args )); |
|
| 58 | + return shortcode_atts( $defaults, array_change_key_case( $args ) ); |
|
| 59 | 59 | } |
| 60 | 60 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | public function __construct() |
| 19 | 19 | { |
| 20 | - $this->options = get_option( Settings::id(), [] ); |
|
| 20 | + $this->options = get_option( Settings::id(), [ ] ); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -28,10 +28,10 @@ discard block |
||
| 28 | 28 | { |
| 29 | 29 | $args = array_pad( $args, 2, null ); |
| 30 | 30 | $group = $this->$group; |
| 31 | - if( is_object( $group )) { |
|
| 31 | + if( is_object( $group ) ) { |
|
| 32 | 32 | return $group; |
| 33 | 33 | } |
| 34 | - return $this->get( $group, $args[0], $args[1] ); |
|
| 34 | + return $this->get( $group, $args[ 0 ], $args[ 1 ] ); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -43,11 +43,11 @@ discard block |
||
| 43 | 43 | if( $group == 'all' ) { |
| 44 | 44 | return (object) $this->options; |
| 45 | 45 | } |
| 46 | - if( empty( $group )) { |
|
| 46 | + if( empty( $group ) ) { |
|
| 47 | 47 | $group = $this->getDefaultGroup(); |
| 48 | 48 | } |
| 49 | - return isset( $this->options[$group] ) |
|
| 50 | - ? $this->options[$group] |
|
| 49 | + return isset( $this->options[ $group ] ) |
|
| 50 | + ? $this->options[ $group ] |
|
| 51 | 51 | : null; |
| 52 | 52 | } |
| 53 | 53 | |
@@ -62,13 +62,13 @@ discard block |
||
| 62 | 62 | if( func_num_args() < 1 ) { |
| 63 | 63 | return $this->all; |
| 64 | 64 | } |
| 65 | - if( is_string( $group )) { |
|
| 65 | + if( is_string( $group ) ) { |
|
| 66 | 66 | $group = $this->$group; |
| 67 | 67 | } |
| 68 | - if( !is_array( $group )) { |
|
| 68 | + if( !is_array( $group ) ) { |
|
| 69 | 69 | return $fallback; |
| 70 | 70 | } |
| 71 | - if( is_null( $key )) { |
|
| 71 | + if( is_null( $key ) ) { |
|
| 72 | 72 | return $group; |
| 73 | 73 | } |
| 74 | 74 | return $this->getValue( $group, $key, $fallback ); |
@@ -89,11 +89,11 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | protected function getValue( array $group, $key, $fallback ) |
| 91 | 91 | { |
| 92 | - if( !array_key_exists( $key, $group )) { |
|
| 92 | + if( !array_key_exists( $key, $group ) ) { |
|
| 93 | 93 | return $fallback; |
| 94 | 94 | } |
| 95 | - return empty( $group[$key] ) && !is_null( $fallback ) |
|
| 95 | + return empty( $group[ $key ] ) && !is_null( $fallback ) |
|
| 96 | 96 | ? $fallback |
| 97 | - : $group[$key]; |
|
| 97 | + : $group[ $key ]; |
|
| 98 | 98 | } |
| 99 | 99 | } |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | { |
| 17 | 17 | public function __construct() |
| 18 | 18 | { |
| 19 | - $this->options = get_option( Archive::id(), [] ); |
|
| 19 | + $this->options = get_option( Archive::id(), [ ] ); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | |
| 63 | 63 | /** |
| 64 | 64 | * @param string $key |
| 65 | - * @param mixed $fallback |
|
| 65 | + * @param string $fallback |
|
| 66 | 66 | * @param string $group |
| 67 | 67 | * @return string|array |
| 68 | 68 | */ |
@@ -24,22 +24,22 @@ discard block |
||
| 24 | 24 | /** |
| 25 | 25 | * @var array |
| 26 | 26 | */ |
| 27 | - public $metaboxes = []; |
|
| 27 | + public $metaboxes = [ ]; |
|
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * {@inheritdoc} |
| 31 | 31 | */ |
| 32 | 32 | public function init() |
| 33 | 33 | { |
| 34 | - if( empty( $this->app->config->{static::ID} ))return; |
|
| 34 | + if( empty( $this->app->config->{static::ID} ) )return; |
|
| 35 | 35 | |
| 36 | 36 | $this->normalize( $this->app->config->{static::ID}, [ |
| 37 | - 'post_types' => [], |
|
| 38 | - ]); |
|
| 37 | + 'post_types' => [ ], |
|
| 38 | + ] ); |
|
| 39 | 39 | |
| 40 | - add_filter( 'rwmb_show', [$this, 'show'], 10, 2 ); |
|
| 41 | - add_filter( 'rwmb_meta_boxes', [$this, 'register'] ); |
|
| 42 | - add_filter( 'rwmb_outer_html', [$this, 'renderField'], 10, 2 ); |
|
| 40 | + add_filter( 'rwmb_show', [ $this, 'show' ], 10, 2 ); |
|
| 41 | + add_filter( 'rwmb_meta_boxes', [ $this, 'register' ] ); |
|
| 42 | + add_filter( 'rwmb_outer_html', [ $this, 'renderField' ], 10, 2 ); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | { |
| 73 | 73 | return PostMeta::get( $key, [ |
| 74 | 74 | 'id' => $this->getPostId(), |
| 75 | - ]); |
|
| 75 | + ] ); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -81,15 +81,15 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | public function register() |
| 83 | 83 | { |
| 84 | - if( current_user_can( 'switch_themes' )) { |
|
| 84 | + if( current_user_can( 'switch_themes' ) ) { |
|
| 85 | 85 | $instructions = $this->initInstructions(); |
| 86 | - if( is_array( $instructions )) { |
|
| 86 | + if( is_array( $instructions ) ) { |
|
| 87 | 87 | $this->normalize( $instructions ); |
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | $metaboxes = func_num_args() |
| 91 | - ? ( new Helper )->toArray( func_get_arg(0) ) |
|
| 92 | - : []; |
|
| 91 | + ? ( new Helper )->toArray( func_get_arg( 0 ) ) |
|
| 92 | + : [ ]; |
|
| 93 | 93 | return array_merge( $metaboxes, $this->metaboxes ); |
| 94 | 94 | } |
| 95 | 95 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | */ |
| 100 | 100 | public function renderField( $html, $field ) |
| 101 | 101 | { |
| 102 | - return $this->validate( $field['condition'] ) |
|
| 102 | + return $this->validate( $field[ 'condition' ] ) |
|
| 103 | 103 | ? $html |
| 104 | 104 | : ''; |
| 105 | 105 | } |
@@ -111,11 +111,11 @@ discard block |
||
| 111 | 111 | public function show( $bool, array $metabox ) |
| 112 | 112 | { |
| 113 | 113 | if( defined( 'DOING_AJAX' ) |
| 114 | - || !isset( $metabox['condition'] ) |
|
| 115 | - || !$this->hasPostType( $metabox )) { |
|
| 114 | + || !isset( $metabox[ 'condition' ] ) |
|
| 115 | + || !$this->hasPostType( $metabox ) ) { |
|
| 116 | 116 | return $bool; |
| 117 | 117 | } |
| 118 | - return $this->validate( $metabox['condition'] ); |
|
| 118 | + return $this->validate( $metabox[ 'condition' ] ); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | */ |
| 124 | 124 | protected function getPostId() |
| 125 | 125 | { |
| 126 | - if( !( $postId = filter_input( INPUT_GET, 'post' ))) { |
|
| 126 | + if( !( $postId = filter_input( INPUT_GET, 'post' ) ) ) { |
|
| 127 | 127 | $postId = filter_input( INPUT_POST, 'post_ID' ); |
| 128 | 128 | } |
| 129 | 129 | return intval( $postId ); |
@@ -136,10 +136,10 @@ discard block |
||
| 136 | 136 | { |
| 137 | 137 | return array_unique( iterator_to_array( |
| 138 | 138 | new RecursiveIteratorIterator( |
| 139 | - new RecursiveArrayIterator( array_column( $this->metaboxes, 'post_types' )) |
|
| 139 | + new RecursiveArrayIterator( array_column( $this->metaboxes, 'post_types' ) ) |
|
| 140 | 140 | ), |
| 141 | 141 | false |
| 142 | - )); |
|
| 142 | + ) ); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | /** |
@@ -147,26 +147,26 @@ discard block |
||
| 147 | 147 | */ |
| 148 | 148 | protected function hasPostType( array $metabox ) |
| 149 | 149 | { |
| 150 | - if( !isset( $metabox['post_types'] )) { |
|
| 150 | + if( !isset( $metabox[ 'post_types' ] ) ) { |
|
| 151 | 151 | return true; |
| 152 | 152 | } |
| 153 | - return in_array( get_post_type( $this->getPostId() ), $metabox['post_types'] ); |
|
| 153 | + return in_array( get_post_type( $this->getPostId() ), $metabox[ 'post_types' ] ); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | /** |
| 157 | 157 | * @return void |
| 158 | 158 | */ |
| 159 | - protected function normalize( array $metaboxes, array $defaults = [] ) |
|
| 159 | + protected function normalize( array $metaboxes, array $defaults = [ ] ) |
|
| 160 | 160 | { |
| 161 | 161 | foreach( $metaboxes as $id => $metabox ) { |
| 162 | 162 | $data = wp_parse_args( $defaults, [ |
| 163 | - 'condition' => [], |
|
| 164 | - 'fields' => [], |
|
| 163 | + 'condition' => [ ], |
|
| 164 | + 'fields' => [ ], |
|
| 165 | 165 | 'id' => $id, |
| 166 | 166 | 'slug' => $id, |
| 167 | - 'validation' => [], |
|
| 168 | - ]); |
|
| 169 | - $this->metaboxes[] = $this->setDependencies( |
|
| 167 | + 'validation' => [ ], |
|
| 168 | + ] ); |
|
| 169 | + $this->metaboxes[ ] = $this->setDependencies( |
|
| 170 | 170 | $this->normalizeThis( $metabox, $data, $id ) |
| 171 | 171 | ); |
| 172 | 172 | } |
@@ -200,10 +200,10 @@ discard block |
||
| 200 | 200 | protected function normalizeFields( array $fields, array $data, $parentId ) |
| 201 | 201 | { |
| 202 | 202 | return array_map( function( $id, $field ) use( $parentId ) { |
| 203 | - $defaults = [ |
|
| 204 | - 'attributes' => [], |
|
| 203 | + $defaults = [ |
|
| 204 | + 'attributes' => [ ], |
|
| 205 | 205 | 'class' => '', |
| 206 | - 'condition' => [], |
|
| 206 | + 'condition' => [ ], |
|
| 207 | 207 | 'depends' => '', |
| 208 | 208 | 'field_name' => $id, |
| 209 | 209 | 'id' => $id, |
@@ -237,11 +237,11 @@ discard block |
||
| 237 | 237 | */ |
| 238 | 238 | protected function normalizeValidation( array $validation, array $data, $parentId ) |
| 239 | 239 | { |
| 240 | - foreach( ['messages', 'rules'] as $key ) { |
|
| 241 | - if( empty( $validation[$key] ))continue; |
|
| 242 | - foreach( $validation[$key] as $id => $value ) { |
|
| 243 | - $validation[$key][$this->normalizeFieldName( $id, ['slug' => $id], $parentId )] = $value; |
|
| 244 | - unset( $validation[$key][$id] ); |
|
| 240 | + foreach( [ 'messages', 'rules' ] as $key ) { |
|
| 241 | + if( empty( $validation[ $key ] ) )continue; |
|
| 242 | + foreach( $validation[ $key ] as $id => $value ) { |
|
| 243 | + $validation[ $key ][ $this->normalizeFieldName( $id, [ 'slug' => $id ], $parentId ) ] = $value; |
|
| 244 | + unset( $validation[ $key ][ $id ] ); |
|
| 245 | 245 | } |
| 246 | 246 | } |
| 247 | 247 | return $validation; |
@@ -252,14 +252,14 @@ discard block |
||
| 252 | 252 | */ |
| 253 | 253 | protected function setDependencies( array $metabox ) |
| 254 | 254 | { |
| 255 | - $fields = &$metabox['fields']; |
|
| 255 | + $fields = &$metabox[ 'fields' ]; |
|
| 256 | 256 | $depends = array_column( $fields, 'depends' ); |
| 257 | 257 | array_walk( $depends, function( $value, $index ) use( &$fields, $metabox ) { |
| 258 | - if( empty( $value ))return; |
|
| 259 | - $dependency = array_search( $value, array_column( $fields, 'id' )); |
|
| 260 | - $fields[$index]['attributes']['data-depends'] = $value; |
|
| 261 | - if( !$this->getMetaValue( $fields[$dependency]['slug'], '', $metabox['slug'] )) { |
|
| 262 | - $fields[$index]['class'] = trim( 'hidden ' . $fields[$index]['class'] ); |
|
| 258 | + if( empty( $value ) )return; |
|
| 259 | + $dependency = array_search( $value, array_column( $fields, 'id' ) ); |
|
| 260 | + $fields[ $index ][ 'attributes' ][ 'data-depends' ] = $value; |
|
| 261 | + if( !$this->getMetaValue( $fields[ $dependency ][ 'slug' ], '', $metabox[ 'slug' ] ) ) { |
|
| 262 | + $fields[ $index ][ 'class' ] = trim( 'hidden ' . $fields[ $index ][ 'class' ] ); |
|
| 263 | 263 | } |
| 264 | 264 | }); |
| 265 | 265 | return $metabox; |
@@ -19,12 +19,12 @@ discard block |
||
| 19 | 19 | $this->pollux_caller = $caller; |
| 20 | 20 | $this->pollux_id = $id; |
| 21 | 21 | |
| 22 | - remove_action( 'add_meta_boxes', [$this, 'add_meta_boxes'] ); |
|
| 23 | - remove_action( 'save_post_post', [$this, 'save_post'] ); |
|
| 22 | + remove_action( 'add_meta_boxes', [ $this, 'add_meta_boxes' ] ); |
|
| 23 | + remove_action( 'save_post_post', [ $this, 'save_post' ] ); |
|
| 24 | 24 | |
| 25 | - add_action( 'pollux/archives/init', [$this, 'add_meta_boxes'] ); |
|
| 26 | - add_action( 'pollux/settings/init', [$this, 'add_meta_boxes'] ); |
|
| 27 | - add_filter( 'rwmb_field_meta', [$this, '_get_field_meta'], 10, 3 ); |
|
| 25 | + add_action( 'pollux/archives/init', [ $this, 'add_meta_boxes' ] ); |
|
| 26 | + add_action( 'pollux/settings/init', [ $this, 'add_meta_boxes' ] ); |
|
| 27 | + add_filter( 'rwmb_field_meta', [ $this, '_get_field_meta' ], 10, 3 ); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -35,13 +35,13 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | public function _get_field_meta( $meta, array $field, $saved ) |
| 37 | 37 | { |
| 38 | - if( !$this->is_edit_screen() || !empty(( new Helper )->toArray( $meta )) || empty( $field['slug'] )) { |
|
| 38 | + if( !$this->is_edit_screen() || !empty( ( new Helper )->toArray( $meta ) ) || empty( $field[ 'slug' ] ) ) { |
|
| 39 | 39 | return $meta; |
| 40 | 40 | } |
| 41 | - $meta = call_user_func( [RWMB_Field::get_class_name( $field ), 'esc_meta'], ( $saved |
|
| 42 | - ? $this->pollux_caller->getMetaValue( $field['slug'], $meta, $this->meta_box['slug'] ) |
|
| 43 | - : $field['std'] |
|
| 44 | - )); |
|
| 41 | + $meta = call_user_func( [ RWMB_Field::get_class_name( $field ), 'esc_meta' ], ( $saved |
|
| 42 | + ? $this->pollux_caller->getMetaValue( $field[ 'slug' ], $meta, $this->meta_box[ 'slug' ] ) |
|
| 43 | + : $field[ 'std' ] |
|
| 44 | + ) ); |
|
| 45 | 45 | return $this->_normalize_field_meta( $meta, $field ); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -51,14 +51,14 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | public function _normalize_field_meta( $meta, array $field ) |
| 53 | 53 | { |
| 54 | - if( !empty( $meta ) && is_array( $meta )) { |
|
| 54 | + if( !empty( $meta ) && is_array( $meta ) ) { |
|
| 55 | 55 | return $meta; |
| 56 | 56 | } |
| 57 | - if( $field['clone'] ) { |
|
| 58 | - return ['']; |
|
| 57 | + if( $field[ 'clone' ] ) { |
|
| 58 | + return [ '' ]; |
|
| 59 | 59 | } |
| 60 | - if( $field['multiple'] ) { |
|
| 61 | - return []; |
|
| 60 | + if( $field[ 'multiple' ] ) { |
|
| 61 | + return [ ]; |
|
| 62 | 62 | } |
| 63 | 63 | return $meta; |
| 64 | 64 | } |
@@ -71,12 +71,12 @@ discard block |
||
| 71 | 71 | public function add_meta_boxes() |
| 72 | 72 | { |
| 73 | 73 | add_meta_box( |
| 74 | - $this->meta_box['id'], |
|
| 75 | - $this->meta_box['title'], |
|
| 76 | - [$this, 'show'], |
|
| 74 | + $this->meta_box[ 'id' ], |
|
| 75 | + $this->meta_box[ 'title' ], |
|
| 76 | + [ $this, 'show' ], |
|
| 77 | 77 | null, |
| 78 | - $this->meta_box['context'], |
|
| 79 | - $this->meta_box['priority'] |
|
| 78 | + $this->meta_box[ 'context' ], |
|
| 79 | + $this->meta_box[ 'priority' ] |
|
| 80 | 80 | ); |
| 81 | 81 | } |
| 82 | 82 | |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | public function is_saved() |
| 95 | 95 | { |
| 96 | 96 | foreach( array_column( $this->fields, 'slug' ) as $field ) { |
| 97 | - if( !is_null( $this->pollux_caller->getMetaValue( $field, null, $this->meta_box['slug'] ))) { |
|
| 97 | + if( !is_null( $this->pollux_caller->getMetaValue( $field, null, $this->meta_box[ 'slug' ] ) ) ) { |
|
| 98 | 98 | return true; |
| 99 | 99 | } |
| 100 | 100 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | public static function normalize( $metabox ) |
| 109 | 109 | { |
| 110 | - unset( $metabox['post_types'] ); |
|
| 111 | - return wp_parse_args( $metabox, ['slug' => ''] ); |
|
| 110 | + unset( $metabox[ 'post_types' ] ); |
|
| 111 | + return wp_parse_args( $metabox, [ 'slug' => '' ] ); |
|
| 112 | 112 | } |
| 113 | 113 | } |