eventespresso / event-espresso-core

core/services/dependencies/DependencyHandler.php

Indentation +13 added lines, -13 removed lines

@@ -7,19 +7,19 @@
 abstract class DependencyHandler implements DependencyHandlerInterface
 {
 
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
 
 
-    /**
-     * DependencyHandler constructor.
-     *
-     * @param EE_Dependency_Map $dependency_map
-     */
-    public function __construct(EE_Dependency_Map $dependency_map)
-    {
-        $this->dependency_map = $dependency_map;
-    }
+	/**
+	 * DependencyHandler constructor.
+	 *
+	 * @param EE_Dependency_Map $dependency_map
+	 */
+	public function __construct(EE_Dependency_Map $dependency_map)
+	{
+		$this->dependency_map = $dependency_map;
+	}
 }

core/services/dependencies/DependencyHandlerInterface.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 interface DependencyHandlerInterface
 {
-    /**
-     * @since $VID:$
-     */
-    public function registerDependencies();
+	/**
+	 * @since $VID:$
+	 */
+	public function registerDependencies();
 }

core/services/routing/Router.php

Indentation +232 added lines, -232 removed lines

@@ -15,236 +15,236 @@
 class Router
 {
 
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
-
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
-
-    /**
-     * @var RouteHandler $route_handler
-     */
-    protected $route_handler;
-
-    /**
-     * @var string $route_request_type
-     */
-    protected $route_request_type;
-
-
-    /**
-     * RoutingSwitch constructor.
-     *
-     * @param EE_Dependency_Map $dependency_map
-     * @param LoaderInterface   $loader
-     * @param RouteHandler      $router
-     */
-    public function __construct(EE_Dependency_Map $dependency_map, LoaderInterface $loader, RouteHandler $router)
-    {
-        $this->dependency_map = $dependency_map;
-        $this->loader         = $loader;
-        $this->route_handler  = $router;
-    }
-
-
-    /**
-     * @throws Exception
-     */
-    public function loadPrimaryRoutes()
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__loadPrimaryRoutes',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\handlers\admin\ActivationRequests',
-            Route::getFullDependencies()
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\handlers\shared\RegularRequests',
-            Route::getFullDependencies()
-        );
-        // now load and prep all primary Routes
-        $this->route_handler->addRoute('EventEspresso\core\domain\entities\routing\handlers\admin\ActivationRequests');
-        $this->route_handler->addRoute('EventEspresso\core\domain\entities\routing\handlers\shared\RegularRequests');
-        $this->route_request_type = $this->route_handler->getRouteRequestType();
-    }
-
-
-    /**
-     *
-     * @throws Exception
-     */
-    public function registerShortcodesModulesAndWidgets()
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__registerShortcodesModulesAndWidgets',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\frontend\ShortcodeRequests'
-                );
-                break;
-        }
-    }
-
-
-    /**
-     *
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    public function brewEspresso()
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__brewEspresso',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\PueRequests'
-                );
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\GQLRequests'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\PueRequests'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\RestApiRequests'
-                );
-                break;
-        }
-    }
-
-
-    /**
-     *
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     * @throws Exception
-     */
-    public function loadControllers()
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__loadControllers',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\AdminRoute'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage'
-                );
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\frontend\FrontendRequests'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\AdminRoute'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoLegacyAdmin'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventsAdmin'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventEditor'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\GutenbergEditor'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\WordPressHeartbeat'
-                );
-                break;
-        }
-    }
-
-
-    /**
-     *
-     * @throws Exception
-     * @throws Exception
-     */
-    public function coreLoadedAndReady()
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__coreLoadedAndReady',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\AssetRequests'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\SessionRequests'
-                );
-                break;
-        }
-    }
-
-
-    /**
-     *
-     * @throws Exception
-     */
-    public function initializeLast()
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__initializeLast',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\PersonalDataRequests'
-                );
-                break;
-        }
-    }
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
+
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
+
+	/**
+	 * @var RouteHandler $route_handler
+	 */
+	protected $route_handler;
+
+	/**
+	 * @var string $route_request_type
+	 */
+	protected $route_request_type;
+
+
+	/**
+	 * RoutingSwitch constructor.
+	 *
+	 * @param EE_Dependency_Map $dependency_map
+	 * @param LoaderInterface   $loader
+	 * @param RouteHandler      $router
+	 */
+	public function __construct(EE_Dependency_Map $dependency_map, LoaderInterface $loader, RouteHandler $router)
+	{
+		$this->dependency_map = $dependency_map;
+		$this->loader         = $loader;
+		$this->route_handler  = $router;
+	}
+
+
+	/**
+	 * @throws Exception
+	 */
+	public function loadPrimaryRoutes()
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__loadPrimaryRoutes',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\handlers\admin\ActivationRequests',
+			Route::getFullDependencies()
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\handlers\shared\RegularRequests',
+			Route::getFullDependencies()
+		);
+		// now load and prep all primary Routes
+		$this->route_handler->addRoute('EventEspresso\core\domain\entities\routing\handlers\admin\ActivationRequests');
+		$this->route_handler->addRoute('EventEspresso\core\domain\entities\routing\handlers\shared\RegularRequests');
+		$this->route_request_type = $this->route_handler->getRouteRequestType();
+	}
+
+
+	/**
+	 *
+	 * @throws Exception
+	 */
+	public function registerShortcodesModulesAndWidgets()
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__registerShortcodesModulesAndWidgets',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\frontend\ShortcodeRequests'
+				);
+				break;
+		}
+	}
+
+
+	/**
+	 *
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function brewEspresso()
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__brewEspresso',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\PueRequests'
+				);
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\GQLRequests'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\PueRequests'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\RestApiRequests'
+				);
+				break;
+		}
+	}
+
+
+	/**
+	 *
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function loadControllers()
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__loadControllers',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\AdminRoute'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage'
+				);
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\frontend\FrontendRequests'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\AdminRoute'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoLegacyAdmin'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventsAdmin'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventEditor'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\GutenbergEditor'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\WordPressHeartbeat'
+				);
+				break;
+		}
+	}
+
+
+	/**
+	 *
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function coreLoadedAndReady()
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__coreLoadedAndReady',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\AssetRequests'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\SessionRequests'
+				);
+				break;
+		}
+	}
+
+
+	/**
+	 *
+	 * @throws Exception
+	 */
+	public function initializeLast()
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__initializeLast',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\PersonalDataRequests'
+				);
+				break;
+		}
+	}
 }

