eventespresso / event-espresso-core

core/domain/entities/routes/specifications/shared/WordPressHeartbeat.php

Indentation +7 added lines, -7 removed lines

@@ -14,11 +14,11 @@
  */
 class WordPressHeartbeat extends RouteMatchSpecification
 {
-    /**
-     * @inheritDoc
-     */
-    public function isMatchingRoute()
-    {
-        return $this->request->isWordPressHeartbeat();
-    }
+	/**
+	 * @inheritDoc
+	 */
+	public function isMatchingRoute()
+	{
+		return $this->request->isWordPressHeartbeat();
+	}
 }

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

Indentation +161 added lines, -161 removed lines

@@ -21,176 +21,176 @@
 class EventAttendees extends Block
 {
 
-    const BLOCK_TYPE = 'event-attendees';
+	const BLOCK_TYPE = 'event-attendees';
 
-    /**
-     * @var EventAttendeesBlockRenderer $renderer
-     */
-    protected $renderer;
+	/**
+	 * @var EventAttendeesBlockRenderer $renderer
+	 */
+	protected $renderer;
 
 
-    /**
-     * EventAttendees constructor.
-     *
-     * @param CoreBlocksAssetManager      $block_asset_manager
-     * @param RequestInterface            $request
-     * @param EventAttendeesBlockRenderer $renderer
-     */
-    public function __construct(
-        CoreBlocksAssetManager $block_asset_manager,
-        RequestInterface $request,
-        EventAttendeesBlockRenderer $renderer
-    ) {
-        parent::__construct($block_asset_manager, $request);
-        $this->renderer= $renderer;
-    }
+	/**
+	 * EventAttendees constructor.
+	 *
+	 * @param CoreBlocksAssetManager      $block_asset_manager
+	 * @param RequestInterface            $request
+	 * @param EventAttendeesBlockRenderer $renderer
+	 */
+	public function __construct(
+		CoreBlocksAssetManager $block_asset_manager,
+		RequestInterface $request,
+		EventAttendeesBlockRenderer $renderer
+	) {
+		parent::__construct($block_asset_manager, $request);
+		$this->renderer= $renderer;
+	}
 
 
-    /**
-     * Perform any early setup required by the block
-     * including setting the block type and supported post types
-     *
-     * @return void
-     */
-    public function initialize()
-    {
-        $this->setBlockType(EventAttendees::BLOCK_TYPE);
-        $this->setSupportedRoutes(
-            array(
-                'EventEspresso\core\domain\entities\routes\specifications\admin\WordPressPostTypeEditor',
-                'EventEspresso\core\domain\entities\routes\specifications\frontend\EspressoBlockRenderer',
-                'EventEspresso\core\domain\entities\routes\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' => 100,
-                ),
-                'order' => array(
-                    'type' => 'string',
-                    'default' => 'ASC'
-                ),
-                'orderBy' => array(
-                    'type' => 'string',
-                    'default' => 'lastThenFirstName',
-                ),
-                '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(EventAttendees::BLOCK_TYPE);
+		$this->setSupportedRoutes(
+			array(
+				'EventEspresso\core\domain\entities\routes\specifications\admin\WordPressPostTypeEditor',
+				'EventEspresso\core\domain\entities\routes\specifications\frontend\EspressoBlockRenderer',
+				'EventEspresso\core\domain\entities\routes\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' => 100,
+				),
+				'order' => array(
+					'type' => 'string',
+					'default' => 'ASC'
+				),
+				'orderBy' => array(
+					'type' => 'string',
+					'default' => 'lastThenFirstName',
+				),
+				'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 4.9.71.p
-     * @return array
-     */
-    private function getAttributesMap()
-    {
-        return array(
-            'event'             => 'sanitize_text_field',
-            'datetime'          => 'sanitize_text_field',
-            'ticket'            => 'sanitize_text_field',
-            'eventId'           => 'absint',
-            'datetimeId'        => 'absint',
-            'ticketId'          => 'absint',
-            'status'            => 'sanitize_text_field',
-            'limit'             => 'intval',
-            'showGravatar'      => 'bool',
-            'avatarClass'       => 'sanitize_text_field',
-            'avatarSize'        => 'absint',
-            'displayOnArchives' => 'bool',
-            'order' => 'sanitize_text_field',
-            'orderBy' => 'sanitize_text_field',
-        );
-    }
+	/**
+	 * 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 4.9.71.p
+	 * @return array
+	 */
+	private function getAttributesMap()
+	{
+		return array(
+			'event'             => 'sanitize_text_field',
+			'datetime'          => 'sanitize_text_field',
+			'ticket'            => 'sanitize_text_field',
+			'eventId'           => 'absint',
+			'datetimeId'        => 'absint',
+			'ticketId'          => 'absint',
+			'status'            => 'sanitize_text_field',
+			'limit'             => 'intval',
+			'showGravatar'      => 'bool',
+			'avatarClass'       => 'sanitize_text_field',
+			'avatarSize'        => 'absint',
+			'displayOnArchives' => 'bool',
+			'order' => 'sanitize_text_field',
+			'orderBy' => 'sanitize_text_field',
+		);
+	}
 
 
-    /**
-     * Sanitizes attributes.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function sanitizeAttributes(array $attributes)
-    {
-        $sanitized_attributes = array();
-        foreach ($attributes as $attribute => $value) {
-            $convert = $this->getAttributesMap();
-            if (isset($convert[ $attribute ])) {
-                $sanitize = $convert[ $attribute ];
-                if ($sanitize === 'bool') {
-                    $sanitized_attributes[ $attribute ] = filter_var(
-                        $value,
-                        FILTER_VALIDATE_BOOLEAN
-                    );
-                } else {
-                    $sanitized_attributes[ $attribute ] = $sanitize($value);
-                }
-                // don't pass along attributes with a 0 value
-                if ($sanitized_attributes[ $attribute ] === 0) {
-                    unset($sanitized_attributes[ $attribute ]);
-                }
-            }
-        }
-        return $attributes;
-    }
+	/**
+	 * Sanitizes attributes.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function sanitizeAttributes(array $attributes)
+	{
+		$sanitized_attributes = array();
+		foreach ($attributes as $attribute => $value) {
+			$convert = $this->getAttributesMap();
+			if (isset($convert[ $attribute ])) {
+				$sanitize = $convert[ $attribute ];
+				if ($sanitize === 'bool') {
+					$sanitized_attributes[ $attribute ] = filter_var(
+						$value,
+						FILTER_VALIDATE_BOOLEAN
+					);
+				} else {
+					$sanitized_attributes[ $attribute ] = $sanitize($value);
+				}
+				// don't pass along attributes with a 0 value
+				if ($sanitized_attributes[ $attribute ] === 0) {
+					unset($sanitized_attributes[ $attribute ]);
+				}
+			}
+		}
+		return $attributes;
+	}
 
 
-    /**
-     * Returns the rendered HTML for the block
-     *
-     * @param array $attributes
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    public function renderBlock(array $attributes = array())
-    {
-        $attributes = $this->sanitizeAttributes($attributes);
-        if (! (bool) $attributes['displayOnArchives'] && (is_archive() || is_front_page() || is_home())) {
-            return '';
-        }
-        $this->loadGraphQLRelayAutoloader();
-        return $this->renderer->render($attributes);
-    }
+	/**
+	 * Returns the rendered HTML for the block
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	public function renderBlock(array $attributes = array())
+	{
+		$attributes = $this->sanitizeAttributes($attributes);
+		if (! (bool) $attributes['displayOnArchives'] && (is_archive() || is_front_page() || is_home())) {
+			return '';
+		}
+		$this->loadGraphQLRelayAutoloader();
+		return $this->renderer->render($attributes);
+	}
 }

core/libraries/form_sections/strategies/display/EE_Admin_File_Uploader_Display_Strategy.strategy.php

Indentation +86 added lines, -86 removed lines

@@ -11,99 +11,99 @@
 class EE_Admin_File_Uploader_Display_Strategy extends EE_Display_Strategy_Base
 {
 
-    /**
-     * Its important this media only get enqueued AFTER init, but before the footer... where the
-     * rest of our forms JS gets enqueued. Otherwise the JS gets enqueued fine, and loaded on the page fine,
-     * but when you upload an image it gets uploaded fine to the server, but it doesn't display and reports an error
-     * (also it doesn't show any of the currently existing media in the modal window that pops up when you click the button
-     * to select media).
-     * Besides that, no special consideration should be required to make the media uploader appear, besides having
-     * this input displayed.
-     * @deprecated. enqueue_js should be called automatically now
-     */
-    public static function enqueue_scripts()
-    {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            __(
-                'EE_Admin_File_Uploader_Display_Strategy::enqueue_scripts() no longer needs to be called in order to display the admin uploader input correctly. This is handled now by EE_Admin_File_Uploader_Display_Strategy::enqueue_js() which is called automatically when enqueueing JS and CSS for the form',
-                'event_espresso'
-            ),
-            '4.9.8.rc.015'
-        );
-        wp_enqueue_media();
-        wp_enqueue_script('media-upload');
-        wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
-    }
+	/**
+	 * Its important this media only get enqueued AFTER init, but before the footer... where the
+	 * rest of our forms JS gets enqueued. Otherwise the JS gets enqueued fine, and loaded on the page fine,
+	 * but when you upload an image it gets uploaded fine to the server, but it doesn't display and reports an error
+	 * (also it doesn't show any of the currently existing media in the modal window that pops up when you click the button
+	 * to select media).
+	 * Besides that, no special consideration should be required to make the media uploader appear, besides having
+	 * this input displayed.
+	 * @deprecated. enqueue_js should be called automatically now
+	 */
+	public static function enqueue_scripts()
+	{
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			__(
+				'EE_Admin_File_Uploader_Display_Strategy::enqueue_scripts() no longer needs to be called in order to display the admin uploader input correctly. This is handled now by EE_Admin_File_Uploader_Display_Strategy::enqueue_js() which is called automatically when enqueueing JS and CSS for the form',
+				'event_espresso'
+			),
+			'4.9.8.rc.015'
+		);
+		wp_enqueue_media();
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
+	}
 
 
-    /**
-     * Enqueues the JS and CSS needed to display this input
-     */
-    public function enqueue_js()
-    {
-        wp_enqueue_media();
-        wp_enqueue_script('media-upload');
-        wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
-        parent::enqueue_js();
-    }
+	/**
+	 * Enqueues the JS and CSS needed to display this input
+	 */
+	public function enqueue_js()
+	{
+		wp_enqueue_media();
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
+		parent::enqueue_js();
+	}
 
 
 
-    /**
-     *
-     * @return string of html to display the field
-     */
+	/**
+	 *
+	 * @return string of html to display the field
+	 */
 
-    public function display()
-    {
-        // the actual input
-        $input = '<input type="text" size="34" ';
-        $input .= 'name="' . $this->_input->html_name() . '" ';
-        $input .= $this->_input->html_class() !== ''
-            ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" '
-            : 'class="large-text ee_media_url" ';
-        $input .= 'value="' . $this->_input->raw_value_in_form() . '" ';
-        $input .= $this->_input->other_html_attributes() . '>';
-        // image uploader
-        $uploader = EEH_HTML::link(
-            '#',
-            '<img src="' . admin_url('images/media-button-image.gif') . '" >',
-            __('click to add an image', 'event_espresso'),
-            '',
-            'ee_media_upload'
-        );
-        // only attempt to show the image if it at least exists
-        $image = $this->_input->raw_value() && $this->src_exists($this->_input->raw_value())
-            ? EEH_HTML::br(2) . EEH_HTML::img(
-                $this->_input->raw_value(),
-                __('logo', 'event_espresso'),
-                '',
-                'ee_media_image'
-            )
-            : '';
-        // html string
-        return EEH_HTML::div(
-            $input . EEH_HTML::nbsp() . $uploader . $image,
-            '',
-            'ee_media_uploader_area'
-        );
-    }
+	public function display()
+	{
+		// the actual input
+		$input = '<input type="text" size="34" ';
+		$input .= 'name="' . $this->_input->html_name() . '" ';
+		$input .= $this->_input->html_class() !== ''
+			? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" '
+			: 'class="large-text ee_media_url" ';
+		$input .= 'value="' . $this->_input->raw_value_in_form() . '" ';
+		$input .= $this->_input->other_html_attributes() . '>';
+		// image uploader
+		$uploader = EEH_HTML::link(
+			'#',
+			'<img src="' . admin_url('images/media-button-image.gif') . '" >',
+			__('click to add an image', 'event_espresso'),
+			'',
+			'ee_media_upload'
+		);
+		// only attempt to show the image if it at least exists
+		$image = $this->_input->raw_value() && $this->src_exists($this->_input->raw_value())
+			? EEH_HTML::br(2) . EEH_HTML::img(
+				$this->_input->raw_value(),
+				__('logo', 'event_espresso'),
+				'',
+				'ee_media_image'
+			)
+			: '';
+		// html string
+		return EEH_HTML::div(
+			$input . EEH_HTML::nbsp() . $uploader . $image,
+			'',
+			'ee_media_uploader_area'
+		);
+	}
 
 
 
-    /**
-     * Asserts an image actually exists as quickly as possible by sending a HEAD
-     * request
-     * @param string $src
-     * @return boolean
-     */
-    protected function src_exists($src)
-    {
-        $results = wp_remote_head($src);
-        if (is_array($results) && ! $results instanceof WP_Error) {
-            return strpos($results['headers']['content-type'], "image") !== false;
-        }
-        return false;
-    }
+	/**
+	 * Asserts an image actually exists as quickly as possible by sending a HEAD
+	 * request
+	 * @param string $src
+	 * @return boolean
+	 */
+	protected function src_exists($src)
+	{
+		$results = wp_remote_head($src);
+		if (is_array($results) && ! $results instanceof WP_Error) {
+			return strpos($results['headers']['content-type'], "image") !== false;
+		}
+		return false;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -59,23 +59,23 @@ 
     {
         // the actual input
         $input = '<input type="text" size="34" ';
-        $input .= 'name="' . $this->_input->html_name() . '" ';
+        $input .= 'name="'.$this->_input->html_name().'" ';
         $input .= $this->_input->html_class() !== ''
-            ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" '
+            ? 'class="large-text ee_media_url '.$this->_input->html_class().'" '
             : 'class="large-text ee_media_url" ';
-        $input .= 'value="' . $this->_input->raw_value_in_form() . '" ';
-        $input .= $this->_input->other_html_attributes() . '>';
+        $input .= 'value="'.$this->_input->raw_value_in_form().'" ';
+        $input .= $this->_input->other_html_attributes().'>';
         // image uploader
         $uploader = EEH_HTML::link(
             '#',
-            '<img src="' . admin_url('images/media-button-image.gif') . '" >',
+            '<img src="'.admin_url('images/media-button-image.gif').'" >',
             __('click to add an image', 'event_espresso'),
             '',
             'ee_media_upload'
         );
         // only attempt to show the image if it at least exists
         $image = $this->_input->raw_value() && $this->src_exists($this->_input->raw_value())
-            ? EEH_HTML::br(2) . EEH_HTML::img(
+            ? EEH_HTML::br(2).EEH_HTML::img(
                 $this->_input->raw_value(),
                 __('logo', 'event_espresso'),
                 '',
@@ -84,7 +84,7 @@ 
             : '';
         // html string
         return EEH_HTML::div(
-            $input . EEH_HTML::nbsp() . $uploader . $image,
+            $input.EEH_HTML::nbsp().$uploader.$image,
             '',
             'ee_media_uploader_area'
         );

core/services/dependencies/DependencyMapRegistrar.php

Indentation +87 added lines, -87 removed lines

@@ -15,102 +15,102 @@
 abstract class DependencyMapRegistrar
 {
 
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
 
-    /**
-     * @var boolean $registered
-     */
-    private $registered = false;
+	/**
+	 * @var boolean $registered
+	 */
+	private $registered = false;
 
 
-    /**
-     * DependencyMap constructor.
-     *
-     * @param EE_Dependency_Map $dependency_map
-     */
-    public function __construct(EE_Dependency_Map $dependency_map)
-    {
-        $this->dependency_map = $dependency_map;
-    }
+	/**
+	 * DependencyMap constructor.
+	 *
+	 * @param EE_Dependency_Map $dependency_map
+	 */
+	public function __construct(EE_Dependency_Map $dependency_map)
+	{
+		$this->dependency_map = $dependency_map;
+	}
 
 
-    /**
-     * registers concrete classes to be substituted for interfaces
-     * ex:
-     *      $this->dependency_map->add_alias(
-     *          'Namespace\path\to\ConcreteClassToInject',  // the class name the alias is for
-     *          'Namespace\path\to\InterfaceOrAlias',       // the class name that would be type hinted for
-     *          'Namespace\path\to\ClassWithDependencies'   // the class that has the dependency
-     *      );
-     *
-     * @return void
-     * @see   EE_Dependency_Map::add_alias()
-     * @since $VID:$
-     */
-    public function registerClassAliases()
-    {
-    }
+	/**
+	 * registers concrete classes to be substituted for interfaces
+	 * ex:
+	 *      $this->dependency_map->add_alias(
+	 *          'Namespace\path\to\ConcreteClassToInject',  // the class name the alias is for
+	 *          'Namespace\path\to\InterfaceOrAlias',       // the class name that would be type hinted for
+	 *          'Namespace\path\to\ClassWithDependencies'   // the class that has the dependency
+	 *      );
+	 *
+	 * @return void
+	 * @see   EE_Dependency_Map::add_alias()
+	 * @since $VID:$
+	 */
+	public function registerClassAliases()
+	{
+	}
 
 
-    /**
-     * registers callbacks for classes that require special loading
-     * ex:
-     *      $this->registerClassLoader(
-     *          'Namespace\path\to\ConcreteClassToInject',  // name of class that requires a custom loader
-     *          'load_core' || static function () { ... }   // name of "loader" method on EE_Registry or Closure
-     *      );
-     *
-     * @return void
-     * @see   EE_Dependency_Map::register_class_loader()
-     * @since $VID:$
-     */
-    public function registerClassLoaders()
-    {
-    }
+	/**
+	 * registers callbacks for classes that require special loading
+	 * ex:
+	 *      $this->registerClassLoader(
+	 *          'Namespace\path\to\ConcreteClassToInject',  // name of class that requires a custom loader
+	 *          'load_core' || static function () { ... }   // name of "loader" method on EE_Registry or Closure
+	 *      );
+	 *
+	 * @return void
+	 * @see   EE_Dependency_Map::register_class_loader()
+	 * @since $VID:$
+	 */
+	public function registerClassLoaders()
+	{
+	}
 
 
-    /**
-     * registers dependencies to be injected into a class upon construction
-     * ex:
-     *      $this->registerDependencies($class, $dependencies, $overwrite);
-     *          'Namespace\path\to\ConcreteClassToInject',  // name of class that requires injected dependencies
-     *          [
-     *              'EEM_Event'                                     => EE_Dependency_Map::load_from_cache,
-     *              'LoaderInterface'                               => EE_Dependency_Map::load_from_cache,
-     *              'EventEspresso\core\services\request\Request'   => EE_Dependency_Map::load_from_cache,
-     *          ], // array where keys are FQCNs and values are load sources (new or cached)
-     *          EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES || EE_Dependency_Map::OVERWRITE_DEPENDENCIES
-     *      );
-     * IMPORTANT !!!
-     * The order of elements in the incoming $dependencies array MUST match
-     * the order of the constructor parameters for the class in question.
-     * This is especially important when overriding any existing dependencies that are registered.
-     * the third parameter controls whether any duplicate dependencies are overwritten or not.
-     *
-     * @return bool
-     * @see   EE_Dependency_Map::registerDependencies()
-     * @since $VID:$
-     */
-    public function registerDependencies()
-    {
-        return false;
-    }
+	/**
+	 * registers dependencies to be injected into a class upon construction
+	 * ex:
+	 *      $this->registerDependencies($class, $dependencies, $overwrite);
+	 *          'Namespace\path\to\ConcreteClassToInject',  // name of class that requires injected dependencies
+	 *          [
+	 *              'EEM_Event'                                     => EE_Dependency_Map::load_from_cache,
+	 *              'LoaderInterface'                               => EE_Dependency_Map::load_from_cache,
+	 *              'EventEspresso\core\services\request\Request'   => EE_Dependency_Map::load_from_cache,
+	 *          ], // array where keys are FQCNs and values are load sources (new or cached)
+	 *          EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES || EE_Dependency_Map::OVERWRITE_DEPENDENCIES
+	 *      );
+	 * IMPORTANT !!!
+	 * The order of elements in the incoming $dependencies array MUST match
+	 * the order of the constructor parameters for the class in question.
+	 * This is especially important when overriding any existing dependencies that are registered.
+	 * the third parameter controls whether any duplicate dependencies are overwritten or not.
+	 *
+	 * @return bool
+	 * @see   EE_Dependency_Map::registerDependencies()
+	 * @since $VID:$
+	 */
+	public function registerDependencies()
+	{
+		return false;
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    public function register()
-    {
-        if ($this->registered) {
-            return;
-        }
-        // \EEH_Debug_Tools::printr(get_called_class(), __FUNCTION__, __FILE__, __LINE__);
-        $this->registerClassAliases();
-        $this->registerClassLoaders();
-        $this->registered = $this->registerDependencies();
-    }
+	/**
+	 * @since $VID:$
+	 */
+	public function register()
+	{
+		if ($this->registered) {
+			return;
+		}
+		// \EEH_Debug_Tools::printr(get_called_class(), __FUNCTION__, __FILE__, __LINE__);
+		$this->registerClassAliases();
+		$this->registerClassLoaders();
+		$this->registered = $this->registerDependencies();
+	}
 }

core/services/dependencies/LocalDependencyMapFactory.php

Indentation +34 added lines, -34 removed lines

@@ -23,42 +23,42 @@
 class LocalDependencyMapFactory extends FactoryWithDependencyResolver
 {
 
-    /**
-     * RouteFactory constructor
-     *
-     * @param DependencyResolver $dependency_resolver
-     * @param LoaderInterface                      $loader
-     */
-    public function __construct(DependencyResolver $dependency_resolver, LoaderInterface $loader)
-    {
-        parent::__construct($dependency_resolver, $loader);
-    }
+	/**
+	 * RouteFactory constructor
+	 *
+	 * @param DependencyResolver $dependency_resolver
+	 * @param LoaderInterface                      $loader
+	 */
+	public function __construct(DependencyResolver $dependency_resolver, LoaderInterface $loader)
+	{
+		parent::__construct($dependency_resolver, $loader);
+	}
 
 
-    /**
-     * @param $fqcn
-     * @return Route
-     * @since 4.9.71.p
-     */
-    public function createRoute($fqcn)
-    {
-        $this->dependencyResolver()->resolveDependenciesForClass($fqcn);
-        return $this->loader()->getShared($fqcn);
-    }
+	/**
+	 * @param $fqcn
+	 * @return Route
+	 * @since 4.9.71.p
+	 */
+	public function createRoute($fqcn)
+	{
+		$this->dependencyResolver()->resolveDependenciesForClass($fqcn);
+		return $this->loader()->getShared($fqcn);
+	}
 
 
-    /**
-     * @param $fqcn
-     * @return Route
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @since 4.9.71.p
-     */
-    public static function create($fqcn)
-    {
-        /** @var LocalDependencyMapFactory $local_dependency_map_factory */
-        $local_dependency_map_factory = LoaderFactory::getLoader()->getShared(LocalDependencyMapFactory::class);
-        return $local_dependency_map_factory->createRoute($fqcn);
-    }
+	/**
+	 * @param $fqcn
+	 * @return Route
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @since 4.9.71.p
+	 */
+	public static function create($fqcn)
+	{
+		/** @var LocalDependencyMapFactory $local_dependency_map_factory */
+		$local_dependency_map_factory = LoaderFactory::getLoader()->getShared(LocalDependencyMapFactory::class);
+		return $local_dependency_map_factory->createRoute($fqcn);
+	}
 }

core/services/dependencies/DependencyResolver.php

Indentation +164 added lines, -164 removed lines

@@ -23,168 +23,168 @@
 class DependencyResolver implements DependencyResolverInterface
 {
 
-    /**
-     * @var Mirror $mirror
-     */
-    private $mirror;
-
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
-
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    private $dependency_map;
-
-    /**
-     * @var ClassAlias[] $aliases
-     */
-    protected $aliases = array();
-
-    /**
-     * @var array $namespace_roots
-     */
-    protected $namespace_roots = array();
-
-
-    /**
-     * RouteMatchSpecificationDependencyResolver constructor.
-     *
-     * @param Mirror              $mirror
-     * @param ClassInterfaceCache $class_cache
-     * @param EE_Dependency_Map   $dependency_map
-     */
-    public function __construct(
-        Mirror $mirror,
-        ClassInterfaceCache $class_cache,
-        EE_Dependency_Map $dependency_map
-    ) {
-        $this->mirror = $mirror;
-        $this->class_cache = $class_cache;
-        $this->dependency_map = $dependency_map;
-        $this->initialize();
-    }
-
-
-    /**
-     * Used to configure and/or setup any aliases or namespace roots required by the DependencyResolver
-     *
-     * @throws InvalidAliasException
-     * @since 4.9.71.p
-     */
-    public function initialize()
-    {
-        // nothing to do here for default resolver
-    }
-
-
-    /**
-     * @return Mirror
-     */
-    public function mirror()
-    {
-        return $this->mirror;
-    }
-
-    /**
-     * @return ClassInterfaceCache
-     */
-    public function classCache()
-    {
-        return $this->class_cache;
-    }
-
-    /**
-     * @return EE_Dependency_Map
-     */
-    public function dependencyMap()
-    {
-        return $this->dependency_map;
-    }
-
-    /**
-     * @param string $fqcn      the class name that should be used (concrete class to replace interface)
-     * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
-     * @param string $for_class the class that has the dependency (is type hinting for the interface)
-     * @throws InvalidAliasException
-     */
-    public function addAlias($fqcn, $alias, $for_class = '')
-    {
-        $this->class_cache->addAlias($fqcn, $alias, $for_class);
-    }
-
-    /**
-     * @param string $param_fqcn Fully Qualified Class Name for dependency parameter
-     * @return string
-     */
-    public function resolveAlias($param_fqcn)
-    {
-        return $this->class_cache->getFqnForAlias($param_fqcn);
-    }
-
-    /**
-     * Primarily used to indicate the namespace root for composite objects
-     * so that dependencies requiring the same DependencyResolver can be acquired
-     * for example:
-     * Vendor\path\to\class\A, Vendor\path\to\class\B, and Vendor\path\to\class\C
-     * may all implement Vendor\path\to\Interface,
-     * but Vendor\path\to\class\C could be a composite object
-     * that requires Vendor\path\to\class\A and Vendor\path\to\class\B,
-     * and needs both of those dependencies resolved, which would therefore require
-     * the use of the same DependencyResolver.
-     *
-     * By specifying a namespace root of "Vendor\path\to\",
-     * then all classes that are descendants of that namespace
-     * will use DependencyResolver to acquire the classes they need
-     *
-     * @param string $namespace_root Partial namespace used for detecting other classes
-     *                               that should employ this same DependencyResolver
-     */
-    public function addNamespaceRoot($namespace_root)
-    {
-        $this->namespace_roots[] = $namespace_root;
-    }
-
-    /**
-     * Returns true if the parameter FQCN belongs to one of
-     * the namespaces that utilizes this DependencyResolver
-     *
-     * @param string $param_fqcn Fully Qualified Class Name for dependency parameter
-     * @return boolean
-     * @since 4.9.71.p
-     */
-    public function dependencyRecursionExists($param_fqcn)
-    {
-        foreach ($this->namespace_roots as $namespace_root) {
-            if (strpos($param_fqcn, $namespace_root) !== false) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @param string $fqcn Fully Qualified Class Name
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     * @since 4.9.71.p
-     */
-    public function resolveDependenciesForClass($fqcn)
-    {
-        $dependencies = array();
-        $params = $this->mirror()->getParameters($fqcn);
-        foreach ($params as $index => $param) {
-            // is this a dependency for a specific class ?
-            $param_class = $this->mirror()->getParameterClassName($param, $fqcn, $index);
-            if ($this->dependencyRecursionExists($param_class)) {
-                $this->resolveDependenciesForClass($param_class);
-            }
-            $param_class = $this->resolveAlias($param_class);
-            $dependencies[ $param_class ] = EE_Dependency_Map::load_from_cache;
-        }
-        $this->dependencyMap()->registerDependencies($fqcn, $dependencies);
-    }
+	/**
+	 * @var Mirror $mirror
+	 */
+	private $mirror;
+
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
+
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	private $dependency_map;
+
+	/**
+	 * @var ClassAlias[] $aliases
+	 */
+	protected $aliases = array();
+
+	/**
+	 * @var array $namespace_roots
+	 */
+	protected $namespace_roots = array();
+
+
+	/**
+	 * RouteMatchSpecificationDependencyResolver constructor.
+	 *
+	 * @param Mirror              $mirror
+	 * @param ClassInterfaceCache $class_cache
+	 * @param EE_Dependency_Map   $dependency_map
+	 */
+	public function __construct(
+		Mirror $mirror,
+		ClassInterfaceCache $class_cache,
+		EE_Dependency_Map $dependency_map
+	) {
+		$this->mirror = $mirror;
+		$this->class_cache = $class_cache;
+		$this->dependency_map = $dependency_map;
+		$this->initialize();
+	}
+
+
+	/**
+	 * Used to configure and/or setup any aliases or namespace roots required by the DependencyResolver
+	 *
+	 * @throws InvalidAliasException
+	 * @since 4.9.71.p
+	 */
+	public function initialize()
+	{
+		// nothing to do here for default resolver
+	}
+
+
+	/**
+	 * @return Mirror
+	 */
+	public function mirror()
+	{
+		return $this->mirror;
+	}
+
+	/**
+	 * @return ClassInterfaceCache
+	 */
+	public function classCache()
+	{
+		return $this->class_cache;
+	}
+
+	/**
+	 * @return EE_Dependency_Map
+	 */
+	public function dependencyMap()
+	{
+		return $this->dependency_map;
+	}
+
+	/**
+	 * @param string $fqcn      the class name that should be used (concrete class to replace interface)
+	 * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
+	 * @param string $for_class the class that has the dependency (is type hinting for the interface)
+	 * @throws InvalidAliasException
+	 */
+	public function addAlias($fqcn, $alias, $for_class = '')
+	{
+		$this->class_cache->addAlias($fqcn, $alias, $for_class);
+	}
+
+	/**
+	 * @param string $param_fqcn Fully Qualified Class Name for dependency parameter
+	 * @return string
+	 */
+	public function resolveAlias($param_fqcn)
+	{
+		return $this->class_cache->getFqnForAlias($param_fqcn);
+	}
+
+	/**
+	 * Primarily used to indicate the namespace root for composite objects
+	 * so that dependencies requiring the same DependencyResolver can be acquired
+	 * for example:
+	 * Vendor\path\to\class\A, Vendor\path\to\class\B, and Vendor\path\to\class\C
+	 * may all implement Vendor\path\to\Interface,
+	 * but Vendor\path\to\class\C could be a composite object
+	 * that requires Vendor\path\to\class\A and Vendor\path\to\class\B,
+	 * and needs both of those dependencies resolved, which would therefore require
+	 * the use of the same DependencyResolver.
+	 *
+	 * By specifying a namespace root of "Vendor\path\to\",
+	 * then all classes that are descendants of that namespace
+	 * will use DependencyResolver to acquire the classes they need
+	 *
+	 * @param string $namespace_root Partial namespace used for detecting other classes
+	 *                               that should employ this same DependencyResolver
+	 */
+	public function addNamespaceRoot($namespace_root)
+	{
+		$this->namespace_roots[] = $namespace_root;
+	}
+
+	/**
+	 * Returns true if the parameter FQCN belongs to one of
+	 * the namespaces that utilizes this DependencyResolver
+	 *
+	 * @param string $param_fqcn Fully Qualified Class Name for dependency parameter
+	 * @return boolean
+	 * @since 4.9.71.p
+	 */
+	public function dependencyRecursionExists($param_fqcn)
+	{
+		foreach ($this->namespace_roots as $namespace_root) {
+			if (strpos($param_fqcn, $namespace_root) !== false) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param string $fqcn Fully Qualified Class Name
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 * @since 4.9.71.p
+	 */
+	public function resolveDependenciesForClass($fqcn)
+	{
+		$dependencies = array();
+		$params = $this->mirror()->getParameters($fqcn);
+		foreach ($params as $index => $param) {
+			// is this a dependency for a specific class ?
+			$param_class = $this->mirror()->getParameterClassName($param, $fqcn, $index);
+			if ($this->dependencyRecursionExists($param_class)) {
+				$this->resolveDependenciesForClass($param_class);
+			}
+			$param_class = $this->resolveAlias($param_class);
+			$dependencies[ $param_class ] = EE_Dependency_Map::load_from_cache;
+		}
+		$this->dependencyMap()->registerDependencies($fqcn, $dependencies);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
                 $this->resolveDependenciesForClass($param_class);
             }
             $param_class = $this->resolveAlias($param_class);
-            $dependencies[ $param_class ] = EE_Dependency_Map::load_from_cache;
+            $dependencies[$param_class] = EE_Dependency_Map::load_from_cache;
         }
         $this->dependencyMap()->registerDependencies($fqcn, $dependencies);
     }

core/services/routes/RouteMatchSpecificationFactory.php

Indentation +36 added lines, -36 removed lines

@@ -23,44 +23,44 @@
 class RouteMatchSpecificationFactory extends FactoryWithDependencyResolver
 {
 
-    /**
-     * RouteMatchSpecificationFactory constructor
-     *
-     * @param RouteMatchSpecificationDependencyResolver $dependency_resolver
-     * @param LoaderInterface                           $loader
-     */
-    public function __construct(RouteMatchSpecificationDependencyResolver $dependency_resolver, LoaderInterface $loader)
-    {
-        parent::__construct($dependency_resolver, $loader);
-    }
+	/**
+	 * RouteMatchSpecificationFactory constructor
+	 *
+	 * @param RouteMatchSpecificationDependencyResolver $dependency_resolver
+	 * @param LoaderInterface                           $loader
+	 */
+	public function __construct(RouteMatchSpecificationDependencyResolver $dependency_resolver, LoaderInterface $loader)
+	{
+		parent::__construct($dependency_resolver, $loader);
+	}
 
 
-    /**
-     * @param $fqcn
-     * @return RouteMatchSpecification
-     * @since 4.9.71.p
-     */
-    public function createNewRouteMatchSpecification($fqcn)
-    {
-        $this->dependencyResolver()->resolveDependenciesForClass($fqcn);
-        return $this->loader()->getShared($fqcn);
-    }
+	/**
+	 * @param $fqcn
+	 * @return RouteMatchSpecification
+	 * @since 4.9.71.p
+	 */
+	public function createNewRouteMatchSpecification($fqcn)
+	{
+		$this->dependencyResolver()->resolveDependenciesForClass($fqcn);
+		return $this->loader()->getShared($fqcn);
+	}
 
 
-    /**
-     * @param $fqcn
-     * @return RouteMatchSpecification
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @since 4.9.71.p
-     */
-    public static function create($fqcn)
-    {
-        /** @var RouteMatchSpecificationFactory $specification_factory */
-        $specification_factory = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\services\routes\RouteMatchSpecificationFactory'
-        );
-        return $specification_factory->createNewRouteMatchSpecification($fqcn);
-    }
+	/**
+	 * @param $fqcn
+	 * @return RouteMatchSpecification
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @since 4.9.71.p
+	 */
+	public static function create($fqcn)
+	{
+		/** @var RouteMatchSpecificationFactory $specification_factory */
+		$specification_factory = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\services\routes\RouteMatchSpecificationFactory'
+		);
+		return $specification_factory->createNewRouteMatchSpecification($fqcn);
+	}
 }

core/services/routes/RouteHandler.php

Indentation +70 added lines, -70 removed lines

@@ -20,83 +20,83 @@
 class RouteHandler
 {
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
-    /**
-     * @var RouteCollection $routes
-     */
-    private $routes;
+	/**
+	 * @var RouteCollection $routes
+	 */
+	private $routes;
 
 
-    /**
-     * AdminRouter constructor.
-     *
-     * @param LoaderInterface  $loader
-     * @param RouteCollection $routes
-     */
-    public function __construct(
-        LoaderInterface $loader,
-        RouteCollection $routes
-    ) {
-        $this->loader = $loader;
-        $this->routes = $routes;
-    }
+	/**
+	 * AdminRouter constructor.
+	 *
+	 * @param LoaderInterface  $loader
+	 * @param RouteCollection $routes
+	 */
+	public function __construct(
+		LoaderInterface $loader,
+		RouteCollection $routes
+	) {
+		$this->loader = $loader;
+		$this->routes = $routes;
+	}
 
 
-    /**
-     * @param string    $fqcn  Fully Qualified Class Name for Route
-     * @param bool      $handle if true [default] will immediately call RouteInterface::handleRequest()
-     * @throws Exception
-     * @since $VID:$
-     */
-    public function addRoute($fqcn, $handle = true)
-    {
-        try {
-            $route = $this->loader->getShared($fqcn);
-            if (! $route instanceof RouteInterface) {
-                throw new InvalidClassException(
-                    sprintf(
-                        esc_html__(
-                            'The supplied FQCN (%1$s) must be an instance of RouteInterface.',
-                            'eventespresso'
-                        ),
-                        $fqcn
-                    )
-                );
-            }
-            $this->routes->add($route);
-            if ($handle) {
-                $route->handleRequest();
-            }
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
+	/**
+	 * @param string    $fqcn  Fully Qualified Class Name for Route
+	 * @param bool      $handle if true [default] will immediately call RouteInterface::handleRequest()
+	 * @throws Exception
+	 * @since $VID:$
+	 */
+	public function addRoute($fqcn, $handle = true)
+	{
+		try {
+			$route = $this->loader->getShared($fqcn);
+			if (! $route instanceof RouteInterface) {
+				throw new InvalidClassException(
+					sprintf(
+						esc_html__(
+							'The supplied FQCN (%1$s) must be an instance of RouteInterface.',
+							'eventespresso'
+						),
+						$fqcn
+					)
+				);
+			}
+			$this->routes->add($route);
+			if ($handle) {
+				$route->handleRequest();
+			}
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
 
 
-    /**
-     * finds and returns all Routes that have yet to be handled
-     *
-     * @return RouteInterface[]
-     */
-    public function getRoutesForCurrentRequest()
-    {
-        return $this->routes->getRoutesForCurrentRequest();
-    }
+	/**
+	 * finds and returns all Routes that have yet to be handled
+	 *
+	 * @return RouteInterface[]
+	 */
+	public function getRoutesForCurrentRequest()
+	{
+		return $this->routes->getRoutesForCurrentRequest();
+	}
 
 
-    /**
-     * calls RouteInterface::handleRequest() on all Routes that
-     *      - match current request
-     *      - have yet to be handled
-     *
-     * @return void
-     */
-    public function handleRoutesForCurrentRequest()
-    {
-        $this->routes->handleRoutesForCurrentRequest();
-    }
+	/**
+	 * calls RouteInterface::handleRequest() on all Routes that
+	 *      - match current request
+	 *      - have yet to be handled
+	 *
+	 * @return void
+	 */
+	public function handleRoutesForCurrentRequest()
+	{
+		$this->routes->handleRoutesForCurrentRequest();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     {
         try {
             $route = $this->loader->getShared($fqcn);
-            if (! $route instanceof RouteInterface) {
+            if ( ! $route instanceof RouteInterface) {
                 throw new InvalidClassException(
                     sprintf(
                         esc_html__(

core/services/routes/RouteMatchSpecificationCollection.php

Indentation +32 added lines, -32 removed lines

@@ -16,36 +16,36 @@
 class RouteMatchSpecificationCollection extends Collection
 {
 
-    const COLLECTION_NAME = 'route_match_specifications';
-
-
-    /**
-     * RouteMatchSpecificationCollection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            'EventEspresso\core\domain\entities\routes\specifications\RouteMatchSpecificationInterface',
-            RouteMatchSpecificationCollection::COLLECTION_NAME
-        );
-    }
-
-
-    /**
-     * getIdentifier
-     * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
-     * If no $identifier is supplied, then the  fully qualified class name is used
-     *
-     * @param        $object
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function getIdentifier($object, $identifier = null)
-    {
-        return ! empty($identifier)
-            ? $identifier
-            : get_class($object);
-    }
+	const COLLECTION_NAME = 'route_match_specifications';
+
+
+	/**
+	 * RouteMatchSpecificationCollection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			'EventEspresso\core\domain\entities\routes\specifications\RouteMatchSpecificationInterface',
+			RouteMatchSpecificationCollection::COLLECTION_NAME
+		);
+	}
+
+
+	/**
+	 * getIdentifier
+	 * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
+	 * If no $identifier is supplied, then the  fully qualified class name is used
+	 *
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function getIdentifier($object, $identifier = null)
+	{
+		return ! empty($identifier)
+			? $identifier
+			: get_class($object);
+	}
 }