eventespresso / event-espresso-core

core/services/assets/BlockAssetManager.php

Indentation +304 added lines, -304 removed lines

@@ -22,309 +22,309 @@
 abstract class BlockAssetManager extends AssetManager implements BlockAssetManagerInterface
 {
 
-    /**
-     * @var string $editor_script_handle
-     */
-    private $editor_script_handle;
-
-    /**
-     * @var string $editor_style_handle
-     */
-    private $editor_style_handle;
-
-    /**
-     * @var string $script_handle
-     */
-    private $script_handle;
-
-    /**
-     * @var string $style_handle
-     */
-    private $style_handle;
-
-
-    /**
-     * @return string
-     */
-    public function getEditorScriptHandle()
-    {
-        return $this->editor_script_handle;
-    }
-
-
-    /**
-     * @param string $editor_script_handle
-     */
-    public function setEditorScriptHandle($editor_script_handle)
-    {
-        if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
-        }
-        $this->editor_script_handle = $editor_script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getEditorStyleHandle()
-    {
-        return $this->editor_style_handle;
-    }
-
-
-    /**
-     * @param string $editor_style_handle
-     */
-    public function setEditorStyleHandle($editor_style_handle)
-    {
-        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
-        }
-        $this->editor_style_handle = $editor_style_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getScriptHandle()
-    {
-        return $this->script_handle;
-    }
-
-
-    /**
-     * @param string $script_handle
-     */
-    public function setScriptHandle($script_handle)
-    {
-        if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
-        }
-        $this->script_handle = $script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getStyleHandle()
-    {
-        return $this->style_handle;
-    }
-
-
-    /**
-     * @param string $style_handle
-     */
-    public function setStyleHandle($style_handle)
-    {
-        if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
-        }
-        $this->style_handle = $style_handle;
-    }
-
-    /**
-     * @since $VID:$
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addAssets()
-    {
-        $this->addEditorScript($this->getEditorScriptHandle());
-        $this->addEditorStyle($this->getEditorStyleHandle());
-        $this->setScriptHandle($this->getScriptHandle());
-        $this->setStyleHandle($this->getStyleHandle());
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since $VID:$
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorScript($handle, array $dependencies = array())
-    {
-        if($this->assets->hasJavascriptAsset($handle)){
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        return parent::addJavascript(
-            $handle,
-            $this->registry->getJsUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $this->addDefaultBlockScriptDependencies($dependencies)
-        )
-        ->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since $VID:$
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $this->addDefaultBlockStyleDependencies($dependencies)
-        );
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since $VID:$
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addScript($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasJavascriptAsset($handle)) {
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        return parent::addJavascript(
-            $handle,
-            $this->registry->getJsUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $dependencies
-        )
-        ->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since $VID:$
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $dependencies
-        );
-    }
-
-
-    /**
-     * @param array $dependencies
-     * @return array
-     */
-    protected function addDefaultBlockScriptDependencies(array $dependencies)
-    {
-        $dependencies += array(
-                'wp-blocks',    // Provides useful functions and components for extending the editor
-                'wp-i18n',      // Provides localization functions
-                'wp-element',   // Provides React.Component
-                'wp-components', // Provides many prebuilt components and controls
-                CoreAssetManager::JS_HANDLE_EE_COMPONENTS
-            );
-        return $dependencies;
-    }
-
-
-    /**
-     * @param array $dependencies
-     * @return array
-     */
-    protected function addDefaultBlockStyleDependencies(array $dependencies)
-    {
-        $dependencies += array(
-            CoreAssetManager::CSS_HANDLE_EE_COMPONENTS,
-        );
-        return $dependencies;
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getEditorScript()
-    {
-        return $this->assets->getJavascriptAsset($this->editor_script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getEditorStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->editor_style_handle);
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getScript()
-    {
-        return $this->assets->getJavascriptAsset($this->script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->style_handle);
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function enqueueAssets()
-    {
-        $assets = array(
-            $this->getEditorScript(),
-            $this->getEditorStyle(),
-            $this->getScript(),
-            $this->getStyle(),
-        );
-        foreach ($assets as $asset) {
-            if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
-                $asset->enqueueAsset();
-            }
-        }
-    }
+	/**
+	 * @var string $editor_script_handle
+	 */
+	private $editor_script_handle;
+
+	/**
+	 * @var string $editor_style_handle
+	 */
+	private $editor_style_handle;
+
+	/**
+	 * @var string $script_handle
+	 */
+	private $script_handle;
+
+	/**
+	 * @var string $style_handle
+	 */
+	private $style_handle;
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorScriptHandle()
+	{
+		return $this->editor_script_handle;
+	}
+
+
+	/**
+	 * @param string $editor_script_handle
+	 */
+	public function setEditorScriptHandle($editor_script_handle)
+	{
+		if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
+		}
+		$this->editor_script_handle = $editor_script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorStyleHandle()
+	{
+		return $this->editor_style_handle;
+	}
+
+
+	/**
+	 * @param string $editor_style_handle
+	 */
+	public function setEditorStyleHandle($editor_style_handle)
+	{
+		if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
+		}
+		$this->editor_style_handle = $editor_style_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getScriptHandle()
+	{
+		return $this->script_handle;
+	}
+
+
+	/**
+	 * @param string $script_handle
+	 */
+	public function setScriptHandle($script_handle)
+	{
+		if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
+		}
+		$this->script_handle = $script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getStyleHandle()
+	{
+		return $this->style_handle;
+	}
+
+
+	/**
+	 * @param string $style_handle
+	 */
+	public function setStyleHandle($style_handle)
+	{
+		if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
+		}
+		$this->style_handle = $style_handle;
+	}
+
+	/**
+	 * @since $VID:$
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addAssets()
+	{
+		$this->addEditorScript($this->getEditorScriptHandle());
+		$this->addEditorStyle($this->getEditorStyleHandle());
+		$this->setScriptHandle($this->getScriptHandle());
+		$this->setStyleHandle($this->getStyleHandle());
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since $VID:$
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorScript($handle, array $dependencies = array())
+	{
+		if($this->assets->hasJavascriptAsset($handle)){
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		return parent::addJavascript(
+			$handle,
+			$this->registry->getJsUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$this->addDefaultBlockScriptDependencies($dependencies)
+		)
+		->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since $VID:$
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$this->addDefaultBlockStyleDependencies($dependencies)
+		);
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since $VID:$
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addScript($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasJavascriptAsset($handle)) {
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		return parent::addJavascript(
+			$handle,
+			$this->registry->getJsUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$dependencies
+		)
+		->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since $VID:$
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$dependencies
+		);
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 * @return array
+	 */
+	protected function addDefaultBlockScriptDependencies(array $dependencies)
+	{
+		$dependencies += array(
+				'wp-blocks',    // Provides useful functions and components for extending the editor
+				'wp-i18n',      // Provides localization functions
+				'wp-element',   // Provides React.Component
+				'wp-components', // Provides many prebuilt components and controls
+				CoreAssetManager::JS_HANDLE_EE_COMPONENTS
+			);
+		return $dependencies;
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 * @return array
+	 */
+	protected function addDefaultBlockStyleDependencies(array $dependencies)
+	{
+		$dependencies += array(
+			CoreAssetManager::CSS_HANDLE_EE_COMPONENTS,
+		);
+		return $dependencies;
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getEditorScript()
+	{
+		return $this->assets->getJavascriptAsset($this->editor_script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getEditorStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->editor_style_handle);
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getScript()
+	{
+		return $this->assets->getJavascriptAsset($this->script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->style_handle);
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function enqueueAssets()
+	{
+		$assets = array(
+			$this->getEditorScript(),
+			$this->getEditorStyle(),
+			$this->getScript(),
+			$this->getStyle(),
+		);
+		foreach ($assets as $asset) {
+			if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
+				$asset->enqueueAsset();
+			}
+		}
+	}
 
 }

core/domain/entities/editor/blocks/EventAttendees.php

Indentation +216 added lines, -216 removed lines

@@ -24,236 +24,236 @@
 class EventAttendees extends Block
 {
 
-    const BLOCK_TYPE = 'event-attendees';
+	const BLOCK_TYPE = 'event-attendees';
 
-    /**
-     * @var EspressoEventAttendees $shortcode
-     */
-    protected $shortcode;
+	/**
+	 * @var EspressoEventAttendees $shortcode
+	 */
+	protected $shortcode;
 
 
-    /**
-     * EventAttendees constructor.
-     *
-     * @param CoreBlocksAssetManager $block_asset_manager
-     * @param RequestInterface       $request
-     * @param EspressoEventAttendees $shortcode
-     */
-    public function __construct(
-        CoreBlocksAssetManager $block_asset_manager,
-        RequestInterface $request,
-        EspressoEventAttendees $shortcode
-    ) {
-        parent::__construct($block_asset_manager, $request);
-        $this->shortcode = $shortcode;
-    }
+	/**
+	 * EventAttendees constructor.
+	 *
+	 * @param CoreBlocksAssetManager $block_asset_manager
+	 * @param RequestInterface       $request
+	 * @param EspressoEventAttendees $shortcode
+	 */
+	public function __construct(
+		CoreBlocksAssetManager $block_asset_manager,
+		RequestInterface $request,
+		EspressoEventAttendees $shortcode
+	) {
+		parent::__construct($block_asset_manager, $request);
+		$this->shortcode = $shortcode;
+	}
 
 
-    /**
-     * Perform any early setup required by the block
-     * including setting the block type and supported post types
-     *
-     * @return void
-     */
-    public function initialize()
-    {
-        $this->setBlockType(self::BLOCK_TYPE);
-        $this->setSupportedRoutes(
-            array(
-                'EventEspresso\core\domain\entities\route_match\specifications\admin\EspressoStandardPostTypeEditor',
-                'EventEspresso\core\domain\entities\route_match\specifications\admin\WordPressPostTypeEditor',
-                'EventEspresso\core\domain\entities\route_match\specifications\frontend\EspressoBlockRenderer',
-                'EventEspresso\core\domain\entities\route_match\specifications\frontend\AnyFrontendRequest'
-            )
-        );
-        $EVT_ID = $this->request->getRequestParam('page') === 'espresso_events'
-            ? $this->request->getRequestParam('post', 0)
-            : 0;
-        $this->setAttributes(
-            array(
-                'eventId'           => array(
-                    'type'    => 'number',
-                    'default' => $EVT_ID,
-                ),
-                'datetimeId'        => array(
-                    'type'    => 'number',
-                    'default' => 0,
-                ),
-                'ticketId'          => array(
-                    'type'    => 'number',
-                    'default' => 0,
-                ),
-                'status'            => array(
-                    'type'    => 'string',
-                    'default' => EEM_Registration::status_id_approved,
-                ),
-                'limit'             => array(
-                    'type'    => 'number',
-                    'default' => 10,
-                ),
-                'showGravatar'      => array(
-                    'type'    => 'boolean',
-                    'default' => false,
-                ),
-                'avatarClass' => array(
-                    'type' => 'string',
-                    'default' => 'contact',
-                ),
-                'avatarSize' => array(
-                    'type' => 'number',
-                    'default' => 24,
-                ),
-                'displayOnArchives' => array(
-                    'type'    => 'boolean',
-                    'default' => false,
-                ),
-            )
-        );
-        $this->setDynamic();
-    }
+	/**
+	 * Perform any early setup required by the block
+	 * including setting the block type and supported post types
+	 *
+	 * @return void
+	 */
+	public function initialize()
+	{
+		$this->setBlockType(self::BLOCK_TYPE);
+		$this->setSupportedRoutes(
+			array(
+				'EventEspresso\core\domain\entities\route_match\specifications\admin\EspressoStandardPostTypeEditor',
+				'EventEspresso\core\domain\entities\route_match\specifications\admin\WordPressPostTypeEditor',
+				'EventEspresso\core\domain\entities\route_match\specifications\frontend\EspressoBlockRenderer',
+				'EventEspresso\core\domain\entities\route_match\specifications\frontend\AnyFrontendRequest'
+			)
+		);
+		$EVT_ID = $this->request->getRequestParam('page') === 'espresso_events'
+			? $this->request->getRequestParam('post', 0)
+			: 0;
+		$this->setAttributes(
+			array(
+				'eventId'           => array(
+					'type'    => 'number',
+					'default' => $EVT_ID,
+				),
+				'datetimeId'        => array(
+					'type'    => 'number',
+					'default' => 0,
+				),
+				'ticketId'          => array(
+					'type'    => 'number',
+					'default' => 0,
+				),
+				'status'            => array(
+					'type'    => 'string',
+					'default' => EEM_Registration::status_id_approved,
+				),
+				'limit'             => array(
+					'type'    => 'number',
+					'default' => 10,
+				),
+				'showGravatar'      => array(
+					'type'    => 'boolean',
+					'default' => false,
+				),
+				'avatarClass' => array(
+					'type' => 'string',
+					'default' => 'contact',
+				),
+				'avatarSize' => array(
+					'type' => 'number',
+					'default' => 24,
+				),
+				'displayOnArchives' => array(
+					'type'    => 'boolean',
+					'default' => false,
+				),
+			)
+		);
+		$this->setDynamic();
+	}
 
 
-    /**
-     * returns an array where the key corresponds to the incoming attribute name from the WP block
-     * and the value corresponds to the attribute name for the existing EspressoEventAttendees shortcode
-     *
-     * @since $VID:$
-     * @return array
-     */
-    private function getAttributesMap()
-    {
-        return array(
-            'eventId'           => array('attribute' => 'event_id', 'sanitize' => 'absint'),
-            'datetimeId'        => array('attribute' => 'datetime_id', 'sanitize' => 'absint'),
-            'ticketId'          => array('attribute' => 'ticket_id', 'sanitize' => 'absint'),
-            'status'            => array('attribute' => 'status', 'sanitize' => 'sanitize_text_field'),
-            'limit'             => array('attribute' => 'limit', 'sanitize' => 'intval'),
-            'showGravatar'      => array('attribute' => 'show_gravatar', 'sanitize' => 'bool'),
-            'avatarClass' => array('attribute' => 'avatar_class', 'sanitize' => 'sanitize_text_field' ),
-            'avatarSize' => array('attribute' => 'avatar_size', 'sanitize' => 'absint' ),
-            'displayOnArchives' => array('attribute' => 'display_on_archives', 'sanitize' => 'bool'),
-        );
-    }
+	/**
+	 * returns an array where the key corresponds to the incoming attribute name from the WP block
+	 * and the value corresponds to the attribute name for the existing EspressoEventAttendees shortcode
+	 *
+	 * @since $VID:$
+	 * @return array
+	 */
+	private function getAttributesMap()
+	{
+		return array(
+			'eventId'           => array('attribute' => 'event_id', 'sanitize' => 'absint'),
+			'datetimeId'        => array('attribute' => 'datetime_id', 'sanitize' => 'absint'),
+			'ticketId'          => array('attribute' => 'ticket_id', 'sanitize' => 'absint'),
+			'status'            => array('attribute' => 'status', 'sanitize' => 'sanitize_text_field'),
+			'limit'             => array('attribute' => 'limit', 'sanitize' => 'intval'),
+			'showGravatar'      => array('attribute' => 'show_gravatar', 'sanitize' => 'bool'),
+			'avatarClass' => array('attribute' => 'avatar_class', 'sanitize' => 'sanitize_text_field' ),
+			'avatarSize' => array('attribute' => 'avatar_size', 'sanitize' => 'absint' ),
+			'displayOnArchives' => array('attribute' => 'display_on_archives', 'sanitize' => 'bool'),
+		);
+	}
 
 
-    /**
-     * @param array $attributes
-     * @since $VID:$
-     * @return array
-     */
-    private function parseAttributes(array $attributes)
-    {
-        foreach ($attributes as $attribute => $value) {
-            $convert = $this->getAttributesMap();
-            if (isset($convert[ $attribute ])) {
-                $sanitize = $convert[ $attribute ]['sanitize'];
-                $converted_attribute_key = $convert[ $attribute ]['attribute'];
-                if ($sanitize === 'bool') {
-                    $attributes[ $converted_attribute_key ] = filter_var(
-                        $value,
-                        FILTER_VALIDATE_BOOLEAN
-                    );
-                } else {
-                    $attributes[ $converted_attribute_key ] = $sanitize($value);
-                }
-                if ($attribute !== $converted_attribute_key) {
-                    unset($attributes[ $attribute ]);
-                }
-                // don't pass along attributes with a 0 value
-                if ($attributes[ $converted_attribute_key ] === 0) {
-                    unset($attributes[ $converted_attribute_key ]);
-                }
-            }
-        }
-        return $attributes;
-    }
+	/**
+	 * @param array $attributes
+	 * @since $VID:$
+	 * @return array
+	 */
+	private function parseAttributes(array $attributes)
+	{
+		foreach ($attributes as $attribute => $value) {
+			$convert = $this->getAttributesMap();
+			if (isset($convert[ $attribute ])) {
+				$sanitize = $convert[ $attribute ]['sanitize'];
+				$converted_attribute_key = $convert[ $attribute ]['attribute'];
+				if ($sanitize === 'bool') {
+					$attributes[ $converted_attribute_key ] = filter_var(
+						$value,
+						FILTER_VALIDATE_BOOLEAN
+					);
+				} else {
+					$attributes[ $converted_attribute_key ] = $sanitize($value);
+				}
+				if ($attribute !== $converted_attribute_key) {
+					unset($attributes[ $attribute ]);
+				}
+				// don't pass along attributes with a 0 value
+				if ($attributes[ $converted_attribute_key ] === 0) {
+					unset($attributes[ $converted_attribute_key ]);
+				}
+			}
+		}
+		return $attributes;
+	}
 
 
-    /**
-     * This ensures we're only sending along the needed attribute for grabbing attendees.
-     * In order:
-     *
-     * - if ticket_id is present then datetime or event id are unneeded.
-     * - if datetime_id is present than event_id is not needed.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function includeNecessaryOnly(array $attributes)
-    {
-        if ($attributes['ticket_id'] > 0) {
-            unset($attributes['event_id'], $attributes['datetime_id']);
-        }
-        if ($attributes['datetime_id'] > 0) {
-            unset($attributes['event_id']);
-        }
-        return $attributes;
-    }
+	/**
+	 * This ensures we're only sending along the needed attribute for grabbing attendees.
+	 * In order:
+	 *
+	 * - if ticket_id is present then datetime or event id are unneeded.
+	 * - if datetime_id is present than event_id is not needed.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function includeNecessaryOnly(array $attributes)
+	{
+		if ($attributes['ticket_id'] > 0) {
+			unset($attributes['event_id'], $attributes['datetime_id']);
+		}
+		if ($attributes['datetime_id'] > 0) {
+			unset($attributes['event_id']);
+		}
+		return $attributes;
+	}
 
 
-    /**
-     * Returns true when there are no id values in the attributes.
-     *
-     * @param array $attributes
-     * @return bool
-     */
-    private function hasNoIds(array $attributes)
-    {
-        return empty($attributes['event_id']) && empty($attributes['datetime_id']) && empty($attributes['ticket_id']);
-    }
+	/**
+	 * Returns true when there are no id values in the attributes.
+	 *
+	 * @param array $attributes
+	 * @return bool
+	 */
+	private function hasNoIds(array $attributes)
+	{
+		return empty($attributes['event_id']) && empty($attributes['datetime_id']) && empty($attributes['ticket_id']);
+	}
 
-    /**
-     * Returns the rendered HTML for the block
-     *
-     * @param array $attributes
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws DomainException
-     */
-    public function renderBlock(array $attributes = array())
-    {
-        $attributes = $this->includeNecessaryOnly($this->parseAttributes($attributes));
-        $rendered_content = $this->shortcode->processShortcode($attributes);
-        if (empty($rendered_content)) {
-            return $this->noContentRender($attributes);
-        }
-        if ($this->hasNoIds($attributes) && $this->request->isWordPressApi()) {
-            $rendered_content = '<div class="components-notice is-success"><p>' . esc_html__(
-                'The content displayed is for the most recent active or upcoming event.  You can display attendees from a different event, ticket or datetime via the block settings.',
-                'event_espresso'
-            ) . '</p></div>' . $rendered_content;
-        }
-        return $rendered_content;
-    }
+	/**
+	 * Returns the rendered HTML for the block
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws DomainException
+	 */
+	public function renderBlock(array $attributes = array())
+	{
+		$attributes = $this->includeNecessaryOnly($this->parseAttributes($attributes));
+		$rendered_content = $this->shortcode->processShortcode($attributes);
+		if (empty($rendered_content)) {
+			return $this->noContentRender($attributes);
+		}
+		if ($this->hasNoIds($attributes) && $this->request->isWordPressApi()) {
+			$rendered_content = '<div class="components-notice is-success"><p>' . esc_html__(
+				'The content displayed is for the most recent active or upcoming event.  You can display attendees from a different event, ticket or datetime via the block settings.',
+				'event_espresso'
+			) . '</p></div>' . $rendered_content;
+		}
+		return $rendered_content;
+	}
 
 
-    /**
-     * Returns rendered content for block when there is no content for rendering due to various conditions.
-     * This content ONLY appears in the editor context.
-     *
-     * @param array $attributes
-     * @return string
-     */
-    private function noContentRender(array $attributes)
-    {
-        $content = '';
-        if ($this->request->isWordPressApi()) {
-            if (empty($attributes['event_id'])) {
-                $content .= esc_html__(
-                    'There are no active or selected events to pull attendees from at this moment. This message only appears in the editor.',
-                    'event_espresso'
-                );
-            } else {
-                $content .= esc_html__(
-                    'There was a problem displaying the content for the selected options. This message only appears in the editor.',
-                    'event_espresso'
-                );
-            }
-            $content = $content !== '' ? '<div class="components-notice is-error"><p>' . $content . '</p></div>' : $content;
-        }
-        return $content;
-    }
+	/**
+	 * Returns rendered content for block when there is no content for rendering due to various conditions.
+	 * This content ONLY appears in the editor context.
+	 *
+	 * @param array $attributes
+	 * @return string
+	 */
+	private function noContentRender(array $attributes)
+	{
+		$content = '';
+		if ($this->request->isWordPressApi()) {
+			if (empty($attributes['event_id'])) {
+				$content .= esc_html__(
+					'There are no active or selected events to pull attendees from at this moment. This message only appears in the editor.',
+					'event_espresso'
+				);
+			} else {
+				$content .= esc_html__(
+					'There was a problem displaying the content for the selected options. This message only appears in the editor.',
+					'event_espresso'
+				);
+			}
+			$content = $content !== '' ? '<div class="components-notice is-error"><p>' . $content . '</p></div>' : $content;
+		}
+		return $content;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -129,8 +129,8 @@ 
             'status'            => array('attribute' => 'status', 'sanitize' => 'sanitize_text_field'),
             'limit'             => array('attribute' => 'limit', 'sanitize' => 'intval'),
             'showGravatar'      => array('attribute' => 'show_gravatar', 'sanitize' => 'bool'),
-            'avatarClass' => array('attribute' => 'avatar_class', 'sanitize' => 'sanitize_text_field' ),
-            'avatarSize' => array('attribute' => 'avatar_size', 'sanitize' => 'absint' ),
+            'avatarClass' => array('attribute' => 'avatar_class', 'sanitize' => 'sanitize_text_field'),
+            'avatarSize' => array('attribute' => 'avatar_size', 'sanitize' => 'absint'),
             'displayOnArchives' => array('attribute' => 'display_on_archives', 'sanitize' => 'bool'),
         );
     }
@@ -145,23 +145,23 @@ 
     {
         foreach ($attributes as $attribute => $value) {
             $convert = $this->getAttributesMap();
-            if (isset($convert[ $attribute ])) {
-                $sanitize = $convert[ $attribute ]['sanitize'];
-                $converted_attribute_key = $convert[ $attribute ]['attribute'];
+            if (isset($convert[$attribute])) {
+                $sanitize = $convert[$attribute]['sanitize'];
+                $converted_attribute_key = $convert[$attribute]['attribute'];
                 if ($sanitize === 'bool') {
-                    $attributes[ $converted_attribute_key ] = filter_var(
+                    $attributes[$converted_attribute_key] = filter_var(
                         $value,
                         FILTER_VALIDATE_BOOLEAN
                     );
                 } else {
-                    $attributes[ $converted_attribute_key ] = $sanitize($value);
+                    $attributes[$converted_attribute_key] = $sanitize($value);
                 }
                 if ($attribute !== $converted_attribute_key) {
-                    unset($attributes[ $attribute ]);
+                    unset($attributes[$attribute]);
                 }
                 // don't pass along attributes with a 0 value
-                if ($attributes[ $converted_attribute_key ] === 0) {
-                    unset($attributes[ $converted_attribute_key ]);
+                if ($attributes[$converted_attribute_key] === 0) {
+                    unset($attributes[$converted_attribute_key]);
                 }
             }
         }
@@ -221,10 +221,10 @@ 
             return $this->noContentRender($attributes);
         }
         if ($this->hasNoIds($attributes) && $this->request->isWordPressApi()) {
-            $rendered_content = '<div class="components-notice is-success"><p>' . esc_html__(
+            $rendered_content = '<div class="components-notice is-success"><p>'.esc_html__(
                 'The content displayed is for the most recent active or upcoming event.  You can display attendees from a different event, ticket or datetime via the block settings.',
                 'event_espresso'
-            ) . '</p></div>' . $rendered_content;
+            ).'</p></div>'.$rendered_content;
         }
         return $rendered_content;
     }
@@ -252,7 +252,7 @@ 
                     'event_espresso'
                 );
             }
-            $content = $content !== '' ? '<div class="components-notice is-error"><p>' . $content . '</p></div>' : $content;
+            $content = $content !== '' ? '<div class="components-notice is-error"><p>'.$content.'</p></div>' : $content;
         }
         return $content;
     }

core/libraries/rest_api/calculations/Attendee.php

Indentation +37 added lines, -37 removed lines

@@ -17,43 +17,43 @@
 class Attendee extends AttendeeCalculationsBase
 {
 
-    /**
-     * @param array                  $wpdb_row
-     * @param WP_REST_Request        $request
-     * @param AttendeeControllerBase $controller
-     * @since 4.9.66.p
-     * @return string
-     */
-    public function userAvatar(array $wpdb_row, WP_REST_Request $request, AttendeeControllerBase $controller)
-    {
-        if (is_array($wpdb_row) && isset($wpdb_row['Attendee_Meta.ATT_email'])) {
-            $email_address = $wpdb_row['Attendee_Meta.ATT_email'];
-        }
-        if (empty($email_address)) {
-            return get_avatar_url('', array('default' => 'mm', 'force_default' => true));
-        }
-        $avatar = get_avatar_url($email_address);
-        return $avatar ? $avatar : '';
-    }
+	/**
+	 * @param array                  $wpdb_row
+	 * @param WP_REST_Request        $request
+	 * @param AttendeeControllerBase $controller
+	 * @since 4.9.66.p
+	 * @return string
+	 */
+	public function userAvatar(array $wpdb_row, WP_REST_Request $request, AttendeeControllerBase $controller)
+	{
+		if (is_array($wpdb_row) && isset($wpdb_row['Attendee_Meta.ATT_email'])) {
+			$email_address = $wpdb_row['Attendee_Meta.ATT_email'];
+		}
+		if (empty($email_address)) {
+			return get_avatar_url('', array('default' => 'mm', 'force_default' => true));
+		}
+		$avatar = get_avatar_url($email_address);
+		return $avatar ? $avatar : '';
+	}
 
 
-    /**
-     * Provides an array for all the calculations possible that outlines a json schema for those calculations.
-     * Array is indexed by calculation (snake case) and value is the schema for that calculation.
-     *
-     * @since 4.9.68.p
-     * @return array
-     */
-    public function schemaForCalculations()
-    {
-        return array(
-            'user_avatar' => array(
-                'description' => esc_html__(
-                    'The avatar url for the attendee (if available).',
-                    'event_espresso'
-                ),
-                'type'        => 'string',
-            ),
-        );
-    }
+	/**
+	 * Provides an array for all the calculations possible that outlines a json schema for those calculations.
+	 * Array is indexed by calculation (snake case) and value is the schema for that calculation.
+	 *
+	 * @since 4.9.68.p
+	 * @return array
+	 */
+	public function schemaForCalculations()
+	{
+		return array(
+			'user_avatar' => array(
+				'description' => esc_html__(
+					'The avatar url for the attendee (if available).',
+					'event_espresso'
+				),
+				'type'        => 'string',
+			),
+		);
+	}
 }