core/domain/DomainBase.php

Indentation +217 added lines, -217 removed lines

@@ -17,221 +17,221 @@
 abstract class DomainBase implements DomainInterface
 {
 
-    const ASSETS_FOLDER = 'assets/';
-
-    /**
-     * Equivalent to `__FILE__` for main plugin file.
-     *
-     * @var FilePath
-     */
-    private $plugin_file;
-
-    /**
-     * String indicating version for plugin
-     *
-     * @var string
-     */
-    private $version;
-
-    /**
-     * @var string $plugin_basename
-     */
-    private $plugin_basename;
-
-    /**
-     * @var string $plugin_path
-     */
-    private $plugin_path;
-
-    /**
-     * @var string $plugin_url
-     */
-    private $plugin_url;
-
-    /**
-     * @var string $asset_namespace
-     */
-    private $asset_namespace;
-
-    /**
-     * @var string $assets_path
-     */
-    private $assets_path;
-
-    /**
-     * @var bool
-     */
-    protected $initialized = false;
-
-
-    /**
-     * Initializes internal properties.
-     *
-     * @param FilePath $plugin_file
-     * @param Version  $version
-     * @param string $asset_namespace
-     */
-    public function __construct(FilePath $plugin_file, Version $version, $asset_namespace = Domain::ASSET_NAMESPACE)
-    {
-        $this->plugin_file = $plugin_file;
-        $this->version     = $version;
-        $this->initialize($asset_namespace);
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     * @since $VID:$
-     */
-    public function initialize($asset_namespace = Domain::ASSET_NAMESPACE)
-    {
-        if (! $this->initialized) {
-            $this->plugin_basename = plugin_basename($this->pluginFile());
-            $this->plugin_path     = plugin_dir_path($this->pluginFile());
-            $this->plugin_url      = plugin_dir_url($this->pluginFile());
-            $this->setAssetNamespace($asset_namespace);
-            $this->setDistributionAssetsPath();
-            $this->initialized = true;
-        }
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     */
-    public function setAssetNamespace($asset_namespace = Domain::ASSET_NAMESPACE)
-    {
-        if (! $this->asset_namespace) {
-            $this->asset_namespace = sanitize_key(
-                // convert directory separators to dashes and remove file extension
-                str_replace(['/', '.php'], ['-', ''], $asset_namespace)
-            );
-        }
-    }
-
-
-    /**
-     * @throws DomainException
-     * @since $VID:$
-     */
-    private function setDistributionAssetsPath()
-    {
-        $assets_path = $this->pluginPath() . DomainBase::ASSETS_FOLDER;
-        if (! is_readable($assets_path)) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The assets distribution folder was not found or is not readable. Please verify that "%1$s" exists and has valid permissions.',
-                        'event_espresso'
-                    ),
-                    $assets_path
-                )
-            );
-        }
-        $this->assets_path = trailingslashit($assets_path);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginFile()
-    {
-        return (string) $this->plugin_file;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginBasename()
-    {
-        return $this->plugin_basename;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function pluginPath($additional_path = '')
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_path . $additional_path
-            : $this->plugin_path;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function pluginUrl($additional_path = '')
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . $additional_path
-            : $this->plugin_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function version()
-    {
-        return (string) $this->version;
-    }
-
-
-    /**
-     * @return Version
-     */
-    public function versionValueObject()
-    {
-        return $this->version;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function distributionAssetsFolder()
-    {
-        return DomainBase::ASSETS_FOLDER;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsPath($additional_path = '')
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
-            : $this->assets_path;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsUrl($additional_path = '')
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
-            : $this->plugin_url . DomainBase::ASSETS_FOLDER;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function assetNamespace()
-    {
-        return $this->asset_namespace;
-    }
+	const ASSETS_FOLDER = 'assets/';
+
+	/**
+	 * Equivalent to `__FILE__` for main plugin file.
+	 *
+	 * @var FilePath
+	 */
+	private $plugin_file;
+
+	/**
+	 * String indicating version for plugin
+	 *
+	 * @var string
+	 */
+	private $version;
+
+	/**
+	 * @var string $plugin_basename
+	 */
+	private $plugin_basename;
+
+	/**
+	 * @var string $plugin_path
+	 */
+	private $plugin_path;
+
+	/**
+	 * @var string $plugin_url
+	 */
+	private $plugin_url;
+
+	/**
+	 * @var string $asset_namespace
+	 */
+	private $asset_namespace;
+
+	/**
+	 * @var string $assets_path
+	 */
+	private $assets_path;
+
+	/**
+	 * @var bool
+	 */
+	protected $initialized = false;
+
+
+	/**
+	 * Initializes internal properties.
+	 *
+	 * @param FilePath $plugin_file
+	 * @param Version  $version
+	 * @param string $asset_namespace
+	 */
+	public function __construct(FilePath $plugin_file, Version $version, $asset_namespace = Domain::ASSET_NAMESPACE)
+	{
+		$this->plugin_file = $plugin_file;
+		$this->version     = $version;
+		$this->initialize($asset_namespace);
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 * @since $VID:$
+	 */
+	public function initialize($asset_namespace = Domain::ASSET_NAMESPACE)
+	{
+		if (! $this->initialized) {
+			$this->plugin_basename = plugin_basename($this->pluginFile());
+			$this->plugin_path     = plugin_dir_path($this->pluginFile());
+			$this->plugin_url      = plugin_dir_url($this->pluginFile());
+			$this->setAssetNamespace($asset_namespace);
+			$this->setDistributionAssetsPath();
+			$this->initialized = true;
+		}
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 */
+	public function setAssetNamespace($asset_namespace = Domain::ASSET_NAMESPACE)
+	{
+		if (! $this->asset_namespace) {
+			$this->asset_namespace = sanitize_key(
+				// convert directory separators to dashes and remove file extension
+				str_replace(['/', '.php'], ['-', ''], $asset_namespace)
+			);
+		}
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @since $VID:$
+	 */
+	private function setDistributionAssetsPath()
+	{
+		$assets_path = $this->pluginPath() . DomainBase::ASSETS_FOLDER;
+		if (! is_readable($assets_path)) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The assets distribution folder was not found or is not readable. Please verify that "%1$s" exists and has valid permissions.',
+						'event_espresso'
+					),
+					$assets_path
+				)
+			);
+		}
+		$this->assets_path = trailingslashit($assets_path);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginFile()
+	{
+		return (string) $this->plugin_file;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginBasename()
+	{
+		return $this->plugin_basename;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function pluginPath($additional_path = '')
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_path . $additional_path
+			: $this->plugin_path;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function pluginUrl($additional_path = '')
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_url . $additional_path
+			: $this->plugin_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function version()
+	{
+		return (string) $this->version;
+	}
+
+
+	/**
+	 * @return Version
+	 */
+	public function versionValueObject()
+	{
+		return $this->version;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsFolder()
+	{
+		return DomainBase::ASSETS_FOLDER;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsPath($additional_path = '')
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->assets_path . $additional_path
+			: $this->assets_path;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsUrl($additional_path = '')
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
+			: $this->plugin_url . DomainBase::ASSETS_FOLDER;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function assetNamespace()
+	{
+		return $this->asset_namespace;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -86,7 +86,7 @@ 
      */
     public function initialize($asset_namespace = Domain::ASSET_NAMESPACE)
     {
-        if (! $this->initialized) {
+        if ( ! $this->initialized) {
             $this->plugin_basename = plugin_basename($this->pluginFile());
             $this->plugin_path     = plugin_dir_path($this->pluginFile());
             $this->plugin_url      = plugin_dir_url($this->pluginFile());
@@ -103,7 +103,7 @@ 
      */
     public function setAssetNamespace($asset_namespace = Domain::ASSET_NAMESPACE)
     {
-        if (! $this->asset_namespace) {
+        if ( ! $this->asset_namespace) {
             $this->asset_namespace = sanitize_key(
                 // convert directory separators to dashes and remove file extension
                 str_replace(['/', '.php'], ['-', ''], $asset_namespace)
@@ -118,8 +118,8 @@ 
      */
     private function setDistributionAssetsPath()
     {
-        $assets_path = $this->pluginPath() . DomainBase::ASSETS_FOLDER;
-        if (! is_readable($assets_path)) {
+        $assets_path = $this->pluginPath().DomainBase::ASSETS_FOLDER;
+        if ( ! is_readable($assets_path)) {
             throw new DomainException(
                 sprintf(
                     esc_html__(
@@ -159,7 +159,7 @@ 
     public function pluginPath($additional_path = '')
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_path . $additional_path
+            ? $this->plugin_path.$additional_path
             : $this->plugin_path;
     }
 
@@ -171,7 +171,7 @@ 
     public function pluginUrl($additional_path = '')
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . $additional_path
+            ? $this->plugin_url.$additional_path
             : $this->plugin_url;
     }
 
@@ -210,7 +210,7 @@ 
     public function distributionAssetsPath($additional_path = '')
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
+            ? $this->assets_path.$additional_path
             : $this->assets_path;
     }
 
@@ -222,8 +222,8 @@ 
     public function distributionAssetsUrl($additional_path = '')
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
-            : $this->plugin_url . DomainBase::ASSETS_FOLDER;
+            ? $this->plugin_url.DomainBase::ASSETS_FOLDER.$additional_path
+            : $this->plugin_url.DomainBase::ASSETS_FOLDER;
     }
 
 

caffeinated/admin/extend/registration_form/templates/question_groups_main_meta_box.template.php

Indentation +81 added lines, -81 removed lines

@@ -11,8 +11,8 @@ 
 /* @var EE_Question[] $all_questions */
 assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions)));// list of unused questions
 foreach ($all_questions as $unused_question) {
-    assert($unused_question);
-    assert($unused_question instanceof EE_Question);
+	assert($unused_question);
+	assert($unused_question instanceof EE_Question);
 }
 /* @var array $values . Array of arrays, where each sub-array contains 2 keys: 'id' (internal value) and 'name' (label for displaying) */
 assert(is_array($values));
@@ -31,8 +31,8 @@ 
             <th>
                 <label for="QSG_name">
                     <?php _e('Group Name', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'group_name_info'
-                    ); ?>
+						'group_name_info'
+					); ?>
                 </label>
             </th>
             <td>
@@ -46,8 +46,8 @@ 
             <th>
                 <label for="QSG_identifier">
                     <?php _e('Group Identifier', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'group_identifier_info'
-                    ); ?>
+						'group_identifier_info'
+					); ?>
                 </label>
             </th>
             <td>
@@ -66,8 +66,8 @@ 
             <th>
                 <label for="QSG_desc">
                     <?php _e('Description', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'group_description_info'
-                    ); ?>
+						'group_description_info'
+					); ?>
                 </label>
             </th>
             <td>
@@ -80,8 +80,8 @@ 
             <th>
                 <label for="QSG_order">
                     <?php _e('Question Group Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'group_order_info'
-                    ); ?>
+						'group_order_info'
+					); ?>
                 </label>
             </th>
             <td>
@@ -94,17 +94,17 @@ 
             <th>
                 <label>
                     <?php _e('Show Name', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'show_group_name_info'
-                    ); ?>
+						'show_group_name_info'
+					); ?>
                 </label>
             </th>
             <td>
                 <label for="QSG_show_group_name">
                     <?php echo EEH_Form_Fields::select_input(
-                        'QSG_show_group_name',
-                        $values,
-                        $question_group->show_group_name()
-                    ); ?>
+						'QSG_show_group_name',
+						$values,
+						$question_group->show_group_name()
+					); ?>
                     <p class="description"><?php _e('Show Group Name on Registration Page?', 'event_espresso'); ?></p>
                 </label>
             </td>
@@ -114,20 +114,20 @@ 
             <th>
                 <label>
                     <?php _e(' Show Description', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'show_group_description_info'
-                    ); ?>
+						'show_group_description_info'
+					); ?>
                 </label>
             </th>
             <td>
                 <label for="QSG_show_group_order">
                     <?php echo EEH_Form_Fields::select_input(
-                        'QSG_show_group_desc',
-                        $values,
-                        $question_group->show_group_desc()
-                    ); ?>
+						'QSG_show_group_desc',
+						$values,
+						$question_group->show_group_desc()
+					); ?>
                     <p class="description"><?php
-                        _e(' Show Group Description on Registration Page?', 'event_espresso');
-                    ?></p>
+						_e(' Show Group Description on Registration Page?', 'event_espresso');
+					?></p>
                 </label>
                 <input type="hidden" name="QSG_system" value="<?php echo $question_group->system_group(); ?>">
             </td>
@@ -143,82 +143,82 @@ 
     <div class="form-table question-group-questions inside">
         <div class="padding">
             <p><span class="description"><?php
-                    _e(
-                        'Select which questions should be shown in this group by checking or unchecking boxes. You can drag and drop questions to reorder them. Your changes will be updated when you save.',
-                        'event_espresso'
-                    ); ?></span></p>
+					_e(
+						'Select which questions should be shown in this group by checking or unchecking boxes. You can drag and drop questions to reorder them. Your changes will be updated when you save.',
+						'event_espresso'
+					); ?></span></p>
             <div>
                 <ul class="question-list-sortable">
                     <?php
-                    $question_order = 0;
-                    $question_group_questions = $question_group->questions();
-                    foreach ($all_questions as $question_ID => $question) {
-                        if ($question instanceof EE_Question) {
-                            /*@var $question EE_Question*/
-                            $checked = isset($question_group_questions[ $question_ID ]) ? ' checked="checked"' : '';
-                            // disable questions from the personal information question group
-                            // is it required in the current question group? if so don't allow admins to remove it
-                            $disabled = in_array(
-                                $question->system_ID(),
-                                EEM_Question::instance()->required_system_questions_in_system_question_group(
-                                    $QSG_system
-                                )
-                            ) ? 'disabled="disabled"' : '';
-                            // limit where system questions can appear
-                            if ($question->system_ID() &&
-                                ! in_array(
-                                    $question->system_ID(),
-                                    EEM_Question::instance()->allowed_system_questions_in_system_question_group(
-                                        $QSG_system
-                                    )
-                                )
-                            ) {
-                                continue; // skip over system question not assigned to this group except for the address system group cause we want the address questions to display even if they aren't selected (but still not show the personal system questions).  The third condition checks if we're displaying a non system question group and the question is a system question, then we skip because for non-system question groups we only want to show non-system questions.
-                            }
-                            ?>
+					$question_order = 0;
+					$question_group_questions = $question_group->questions();
+					foreach ($all_questions as $question_ID => $question) {
+						if ($question instanceof EE_Question) {
+							/*@var $question EE_Question*/
+							$checked = isset($question_group_questions[ $question_ID ]) ? ' checked="checked"' : '';
+							// disable questions from the personal information question group
+							// is it required in the current question group? if so don't allow admins to remove it
+							$disabled = in_array(
+								$question->system_ID(),
+								EEM_Question::instance()->required_system_questions_in_system_question_group(
+									$QSG_system
+								)
+							) ? 'disabled="disabled"' : '';
+							// limit where system questions can appear
+							if ($question->system_ID() &&
+								! in_array(
+									$question->system_ID(),
+									EEM_Question::instance()->allowed_system_questions_in_system_question_group(
+										$QSG_system
+									)
+								)
+							) {
+								continue; // skip over system question not assigned to this group except for the address system group cause we want the address questions to display even if they aren't selected (but still not show the personal system questions).  The third condition checks if we're displaying a non system question group and the question is a system question, then we skip because for non-system question groups we only want to show non-system questions.
+							}
+							?>
                             <li class="ee-question-sortable">
                                 <label for="question-<?php echo $question_ID ?>">
                                     <input type="checkbox" name="questions[<?php echo $question_ID; ?>]"
                                            id="question-<?php echo $question_ID; ?>"
                                            value="<?php echo $question_ID; ?>"<?php echo $disabled; ?><?php echo $checked; ?>/>
                                     <span class="question-text"><?php
-                                        echo trim($question->display_text())
-                                             . (95 <= strlen(trim($question->display_text()))
-                                                ? "&hellip;"
-                                                : '');
-                                                                ?>
+										echo trim($question->display_text())
+											 . (95 <= strlen(trim($question->display_text()))
+												? "&hellip;"
+												: '');
+																?>
                                     </span>
                                     <input class="question-group-QGQ_order" type="hidden"
                                            name="question_orders[<?php echo $question_ID; ?>]"
                                            value="<?php echo $question_order; ?>">
                                 </label>
                                 <?php
-                                if (EE_Registry::instance()->CAP->current_user_can(
-                                    'ee_edit_question',
-                                    'espresso_registration_form_edit_question',
-                                    $question->ID()
-                                )) {
-                                    $edit_query_args = array(
-                                        'action' => 'edit_question',
-                                        'QST_ID' => $question->ID(),
-                                    );
-                                    $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+								if (EE_Registry::instance()->CAP->current_user_can(
+									'ee_edit_question',
+									'espresso_registration_form_edit_question',
+									$question->ID()
+								)) {
+									$edit_query_args = array(
+										'action' => 'edit_question',
+										'QST_ID' => $question->ID(),
+									);
+									$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
 
-                                    echo '<a href="' . $edit_link . '" target="_blank" title="' .
-                                        sprintf(
-                                            esc_attr__('Edit %s', 'event_espresso'),
-                                            $question->admin_label()
-                                        )
-                                        . '"><span class="dashicons dashicons-edit"></span>
+									echo '<a href="' . $edit_link . '" target="_blank" title="' .
+										sprintf(
+											esc_attr__('Edit %s', 'event_espresso'),
+											$question->admin_label()
+										)
+										. '"><span class="dashicons dashicons-edit"></span>
                                         </a>';
-                                }
-                                ?>
+								}
+								?>
                             </li>
                             <?php
-                            $question_order++;
-                        }
-                    }
-                    ?>
+							$question_order++;
+						}
+					}
+					?>
                 </ul>
             </div>
         </div>

caffeinated/admin/extend/about/templates/whats_new.template.php

Indentation +35 added lines, -35 removed lines

@@ -1,58 +1,58 @@
 <div class="changelog point-releases">
     <!-- <h3><?php echo esc_html(
-        _n('Minor Release Information', 'Minor Releases', 1, 'event_espresso')
-    ); ?></h3> -->
+		_n('Minor Release Information', 'Minor Releases', 1, 'event_espresso')
+	); ?></h3> -->
     <h3><?php echo esc_html(
-        _n('Major Release Information', 'Major Releases', 1, 'event_espresso')
-    ); ?></h3>
+		_n('Major Release Information', 'Major Releases', 1, 'event_espresso')
+	); ?></h3>
     <?php // $type = 'minor'; ?>
     <?php $type = 'major'; ?>
     <p><?php
-        printf(
-            esc_html__('%1$sVersion %2$s%3$s is a %4$s release.', 'event_espresso'),
-            '<strong>',
-            EVENT_ESPRESSO_VERSION,
-            '</strong>',
-            $type
-        ); ?>
+		printf(
+			esc_html__('%1$sVersion %2$s%3$s is a %4$s release.', 'event_espresso'),
+			'<strong>',
+			EVENT_ESPRESSO_VERSION,
+			'</strong>',
+			$type
+		); ?>
         <?php
-        $ver = explode('.', EVENT_ESPRESSO_VERSION);
-        array_pop($ver);
-        $ver = implode('.', $ver);
-        ?>
+		$ver = explode('.', EVENT_ESPRESSO_VERSION);
+		array_pop($ver);
+		$ver = implode('.', $ver);
+		?>
         <?php printf(
-            esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
-            '<a href="http://eventespresso.com/wiki/ee4-changelog/#' . $ver . '" target="_blank" rel="noopener noreferrer">',
-            '</a>'
-        ); ?>
+			esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
+			'<a href="http://eventespresso.com/wiki/ee4-changelog/#' . $ver . '" target="_blank" rel="noopener noreferrer">',
+			'</a>'
+		); ?>
     </p>
 </div><!-- end .changelog .point-releases -->
 
 <div class="changelog">
     <?php
-    // maintenance mode on?
-    if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
-        ?>
+	// maintenance mode on?
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
+		?>
         <div class="ee-attention">
             <h2 class="ee-maintenance-mode-callout"><?php
-                esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso');
-            ?></h2>
+				esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso');
+			?></h2>
             <p>
                 <?php
-                printf(
-                    esc_html__(
-                        'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %1$sEvent Espresso Maintenance%2$s page.',
-                        'event_espresso'
-                    ),
-                    '<a href="admin.php?page=espresso_maintenance_settings">',
-                    '</a>'
-                );
-                ?>
+				printf(
+					esc_html__(
+						'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %1$sEvent Espresso Maintenance%2$s page.',
+						'event_espresso'
+					),
+					'<a href="admin.php?page=espresso_maintenance_settings">',
+					'</a>'
+				);
+				?>
             </p>
         </div>
         <?php
-    }
-    ?>
+	}
+	?>
 
     <h2 class="about-headline-callout">Updates &amp; Fixes in EE 4.10</h2>
     <p>This release brought many background updates/improvements to existing core features, and support for many new

caffeinated/admin/extend/events/templates/event_datetime_timezones.template.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
         <span class="current-date"> <?php echo $current_date; ?></span>
         <?php echo $current_time_help_link; ?>
         <a id="change-date-time-lnk" href="options-general.php" target="_blank"><?php
-            _e('Change timezone and date format settings?', 'event_espresso');
-        ?></a>
+			_e('Change timezone and date format settings?', 'event_espresso');
+		?></a>
 
         <h6> <?php _e('Event Timezone:', 'event_espresso') ?> </h6>
         <?php echo $event_timezone; ?>

caffeinated/admin/new/pricing/templates/pricing_details_main_meta_box.template.php

Indentation +28 added lines, -28 removed lines

@@ -4,40 +4,40 @@ 
         <tbody>
         <tr valign="top">
             <th><label for="PRT_ID"><?php
-                    _e(
-                        'Type',
-                        'event_espresso'
-                    ); ?></label> <?php echo EEH_Template::get_help_tab_link('type_field_info'); ?></th>
+					_e(
+						'Type',
+						'event_espresso'
+					); ?></label> <?php echo EEH_Template::get_help_tab_link('type_field_info'); ?></th>
             <td>
                 <?php if ($price->type_obj() && $price->type_obj()->base_type() === 1) : ?>
                     <input type="hidden" name="PRT_ID" id="PRT_ID" value="<?php echo $price->type(); ?>"/>
                     <p><strong><?php _e('Price', 'event_espresso'); ?></strong></p>
                     <p class="description">
                         <?php
-                        _e(
-                            'This is the default base price. Every new ticket created will start off with this base price.',
-                            'event_espresso'
-                        );
-                        ?>
+						_e(
+							'This is the default base price. Every new ticket created will start off with this base price.',
+							'event_espresso'
+						);
+						?>
                     </p>
                 <?php else : ?>
                     <?php echo EEH_Form_Fields::select_input('PRT_ID', $price_types, $price->type(), 'id="PRT_ID"'); ?>
                     <p class="description">
                         <?php
-                            _e(
-                                'Price Modifier. Default items will apply to ALL new events you create.',
-                                'event_espresso'
-                            );
-                        ?></p>
+							_e(
+								'Price Modifier. Default items will apply to ALL new events you create.',
+								'event_espresso'
+							);
+						?></p>
                 <?php endif; ?>
             </td>
         </tr>
         <tr valign="top">
             <th><label for="PRC_name"><?php
-                    _e(
-                        'Name',
-                        'event_espresso'
-                    ); ?></label> <?php echo EEH_Template::get_help_tab_link('name_field_info'); ?></th>
+					_e(
+						'Name',
+						'event_espresso'
+					); ?></label> <?php echo EEH_Template::get_help_tab_link('name_field_info'); ?></th>
             <td>
                 <input class="regular-text" type="text" id="PRC_name" name="PRC_name"
                        value="<?php $price->f('PRC_name'); ?>"/>
@@ -45,22 +45,22 @@ 
         </tr>
         <tr valign="top">
             <th><label for="PRC_desc"><?php
-                    _e(
-                        'Description',
-                        'event_espresso'
-                    ); ?></label> <?php echo EEH_Template::get_help_tab_link('description_field_info'); ?></th>
+					_e(
+						'Description',
+						'event_espresso'
+					); ?></label> <?php echo EEH_Template::get_help_tab_link('description_field_info'); ?></th>
             <td>
                     <textarea class="regular-text" id="PRC_desc" name="PRC_desc" rows="5"><?php
-                        $price->f('PRC_desc');
-                    ?></textarea><br/>
+						$price->f('PRC_desc');
+					?></textarea><br/>
             </td>
         </tr>
         <tr valign="top">
             <th><label for="PRC_amount"><?php
-                    _e(
-                        'Amount',
-                        'event_espresso'
-                    ); ?><?php echo EEH_Template::get_help_tab_link('amount_field_info'); ?></label></th>
+					_e(
+						'Amount',
+						'event_espresso'
+					); ?><?php echo EEH_Template::get_help_tab_link('amount_field_info'); ?></label></th>
             <td>
                 <input class="small-text ee-numeric" type="text" id="PRC_amount" name="PRC_amount"
                        value="<?php echo $price->amount(); ?>"/>

caffeinated/admin/new/pricing/templates/event_tickets_datetime_ticket_row.template.php

Indentation +106 added lines, -106 removed lines

@@ -1,6 +1,6 @@ 
 <tr valign="top" class="ee-ticket-sortable ticket-row<?php echo $ticket_archive_class;
 if (WP_DEBUG) {
-    echo ' ee-wp-debug';
+	echo ' ee-wp-debug';
 } ?>" id="display-ticketrow-<?php echo $tkt_row; ?>">
     <!--<td class="ee-tkt-order-field"><span class="dashicons dashicons-sort<?php echo $tkt_status_class; ?>"><input type="hidden" name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_order]" class="edit-ticket-TKT_order" value ="<?php echo $TKT_order; ?>" ></span></td>-->
     <td class="ee-tkt-order-field"><span
@@ -107,9 +107,9 @@ 
                    class="edit-ticket-TKT_row" value="<?php echo $tkt_row; ?>">
 
             <!--<div class="total-price-container"><?php printf(
-                esc_html__('Total Final Price: %s', 'event_espresso'),
-                '<span class="ticket-price-amount">' . $TKT_price . '</span>'
-            ); ?> </div>-->
+				esc_html__('Total Final Price: %s', 'event_espresso'),
+				'<span class="ticket-price-amount">' . $TKT_price . '</span>'
+			); ?> </div>-->
             <textarea name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_description]"
                       class="edit-ticket-TKT_description ee-full-textarea-inp"
                       placeholder="Ticket Description"><?php echo $TKT_description; ?></textarea>
