pryley / pollux

autoload.php

Braces +6 added lines, -2 removed lines

@@ -13,9 +13,13 @@
 	];
 	foreach( $namespaces as $prefix => $base_dir ) {
 		$len = strlen( $prefix );
-		if( strncmp( $prefix, $class, $len ) !== 0 )continue;
+		if( strncmp( $prefix, $class, $len ) !== 0 ) {
+			continue;
+		}
 		$file = $base_dir . str_replace( '\\', '/', substr( $class, $len ) ) . '.php';
-		if( !file_exists( $file ) )continue;
+		if( !file_exists( $file ) ) {
+			continue;
+		}
 		require $file;
 		break;
 	}

src/AliasLoader.php

Spacing +5 added lines, -5 removed lines

@@ -38,9 +38,9 @@ 
 	 *
 	 * @return AliasLoader
 	 */
-	public static function getInstance( array $aliases = [] )
+	public static function getInstance( array $aliases = [ ] )
 	{
-		if( is_null( static::$instance )) {
+		if( is_null( static::$instance ) ) {
 			return static::$instance = new static( $aliases );
 		}
 
@@ -60,8 +60,8 @@ 
 	 */
 	public function load( $alias )
 	{
-		if( isset( $this->aliases[$alias] )) {
-			return class_alias( $this->aliases[$alias], $alias );
+		if( isset( $this->aliases[ $alias ] ) ) {
+			return class_alias( $this->aliases[ $alias ], $alias );
 		}
 	}
 
@@ -73,7 +73,7 @@ 
 	public function register()
 	{
 		if( !$this->registered ) {
-			spl_autoload_register( [$this, 'load'], true, true );
+			spl_autoload_register( [ $this, 'load' ], true, true );
 			$this->registered = true;
 		}
 	}

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
 	}
 
 	private function __clone()
-	{}
+	{
+}
 
 	/**
 	 * Get or create the singleton alias loader instance.

src/Container.php

Indentation +14 added lines, -14 removed lines

@@ -16,18 +16,18 @@ 
 	 */
 	protected static $instance;
 
-    /**
-     * The container's bound services.
-     *
-     * @var array
-     */
+	/**
+	 * The container's bound services.
+	 *
+	 * @var array
+	 */
 	protected $services = [];
 
-    /**
-     * The container's bucket items
-     *
-     * @var array
-     */
+	/**
+	 * The container's bucket items
+	 *
+	 * @var array
+	 */
 	protected $bucket = [];
 
 	/**
@@ -123,10 +123,10 @@ 
 	}
 
    /**
-	 * Register a Provider.
-	 *
-	 * @return void
-	 */
+    * Register a Provider.
+    *
+    * @return void
+    */
 	public function register( $provider )
 	{
 		$provider->register( $this );

Spacing +17 added lines, -17 removed lines

@@ -21,14 +21,14 @@ 
      *
      * @var array
      */
-	protected $services = [];
+	protected $services = [ ];
 
     /**
      * The container's bucket items
      *
      * @var array
      */
-	protected $bucket = [];
+	protected $bucket = [ ];
 
 	/**
 	 * Set the globally available instance of the container.
@@ -37,7 +37,7 @@ 
 	 */
 	public static function getInstance()
 	{
-		if( is_null( static::$instance )) {
+		if( is_null( static::$instance ) ) {
 			static::$instance = new static;
 		}
 
@@ -54,7 +54,7 @@ 
 	 */
 	public function bind( $alias, $concrete )
 	{
-		$this->services[$alias] = $concrete;
+		$this->services[ $alias ] = $concrete;
 	}
 
 	/**
@@ -68,14 +68,14 @@ 
 	 */
 	public function make( $abstract )
 	{
-		$service = isset( $this->services[$abstract] )
-			? $this->services[$abstract]
+		$service = isset( $this->services[ $abstract ] )
+			? $this->services[ $abstract ]
 			: $this->addNamespace( $abstract );
 
-		if( is_callable( $service )) {
-			return call_user_func_array( $service, [$this] );
+		if( is_callable( $service ) ) {
+			return call_user_func_array( $service, [ $this ] );
 		}
-		if( is_object( $service )) {
+		if( is_object( $service ) ) {
 			return $service;
 		}
 
@@ -92,7 +92,7 @@ 
 	 */
 	public function singleton( $abstract, $concrete )
 	{
-		$this->bind( $abstract, $this->make( $concrete ));
+		$this->bind( $abstract, $this->make( $concrete ) );
 	}
 
 	/**
@@ -104,8 +104,8 @@ 
 	 */
 	public function __get( $item )
 	{
-		return isset( $this->bucket[$item] )
-			? $this->bucket[$item]
+		return isset( $this->bucket[ $item ] )
+			? $this->bucket[ $item ]
 			: null;
 	}
 
@@ -119,7 +119,7 @@ 
 	 */
 	public function __set( $item, $value )
 	{
-		$this->bucket[$item] = $value;
+		$this->bucket[ $item ] = $value;
 	}
 
    /**
@@ -141,7 +141,7 @@ 
 	 */
 	protected function addNamespace( $abstract )
 	{
-		if( strpos( $abstract, __NAMESPACE__ ) === false && !class_exists( $abstract )) {
+		if( strpos( $abstract, __NAMESPACE__ ) === false && !class_exists( $abstract ) ) {
 			$abstract = __NAMESPACE__ . "\\$abstract";
 		}
 
@@ -183,7 +183,7 @@ 
 			return $this->notInstantiable( $concrete );
 		}
 
-		if( is_null(( $constructor = $reflector->getConstructor() ))) {
+		if( is_null( ( $constructor = $reflector->getConstructor() ) ) ) {
 			return new $concrete;
 		}
 
@@ -218,11 +218,11 @@ 
 	 */
 	protected function resolveDependencies( array $dependencies )
 	{
-		$results = [];
+		$results = [ ];
 
 		foreach( $dependencies as $dependency ) {
 			// If the class is null, the dependency is a string or some other primitive type
-			$results[] = !is_null( $class = $dependency->getClass() )
+			$results[ ] = !is_null( $class = $dependency->getClass() )
 				? $this->resolveClass( $dependency )
 				: null;
 		}

src/Facade.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
 	 */
 	public static function clearResolvedInstances()
 	{
-		static::$resolvedInstance = [];
+		static::$resolvedInstance = [ ];
 	}
 
 	/**
@@ -102,14 +102,14 @@ 
 	 */
 	protected static function resolveFacadeInstance( $name )
 	{
-		if( is_object( $name )) {
+		if( is_object( $name ) ) {
 			return $name;
 		}
 
-		if( isset( static::$resolvedInstance[$name] )) {
-			return static::$resolvedInstance[$name];
+		if( isset( static::$resolvedInstance[ $name ] ) ) {
+			return static::$resolvedInstance[ $name ];
 		}
 
-		return static::$resolvedInstance[$name] = static::$app->make( $name );
+		return static::$resolvedInstance[ $name ] = static::$app->make( $name );
 	}
 }

src/PostType/Columns.php

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 	{
 		foreach( $this->types as $type => $args ) {
 			add_action( "manage_{$type}_posts_custom_column", [$this, 'printColumnValue'], 10, 2 );
-			add_filter( "manage_{$type}_posts_columns", function( $columns ) use( $args ) {
+			add_filter( "manage_{$type}_posts_columns", function( $columns ) use( $args )
+			{
 				return count( $args['columns'] ) > 1
 					? $args['columns']
 					: $columns;

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
 	/**
 	 * @var array
 	 */
-	public $columns = [];
+	public $columns = [ ];
 
 	/**
 	 * @var void
@@ -22,10 +22,10 @@ 
 	public function initColumns()
 	{
 		foreach( $this->types as $type => $args ) {
-			add_action( "manage_{$type}_posts_custom_column", [$this, 'printColumnValue'], 10, 2 );
+			add_action( "manage_{$type}_posts_custom_column", [ $this, 'printColumnValue' ], 10, 2 );
 			add_filter( "manage_{$type}_posts_columns", function( $columns ) use( $args ) {
-				return count( $args['columns'] ) > 1
-					? $args['columns']
+				return count( $args[ 'columns' ] ) > 1
+					? $args[ 'columns' ]
 					: $columns;
 			});
 		}
@@ -54,8 +54,8 @@ 
 		if( has_post_thumbnail( $postId ) ) {
 			list( $src, $width, $height ) = wp_get_attachment_image_src( get_post_thumbnail_id( $postId ), 'thumbnail' );
 			$thumbnail = sprintf( '<img src="%s" alt="%s" width="%s" height="%s">',
-				esc_url( set_url_scheme( $src )),
-				esc_attr( get_the_title( $postId )),
+				esc_url( set_url_scheme( $src ) ),
+				esc_attr( get_the_title( $postId ) ),
 				$width,
 				$height
 			);
@@ -71,9 +71,9 @@ 
 	protected function getColumnMedia()
 	{
 		return count( PostMeta::get( 'media', [
-			'fallback' => [],
+			'fallback' => [ ],
 			'single' => false,
-		]));
+		] ) );
 	}
 
 	/**
@@ -91,8 +91,8 @@ 
 	protected function normalizeColumns( array $columns )
 	{
 		$columns = array_flip( $columns );
-		$columns = array_merge( $columns, array_intersect_key( $this->columns, $columns ));
-		return ['cb' => '<input type="checkbox">'] + $columns;
+		$columns = array_merge( $columns, array_intersect_key( $this->columns, $columns ) );
+		return [ 'cb' => '<input type="checkbox">' ] + $columns;
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 		$defaults = [
 			'author' => __( 'Author', 'pollux' ),
 			'categories' => __( 'Categories', 'pollux' ),
-			'comments' => sprintf( '<span class="vers comment-grey-bubble" title="%1$s"><span class="screen-reader-text">%1$s</span></span>', __( 'Comments', 'pollux' )),
+			'comments' => sprintf( '<span class="vers comment-grey-bubble" title="%1$s"><span class="screen-reader-text">%1$s</span></span>', __( 'Comments', 'pollux' ) ),
 			'date' => __( 'Date', 'pollux' ),
 			'media' => __( 'Media', 'pollux' ),
 			'slug' => __( 'Slug', 'pollux' ),

src/MetaBox/Condition.php

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 	 */
 	public function validate( array $conditions )
 	{
-		array_walk( $conditions, function( &$value, $key ) {
+		array_walk( $conditions, function( &$value, $key )
+		{
 			$method = ( new Helper )->buildMethodName( $key, 'validate' );
 			$value = method_exists( $this, $method )
 				? $this->$method( $value )
@@ -41,7 +42,8 @@ 
 			foreach( $conditions as $key ) {
 				$conditions[str_replace( '!', '', $key )] = substr( $key, 0, 1 ) == '!' ? 0 : 1;
 			}
-			$conditions = array_filter( $conditions, function( $key ) {
+			$conditions = array_filter( $conditions, function( $key )
+			{
 				return !is_numeric( $key );
 			}, ARRAY_FILTER_USE_KEY );
 		}

Spacing +8 added lines, -8 removed lines

@@ -43,12 +43,12 @@ 
 	 */
 	protected function normalizeCondition( $conditions )
 	{
-		if( !is_array( $conditions )) {
-			$conditions = [];
+		if( !is_array( $conditions ) ) {
+			$conditions = [ ];
 		}
-		if( count( array_filter( array_keys( $conditions ), 'is_string' )) == 0 ) {
+		if( count( array_filter( array_keys( $conditions ), 'is_string' ) ) == 0 ) {
 			foreach( $conditions as $key ) {
-				$conditions[str_replace( '!', '', $key )] = substr( $key, 0, 1 ) == '!' ? 0 : 1;
+				$conditions[ str_replace( '!', '', $key ) ] = substr( $key, 0, 1 ) == '!' ? 0 : 1;
 			}
 			$conditions = array_filter( $conditions, function( $key ) {
 				return !is_numeric( $key );
@@ -56,7 +56,7 @@ 
 		}
 		return array_intersect_key(
 			$conditions,
-			array_flip( $this->filter( 'conditions', static::conditions() ))
+			array_flip( $this->filter( 'conditions', static::conditions() ) )
 		);
 	}
 
@@ -102,7 +102,7 @@ 
 	 */
 	protected function validateIsFrontPage( $value )
 	{
-		return $value == ( $this->getPostId() == get_option( 'page_on_front' ));
+		return $value == ( $this->getPostId() == get_option( 'page_on_front' ) );
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	protected function validateIsHome( $value )
 	{
-		return $value == ( $this->getPostId() == get_option( 'page_for_posts' ));
+		return $value == ( $this->getPostId() == get_option( 'page_for_posts' ) );
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	{
 		return ( new Helper )->endsWith(
 			$value,
-			basename( get_page_template_slug( $this->getPostId() ))
+			basename( get_page_template_slug( $this->getPostId() ) )
 		);
 	}
 

src/MetaBox/PostMetaManager.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 	 */
 	public function get( $metaKey, array $args = [] )
 	{
-		if( empty( $metaKey ))return;
+		if( empty( $metaKey )) {
+			return;
+		}
 
 		$args = $this->normalize( $args );
 		$metaKey = $this->buildMetaKey( $metaKey, $args['prefix'] );

Spacing +8 added lines, -8 removed lines

@@ -16,19 +16,19 @@ 
 	 * @param string $metaKey
 	 * @return mixed
 	 */
-	public function get( $metaKey, array $args = [] )
+	public function get( $metaKey, array $args = [ ] )
 	{
-		if( empty( $metaKey ))return;
+		if( empty( $metaKey ) )return;
 
 		$args = $this->normalize( $args );
-		$metaKey = $this->buildMetaKey( $metaKey, $args['prefix'] );
-		$metaValue = get_post_meta( $args['id'], $metaKey, $args['single'] );
+		$metaKey = $this->buildMetaKey( $metaKey, $args[ 'prefix' ] );
+		$metaValue = get_post_meta( $args[ 'id' ], $metaKey, $args[ 'single' ] );
 
-		if( is_string( $metaValue )) {
+		if( is_string( $metaValue ) ) {
 			$metaValue = trim( $metaValue );
 		}
 		return empty( $metaValue )
-			? $args['fallback']
+			? $args[ 'fallback' ]
 			: $metaValue;
 	}
 
@@ -39,7 +39,7 @@ 
 	 */
 	protected function buildMetaKey( $metaKey, $prefix )
 	{
-		return ( substr( $metaKey, 0, 1 ) == '_' && !empty( $prefix ))
+		return ( substr( $metaKey, 0, 1 ) == '_' && !empty( $prefix ) )
 			? sprintf( '_%s%s', rtrim( $prefix, '_' ), $metaKey )
 			: $prefix . $metaKey;
 	}
@@ -55,6 +55,6 @@ 
 			'single'   => true,
 			'prefix'   => Application::prefix(),
 		];
-		return shortcode_atts( $defaults, array_change_key_case( $args ));
+		return shortcode_atts( $defaults, array_change_key_case( $args ) );
 	}
 }

src/MetaBox/ArchiveMetaManager.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 {
 	public function __construct()
 	{
-		$this->options = get_option( Archive::id(), [] );
+		$this->options = get_option( Archive::id(), [ ] );
 	}
 
 	/**

src/MetaBox/MetaBox.php

Doc Comments +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
 	/**
 	 * @param string $key
-	 * @param mixed $fallback
+	 * @param string $fallback
 	 * @param string $group
 	 * @return string|array
 	 */

Braces +13 added lines, -5 removed lines

@@ -31,7 +31,9 @@ 
 	 */
 	public function init()
 	{
-		if( empty( $this->app->config->{static::ID} ))return;
+		if( empty( $this->app->config->{static::ID} )) {
+			return;
+		}
 
 		$this->normalize( $this->app->config->{static::ID}, [
 			'post_types' => [],
@@ -199,7 +201,8 @@ 
 	 */
 	protected function normalizeFields( array $fields, array $data, $parentId )
 	{
-		return array_map( function( $id, $field ) use( $parentId ) {
+		return array_map( function( $id, $field ) use( $parentId )
+		{
 			$defaults =  [
 				'attributes' => [],
 				'class' => '',
@@ -238,7 +241,9 @@ 
 	protected function normalizeValidation( array $validation, array $data, $parentId )
 	{
 		foreach( ['messages', 'rules'] as $key ) {
-			if( empty( $validation[$key] ))continue;
+			if( empty( $validation[$key] )) {
+				continue;
+			}
 			foreach( $validation[$key] as $id => $value ) {
 				$validation[$key][$this->normalizeFieldName( $id, ['slug' => $id], $parentId )] = $value;
 				unset( $validation[$key][$id] );
@@ -254,8 +259,11 @@ 
 	{
 		$fields = &$metabox['fields'];
 		$depends = array_column( $fields, 'depends' );
-		array_walk( $depends, function( $value, $index ) use( &$fields, $metabox ) {
-			if( empty( $value ))return;
+		array_walk( $depends, function( $value, $index ) use( &$fields, $metabox )
+		{
+			if( empty( $value )) {
+				return;
+			}
 			$dependency = array_search( $value, array_column( $fields, 'id' ));
 			$fields[$index]['attributes']['data-depends'] = $value;
 			if( !$this->getMetaValue( $fields[$dependency]['slug'], '', $metabox['slug'] )) {

Spacing +49 added lines, -49 removed lines

@@ -25,23 +25,23 @@ 
 	/**
 	 * @var array
 	 */
-	public $metaboxes = [];
+	public $metaboxes = [ ];
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function init()
 	{
-		if( empty( $this->app->config->{static::ID} ))return;
+		if( empty( $this->app->config->{static::ID} ) )return;
 
 		$this->normalize( $this->app->config->{static::ID}, [
-			'post_types' => [],
-		]);
+			'post_types' => [ ],
+		] );
 
-		add_filter( 'rwmb_normalize_map_field', [$this, 'normalizeMapField'] );
-		add_filter( 'rwmb_show',                [$this, 'show'], 10, 2 );
-		add_filter( 'rwmb_meta_boxes',          [$this, 'register'] );
-		add_filter( 'rwmb_outer_html',          [$this, 'renderField'], 10, 2 );
+		add_filter( 'rwmb_normalize_map_field', [ $this, 'normalizeMapField' ] );
+		add_filter( 'rwmb_show', [ $this, 'show' ], 10, 2 );
+		add_filter( 'rwmb_meta_boxes', [ $this, 'register' ] );
+		add_filter( 'rwmb_outer_html', [ $this, 'renderField' ], 10, 2 );
 
 	}
 
@@ -75,7 +75,7 @@ 
 	{
 		return PostMeta::get( $key, [
 			'id' => $this->getPostId(),
-		]);
+		] );
 	}
 
 	/**
@@ -84,15 +84,15 @@ 
 	 */
 	public function normalizeMapField( $field )
 	{
-		if( empty( $field['address_field'] )) {
+		if( empty( $field[ 'address_field' ] ) ) {
 			return $field;
 		}
-		if( !$this->app->make( Helper::class )->startsWith( Application::PREFIX, $field['address_field'] )) {
-			$field['address_field'] = Application::PREFIX . $field['address_field'];
+		if( !$this->app->make( Helper::class )->startsWith( Application::PREFIX, $field[ 'address_field' ] ) ) {
+			$field[ 'address_field' ] = Application::PREFIX . $field[ 'address_field' ];
 		}
-		$apiKey = SiteMeta::services( $field['api_key'] );
-		if( !empty( $apiKey ) && is_string( $apiKey )) {
-			$field['api_key'] = $apiKey;
+		$apiKey = SiteMeta::services( $field[ 'api_key' ] );
+		if( !empty( $apiKey ) && is_string( $apiKey ) ) {
+			$field[ 'api_key' ] = $apiKey;
 		}
 		return $field;
 	}
@@ -103,15 +103,15 @@ 
 	 */
 	public function register()
 	{
-		if( current_user_can( 'switch_themes' )) {
+		if( current_user_can( 'switch_themes' ) ) {
 			$instructions = $this->initInstructions();
-			if( is_array( $instructions )) {
+			if( is_array( $instructions ) ) {
 				$this->normalize( $instructions );
 			}
 		}
 		$metaboxes = func_num_args()
-			? ( new Helper )->toArray( func_get_arg(0) )
-			: [];
+			? ( new Helper )->toArray( func_get_arg( 0 ) )
+			: [ ];
 		return array_merge( $metaboxes, $this->metaboxes );
 	}
 
@@ -121,7 +121,7 @@ 
 	 */
 	public function renderField( $html, $field )
 	{
-		return $this->validate( $field['condition'] )
+		return $this->validate( $field[ 'condition' ] )
 			? $html
 			: '';
 	}
@@ -133,11 +133,11 @@ 
 	public function show( $bool, array $metabox )
 	{
 		if( defined( 'DOING_AJAX' )
-			|| !isset( $metabox['condition'] )
-			|| !$this->hasPostType( $metabox )) {
+			|| !isset( $metabox[ 'condition' ] )
+			|| !$this->hasPostType( $metabox ) ) {
 			return $bool;
 		}
-		return $this->validate( $metabox['condition'] );
+		return $this->validate( $metabox[ 'condition' ] );
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 	 */
 	protected function getPostId()
 	{
-		if( !( $postId = filter_input( INPUT_GET, 'post' ))) {
+		if( !( $postId = filter_input( INPUT_GET, 'post' ) ) ) {
 			$postId = filter_input( INPUT_POST, 'post_ID' );
 		}
 		return intval( $postId );
@@ -158,10 +158,10 @@ 
 	{
 		return array_unique( iterator_to_array(
 			new RecursiveIteratorIterator(
-				new RecursiveArrayIterator( array_column( $this->metaboxes, 'post_types' ))
+				new RecursiveArrayIterator( array_column( $this->metaboxes, 'post_types' ) )
 			),
 			false
-		));
+		) );
 	}
 
 	/**
@@ -169,29 +169,29 @@ 
 	 */
 	protected function hasPostType( array $metabox )
 	{
-		if( !isset( $metabox['post_types'] )) {
+		if( !isset( $metabox[ 'post_types' ] ) ) {
 			return true;
 		}
-		if( !( $type = filter_input( INPUT_GET, 'post_type' ))) {
+		if( !( $type = filter_input( INPUT_GET, 'post_type' ) ) ) {
 			$type = get_post_type( $this->getPostId() );
 		}
-		return in_array( $type, $metabox['post_types'] );
+		return in_array( $type, $metabox[ 'post_types' ] );
 	}
 
 	/**
 	 * @return void
 	 */
-	protected function normalize( array $metaboxes, array $defaults = [] )
+	protected function normalize( array $metaboxes, array $defaults = [ ] )
 	{
 		foreach( $metaboxes as $id => $metabox ) {
 			$data = wp_parse_args( $defaults, [
-				'condition' => [],
-				'fields' => [],
+				'condition' => [ ],
+				'fields' => [ ],
 				'id' => $id,
 				'slug' => $id,
-				'validation' => [],
-			]);
-			$this->metaboxes[] = $this->setDependencies(
+				'validation' => [ ],
+			] );
+			$this->metaboxes[ ] = $this->setDependencies(
 				$this->normalizeThis( $metabox, $data, $id )
 			);
 		}
@@ -225,10 +225,10 @@ 
 	protected function normalizeFields( array $fields, array $data, $parentId )
 	{
 		return array_map( function( $id, $field ) use( $parentId ) {
-			$defaults =  [
-				'attributes' => [],
+			$defaults = [
+				'attributes' => [ ],
 				'class' => '',
-				'condition' => [],
+				'condition' => [ ],
 				'depends' => '',
 				'field_name' => $id,
 				'id' => $id,
@@ -262,11 +262,11 @@ 
 	 */
 	protected function normalizeValidation( array $validation, array $data, $parentId )
 	{
-		foreach( ['messages', 'rules'] as $key ) {
-			if( empty( $validation[$key] ))continue;
-			foreach( $validation[$key] as $id => $value ) {
-				$validation[$key][$this->normalizeFieldName( $id, ['slug' => $id], $parentId )] = $value;
-				unset( $validation[$key][$id] );
+		foreach( [ 'messages', 'rules' ] as $key ) {
+			if( empty( $validation[ $key ] ) )continue;
+			foreach( $validation[ $key ] as $id => $value ) {
+				$validation[ $key ][ $this->normalizeFieldName( $id, [ 'slug' => $id ], $parentId ) ] = $value;
+				unset( $validation[ $key ][ $id ] );
 			}
 		}
 		return $validation;
@@ -277,14 +277,14 @@ 
 	 */
 	protected function setDependencies( array $metabox )
 	{
-		$fields = &$metabox['fields'];
+		$fields = &$metabox[ 'fields' ];
 		$depends = array_column( $fields, 'depends' );
 		array_walk( $depends, function( $value, $index ) use( &$fields, $metabox ) {
-			if( empty( $value ))return;
-			$dependency = array_search( $value, array_column( $fields, 'id' ));
-			$fields[$index]['attributes']['data-depends'] = $value;
-			if( !$this->getMetaValue( $fields[$dependency]['slug'], '', $metabox['slug'] )) {
-				$fields[$index]['class'] = trim( 'hidden ' . $fields[$index]['class'] );
+			if( empty( $value ) )return;
+			$dependency = array_search( $value, array_column( $fields, 'id' ) );
+			$fields[ $index ][ 'attributes' ][ 'data-depends' ] = $value;
+			if( !$this->getMetaValue( $fields[ $dependency ][ 'slug' ], '', $metabox[ 'slug' ] ) ) {
+				$fields[ $index ][ 'class' ] = trim( 'hidden ' . $fields[ $index ][ 'class' ] );
 			}
 		});
 		return $metabox;