pryley / site-reviews

plugin/Controllers/EditorController/Metaboxes.php

Indentation +28 added lines, -28 removed lines

@@ -7,33 +7,33 @@
 
 class Metaboxes
 {
-    /**
-     * @param int $postId
-     * @return void
-     */
-    public function saveAssignedToMetabox($postId)
-    {
-        if (!wp_verify_nonce(Helper::filterInput('_nonce-assigned-to'), 'assigned_to')) {
-            return;
-        }
-        $assignedTo = strval(Helper::filterInput('assigned_to'));
-        glsr(Database::class)->update($postId, 'assigned_to', $assignedTo);
-    }
+	/**
+	 * @param int $postId
+	 * @return void
+	 */
+	public function saveAssignedToMetabox($postId)
+	{
+		if (!wp_verify_nonce(Helper::filterInput('_nonce-assigned-to'), 'assigned_to')) {
+			return;
+		}
+		$assignedTo = strval(Helper::filterInput('assigned_to'));
+		glsr(Database::class)->update($postId, 'assigned_to', $assignedTo);
+	}
 
-    /**
-     * @param int $postId
-     * @return mixed
-     */
-    public function saveResponseMetabox($postId)
-    {
-        if (!wp_verify_nonce(Helper::filterInput('_nonce-response'), 'response')) {
-            return;
-        }
-        $response = strval(Helper::filterInput('response'));
-        glsr(Database::class)->update($postId, 'response', trim(wp_kses($response, [
-            'a' => ['href' => [], 'title' => []],
-            'em' => [],
-            'strong' => [],
-        ])));
-    }
+	/**
+	 * @param int $postId
+	 * @return mixed
+	 */
+	public function saveResponseMetabox($postId)
+	{
+		if (!wp_verify_nonce(Helper::filterInput('_nonce-response'), 'response')) {
+			return;
+		}
+		$response = strval(Helper::filterInput('response'));
+		glsr(Database::class)->update($postId, 'response', trim(wp_kses($response, [
+			'a' => ['href' => [], 'title' => []],
+			'em' => [],
+			'strong' => [],
+		])));
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -11,29 +11,29 @@
      * @param int $postId
      * @return void
      */
-    public function saveAssignedToMetabox($postId)
+    public function saveAssignedToMetabox( $postId )
     {
-        if (!wp_verify_nonce(Helper::filterInput('_nonce-assigned-to'), 'assigned_to')) {
+        if( !wp_verify_nonce( Helper::filterInput( '_nonce-assigned-to' ), 'assigned_to' ) ) {
             return;
         }
-        $assignedTo = strval(Helper::filterInput('assigned_to'));
-        glsr(Database::class)->update($postId, 'assigned_to', $assignedTo);
+        $assignedTo = strval( Helper::filterInput( 'assigned_to' ) );
+        glsr( Database::class )->update( $postId, 'assigned_to', $assignedTo );
     }
 
     /**
      * @param int $postId
      * @return mixed
      */
-    public function saveResponseMetabox($postId)
+    public function saveResponseMetabox( $postId )
     {
-        if (!wp_verify_nonce(Helper::filterInput('_nonce-response'), 'response')) {
+        if( !wp_verify_nonce( Helper::filterInput( '_nonce-response' ), 'response' ) ) {
             return;
         }
-        $response = strval(Helper::filterInput('response'));
-        glsr(Database::class)->update($postId, 'response', trim(wp_kses($response, [
+        $response = strval( Helper::filterInput( 'response' ) );
+        glsr( Database::class )->update( $postId, 'response', trim( wp_kses( $response, [
             'a' => ['href' => [], 'title' => []],
             'em' => [],
             'strong' => [],
-        ])));
+        ] ) ) );
     }
 }

plugin/Controllers/BlocksController.php

Spacing +12 added lines, -12 removed lines

@@ -13,9 +13,9 @@ 
      * @return array
      * @filter block_categories
      */
-    public function filterBlockCategories($categories)
+    public function filterBlockCategories( $categories )
     {
-        $categories = Arr::consolidateArray($categories);
+        $categories = Arr::consolidateArray( $categories );
         $categories[] = [
             'icon' => null,
             'slug' => Application::ID,
@@ -31,7 +31,7 @@ 
      * @filter classic_editor_enabled_editors_for_post_type
      * @plugin classic-editor/classic-editor.php
      */
-    public function filterEnabledEditors($editors, $postType)
+    public function filterEnabledEditors( $editors, $postType )
     {
         return Application::POST_TYPE == $postType
             ? ['block_editor' => false, 'classic_editor' => false]
@@ -44,7 +44,7 @@ 
      * @return bool
      * @filter use_block_editor_for_post_type
      */
-    public function filterUseBlockEditor($bool, $postType)
+    public function filterUseBlockEditor( $bool, $postType )
     {
         return Application::POST_TYPE == $postType
             ? false
@@ -58,13 +58,13 @@ 
     {
         wp_register_style(
             Application::ID.'/blocks',
-            glsr()->url('assets/styles/'.Application::ID.'-blocks.css'),
+            glsr()->url( 'assets/styles/'.Application::ID.'-blocks.css' ),
             ['wp-edit-blocks'],
             glsr()->version
         );
         wp_register_script(
             Application::ID.'/blocks',
-            glsr()->url('assets/scripts/'.Application::ID.'-blocks.js'),
+            glsr()->url( 'assets/scripts/'.Application::ID.'-blocks.js' ),
             ['wp-api-fetch', 'wp-blocks', 'wp-i18n', 'wp-editor', 'wp-element', Application::ID],
             glsr()->version
         );
@@ -79,14 +79,14 @@ 
         $blocks = [
             'form', 'reviews', 'summary',
         ];
-        foreach ($blocks as $block) {
-            $id = str_replace('_reviews', '', Application::ID.'_'.$block);
-            $blockClass = Helper::buildClassName($id.'-block', 'Blocks');
-            if (!class_exists($blockClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $blockClass));
+        foreach( $blocks as $block ) {
+            $id = str_replace( '_reviews', '', Application::ID.'_'.$block );
+            $blockClass = Helper::buildClassName( $id.'-block', 'Blocks' );
+            if( !class_exists( $blockClass ) ) {
+                glsr_log()->error( sprintf( 'Class missing (%s)', $blockClass ) );
                 continue;
             }
-            glsr($blockClass)->register($block);
+            glsr( $blockClass )->register( $block );
         }
     }
 }

Indentation +78 added lines, -78 removed lines

@@ -8,86 +8,86 @@
 
 class BlocksController extends Controller
 {
-    /**
-     * @param array $categories
-     * @return array
-     * @filter block_categories
-     */
-    public function filterBlockCategories($categories)
-    {
-        $categories = Arr::consolidateArray($categories);
-        $categories[] = [
-            'icon' => null,
-            'slug' => Application::ID,
-            'title' => glsr()->name,
-        ];
-        return $categories;
-    }
+	/**
+	 * @param array $categories
+	 * @return array
+	 * @filter block_categories
+	 */
+	public function filterBlockCategories($categories)
+	{
+		$categories = Arr::consolidateArray($categories);
+		$categories[] = [
+			'icon' => null,
+			'slug' => Application::ID,
+			'title' => glsr()->name,
+		];
+		return $categories;
+	}
 
-    /**
-     * @param array $editors
-     * @param string $postType
-     * @return array
-     * @filter classic_editor_enabled_editors_for_post_type
-     * @plugin classic-editor/classic-editor.php
-     */
-    public function filterEnabledEditors($editors, $postType)
-    {
-        return Application::POST_TYPE == $postType
-            ? ['block_editor' => false, 'classic_editor' => false]
-            : $editors;
-    }
+	/**
+	 * @param array $editors
+	 * @param string $postType
+	 * @return array
+	 * @filter classic_editor_enabled_editors_for_post_type
+	 * @plugin classic-editor/classic-editor.php
+	 */
+	public function filterEnabledEditors($editors, $postType)
+	{
+		return Application::POST_TYPE == $postType
+			? ['block_editor' => false, 'classic_editor' => false]
+			: $editors;
+	}
 
-    /**
-     * @param bool $bool
-     * @param string $postType
-     * @return bool
-     * @filter use_block_editor_for_post_type
-     */
-    public function filterUseBlockEditor($bool, $postType)
-    {
-        return Application::POST_TYPE == $postType
-            ? false
-            : $bool;
-    }
+	/**
+	 * @param bool $bool
+	 * @param string $postType
+	 * @return bool
+	 * @filter use_block_editor_for_post_type
+	 */
+	public function filterUseBlockEditor($bool, $postType)
+	{
+		return Application::POST_TYPE == $postType
+			? false
+			: $bool;
+	}
 
-    /**
-     * @return void
-     * @action init
-     */
-    public function registerAssets()
-    {
-        wp_register_style(
-            Application::ID.'/blocks',
-            glsr()->url('assets/styles/'.Application::ID.'-blocks.css'),
-            ['wp-edit-blocks'],
-            glsr()->version
-        );
-        wp_register_script(
-            Application::ID.'/blocks',
-            glsr()->url('assets/scripts/'.Application::ID.'-blocks.js'),
-            ['wp-api-fetch', 'wp-blocks', 'wp-i18n', 'wp-editor', 'wp-element', Application::ID],
-            glsr()->version
-        );
-    }
+	/**
+	 * @return void
+	 * @action init
+	 */
+	public function registerAssets()
+	{
+		wp_register_style(
+			Application::ID.'/blocks',
+			glsr()->url('assets/styles/'.Application::ID.'-blocks.css'),
+			['wp-edit-blocks'],
+			glsr()->version
+		);
+		wp_register_script(
+			Application::ID.'/blocks',
+			glsr()->url('assets/scripts/'.Application::ID.'-blocks.js'),
+			['wp-api-fetch', 'wp-blocks', 'wp-i18n', 'wp-editor', 'wp-element', Application::ID],
+			glsr()->version
+		);
+	}
 
-    /**
-     * @return void
-     * @action init
-     */
-    public function registerBlocks()
-    {
-        $blocks = [
-            'form', 'reviews', 'summary',
-        ];
-        foreach ($blocks as $block) {
-            $id = str_replace('_reviews', '', Application::ID.'_'.$block);
-            $blockClass = Helper::buildClassName($id.'-block', 'Blocks');
-            if (!class_exists($blockClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $blockClass));
-                continue;
-            }
-            glsr($blockClass)->register($block);
-        }
-    }
+	/**
+	 * @return void
+	 * @action init
+	 */
+	public function registerBlocks()
+	{
+		$blocks = [
+			'form', 'reviews', 'summary',
+		];
+		foreach ($blocks as $block) {
+			$id = str_replace('_reviews', '', Application::ID.'_'.$block);
+			$blockClass = Helper::buildClassName($id.'-block', 'Blocks');
+			if (!class_exists($blockClass)) {
+				glsr_log()->error(sprintf('Class missing (%s)', $blockClass));
+				continue;
+			}
+			glsr($blockClass)->register($block);
+		}
+	}
 }

plugin/Handlers/RegisterShortcodes.php

Indentation +14 added lines, -14 removed lines

@@ -7,18 +7,18 @@
 
 class RegisterShortcodes
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        foreach ($command->shortcodes as $shortcode) {
-            $shortcodeClass = Helper::buildClassName($shortcode.'-shortcode', 'Shortcodes');
-            if (!class_exists($shortcodeClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $shortcodeClass));
-                continue;
-            }
-            add_shortcode($shortcode, [glsr($shortcodeClass), 'buildShortcode']);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		foreach ($command->shortcodes as $shortcode) {
+			$shortcodeClass = Helper::buildClassName($shortcode.'-shortcode', 'Shortcodes');
+			if (!class_exists($shortcodeClass)) {
+				glsr_log()->error(sprintf('Class missing (%s)', $shortcodeClass));
+				continue;
+			}
+			add_shortcode($shortcode, [glsr($shortcodeClass), 'buildShortcode']);
+		}
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -10,15 +10,15 @@
     /**
      * @return void
      */
-    public function handle(Command $command)
+    public function handle( Command $command )
     {
-        foreach ($command->shortcodes as $shortcode) {
-            $shortcodeClass = Helper::buildClassName($shortcode.'-shortcode', 'Shortcodes');
-            if (!class_exists($shortcodeClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $shortcodeClass));
+        foreach( $command->shortcodes as $shortcode ) {
+            $shortcodeClass = Helper::buildClassName( $shortcode.'-shortcode', 'Shortcodes' );
+            if( !class_exists( $shortcodeClass ) ) {
+                glsr_log()->error( sprintf( 'Class missing (%s)', $shortcodeClass ) );
                 continue;
             }
-            add_shortcode($shortcode, [glsr($shortcodeClass), 'buildShortcode']);
+            add_shortcode( $shortcode, [glsr( $shortcodeClass ), 'buildShortcode'] );
         }
     }
 }

plugin/Handlers/RegisterTinymcePopups.php

Indentation +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@
 
 class RegisterTinymcePopups
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        foreach ($command->popups as $slug => $label) {
-            $buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes');
-            if (!class_exists($buttonClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $buttonClass));
-                continue;
-            }
-            $shortcode = glsr($buttonClass)->register($slug, [
-                'label' => $label,
-                'title' => $label,
-            ]);
-            glsr()->mceShortcodes[$slug] = $shortcode->properties;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		foreach ($command->popups as $slug => $label) {
+			$buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes');
+			if (!class_exists($buttonClass)) {
+				glsr_log()->error(sprintf('Class missing (%s)', $buttonClass));
+				continue;
+			}
+			$shortcode = glsr($buttonClass)->register($slug, [
+				'label' => $label,
+				'title' => $label,
+			]);
+			glsr()->mceShortcodes[$slug] = $shortcode->properties;
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -10,18 +10,18 @@
     /**
      * @return void
      */
-    public function handle(Command $command)
+    public function handle( Command $command )
     {
-        foreach ($command->popups as $slug => $label) {
-            $buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes');
-            if (!class_exists($buttonClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $buttonClass));
+        foreach( $command->popups as $slug => $label ) {
+            $buttonClass = Helper::buildClassName( $slug.'-popup', 'Shortcodes' );
+            if( !class_exists( $buttonClass ) ) {
+                glsr_log()->error( sprintf( 'Class missing (%s)', $buttonClass ) );
                 continue;
             }
-            $shortcode = glsr($buttonClass)->register($slug, [
+            $shortcode = glsr( $buttonClass )->register( $slug, [
                 'label' => $label,
                 'title' => $label,
-            ]);
+            ] );
             glsr()->mceShortcodes[$slug] = $shortcode->properties;
         }
     }

plugin/Database/DefaultsManager.php

Indentation +52 added lines, -52 removed lines

@@ -6,60 +6,60 @@
 
 class DefaultsManager
 {
-    /**
-     * @return array
-     */
-    public function defaults()
-    {
-        $settings = $this->settings();
-        $defaults = (array) array_combine(array_keys($settings), glsr_array_column($settings, 'default'));
-        return wp_parse_args($defaults, [
-            'version' => '',
-            'version_upgraded_from' => '',
-        ]);
-    }
+	/**
+	 * @return array
+	 */
+	public function defaults()
+	{
+		$settings = $this->settings();
+		$defaults = (array) array_combine(array_keys($settings), glsr_array_column($settings, 'default'));
+		return wp_parse_args($defaults, [
+			'version' => '',
+			'version_upgraded_from' => '',
+		]);
+	}
 
-    /**
-     * @return array
-     */
-    public function get()
-    {
-        return Arr::convertDotNotationArray($this->defaults());
-    }
+	/**
+	 * @return array
+	 */
+	public function get()
+	{
+		return Arr::convertDotNotationArray($this->defaults());
+	}
 
-    /**
-     * @return array
-     */
-    public function set()
-    {
-        $settings = glsr(OptionManager::class)->all();
-        $currentSettings = Arr::removeEmptyArrayValues($settings);
-        $defaultSettings = array_replace_recursive($this->get(), $currentSettings);
-        $updatedSettings = array_replace_recursive($settings, $defaultSettings);
-        update_option(OptionManager::databaseKey(), $updatedSettings);
-        return $defaultSettings;
-    }
+	/**
+	 * @return array
+	 */
+	public function set()
+	{
+		$settings = glsr(OptionManager::class)->all();
+		$currentSettings = Arr::removeEmptyArrayValues($settings);
+		$defaultSettings = array_replace_recursive($this->get(), $currentSettings);
+		$updatedSettings = array_replace_recursive($settings, $defaultSettings);
+		update_option(OptionManager::databaseKey(), $updatedSettings);
+		return $defaultSettings;
+	}
 
-    /**
-     * @return array
-     */
-    public function settings()
-    {
-        $settings = apply_filters('site-reviews/addon/settings', glsr()->config('settings'));
-        return $this->normalize($settings);
-    }
+	/**
+	 * @return array
+	 */
+	public function settings()
+	{
+		$settings = apply_filters('site-reviews/addon/settings', glsr()->config('settings'));
+		return $this->normalize($settings);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $settings)
-    {
-        array_walk($settings, function (&$setting) {
-            if (isset($setting['default'])) {
-                return;
-            }
-            $setting['default'] = '';
-        });
-        return $settings;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $settings)
+	{
+		array_walk($settings, function (&$setting) {
+			if (isset($setting['default'])) {
+				return;
+			}
+			$setting['default'] = '';
+		});
+		return $settings;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -12,11 +12,11 @@ 
     public function defaults()
     {
         $settings = $this->settings();
-        $defaults = (array) array_combine(array_keys($settings), glsr_array_column($settings, 'default'));
-        return wp_parse_args($defaults, [
+        $defaults = (array)array_combine( array_keys( $settings ), glsr_array_column( $settings, 'default' ) );
+        return wp_parse_args( $defaults, [
             'version' => '',
             'version_upgraded_from' => '',
-        ]);
+        ] );
     }
 
     /**
@@ -24,7 +24,7 @@ 
      */
     public function get()
     {
-        return Arr::convertDotNotationArray($this->defaults());
+        return Arr::convertDotNotationArray( $this->defaults() );
     }
 
     /**
@@ -32,11 +32,11 @@ 
      */
     public function set()
     {
-        $settings = glsr(OptionManager::class)->all();
-        $currentSettings = Arr::removeEmptyArrayValues($settings);
-        $defaultSettings = array_replace_recursive($this->get(), $currentSettings);
-        $updatedSettings = array_replace_recursive($settings, $defaultSettings);
-        update_option(OptionManager::databaseKey(), $updatedSettings);
+        $settings = glsr( OptionManager::class )->all();
+        $currentSettings = Arr::removeEmptyArrayValues( $settings );
+        $defaultSettings = array_replace_recursive( $this->get(), $currentSettings );
+        $updatedSettings = array_replace_recursive( $settings, $defaultSettings );
+        update_option( OptionManager::databaseKey(), $updatedSettings );
         return $defaultSettings;
     }
 
@@ -45,17 +45,17 @@ 
      */
     public function settings()
     {
-        $settings = apply_filters('site-reviews/addon/settings', glsr()->config('settings'));
-        return $this->normalize($settings);
+        $settings = apply_filters( 'site-reviews/addon/settings', glsr()->config( 'settings' ) );
+        return $this->normalize( $settings );
     }
 
     /**
      * @return array
      */
-    protected function normalize(array $settings)
+    protected function normalize( array $settings )
     {
-        array_walk($settings, function (&$setting) {
-            if (isset($setting['default'])) {
+        array_walk( $settings, function( &$setting ) {
+            if( isset($setting['default']) ) {
                 return;
             }
             $setting['default'] = '';

plugin/Commands/RegisterPostType.php

Indentation +69 added lines, -69 removed lines

@@ -9,77 +9,77 @@
 
 class RegisterPostType
 {
-    public $args;
-    public $columns;
-    public $plural;
-    public $postType;
-    public $single;
+	public $args;
+	public $columns;
+	public $plural;
+	public $postType;
+	public $single;
 
-    public function __construct($input)
-    {
-        $args = glsr(PostTypeDefaults::class)->merge($input);
-        $this->normalize($args);
-        $this->normalizeColumns();
-        $this->normalizeLabels();
-    }
+	public function __construct($input)
+	{
+		$args = glsr(PostTypeDefaults::class)->merge($input);
+		$this->normalize($args);
+		$this->normalizeColumns();
+		$this->normalizeLabels();
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalize(array $args)
-    {
-        foreach ($args as $key => $value) {
-            $property = Helper::buildPropertyName($key);
-            if (!property_exists($this, $property)) {
-                continue;
-            }
-            $this->$property = $value;
-            unset($args[$key]);
-        }
-        $this->args = wp_parse_args($args, [
-            'menu_name' => $this->plural,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalize(array $args)
+	{
+		foreach ($args as $key => $value) {
+			$property = Helper::buildPropertyName($key);
+			if (!property_exists($this, $property)) {
+				continue;
+			}
+			$this->$property = $value;
+			unset($args[$key]);
+		}
+		$this->args = wp_parse_args($args, [
+			'menu_name' => $this->plural,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeLabels()
-    {
-        $this->args['labels'] = wp_parse_args($this->args['labels'], [
-            'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural),
-            'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural),
-            'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single),
-            'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single),
-            'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single),
-            'menu_name' => $this->args['menu_name'],
-            'name' => $this->plural,
-            'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single),
-            'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural),
-            'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural),
-            'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural),
-            'singular_name' => $this->single,
-            'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single),
-            'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single),
-        ]);
-        unset($this->args['menu_name']);
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeLabels()
+	{
+		$this->args['labels'] = wp_parse_args($this->args['labels'], [
+			'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural),
+			'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural),
+			'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single),
+			'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single),
+			'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single),
+			'menu_name' => $this->args['menu_name'],
+			'name' => $this->plural,
+			'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single),
+			'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural),
+			'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural),
+			'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural),
+			'singular_name' => $this->single,
+			'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single),
+			'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single),
+		]);
+		unset($this->args['menu_name']);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeColumns()
-    {
-        $this->columns = ['cb' => ''] + $this->columns;
-        if (array_key_exists('category', $this->columns)) {
-            $keys = array_keys($this->columns);
-            $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY;
-            $this->columns = array_combine($keys, $this->columns);
-        }
-        if (array_key_exists('pinned', $this->columns)) {
-            $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>',
-                ['class' => 'pinned-icon']
-            );
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeColumns()
+	{
+		$this->columns = ['cb' => ''] + $this->columns;
+		if (array_key_exists('category', $this->columns)) {
+			$keys = array_keys($this->columns);
+			$keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY;
+			$this->columns = array_combine($keys, $this->columns);
+		}
+		if (array_key_exists('pinned', $this->columns)) {
+			$this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>',
+				['class' => 'pinned-icon']
+			);
+		}
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -15,10 +15,10 @@ 
     public $postType;
     public $single;
 
-    public function __construct($input)
+    public function __construct( $input )
     {
-        $args = glsr(PostTypeDefaults::class)->merge($input);
-        $this->normalize($args);
+        $args = glsr( PostTypeDefaults::class )->merge( $input );
+        $this->normalize( $args );
         $this->normalizeColumns();
         $this->normalizeLabels();
     }
@@ -26,19 +26,19 @@ 
     /**
      * @return void
      */
-    protected function normalize(array $args)
+    protected function normalize( array $args )
     {
-        foreach ($args as $key => $value) {
-            $property = Helper::buildPropertyName($key);
-            if (!property_exists($this, $property)) {
+        foreach( $args as $key => $value ) {
+            $property = Helper::buildPropertyName( $key );
+            if( !property_exists( $this, $property ) ) {
                 continue;
             }
             $this->$property = $value;
             unset($args[$key]);
         }
-        $this->args = wp_parse_args($args, [
+        $this->args = wp_parse_args( $args, [
             'menu_name' => $this->plural,
-        ]);
+        ] );
     }
 
     /**
@@ -46,22 +46,22 @@ 
      */
     protected function normalizeLabels()
     {
-        $this->args['labels'] = wp_parse_args($this->args['labels'], [
-            'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural),
-            'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural),
-            'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single),
-            'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single),
-            'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single),
+        $this->args['labels'] = wp_parse_args( $this->args['labels'], [
+            'add_new_item' => sprintf( _x( 'Add New %s', 'Add New Post', 'site-reviews' ), $this->plural ),
+            'all_items' => sprintf( _x( 'All %s', 'All Posts', 'site-reviews' ), $this->plural ),
+            'archives' => sprintf( _x( '%s Archives', 'Post Archives', 'site-reviews' ), $this->single ),
+            'edit_item' => sprintf( _x( 'Edit %s', 'Edit Post', 'site-reviews' ), $this->single ),
+            'insert_into_item' => sprintf( _x( 'Insert into %s', 'Insert into Post', 'site-reviews' ), $this->single ),
             'menu_name' => $this->args['menu_name'],
             'name' => $this->plural,
-            'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single),
-            'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural),
-            'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural),
-            'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural),
+            'new_item' => sprintf( _x( 'New %s', 'New Post', 'site-reviews' ), $this->single ),
+            'not_found' => sprintf( _x( 'No %s found', 'No Posts found', 'site-reviews' ), $this->plural ),
+            'not_found_in_trash' => sprintf( _x( 'No %s found in Trash', 'No Posts found in Trash', 'site-reviews' ), $this->plural ),
+            'search_items' => sprintf( _x( 'Search %s', 'Search Posts', 'site-reviews' ), $this->plural ),
             'singular_name' => $this->single,
-            'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single),
-            'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single),
-        ]);
+            'uploaded_to_this_item' => sprintf( _x( 'Uploaded to this %s', 'Uploaded to this Post', 'site-reviews' ), $this->single ),
+            'view_item' => sprintf( _x( 'View %s', 'View Post', 'site-reviews' ), $this->single ),
+        ] );
         unset($this->args['menu_name']);
     }
 
@@ -71,13 +71,13 @@ 
     protected function normalizeColumns()
     {
         $this->columns = ['cb' => ''] + $this->columns;
-        if (array_key_exists('category', $this->columns)) {
-            $keys = array_keys($this->columns);
-            $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY;
-            $this->columns = array_combine($keys, $this->columns);
+        if( array_key_exists( 'category', $this->columns ) ) {
+            $keys = array_keys( $this->columns );
+            $keys[array_search( 'category', $keys )] = 'taxonomy-'.Application::TAXONOMY;
+            $this->columns = array_combine( $keys, $this->columns );
         }
-        if (array_key_exists('pinned', $this->columns)) {
-            $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>',
+        if( array_key_exists( 'pinned', $this->columns ) ) {
+            $this->columns['pinned'] = glsr( Builder::class )->span( '<span>'.$this->columns['pinned'].'</span>',
                 ['class' => 'pinned-icon']
             );
         }

plugin/Router.php

Indentation +147 added lines, -147 removed lines

@@ -7,162 +7,162 @@
 
 class Router
 {
-    /**
-     * @var array
-     */
-    protected $unguardedActions = [];
+	/**
+	 * @var array
+	 */
+	protected $unguardedActions = [];
 
-    public function __construct()
-    {
-        $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
-            'dismiss-notice',
-            'fetch-paged-reviews',
-        ]);
-    }
+	public function __construct()
+	{
+		$this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
+			'dismiss-notice',
+			'fetch-paged-reviews',
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routeAdminPostRequest()
-    {
-        $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
-            return;
-        }
-        check_admin_referer($request['_action']);
-        $this->routeRequest('admin', $request['_action'], $request);
-    }
+	/**
+	 * @return void
+	 */
+	public function routeAdminPostRequest()
+	{
+		$request = $this->getRequest();
+		if (!$this->isValidPostRequest($request)) {
+			return;
+		}
+		check_admin_referer($request['_action']);
+		$this->routeRequest('admin', $request['_action'], $request);
+	}
 
-    /**
-     * @return void
-     */
-    public function routeAjaxRequest()
-    {
-        $request = $this->getRequest();
-        $this->checkAjaxRequest($request);
-        $this->checkAjaxNonce($request);
-        $this->routeRequest('ajax', $request['_action'], $request);
-        wp_die();
-    }
+	/**
+	 * @return void
+	 */
+	public function routeAjaxRequest()
+	{
+		$request = $this->getRequest();
+		$this->checkAjaxRequest($request);
+		$this->checkAjaxNonce($request);
+		$this->routeRequest('ajax', $request['_action'], $request);
+		wp_die();
+	}
 
-    /**
-     * @return void
-     */
-    public function routePublicPostRequest()
-    {
-        if (is_admin()) {
-            return;
-        }
-        $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
-            return;
-        }
-        if (!$this->isValidPublicNonce($request)) {
-            return;
-        }
-        $this->routeRequest('public', $request['_action'], $request);
-    }
+	/**
+	 * @return void
+	 */
+	public function routePublicPostRequest()
+	{
+		if (is_admin()) {
+			return;
+		}
+		$request = $this->getRequest();
+		if (!$this->isValidPostRequest($request)) {
+			return;
+		}
+		if (!$this->isValidPublicNonce($request)) {
+			return;
+		}
+		$this->routeRequest('public', $request['_action'], $request);
+	}
 
-    /**
-     * @return void
-     */
-    protected function checkAjaxNonce(array $request)
-    {
-        if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) {
-            return;
-        }
-        if (!isset($request['_nonce'])) {
-            $this->sendAjaxError('request is missing a nonce', $request);
-        }
-        if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            $this->sendAjaxError('request failed the nonce check', $request, 403);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function checkAjaxNonce(array $request)
+	{
+		if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) {
+			return;
+		}
+		if (!isset($request['_nonce'])) {
+			$this->sendAjaxError('request is missing a nonce', $request);
+		}
+		if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
+			$this->sendAjaxError('request failed the nonce check', $request, 403);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function checkAjaxRequest(array $request)
-    {
-        if (!isset($request['_action'])) {
-            $this->sendAjaxError('request must include an action', $request);
-        }
-        if (empty($request['_ajax_request'])) {
-            $this->sendAjaxError('request is invalid', $request);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function checkAjaxRequest(array $request)
+	{
+		if (!isset($request['_action'])) {
+			$this->sendAjaxError('request must include an action', $request);
+		}
+		if (empty($request['_ajax_request'])) {
+			$this->sendAjaxError('request is invalid', $request);
+		}
+	}
 
-    /**
-     * All ajax requests in the plugin are triggered by a single action hook: glsr_action,
-     * while each ajax route is determined by $_POST[request][_action].
-     * @return array
-     */
-    protected function getRequest()
-    {
-        $request = Helper::filterInputArray(Application::ID);
-        if (Helper::filterInput('action') == Application::PREFIX.'action') {
-            $request['_ajax_request'] = true;
-        }
-        if ('submit-review' == Helper::filterInput('_action', $request)) {
-            $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response');
-        }
-        return $request;
-    }
+	/**
+	 * All ajax requests in the plugin are triggered by a single action hook: glsr_action,
+	 * while each ajax route is determined by $_POST[request][_action].
+	 * @return array
+	 */
+	protected function getRequest()
+	{
+		$request = Helper::filterInputArray(Application::ID);
+		if (Helper::filterInput('action') == Application::PREFIX.'action') {
+			$request['_ajax_request'] = true;
+		}
+		if ('submit-review' == Helper::filterInput('_action', $request)) {
+			$request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response');
+		}
+		return $request;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isValidPostRequest(array $request = [])
-    {
-        return !empty($request['_action']) && empty($request['_ajax_request']);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isValidPostRequest(array $request = [])
+	{
+		return !empty($request['_action']) && empty($request['_ajax_request']);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isValidPublicNonce(array $request)
-    {
-        if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            glsr_log()->error('nonce check failed for public request')->debug($request);
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isValidPublicNonce(array $request)
+	{
+		if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
+			glsr_log()->error('nonce check failed for public request')->debug($request);
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * @param string $type
-     * @param string $action
-     * @return void
-     */
-    protected function routeRequest($type, $action, array $request = [])
-    {
-        $actionHook = 'site-reviews/route/'.$type.'/request';
-        $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers'));
-        $method = Helper::buildMethodName($action, 'router');
-        $request = apply_filters('site-reviews/route/request', $request, $action, $type);
-        do_action($actionHook, $action, $request);
-        if (is_callable([$controller, $method])) {
-            call_user_func([$controller, $method], $request);
-            return;
-        }
-        if (0 === did_action($actionHook)) {
-            glsr_log('Unknown '.$type.' router request: '.$action);
-        }
-    }
+	/**
+	 * @param string $type
+	 * @param string $action
+	 * @return void
+	 */
+	protected function routeRequest($type, $action, array $request = [])
+	{
+		$actionHook = 'site-reviews/route/'.$type.'/request';
+		$controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers'));
+		$method = Helper::buildMethodName($action, 'router');
+		$request = apply_filters('site-reviews/route/request', $request, $action, $type);
+		do_action($actionHook, $action, $request);
+		if (is_callable([$controller, $method])) {
+			call_user_func([$controller, $method], $request);
+			return;
+		}
+		if (0 === did_action($actionHook)) {
+			glsr_log('Unknown '.$type.' router request: '.$action);
+		}
+	}
 
-    /**
-     * @param string $error
-     * @param int $statusCode
-     * @return void
-     */
-    protected function sendAjaxError($error, array $request, $statusCode = 400)
-    {
-        glsr_log()->error($error)->debug($request);
-        glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
-        wp_send_json_error([
-            'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
-            'notices' => glsr(Notice::class)->get(),
-            'error' => $error,
-        ]);
-    }
+	/**
+	 * @param string $error
+	 * @param int $statusCode
+	 * @return void
+	 */
+	protected function sendAjaxError($error, array $request, $statusCode = 400)
+	{
+		glsr_log()->error($error)->debug($request);
+		glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
+		wp_send_json_error([
+			'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
+			'notices' => glsr(Notice::class)->get(),
+			'error' => $error,
+		]);
+	}
 }

Spacing +47 added lines, -47 removed lines

@@ -14,10 +14,10 @@ 
 
     public function __construct()
     {
-        $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
+        $this->unguardedActions = apply_filters( 'site-reviews/router/unguarded-actions', [
             'dismiss-notice',
             'fetch-paged-reviews',
-        ]);
+        ] );
     }
 
     /**
@@ -26,11 +26,11 @@ 
     public function routeAdminPostRequest()
     {
         $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
+        if( !$this->isValidPostRequest( $request ) ) {
             return;
         }
-        check_admin_referer($request['_action']);
-        $this->routeRequest('admin', $request['_action'], $request);
+        check_admin_referer( $request['_action'] );
+        $this->routeRequest( 'admin', $request['_action'], $request );
     }
 
     /**
@@ -39,9 +39,9 @@ 
     public function routeAjaxRequest()
     {
         $request = $this->getRequest();
-        $this->checkAjaxRequest($request);
-        $this->checkAjaxNonce($request);
-        $this->routeRequest('ajax', $request['_action'], $request);
+        $this->checkAjaxRequest( $request );
+        $this->checkAjaxNonce( $request );
+        $this->routeRequest( 'ajax', $request['_action'], $request );
         wp_die();
     }
 
@@ -50,45 +50,45 @@ 
      */
     public function routePublicPostRequest()
     {
-        if (is_admin()) {
+        if( is_admin() ) {
             return;
         }
         $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
+        if( !$this->isValidPostRequest( $request ) ) {
             return;
         }
-        if (!$this->isValidPublicNonce($request)) {
+        if( !$this->isValidPublicNonce( $request ) ) {
             return;
         }
-        $this->routeRequest('public', $request['_action'], $request);
+        $this->routeRequest( 'public', $request['_action'], $request );
     }
 
     /**
      * @return void
      */
-    protected function checkAjaxNonce(array $request)
+    protected function checkAjaxNonce( array $request )
     {
-        if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) {
+        if( !is_user_logged_in() || in_array( Arr::get( $request, '_action' ), $this->unguardedActions ) ) {
             return;
         }
-        if (!isset($request['_nonce'])) {
-            $this->sendAjaxError('request is missing a nonce', $request);
+        if( !isset($request['_nonce']) ) {
+            $this->sendAjaxError( 'request is missing a nonce', $request );
         }
-        if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            $this->sendAjaxError('request failed the nonce check', $request, 403);
+        if( !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
+            $this->sendAjaxError( 'request failed the nonce check', $request, 403 );
         }
     }
 
     /**
      * @return void
      */
-    protected function checkAjaxRequest(array $request)
+    protected function checkAjaxRequest( array $request )
     {
-        if (!isset($request['_action'])) {
-            $this->sendAjaxError('request must include an action', $request);
+        if( !isset($request['_action']) ) {
+            $this->sendAjaxError( 'request must include an action', $request );
         }
-        if (empty($request['_ajax_request'])) {
-            $this->sendAjaxError('request is invalid', $request);
+        if( empty($request['_ajax_request']) ) {
+            $this->sendAjaxError( 'request is invalid', $request );
         }
     }
 
@@ -99,12 +99,12 @@ 
      */
     protected function getRequest()
     {
-        $request = Helper::filterInputArray(Application::ID);
-        if (Helper::filterInput('action') == Application::PREFIX.'action') {
+        $request = Helper::filterInputArray( Application::ID );
+        if( Helper::filterInput( 'action' ) == Application::PREFIX.'action' ) {
             $request['_ajax_request'] = true;
         }
-        if ('submit-review' == Helper::filterInput('_action', $request)) {
-            $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response');
+        if( 'submit-review' == Helper::filterInput( '_action', $request ) ) {
+            $request['_recaptcha-token'] = Helper::filterInput( 'g-recaptcha-response' );
         }
         return $request;
     }
@@ -112,7 +112,7 @@ 
     /**
      * @return bool
      */
-    protected function isValidPostRequest(array $request = [])
+    protected function isValidPostRequest( array $request = [] )
     {
         return !empty($request['_action']) && empty($request['_ajax_request']);
     }
@@ -120,10 +120,10 @@ 
     /**
      * @return bool
      */
-    protected function isValidPublicNonce(array $request)
+    protected function isValidPublicNonce( array $request )
     {
-        if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            glsr_log()->error('nonce check failed for public request')->debug($request);
+        if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
+            glsr_log()->error( 'nonce check failed for public request' )->debug( $request );
             return false;
         }
         return true;
@@ -134,19 +134,19 @@ 
      * @param string $action
      * @return void
      */
-    protected function routeRequest($type, $action, array $request = [])
+    protected function routeRequest( $type, $action, array $request = [] )
     {
         $actionHook = 'site-reviews/route/'.$type.'/request';
-        $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers'));
-        $method = Helper::buildMethodName($action, 'router');
-        $request = apply_filters('site-reviews/route/request', $request, $action, $type);
-        do_action($actionHook, $action, $request);
-        if (is_callable([$controller, $method])) {
-            call_user_func([$controller, $method], $request);
+        $controller = glsr( Helper::buildClassName( $type.'-controller', 'Controllers' ) );
+        $method = Helper::buildMethodName( $action, 'router' );
+        $request = apply_filters( 'site-reviews/route/request', $request, $action, $type );
+        do_action( $actionHook, $action, $request );
+        if( is_callable( [$controller, $method] ) ) {
+            call_user_func( [$controller, $method], $request );
             return;
         }
-        if (0 === did_action($actionHook)) {
-            glsr_log('Unknown '.$type.' router request: '.$action);
+        if( 0 === did_action( $actionHook ) ) {
+            glsr_log( 'Unknown '.$type.' router request: '.$action );
         }
     }
 
@@ -155,14 +155,14 @@ 
      * @param int $statusCode
      * @return void
      */
-    protected function sendAjaxError($error, array $request, $statusCode = 400)
+    protected function sendAjaxError( $error, array $request, $statusCode = 400 )
     {
-        glsr_log()->error($error)->debug($request);
-        glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
-        wp_send_json_error([
-            'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
-            'notices' => glsr(Notice::class)->get(),
+        glsr_log()->error( $error )->debug( $request );
+        glsr( Notice::class )->addError( __( 'There was an error (try reloading the page).', 'site-reviews' ).' <code>'.$error.'</code>' );
+        wp_send_json_error( [
+            'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ),
+            'notices' => glsr( Notice::class )->get(),
             'error' => $error,
-        ]);
+        ] );
     }
 }

plugin/Controllers/TaxonomyController.php

Indentation +88 added lines, -88 removed lines

@@ -8,97 +8,97 @@
 
 class TaxonomyController
 {
-    /**
-     * @return void
-     * @action Application::TAXONOMY._add_form_fields
-     * @action Application::TAXONOMY._edit_form
-     */
-    public function disableParents()
-    {
-        global $wp_taxonomies;
-        $wp_taxonomies[Application::TAXONOMY]->hierarchical = false;
-    }
+	/**
+	 * @return void
+	 * @action Application::TAXONOMY._add_form_fields
+	 * @action Application::TAXONOMY._edit_form
+	 */
+	public function disableParents()
+	{
+		global $wp_taxonomies;
+		$wp_taxonomies[Application::TAXONOMY]->hierarchical = false;
+	}
 
-    /**
-     * @return void
-     * @action Application::TAXONOMY._term_edit_form_top
-     * @action Application::TAXONOMY._term_new_form_tag
-     */
-    public function enableParents()
-    {
-        global $wp_taxonomies;
-        $wp_taxonomies[Application::TAXONOMY]->hierarchical = true;
-    }
+	/**
+	 * @return void
+	 * @action Application::TAXONOMY._term_edit_form_top
+	 * @action Application::TAXONOMY._term_new_form_tag
+	 */
+	public function enableParents()
+	{
+		global $wp_taxonomies;
+		$wp_taxonomies[Application::TAXONOMY]->hierarchical = true;
+	}
 
-    /**
-     * @return void
-     * @action restrict_manage_posts
-     */
-    public function renderTaxonomyFilter()
-    {
-        if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) {
-            return;
-        }
-        echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [
-            'class' => 'screen-reader-text',
-            'for' => Application::TAXONOMY,
-        ]);
-        wp_dropdown_categories([
-            'depth' => 3,
-            'hide_empty' => true,
-            'hide_if_empty' => true,
-            'hierarchical' => true,
-            'name' => Application::TAXONOMY,
-            'orderby' => 'name',
-            'selected' => $this->getSelected(),
-            'show_count' => false,
-            'show_option_all' => $this->getShowOptionAll(),
-            'taxonomy' => Application::TAXONOMY,
-            'value_field' => 'slug',
-        ]);
-    }
+	/**
+	 * @return void
+	 * @action restrict_manage_posts
+	 */
+	public function renderTaxonomyFilter()
+	{
+		if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) {
+			return;
+		}
+		echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [
+			'class' => 'screen-reader-text',
+			'for' => Application::TAXONOMY,
+		]);
+		wp_dropdown_categories([
+			'depth' => 3,
+			'hide_empty' => true,
+			'hide_if_empty' => true,
+			'hierarchical' => true,
+			'name' => Application::TAXONOMY,
+			'orderby' => 'name',
+			'selected' => $this->getSelected(),
+			'show_count' => false,
+			'show_option_all' => $this->getShowOptionAll(),
+			'taxonomy' => Application::TAXONOMY,
+			'value_field' => 'slug',
+		]);
+	}
 
-    /**
-     * @param int $postId
-     * @param array $terms
-     * @param array $newTTIds
-     * @param string $taxonomy
-     * @param bool $append
-     * @param array $oldTTIds
-     * @return void
-     * @action set_object_terms
-     */
-    public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
-    {
-        if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) {
-            return;
-        }
-        $diff = array_diff($newTTIds, $oldTTIds);
-        if (empty($newTerm = array_shift($diff))) {
-            $newTerm = array_shift($newTTIds);
-        }
-        if ($newTerm) {
-            wp_set_object_terms($postId, intval($newTerm), $taxonomy);
-        }
-    }
+	/**
+	 * @param int $postId
+	 * @param array $terms
+	 * @param array $newTTIds
+	 * @param string $taxonomy
+	 * @param bool $append
+	 * @param array $oldTTIds
+	 * @return void
+	 * @action set_object_terms
+	 */
+	public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
+	{
+		if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) {
+			return;
+		}
+		$diff = array_diff($newTTIds, $oldTTIds);
+		if (empty($newTerm = array_shift($diff))) {
+			$newTerm = array_shift($newTTIds);
+		}
+		if ($newTerm) {
+			wp_set_object_terms($postId, intval($newTerm), $taxonomy);
+		}
+	}
 
-    /**
-     * @return string
-     */
-    protected function getSelected()
-    {
-        global $wp_query;
-        return Arr::get($wp_query->query, Application::TAXONOMY);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getSelected()
+	{
+		global $wp_query;
+		return Arr::get($wp_query->query, Application::TAXONOMY);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getShowOptionAll()
-    {
-        $taxonomy = get_taxonomy(Application::TAXONOMY);
-        return $taxonomy
-            ? ucfirst(strtolower($taxonomy->labels->all_items))
-            : '';
-    }
+	/**
+	 * @return string
+	 */
+	protected function getShowOptionAll()
+	{
+		$taxonomy = get_taxonomy(Application::TAXONOMY);
+		return $taxonomy
+			? ucfirst(strtolower($taxonomy->labels->all_items))
+			: '';
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -36,14 +36,14 @@ 
      */
     public function renderTaxonomyFilter()
     {
-        if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) {
+        if( !is_object_in_taxonomy( glsr_current_screen()->post_type, Application::TAXONOMY ) ) {
             return;
         }
-        echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [
+        echo glsr( Builder::class )->label( __( 'Filter by category', 'site-reviews' ), [
             'class' => 'screen-reader-text',
             'for' => Application::TAXONOMY,
-        ]);
-        wp_dropdown_categories([
+        ] );
+        wp_dropdown_categories( [
             'depth' => 3,
             'hide_empty' => true,
             'hide_if_empty' => true,
@@ -55,7 +55,7 @@ 
             'show_option_all' => $this->getShowOptionAll(),
             'taxonomy' => Application::TAXONOMY,
             'value_field' => 'slug',
-        ]);
+        ] );
     }
 
     /**
@@ -68,17 +68,17 @@ 
      * @return void
      * @action set_object_terms
      */
-    public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
+    public function restrictTermSelection( $postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds )
     {
-        if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) {
+        if( Application::TAXONOMY != $taxonomy || count( $newTTIds ) <= 1 ) {
             return;
         }
-        $diff = array_diff($newTTIds, $oldTTIds);
-        if (empty($newTerm = array_shift($diff))) {
-            $newTerm = array_shift($newTTIds);
+        $diff = array_diff( $newTTIds, $oldTTIds );
+        if( empty($newTerm = array_shift( $diff )) ) {
+            $newTerm = array_shift( $newTTIds );
         }
-        if ($newTerm) {
-            wp_set_object_terms($postId, intval($newTerm), $taxonomy);
+        if( $newTerm ) {
+            wp_set_object_terms( $postId, intval( $newTerm ), $taxonomy );
         }
     }
 
@@ -88,7 +88,7 @@ 
     protected function getSelected()
     {
         global $wp_query;
-        return Arr::get($wp_query->query, Application::TAXONOMY);
+        return Arr::get( $wp_query->query, Application::TAXONOMY );
     }
 
     /**
@@ -96,9 +96,9 @@ 
      */
     protected function getShowOptionAll()
     {
-        $taxonomy = get_taxonomy(Application::TAXONOMY);
+        $taxonomy = get_taxonomy( Application::TAXONOMY );
         return $taxonomy
-            ? ucfirst(strtolower($taxonomy->labels->all_items))
+            ? ucfirst( strtolower( $taxonomy->labels->all_items ) )
             : '';
     }
 }

plugin/Modules/Schema/BaseType.php

Indentation +221 added lines, -221 removed lines

@@ -13,248 +13,248 @@
 
 abstract class BaseType implements ArrayAccess, JsonSerializable, Type
 {
-    /**
-     * @var array
-     */
-    public $allowed = [];
+	/**
+	 * @var array
+	 */
+	public $allowed = [];
 
-    /**
-     * @var array
-     */
-    public $parents = [];
+	/**
+	 * @var array
+	 */
+	public $parents = [];
 
-    /**
-     * @var array
-     */
-    protected $properties = [];
+	/**
+	 * @var array
+	 */
+	protected $properties = [];
 
-    /**
-     * @var string
-     */
-    protected $type;
+	/**
+	 * @var string
+	 */
+	protected $type;
 
-    /**
-     * @param string $method
-     * @return static
-     */
-    public function __call($method, array $arguments)
-    {
-        return $this->setProperty($method, Arr::get($arguments, 0));
-    }
+	/**
+	 * @param string $method
+	 * @return static
+	 */
+	public function __call($method, array $arguments)
+	{
+		return $this->setProperty($method, Arr::get($arguments, 0));
+	}
 
-    /**
-     * @param string $type
-     */
-    public function __construct($type = null)
-    {
-        $this->type = !is_string($type)
-            ? (new ReflectionClass($this))->getShortName()
-            : $type;
-        $this->setAllowedProperties();
-    }
+	/**
+	 * @param string $type
+	 */
+	public function __construct($type = null)
+	{
+		$this->type = !is_string($type)
+			? (new ReflectionClass($this))->getShortName()
+			: $type;
+		$this->setAllowedProperties();
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toScript();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toScript();
+	}
 
-    /**
-     * @return static
-     */
-    public function addProperties(array $properties)
-    {
-        foreach ($properties as $property => $value) {
-            $this->setProperty($property, $value);
-        }
-        return $this;
-    }
+	/**
+	 * @return static
+	 */
+	public function addProperties(array $properties)
+	{
+		foreach ($properties as $property => $value) {
+			$this->setProperty($property, $value);
+		}
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    public function getContext()
-    {
-        return 'https://schema.org';
-    }
+	/**
+	 * @return string
+	 */
+	public function getContext()
+	{
+		return 'https://schema.org';
+	}
 
-    /**
-     * @return array
-     */
-    public function getProperties()
-    {
-        return $this->properties;
-    }
+	/**
+	 * @return array
+	 */
+	public function getProperties()
+	{
+		return $this->properties;
+	}
 
-    /**
-     * @param string $property
-     * @param mixed $default
-     * @return mixed
-     */
-    public function getProperty($property, $default = null)
-    {
-        return Arr::get($this->properties, $property, $default);
-    }
+	/**
+	 * @param string $property
+	 * @param mixed $default
+	 * @return mixed
+	 */
+	public function getProperty($property, $default = null)
+	{
+		return Arr::get($this->properties, $property, $default);
+	}
 
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
+	/**
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
 
-    /**
-     * @param bool $condition
-     * @param mixed $callback
-     * @return static
-     */
-    public function doIf($condition, $callback)
-    {
-        if ($condition) {
-            $callback($this);
-        }
-        return $this;
-    }
+	/**
+	 * @param bool $condition
+	 * @param mixed $callback
+	 * @return static
+	 */
+	public function doIf($condition, $callback)
+	{
+		if ($condition) {
+			$callback($this);
+		}
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function jsonSerialize()
-    {
-        return $this->toArray();
-    }
+	/**
+	 * @return array
+	 */
+	public function jsonSerialize()
+	{
+		return $this->toArray();
+	}
 
-    /**
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return array_key_exists($offset, $this->properties);
-    }
+	/**
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		return array_key_exists($offset, $this->properties);
+	}
 
-    /**
-     * @param string $offset
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return $this->getProperty($offset);
-    }
+	/**
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->getProperty($offset);
+	}
 
-    /**
-     * @param string $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->setProperty($offset, $value);
-    }
+	/**
+	 * @param string $offset
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$this->setProperty($offset, $value);
+	}
 
-    /**
-     * @param string $offset
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->properties[$offset]);
-    }
+	/**
+	 * @param string $offset
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($this->properties[$offset]);
+	}
 
-    /**
-     * @param string $property
-     * @param mixed $value
-     * @return static
-     */
-    public function setProperty($property, $value)
-    {
-        if (!in_array($property, $this->allowed)
-            && 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
-            glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
-            return $this;
-        }
-        $this->properties[$property] = $value;
-        return $this;
-    }
+	/**
+	 * @param string $property
+	 * @param mixed $value
+	 * @return static
+	 */
+	public function setProperty($property, $value)
+	{
+		if (!in_array($property, $this->allowed)
+			&& 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
+			glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
+			return $this;
+		}
+		$this->properties[$property] = $value;
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        return [
-            '@context' => $this->getContext(),
-            '@type' => $this->getType(),
-        ] + $this->serializeProperty($this->getProperties());
-    }
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return [
+			'@context' => $this->getContext(),
+			'@type' => $this->getType(),
+		] + $this->serializeProperty($this->getProperties());
+	}
 
-    /**
-     * @return string
-     */
-    public function toScript()
-    {
-        return sprintf('<script type="application/ld+json">%s</script>',
-            json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
-        );
-    }
+	/**
+	 * @return string
+	 */
+	public function toScript()
+	{
+		return sprintf('<script type="application/ld+json">%s</script>',
+			json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
+		);
+	}
 
-    /**
-     * @param array|null $parents
-     * @return array
-     */
-    protected function getParents($parents = null)
-    {
-        if (!isset($parents)) {
-            $parents = $this->parents;
-        }
-        $newParents = $parents;
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
-                continue;
-            }
-            $newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
-        }
-        return array_values(array_unique($newParents));
-    }
+	/**
+	 * @param array|null $parents
+	 * @return array
+	 */
+	protected function getParents($parents = null)
+	{
+		if (!isset($parents)) {
+			$parents = $this->parents;
+		}
+		$newParents = $parents;
+		foreach ($parents as $parent) {
+			$parentClass = Helper::buildClassName($parent, __NAMESPACE__);
+			if (!class_exists($parentClass)) {
+				continue;
+			}
+			$newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
+		}
+		return array_values(array_unique($newParents));
+	}
 
-    /**
-     * @return void
-     */
-    protected function setAllowedProperties()
-    {
-        $parents = $this->getParents();
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
-                continue;
-            }
-            $this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function setAllowedProperties()
+	{
+		$parents = $this->getParents();
+		foreach ($parents as $parent) {
+			$parentClass = Helper::buildClassName($parent, __NAMESPACE__);
+			if (!class_exists($parentClass)) {
+				continue;
+			}
+			$this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
+		}
+	}
 
-    /**
-     * @param mixed $property
-     * @return array|string
-     */
-    protected function serializeProperty($property)
-    {
-        if (is_array($property)) {
-            return array_map([$this, 'serializeProperty'], $property);
-        }
-        if ($property instanceof Type) {
-            $property = $property->toArray();
-            unset($property['@context']);
-        }
-        if ($property instanceof DateTimeInterface) {
-            $property = $property->format(DateTime::ATOM);
-        }
-        if (is_object($property)) {
-            throw new InvalidProperty();
-        }
-        return $property;
-    }
+	/**
+	 * @param mixed $property
+	 * @return array|string
+	 */
+	protected function serializeProperty($property)
+	{
+		if (is_array($property)) {
+			return array_map([$this, 'serializeProperty'], $property);
+		}
+		if ($property instanceof Type) {
+			$property = $property->toArray();
+			unset($property['@context']);
+		}
+		if ($property instanceof DateTimeInterface) {
+			$property = $property->format(DateTime::ATOM);
+		}
+		if (is_object($property)) {
+			throw new InvalidProperty();
+		}
+		return $property;
+	}
 }

Spacing +45 added lines, -45 removed lines

@@ -37,18 +37,18 @@ 
      * @param string $method
      * @return static
      */
-    public function __call($method, array $arguments)
+    public function __call( $method, array $arguments )
     {
-        return $this->setProperty($method, Arr::get($arguments, 0));
+        return $this->setProperty( $method, Arr::get( $arguments, 0 ) );
     }
 
     /**
      * @param string $type
      */
-    public function __construct($type = null)
+    public function __construct( $type = null )
     {
-        $this->type = !is_string($type)
-            ? (new ReflectionClass($this))->getShortName()
+        $this->type = !is_string( $type )
+            ? (new ReflectionClass( $this ))->getShortName()
             : $type;
         $this->setAllowedProperties();
     }
@@ -64,10 +64,10 @@ 
     /**
      * @return static
      */
-    public function addProperties(array $properties)
+    public function addProperties( array $properties )
     {
-        foreach ($properties as $property => $value) {
-            $this->setProperty($property, $value);
+        foreach( $properties as $property => $value ) {
+            $this->setProperty( $property, $value );
         }
         return $this;
     }
@@ -93,9 +93,9 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function getProperty($property, $default = null)
+    public function getProperty( $property, $default = null )
     {
-        return Arr::get($this->properties, $property, $default);
+        return Arr::get( $this->properties, $property, $default );
     }
 
     /**
@@ -111,10 +111,10 @@ 
      * @param mixed $callback
      * @return static
      */
-    public function doIf($condition, $callback)
+    public function doIf( $condition, $callback )
     {
-        if ($condition) {
-            $callback($this);
+        if( $condition ) {
+            $callback( $this );
         }
         return $this;
     }
@@ -131,18 +131,18 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return array_key_exists($offset, $this->properties);
+        return array_key_exists( $offset, $this->properties );
     }
 
     /**
      * @param string $offset
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        return $this->getProperty($offset);
+        return $this->getProperty( $offset );
     }
 
     /**
@@ -150,16 +150,16 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        $this->setProperty($offset, $value);
+        $this->setProperty( $offset, $value );
     }
 
     /**
      * @param string $offset
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
         unset($this->properties[$offset]);
     }
@@ -169,11 +169,11 @@ 
      * @param mixed $value
      * @return static
      */
-    public function setProperty($property, $value)
+    public function setProperty( $property, $value )
     {
-        if (!in_array($property, $this->allowed)
-            && 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
-            glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
+        if( !in_array( $property, $this->allowed )
+            && 'UnknownType' != (new ReflectionClass( $this ))->getShortName() ) {
+            glsr_log()->warning( $this->getType().' does not allow the "'.$property.'" property' );
             return $this;
         }
         $this->properties[$property] = $value;
@@ -188,7 +188,7 @@ 
         return [
             '@context' => $this->getContext(),
             '@type' => $this->getType(),
-        ] + $this->serializeProperty($this->getProperties());
+        ] + $this->serializeProperty( $this->getProperties() );
     }
 
     /**
@@ -196,8 +196,8 @@ 
      */
     public function toScript()
     {
-        return sprintf('<script type="application/ld+json">%s</script>',
-            json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
+        return sprintf( '<script type="application/ld+json">%s</script>',
+            json_encode( $this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES )
         );
     }
 
@@ -205,20 +205,20 @@ 
      * @param array|null $parents
      * @return array
      */
-    protected function getParents($parents = null)
+    protected function getParents( $parents = null )
     {
-        if (!isset($parents)) {
+        if( !isset($parents) ) {
             $parents = $this->parents;
         }
         $newParents = $parents;
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
+        foreach( $parents as $parent ) {
+            $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ );
+            if( !class_exists( $parentClass ) ) {
                 continue;
             }
-            $newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
+            $newParents = array_merge( $newParents, $this->getParents( (new $parentClass())->parents ) );
         }
-        return array_values(array_unique($newParents));
+        return array_values( array_unique( $newParents ) );
     }
 
     /**
@@ -227,12 +227,12 @@ 
     protected function setAllowedProperties()
     {
         $parents = $this->getParents();
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
+        foreach( $parents as $parent ) {
+            $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ );
+            if( !class_exists( $parentClass ) ) {
                 continue;
             }
-            $this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
+            $this->allowed = array_values( array_unique( array_merge( (new $parentClass())->allowed, $this->allowed ) ) );
         }
     }
 
@@ -240,19 +240,19 @@ 
      * @param mixed $property
      * @return array|string
      */
-    protected function serializeProperty($property)
+    protected function serializeProperty( $property )
     {
-        if (is_array($property)) {
-            return array_map([$this, 'serializeProperty'], $property);
+        if( is_array( $property ) ) {
+            return array_map( [$this, 'serializeProperty'], $property );
         }
-        if ($property instanceof Type) {
+        if( $property instanceof Type ) {
             $property = $property->toArray();
             unset($property['@context']);
         }
-        if ($property instanceof DateTimeInterface) {
-            $property = $property->format(DateTime::ATOM);
+        if( $property instanceof DateTimeInterface ) {
+            $property = $property->format( DateTime::ATOM );
         }
-        if (is_object($property)) {
+        if( is_object( $property ) ) {
             throw new InvalidProperty();
         }
         return $property;