@@ -123,20 +123,20 @@ 
                     <thead>
                     <tr valign="bottom">
                         <td><span class="TD_TKT_number_datetimes_label"><?php
-                                esc_html_e(
-                                    '# Datetimes',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'# Datetimes',
+									'event_espresso'
+								); ?></span></td>
                         <td><span class="TD_TKT_min_qty_label"><?php
-                                esc_html_e(
-                                    'Minimum Quantity',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'Minimum Quantity',
+									'event_espresso'
+								); ?></span></td>
                         <td><span class="TD_TKT_max_qty_label"><?php
-                                esc_html_e(
-                                    'Maximum Quantity',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'Maximum Quantity',
+									'event_espresso'
+								); ?></span></td>
                     </tr>
                     </thead>
                     <tbody>
@@ -194,24 +194,24 @@ 
                     <input type="checkbox"
                            name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_required]"
                            class="edit-ticket-TKT_required" value="1"<?php
-                            echo $TKT_required
-                                ? ' checked="checked"'
-                                : '';
-                            echo $disabled
-                                ? ' disabled'
-                                : ''; ?>>
+							echo $TKT_required
+								? ' checked="checked"'
+								: '';
+							echo $disabled
+								? ' disabled'
+								: ''; ?>>
                     <label for="edit-ticket-TKT_required"><?php
-                        esc_html_e(
-                            'This ticket is required (will appear first in frontend ticket lists).',
-                            'event_espresso'
-                        ); ?></label>
+						esc_html_e(
+							'This ticket is required (will appear first in frontend ticket lists).',
+							'event_espresso'
+						); ?></label>
                 </div>
                 <div class="ticket-is-taxable-container">
                     <?php if (! empty($tax_rows)) { ?>
                         <?php if ($disabled) : ?>
                             <?php
-                            $tax_value = ! empty($TKT_taxable) ? 1 : 0;
-                            ?>
+							$tax_value = ! empty($TKT_taxable) ? 1 : 0;
+							?>
                         <input class="TKT-taxable-checkbox" type="hidden"
                                name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_taxable]"
                                value="<?php echo $tax_value; ?>">
@@ -225,16 +225,16 @@ 
                                value="1"<?php echo $TKT_taxable; ?>>
                         <?php endif; ?>
                     <label for="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>"> <?php
-                        esc_html_e('This ticket is taxable.', 'event_espresso'); ?>
+						esc_html_e('This ticket is taxable.', 'event_espresso'); ?>
                     <?php } //end tax_rows check ?>
                 </div>
             </div>
             <div class="price-table-container">
                 <h4 class="tickets-heading price-table-info"<?php echo $show_price_modifier; ?>><?php
-                    esc_html_e(
-                        'Price Modifiers',
-                        'event_espresso'
-                    ); ?></h4>
+					esc_html_e(
+						'Price Modifiers',
+						'event_espresso'
+					); ?></h4>
                 <table class="price-table">
                     <thead class="price-table-info"<?php echo $show_price_modifier; ?>>
                     <tr>
@@ -254,10 +254,10 @@ 
                     <tr class="price-subtotal-row TKT-taxes-display"<?php echo $display_subtotal; ?>>
                         <td colspan="4" class="ee-numeric">
                             <span class="TKT-taxable-subtotal-label"><strong><?php
-                                    esc_html_e(
-                                        'Subtotal',
-                                        'event_espresso'
-                                    ); ?></strong></span>
+									esc_html_e(
+										'Subtotal',
+										'event_espresso'
+									); ?></strong></span>
                         </td>
                         <td class="ee-numeric">
                             <span
@@ -290,51 +290,51 @@ 
             <div style="clear:both"></div>
             <h4 class="tickets-heading"><?php esc_html_e('Event Datetimes', 'event_espresso'); ?></h4>
             <p><?php
-                esc_html_e(
-                    'This ticket will be usable (allow entrance) for the following selected event datetimes (click to select).  The "# Datetimes" amount (above) indicates how many of the assigned datetimes the ticket holder can gain access to:',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'This ticket will be usable (allow entrance) for the following selected event datetimes (click to select).  The "# Datetimes" amount (above) indicates how many of the assigned datetimes the ticket holder can gain access to:',
+					'event_espresso'
+				); ?></p>
             <ul class="datetime-tickets-list">
                 <?php echo $ticket_datetimes_list; ?>
             </ul>
 
             <?php do_action(
-                'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end',
-                $tkt_row,
-                $TKT_ID
-            ); ?>
+				'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end',
+				$tkt_row,
+				$TKT_ID
+			); ?>
             <div class="ee-editor-footer-container">
                 <div class="ee-editor-id-container">
                     <span class="ee-item-id"><?php echo
-                        $TKT_ID
-                            ? sprintf(
-                                esc_html__('Ticket ID: %d', 'event_espresso'),
-                                $TKT_ID
-                            )
-                                             : ''; ?></span>
+						$TKT_ID
+							? sprintf(
+								esc_html__('Ticket ID: %d', 'event_espresso'),
+								$TKT_ID
+							)
+											 : ''; ?></span>
                 </div>
                 <div class="save-cancel-button-container">
                     <label for="edit-ticket-TKT_is_default_selector"><?php
-                        esc_html_e(
-                            'use this new ticket as a default ticket for any new events',
-                            'event_espresso'
-                        ); ?></label>
+						esc_html_e(
+							'use this new ticket as a default ticket for any new events',
+							'event_espresso'
+						); ?></label>
                     <input type="checkbox"
                            name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_is_default_selector]"
                            class="edit-ticket-TKT_is_default_selector" value="1"<?php
-                            echo $disabled
-                                ? ' disabled'
-                                : ''; ?>>
+							echo $disabled
+								? ' disabled'
+								: ''; ?>>
                     <input type="hidden"
                            name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_is_default]"
                            class="edit-ticket-TKT_is_default" value="<?php echo $TKT_is_default; ?>">
                     <!--<button class="button-primary ee-save-button" data-context="ticket" data-ticket-row="<?php echo $tkt_row; ?>"><?php esc_html_e(
-                        'Update Ticket',
-                        'event_espresso'
-                    ); ?></button>-->
+						'Update Ticket',
+						'event_espresso'
+					); ?></button>-->
                     <button class="button-secondary ee-cancel-button" data-context="ticket"
                             data-ticket-row="<?php echo $tkt_row; ?>"><?php
-                                    esc_html_e('Close', 'event_espresso'); ?></button>
+									esc_html_e('Close', 'event_espresso'); ?></button>
                 </div>
             </div>
             <!-- these hidden inputs are for tracking changes in dtts attached to tickets during a js session -->
@@ -356,47 +356,47 @@ 
 </tr>
 <?php
 /**
- * template args in use
- *
- * $tkt_row
- * $tkt_status_class
- * $TKT_name
- * $TKT_start_date
- * $TKT_end_date
- * $TKT_status
- * $TKT_price
- * $TKT_qty
- * $TKT_uses
- * $TKT_min
- * $TKT_max
- * $TKT_sold
- * $TKT_registrations
- * $TKT_ID
- * $TKT_description
- * $TKT_is_default
- * $TKT_price_rows
- * $TKT_base_price
- * $TKT_base_price_ID
- * $TKT_order
- * $disabled
- * $ticket_archive_class
- * $trash_icon
- * $trash_hidden
- * $clone_icon
- * $display_edit_tkt_row
- * $edit_tkt_expanded
- *
- * $TKT_taxable
- * $display_subtotal
- * $TKT_subtotal_amount
- * $tax_rows
- *
- * $show_price_modifier;
- * $total_price_rows
- * $ticket_datetimes_list
- * $starting_ticket_datetime_rows (datetimes attached to ticket on page load)
- * $existing_ticket_price_ids;
- * $ticket_template_id;
- * $show_price_modifier
- * $show_price_mod_button
- */
+									 * template args in use
+									 *
+									 * $tkt_row
+									 * $tkt_status_class
+									 * $TKT_name
+									 * $TKT_start_date
+									 * $TKT_end_date
+									 * $TKT_status
+									 * $TKT_price
+									 * $TKT_qty
+									 * $TKT_uses
+									 * $TKT_min
+									 * $TKT_max
+									 * $TKT_sold
+									 * $TKT_registrations
+									 * $TKT_ID
+									 * $TKT_description
+									 * $TKT_is_default
+									 * $TKT_price_rows
+									 * $TKT_base_price
+									 * $TKT_base_price_ID
+									 * $TKT_order
+									 * $disabled
+									 * $ticket_archive_class
+									 * $trash_icon
+									 * $trash_hidden
+									 * $clone_icon
+									 * $display_edit_tkt_row
+									 * $edit_tkt_expanded
+									 *
+									 * $TKT_taxable
+									 * $display_subtotal
+									 * $TKT_subtotal_amount
+									 * $tax_rows
+									 *
+									 * $show_price_modifier;
+									 * $total_price_rows
+									 * $ticket_datetimes_list
+									 * $starting_ticket_datetime_rows (datetimes attached to ticket on page load)
+									 * $existing_ticket_price_ids;
+									 * $ticket_template_id;
+									 * $show_price_modifier
+									 * $show_price_mod_button
+									 */

Spacing +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
 
             <!--<div class="total-price-container"><?php printf(
                 esc_html__('Total Final Price: %s', 'event_espresso'),
-                '<span class="ticket-price-amount">' . $TKT_price . '</span>'
+                '<span class="ticket-price-amount">'.$TKT_price.'</span>'
             ); ?> </div>-->
             <textarea name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_description]"
                       class="edit-ticket-TKT_description ee-full-textarea-inp"
@@ -207,7 +207,7 @@ 
                         ); ?></label>
                 </div>
                 <div class="ticket-is-taxable-container">
-                    <?php if (! empty($tax_rows)) { ?>
+                    <?php if ( ! empty($tax_rows)) { ?>
                         <?php if ($disabled) : ?>
                             <?php
                             $tax_value = ! empty($TKT_taxable) ? 1 : 0;

Braces +40 added lines, -16 removed lines

@@ -19,8 +19,11 @@ 
                    class="edit-ticket-TKT_start_date ee-text-inp" value="<?php echo $TKT_start_date; ?>">
             <input type="text" name="archived_ticket[TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp"
                    value="<?php echo $TKT_start_date; ?>" disabled>
-        <?php else : ?>
-            <input id="edit-ticket-TKT_start_date-<?php echo $tkt_row; ?>" type="text"
+        <?php else {
+	: ?>
+            <input id="edit-ticket-TKT_start_date-<?php echo $tkt_row;
+}
+?>" type="text"
                    name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_start_date]"
                    class="edit-ticket-TKT_start_date ee-text-inp ee-datepicker" value="<?php echo $TKT_start_date; ?>"
                    data-context="start-ticket" data-date-field-context="#display-ticketrow-<?php echo $tkt_row; ?>"
@@ -34,8 +37,11 @@ 
                    class="edit-ticket-TKT_end_date ee-text-inp" value="<?php echo $TKT_end_date; ?>">
             <input type="text" name="archived_ticket[TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp"
                    value="<?php echo $TKT_end_date; ?>" disabled>
-        <?php else : ?>
-            <input id="edit-ticket-TKT_end_date-<?php echo $tkt_row; ?>" type="text"
+        <?php else {
+	: ?>
+            <input id="edit-ticket-TKT_end_date-<?php echo $tkt_row;
+}
+?>" type="text"
                    name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_end_date]"
                    class="edit-ticket-TKT_end_date ee-text-inp ee-datepicker" value="<?php echo $TKT_end_date; ?>"
                    data-context="end-ticket" data-date-field-context="#display-ticketrow-<?php echo $tkt_row; ?>"
@@ -51,8 +57,11 @@ 
             <input type="text" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_base_price]"
                    class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric"
                    value="<?php echo $TKT_base_price; ?>" disabled>
-        <?php else : ?>
-            <input id="edit-ticket-TKT_base_price-<?php echo $tkt_row; ?>" type="text"
+        <?php else {
+	: ?>
+            <input id="edit-ticket-TKT_base_price-<?php echo $tkt_row;
+}
+?>" type="text"
                    name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_base_price]"
                    class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric"
                    value="<?php echo $TKT_base_price; ?>">
@@ -69,8 +78,11 @@ 
             <input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric"
                    name="archived_ticket[<?php echo $tkt_row; ?>][TKT_qty]" value="<?php echo $TKT_qty_for_input; ?>"
                    disabled>
-        <?php else : ?>
-            <input type="text" id="edit-ticket-TKT_qty-<?php echo $tkt_row; ?>"
+        <?php else {
+	: ?>
+            <input type="text" id="edit-ticket-TKT_qty-<?php echo $tkt_row;
+}
+?>"
                    class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric"
                    name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_qty]"
                    value="<?php echo $TKT_qty_for_input; ?>">
@@ -149,9 +161,12 @@ 
                                 <input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric"
                                        name="archived_ticket[<?php echo $tkt_row; ?>][TKT_uses]"
                                        value="<?php echo $TKT_uses; ?>" disabled>
-                            <?php else : ?>
+                            <?php else {
+	: ?>
                                 <input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric"
-                                       name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_uses]"
+                                       name="<?php echo $edit_tickets_name;
+}
+?>[<?php echo $tkt_row; ?>][TKT_uses]"
                                        value="<?php echo $TKT_uses; ?>">
                             <?php endif; ?>
                         </td>
@@ -163,9 +178,12 @@ 
                                 <input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric"
                                        name="archived_ticket[<?php echo $tkt_row; ?>][TKT_min]"
                                        value="<?php echo $TKT_min; ?>" disabled>
-                            <?php else : ?>
+                            <?php else {
+	: ?>
                                 <input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric"
-                                       name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_min]"
+                                       name="<?php echo $edit_tickets_name;
+}
+?>[<?php echo $tkt_row; ?>][TKT_min]"
                                        value="<?php echo $TKT_min; ?>">
                             <?php endif; ?>
                         </td>
@@ -177,9 +195,12 @@ 
                                 <input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric"
                                        name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_max]"
                                        value="<?php echo $TKT_max; ?>" disabled>
-                            <?php else : ?>
+                            <?php else {
+	: ?>
                                 <input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric"
-                                       name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_max]"
+                                       name="<?php echo $edit_tickets_name;
+}
+?>[<?php echo $tkt_row; ?>][TKT_max]"
                                        value="<?php echo $TKT_max; ?>">
                             <?php endif; ?>
                         </td>
@@ -218,8 +239,11 @@ 
                         <input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>"
                                type="checkbox" name="archived_ticket[<?php echo $tkt_row; ?>][TKT_taxable]"
                                value="1"<?php echo $TKT_taxable; ?> disabled>
-                        <?php else : ?>
-                        <input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row; ?>"
+                        <?php else {
+	: ?>
+                        <input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo $tkt_row;
+}
+?>"
                                type="checkbox"
                                name="<?php echo $edit_tickets_name; ?>[<?php echo $tkt_row; ?>][TKT_taxable]"
                                value="1"<?php echo $TKT_taxable; ?>>