eventespresso / event-espresso-core

core/services/privacy/export/PersonalDataExporterManager.php

Indentation +58 added lines, -58 removed lines

@@ -23,68 +23,68 @@
 class PersonalDataExporterManager
 {
 
-    public function __construct()
-    {
-        add_filter(
-            'wp_privacy_personal_data_exporters',
-            array($this, 'hookInExporters')
-        );
-    }
+	public function __construct()
+	{
+		add_filter(
+			'wp_privacy_personal_data_exporters',
+			array($this, 'hookInExporters')
+		);
+	}
 
 
-    /**
-     * Adds EE's exporters to the list of WP exporters
-     *
-     * @param array $exporters
-     * @return array
-     */
-    public function hookInExporters($exporters)
-    {
-        // load all the privacy policy stuff
-        // add post policy text
-        foreach ($this->loadPrivateDataExporterCollection() as $exporter) {
-            $exporters[ get_class($exporter) ] = array(
-                'exporter_friendly_name' => $exporter->name(),
-                'callback'               => array($exporter, 'export'),
-            );
-        }
-        return $exporters;
-    }
+	/**
+	 * Adds EE's exporters to the list of WP exporters
+	 *
+	 * @param array $exporters
+	 * @return array
+	 */
+	public function hookInExporters($exporters)
+	{
+		// load all the privacy policy stuff
+		// add post policy text
+		foreach ($this->loadPrivateDataExporterCollection() as $exporter) {
+			$exporters[ get_class($exporter) ] = array(
+				'exporter_friendly_name' => $exporter->name(),
+				'callback'               => array($exporter, 'export'),
+			);
+		}
+		return $exporters;
+	}
 
 
-    /**
-     * @return CollectionInterface|PersonalDataExporterInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function loadPrivateDataExporterCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-                // collection name
-                'personal_data_exporters',
-                // collection interface
-                'EventEspresso\core\services\privacy\export\PersonalDataExporterInterface',
-                // FQCNs for classes to add (all classes within that namespace will be loaded)
-                apply_filters(
-                    'FHEE__EventEspresso_core_services_privacy_export_PersonalDataExporterManager__exporters',
-                    array('EventEspresso\core\domain\services\admin\privacy\export')
-                ),
-                // filepaths to classes to add
-                array(),
-                // file mask to use if parsing folder for files to add
-                '',
-                // what to use as identifier for collection entities
-                // using CLASS NAME prevents duplicates (works like a singleton)
-                CollectionDetails::ID_CLASS_NAME
-            )
-        );
-        return $loader->getCollection();
-    }
+	/**
+	 * @return CollectionInterface|PersonalDataExporterInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function loadPrivateDataExporterCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+				// collection name
+				'personal_data_exporters',
+				// collection interface
+				'EventEspresso\core\services\privacy\export\PersonalDataExporterInterface',
+				// FQCNs for classes to add (all classes within that namespace will be loaded)
+				apply_filters(
+					'FHEE__EventEspresso_core_services_privacy_export_PersonalDataExporterManager__exporters',
+					array('EventEspresso\core\domain\services\admin\privacy\export')
+				),
+				// filepaths to classes to add
+				array(),
+				// file mask to use if parsing folder for files to add
+				'',
+				// what to use as identifier for collection entities
+				// using CLASS NAME prevents duplicates (works like a singleton)
+				CollectionDetails::ID_CLASS_NAME
+			)
+		);
+		return $loader->getCollection();
+	}
 }
 
 // End of file PersonalDataExporterManager.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         // load all the privacy policy stuff
         // add post policy text
         foreach ($this->loadPrivateDataExporterCollection() as $exporter) {
-            $exporters[ get_class($exporter) ] = array(
+            $exporters[get_class($exporter)] = array(
                 'exporter_friendly_name' => $exporter->name(),
                 'callback'               => array($exporter, 'export'),
             );

core/services/privacy/erasure/PersonalDataEraserManager.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         // load all the privacy policy stuff
         // add post policy text
         foreach ($this->loadPrivateDataEraserCollection() as $eraser) {
-            $erasers[ get_class($eraser) ] = array(
+            $erasers[get_class($eraser)] = array(
                 'eraser_friendly_name' => $eraser->name(),
                 'callback'             => array($eraser, 'erase'),
             );

Indentation +55 added lines, -55 removed lines

@@ -23,65 +23,65 @@
 class PersonalDataEraserManager
 {
 
-    public function __construct()
-    {
-        add_filter(
-            'wp_privacy_personal_data_erasers',
-            array($this, 'hookInErasers')
-        );
-    }
+	public function __construct()
+	{
+		add_filter(
+			'wp_privacy_personal_data_erasers',
+			array($this, 'hookInErasers')
+		);
+	}
 
 
-    /**
-     * For all the registered `PrivateDataEraserInterface`s, add them as erasers
-     */
-    public function hookInErasers($erasers)
-    {
-        // load all the privacy policy stuff
-        // add post policy text
-        foreach ($this->loadPrivateDataEraserCollection() as $eraser) {
-            $erasers[ get_class($eraser) ] = array(
-                'eraser_friendly_name' => $eraser->name(),
-                'callback'             => array($eraser, 'erase'),
-            );
-        }
-        return $erasers;
-    }
+	/**
+	 * For all the registered `PrivateDataEraserInterface`s, add them as erasers
+	 */
+	public function hookInErasers($erasers)
+	{
+		// load all the privacy policy stuff
+		// add post policy text
+		foreach ($this->loadPrivateDataEraserCollection() as $eraser) {
+			$erasers[ get_class($eraser) ] = array(
+				'eraser_friendly_name' => $eraser->name(),
+				'callback'             => array($eraser, 'erase'),
+			);
+		}
+		return $erasers;
+	}
 
 
-    /**
-     * @return CollectionInterface|PersonalDataEraserInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function loadPrivateDataEraserCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-                // collection name
-                'privacy_erasers',
-                // collection interface
-                'EventEspresso\core\services\privacy\erasure\PersonalDataEraserInterface',
-                // FQCNs for classes to add (all classes within that namespace will be loaded)
-                apply_filters(
-                    'FHEE__EventEspresso_core_services_privacy_erasure_PersonalDataEraserManager__erasers',
-                    array('EventEspresso\core\domain\services\admin\privacy\erasure')
-                ),
-                // filepaths to classes to add
-                array(),
-                // file mask to use if parsing folder for files to add
-                '',
-                // what to use as identifier for collection entities
-                // using CLASS NAME prevents duplicates (works like a singleton)
-                CollectionDetails::ID_CLASS_NAME
-            )
-        );
-        return $loader->getCollection();
-    }
+	/**
+	 * @return CollectionInterface|PersonalDataEraserInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function loadPrivateDataEraserCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+				// collection name
+				'privacy_erasers',
+				// collection interface
+				'EventEspresso\core\services\privacy\erasure\PersonalDataEraserInterface',
+				// FQCNs for classes to add (all classes within that namespace will be loaded)
+				apply_filters(
+					'FHEE__EventEspresso_core_services_privacy_erasure_PersonalDataEraserManager__erasers',
+					array('EventEspresso\core\domain\services\admin\privacy\erasure')
+				),
+				// filepaths to classes to add
+				array(),
+				// file mask to use if parsing folder for files to add
+				'',
+				// what to use as identifier for collection entities
+				// using CLASS NAME prevents duplicates (works like a singleton)
+				CollectionDetails::ID_CLASS_NAME
+			)
+		);
+		return $loader->getCollection();
+	}
 }
 // End of file PersonalDataEraserManager.php
 // Location: EventEspresso\core\domain\services\admin/PersonalDataEraserManager.php

core/domain/services/custom_post_types/RegisterCustomTaxonomies.php

Indentation +85 added lines, -85 removed lines

@@ -17,97 +17,97 @@
 class RegisterCustomTaxonomies
 {
 
-    /**
-     * @var CustomTaxonomyDefinitions $custom_taxonomies
-     */
-    public $custom_taxonomies;
+	/**
+	 * @var CustomTaxonomyDefinitions $custom_taxonomies
+	 */
+	public $custom_taxonomies;
 
 
-    /**
-     * RegisterCustomTaxonomies constructor.
-     *
-     * @param CustomTaxonomyDefinitions $custom_taxonomies
-     */
-    public function __construct(CustomTaxonomyDefinitions $custom_taxonomies)
-    {
-        $this->custom_taxonomies = $custom_taxonomies;
-    }
+	/**
+	 * RegisterCustomTaxonomies constructor.
+	 *
+	 * @param CustomTaxonomyDefinitions $custom_taxonomies
+	 */
+	public function __construct(CustomTaxonomyDefinitions $custom_taxonomies)
+	{
+		$this->custom_taxonomies = $custom_taxonomies;
+	}
 
 
-    /**
-     * @return void
-     * @throws DomainException
-     */
-    public function registerCustomTaxonomies()
-    {
-        $custom_taxonomies = $this->custom_taxonomies->getCustomTaxonomyDefinitions();
-        foreach ($custom_taxonomies as $taxonomy => $tax) {
-            $this->registerCustomTaxonomy(
-                $taxonomy,
-                $tax['singular_name'],
-                $tax['plural_name'],
-                $tax['args']
-            );
-        }
-    }
+	/**
+	 * @return void
+	 * @throws DomainException
+	 */
+	public function registerCustomTaxonomies()
+	{
+		$custom_taxonomies = $this->custom_taxonomies->getCustomTaxonomyDefinitions();
+		foreach ($custom_taxonomies as $taxonomy => $tax) {
+			$this->registerCustomTaxonomy(
+				$taxonomy,
+				$tax['singular_name'],
+				$tax['plural_name'],
+				$tax['args']
+			);
+		}
+	}
 
 
-    /**
-     * Registers a custom taxonomy. Should be called before registering custom post types,
-     * otherwise you should link the taxonomy to the custom post type using 'register_taxonomy_for_object_type'.
-     *
-     * @param string $taxonomy_name      , eg 'books'
-     * @param string $singular_name      internationalized singular name
-     * @param string $plural_name        internationalized plural name
-     * @param array  $override_arguments like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
-     * @throws DomainException
-     */
-    public function registerCustomTaxonomy($taxonomy_name, $singular_name, $plural_name, array $override_arguments)
-    {
-        $result = register_taxonomy(
-            $taxonomy_name,
-            null,
-            $this->prepareArguments(
-                $singular_name,
-                $plural_name,
-                $override_arguments
-            )
-        );
-        if ($result instanceof WP_Error) {
-            throw new DomainException($result->get_error_message());
-        }
-    }
+	/**
+	 * Registers a custom taxonomy. Should be called before registering custom post types,
+	 * otherwise you should link the taxonomy to the custom post type using 'register_taxonomy_for_object_type'.
+	 *
+	 * @param string $taxonomy_name      , eg 'books'
+	 * @param string $singular_name      internationalized singular name
+	 * @param string $plural_name        internationalized plural name
+	 * @param array  $override_arguments like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
+	 * @throws DomainException
+	 */
+	public function registerCustomTaxonomy($taxonomy_name, $singular_name, $plural_name, array $override_arguments)
+	{
+		$result = register_taxonomy(
+			$taxonomy_name,
+			null,
+			$this->prepareArguments(
+				$singular_name,
+				$plural_name,
+				$override_arguments
+			)
+		);
+		if ($result instanceof WP_Error) {
+			throw new DomainException($result->get_error_message());
+		}
+	}
 
 
-    /**
-     * @param string $singular_name
-     * @param string $plural_name
-     * @param array  $override_arguments
-     * @since 4.9.62.p
-     * @return array
-     */
-    protected function prepareArguments($singular_name, $plural_name, array $override_arguments)
-    {
-        $arguments = array(
-            'hierarchical'      => true,
-            'labels'            => array(
-                'name'          => $plural_name,
-                'singular_name' => $singular_name,
-            ),
-            'show_ui'           => true,
-            'show_ee_ui'        => true,
-            'show_admin_column' => true,
-            'query_var'         => true,
-            'show_in_nav_menus' => false,
-            'map_meta_cap'      => true,
-        );
-        if ($override_arguments) {
-            if (isset($override_args['labels'])) {
-                $labels = array_merge($arguments['labels'], $override_arguments['labels']);
-                $arguments['labels'] = $labels;
-            }
-            $arguments = array_merge($arguments, $override_arguments);
-        }
-        return $arguments;
-    }
+	/**
+	 * @param string $singular_name
+	 * @param string $plural_name
+	 * @param array  $override_arguments
+	 * @since 4.9.62.p
+	 * @return array
+	 */
+	protected function prepareArguments($singular_name, $plural_name, array $override_arguments)
+	{
+		$arguments = array(
+			'hierarchical'      => true,
+			'labels'            => array(
+				'name'          => $plural_name,
+				'singular_name' => $singular_name,
+			),
+			'show_ui'           => true,
+			'show_ee_ui'        => true,
+			'show_admin_column' => true,
+			'query_var'         => true,
+			'show_in_nav_menus' => false,
+			'map_meta_cap'      => true,
+		);
+		if ($override_arguments) {
+			if (isset($override_args['labels'])) {
+				$labels = array_merge($arguments['labels'], $override_arguments['labels']);
+				$arguments['labels'] = $labels;
+			}
+			$arguments = array_merge($arguments, $override_arguments);
+		}
+		return $arguments;
+	}
 }

core/CPTs/EE_Register_CPTs.core.php

Indentation +313 added lines, -313 removed lines

@@ -19,303 +19,303 @@ 
 {
 
 
-    /**
-     * instantiated at init priority 5
-     *
-     * @deprecated 4.9.62.p
-     */
-    public function __construct()
-    {
-        do_action('AHEE__EE_Register_CPTs__construct_end', $this);
-    }
-
-
-    /**
-     * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
-     *
-     * @deprecated 4.9.62.p
-     * @return void
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public static function maybe_flush_rewrite_rules()
-    {
-        /** @var EventEspresso\core\domain\services\custom_post_types\RewriteRules $rewrite_rules */
-        $rewrite_rules = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\services\custom_post_types\RewriteRules'
-        );
-        $rewrite_rules->flushRewriteRules();
-    }
-
-
-    /**
-     * @return CustomTaxonomyDefinitions
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getTaxonomyDefinitions()
-    {
-        return LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions'
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $description The description content.
-     * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function ee_filter_ee_term_description_not_wp($description, $taxonomy)
-    {
-        $taxonomies = EE_Register_CPTs::getTaxonomyDefinitions();
-        return $taxonomies->filterCustomTermDescription($description, $taxonomy);
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_taxonomies()
-    {
-        $taxonomies = EE_Register_CPTs::getTaxonomyDefinitions();
-        return $taxonomies->getCustomTaxonomyDefinitions();
-    }
-
-
-    /**
-     * @return CustomPostTypeDefinitions
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getCustomPostTypeDefinitions()
-    {
-        return LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_CPTs()
-    {
-        $custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
-        return $custom_post_types->getDefinitions();
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_private_CPTs()
-    {
-        $custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
-        return $custom_post_types->getPrivateCustomPostTypes();
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $post_type_slug              If a slug is included, then attempt to retrieve the model name for
-     *                                            the given cpt slug.  Otherwise if empty, then we'll return all cpt
-     *                                            model names for cpts registered in EE.
-     * @return array           Empty array if no matching model names for the given slug or an array of model
-     *                                            names indexed by post type slug.
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function get_cpt_model_names($post_type_slug = '')
-    {
-        $custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
-        return $custom_post_types->getCustomPostTypeModelNames($post_type_slug);
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
-     *                               the cpt matching the given slug.  Otherwise all cpt models will be
-     *                               instantiated (if possible).
-     * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
-     *                               EEM models indexed by post slug.
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function instantiate_cpt_models($post_type_slug = '')
-    {
-        $custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
-        return $custom_post_types->getCustomPostTypeModels($post_type_slug);
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $taxonomy_name , eg 'books'
-     * @param string $singular_name internationalized singular name
-     * @param string $plural_name   internationalized plural name
-     * @param array  $override_args like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     */
-    public function register_taxonomy($taxonomy_name, $singular_name, $plural_name, $override_args = array())
-    {
-        /** @var \EventEspresso\core\domain\services\custom_post_types\registerCustomTaxonomies $taxonomies */
-        $taxonomies = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'
-        );
-        $taxonomies->registerCustomTaxonomy(
-            $taxonomy_name,
-            $singular_name,
-            $plural_name,
-            $override_args
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $post_type     the actual post type name
-     *                              (VERY IMPORTANT: this much match what the slug is for admin pages related to this
-     *                              cpt Also any models must use this slug as well)
-     * @param string $singular_name a pre-internationalized string for the singular name of the objects
-     * @param string $plural_name   a pre-internalized string for the plural name of the objects
-     * @param array  $override_args exactly like $args as described in
-     *                              http://codex.wordpress.org/Function_Reference/register_post_type The default values
-     *                              set in this function will be overridden by whatever you set in $override_args
-     * @param string $singular_slug
-     * @param string $plural_slug
-     * @return void , but registers the custom post type
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     */
-    public function register_CPT(
-        $post_type,
-        $singular_name,
-        $plural_name,
-        $override_args = array(),
-        $singular_slug = '',
-        $plural_slug = ''
-    ) {
-        /** @var \EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes $register_custom_post_types */
-        $register_custom_post_types = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'
-        );
-        $register_custom_post_types->registerCustomPostType(
-            $post_type,
-            $singular_name,
-            $plural_name,
-            $singular_slug,
-            $plural_slug,
-            $override_args
-        );
-    }
-
-
-    /**
-     * @return RegisterCustomTaxonomyTerms
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getRegisterCustomTaxonomyTerms()
-    {
-        return LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomyTerms'
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function set_must_use_event_types()
-    {
-        $register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
-        $register_custom_taxonomy_terms->setMustUseEventTypes();
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $taxonomy     The name of the taxonomy
-     * @param array  $term_details An array of term details indexed by slug and containing Name of term, and
-     *                             description as the elements in the array
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function set_must_use_terms($taxonomy, $term_details)
-    {
-        $register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
-        $register_custom_taxonomy_terms->setMustUseTerms($taxonomy, $term_details);
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $taxonomy  The taxonomy we're using for the default term
-     * @param string $term_slug The slug of the term that will be the default.
-     * @param array  $cpt_slugs An array of custom post types we want the default assigned to
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function set_default_term($taxonomy, $term_slug, $cpt_slugs = array())
-    {
-        $register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
-        $register_custom_taxonomy_terms->registerCustomTaxonomyTerm(
-            $taxonomy,
-            $term_slug,
-            $cpt_slugs
-        );
-    }
-
-
-    /**
-     * @deprecated 4.9.62.p
-     * @param  int     $post_id ID of CPT being saved
-     * @param  WP_Post $post    Post object
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function save_default_term($post_id, $post)
-    {
-        $register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
-        $register_custom_taxonomy_terms->saveDefaultTerm($post_id, $post);
-    }
+	/**
+	 * instantiated at init priority 5
+	 *
+	 * @deprecated 4.9.62.p
+	 */
+	public function __construct()
+	{
+		do_action('AHEE__EE_Register_CPTs__construct_end', $this);
+	}
+
+
+	/**
+	 * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
+	 *
+	 * @deprecated 4.9.62.p
+	 * @return void
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public static function maybe_flush_rewrite_rules()
+	{
+		/** @var EventEspresso\core\domain\services\custom_post_types\RewriteRules $rewrite_rules */
+		$rewrite_rules = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\services\custom_post_types\RewriteRules'
+		);
+		$rewrite_rules->flushRewriteRules();
+	}
+
+
+	/**
+	 * @return CustomTaxonomyDefinitions
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getTaxonomyDefinitions()
+	{
+		return LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions'
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $description The description content.
+	 * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function ee_filter_ee_term_description_not_wp($description, $taxonomy)
+	{
+		$taxonomies = EE_Register_CPTs::getTaxonomyDefinitions();
+		return $taxonomies->filterCustomTermDescription($description, $taxonomy);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_taxonomies()
+	{
+		$taxonomies = EE_Register_CPTs::getTaxonomyDefinitions();
+		return $taxonomies->getCustomTaxonomyDefinitions();
+	}
+
+
+	/**
+	 * @return CustomPostTypeDefinitions
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getCustomPostTypeDefinitions()
+	{
+		return LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_CPTs()
+	{
+		$custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
+		return $custom_post_types->getDefinitions();
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_private_CPTs()
+	{
+		$custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
+		return $custom_post_types->getPrivateCustomPostTypes();
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $post_type_slug              If a slug is included, then attempt to retrieve the model name for
+	 *                                            the given cpt slug.  Otherwise if empty, then we'll return all cpt
+	 *                                            model names for cpts registered in EE.
+	 * @return array           Empty array if no matching model names for the given slug or an array of model
+	 *                                            names indexed by post type slug.
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function get_cpt_model_names($post_type_slug = '')
+	{
+		$custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
+		return $custom_post_types->getCustomPostTypeModelNames($post_type_slug);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
+	 *                               the cpt matching the given slug.  Otherwise all cpt models will be
+	 *                               instantiated (if possible).
+	 * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
+	 *                               EEM models indexed by post slug.
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function instantiate_cpt_models($post_type_slug = '')
+	{
+		$custom_post_types = EE_Register_CPTs::getCustomPostTypeDefinitions();
+		return $custom_post_types->getCustomPostTypeModels($post_type_slug);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $taxonomy_name , eg 'books'
+	 * @param string $singular_name internationalized singular name
+	 * @param string $plural_name   internationalized plural name
+	 * @param array  $override_args like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 */
+	public function register_taxonomy($taxonomy_name, $singular_name, $plural_name, $override_args = array())
+	{
+		/** @var \EventEspresso\core\domain\services\custom_post_types\registerCustomTaxonomies $taxonomies */
+		$taxonomies = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'
+		);
+		$taxonomies->registerCustomTaxonomy(
+			$taxonomy_name,
+			$singular_name,
+			$plural_name,
+			$override_args
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $post_type     the actual post type name
+	 *                              (VERY IMPORTANT: this much match what the slug is for admin pages related to this
+	 *                              cpt Also any models must use this slug as well)
+	 * @param string $singular_name a pre-internationalized string for the singular name of the objects
+	 * @param string $plural_name   a pre-internalized string for the plural name of the objects
+	 * @param array  $override_args exactly like $args as described in
+	 *                              http://codex.wordpress.org/Function_Reference/register_post_type The default values
+	 *                              set in this function will be overridden by whatever you set in $override_args
+	 * @param string $singular_slug
+	 * @param string $plural_slug
+	 * @return void , but registers the custom post type
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 */
+	public function register_CPT(
+		$post_type,
+		$singular_name,
+		$plural_name,
+		$override_args = array(),
+		$singular_slug = '',
+		$plural_slug = ''
+	) {
+		/** @var \EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes $register_custom_post_types */
+		$register_custom_post_types = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'
+		);
+		$register_custom_post_types->registerCustomPostType(
+			$post_type,
+			$singular_name,
+			$plural_name,
+			$singular_slug,
+			$plural_slug,
+			$override_args
+		);
+	}
+
+
+	/**
+	 * @return RegisterCustomTaxonomyTerms
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getRegisterCustomTaxonomyTerms()
+	{
+		return LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomyTerms'
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function set_must_use_event_types()
+	{
+		$register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
+		$register_custom_taxonomy_terms->setMustUseEventTypes();
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $taxonomy     The name of the taxonomy
+	 * @param array  $term_details An array of term details indexed by slug and containing Name of term, and
+	 *                             description as the elements in the array
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function set_must_use_terms($taxonomy, $term_details)
+	{
+		$register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
+		$register_custom_taxonomy_terms->setMustUseTerms($taxonomy, $term_details);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $taxonomy  The taxonomy we're using for the default term
+	 * @param string $term_slug The slug of the term that will be the default.
+	 * @param array  $cpt_slugs An array of custom post types we want the default assigned to
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function set_default_term($taxonomy, $term_slug, $cpt_slugs = array())
+	{
+		$register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
+		$register_custom_taxonomy_terms->registerCustomTaxonomyTerm(
+			$taxonomy,
+			$term_slug,
+			$cpt_slugs
+		);
+	}
+
+
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param  int     $post_id ID of CPT being saved
+	 * @param  WP_Post $post    Post object
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function save_default_term($post_id, $post)
+	{
+		$register_custom_taxonomy_terms = EE_Register_CPTs::getRegisterCustomTaxonomyTerms();
+		$register_custom_taxonomy_terms->saveDefaultTerm($post_id, $post);
+	}
 }
 
 /**
@@ -327,24 +327,24 @@ 
 class EE_Default_Term
 {
 
-    // props holding the items
-    public $taxonomy = '';
+	// props holding the items
+	public $taxonomy = '';
 
-    public $cpt_slugs = array();
+	public $cpt_slugs = array();
 
-    public $term_slug = '';
+	public $term_slug = '';
 
 
-    /**
-     * @deprecated 4.9.62.p
-     * @param string $taxonomy  The taxonomy the default term belongs to
-     * @param string $term_slug The slug of the term that will be the default.
-     * @param array  $cpt_slugs The custom post type the default term gets saved with
-     */
-    public function __construct($taxonomy, $term_slug, $cpt_slugs = array())
-    {
-        $this->taxonomy = $taxonomy;
-        $this->cpt_slugs = (array) $cpt_slugs;
-        $this->term_slug = $term_slug;
-    }
+	/**
+	 * @deprecated 4.9.62.p
+	 * @param string $taxonomy  The taxonomy the default term belongs to
+	 * @param string $term_slug The slug of the term that will be the default.
+	 * @param array  $cpt_slugs The custom post type the default term gets saved with
+	 */
+	public function __construct($taxonomy, $term_slug, $cpt_slugs = array())
+	{
+		$this->taxonomy = $taxonomy;
+		$this->cpt_slugs = (array) $cpt_slugs;
+		$this->term_slug = $term_slug;
+	}
 }

core/services/request/middleware/RecommendedVersions.php

Spacing +5 added lines, -5 removed lines

@@ -32,18 +32,18 @@ 
         $this->request = $request;
         $this->response = $response;
         // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
+        if ( ! $this->minimumWordPressVersionRequired()) {
             $this->request->unSetRequestParam('activate', true);
             add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
             $this->response->terminateRequest();
             $this->response->deactivatePlugin();
         }
         // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
+        if ( ! $this->minimumPhpVersionRecommended()) {
             $this->displayMinimumRecommendedPhpVersionNotice();
         }
         // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
+        if ( ! $this->upcomingRequiredPhpVersion()) {
             $this->displayUpcomingRequiredVersion();
         }
         $this->response = $this->processRequestStack($this->request, $this->response);
@@ -142,7 +142,7 @@ 
     {
         if ($this->request->isAdmin()) {
             new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+                'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
                 sprintf(
                     esc_html__(
                         'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
@@ -180,7 +180,7 @@ 
             && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
             && current_user_can('update_plugins')
         ) {
-            add_action('admin_notices', function () {
+            add_action('admin_notices', function() {
                 echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
                      . sprintf(
                          esc_html__(

Indentation +173 added lines, -173 removed lines

@@ -19,183 +19,183 @@
 class RecommendedVersions extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidDataTypeException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
-            $this->request->unSetRequestParam('activate', true);
-            add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
-            $this->response->terminateRequest();
-            $this->response->deactivatePlugin();
-        }
-        // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
-            $this->displayMinimumRecommendedPhpVersionNotice();
-        }
-        // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
-            $this->displayUpcomingRequiredVersion();
-        }
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
-
-
-    /**
-     * Helper method to assess installed wp version against given values.
-     * By default this compares the required minimum version of WP for EE against the installed version of WP
-     * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
-     * against) so consider that when sending in your values.
-     *
-     * @param string $version_to_check
-     * @param string $operator
-     * @return bool
-     */
-    public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
-    {
-        global $wp_version;
-        return version_compare(
-            // first account for wp_version being pre-release
-            // (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
-            strpos($wp_version, '-') > 0
-                ? substr($wp_version, 0, strpos($wp_version, '-'))
-                : $wp_version,
-            $version_to_check,
-            $operator
-        );
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumWordPressVersionRequired()
-    {
-        return RecommendedVersions::compareWordPressVersion();
-    }
-
-
-    /**
-     * @param string $min_version
-     * @return boolean
-     */
-    private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
-    {
-        return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumPhpVersionRecommended()
-    {
-        return $this->checkPhpVersion();
-    }
-
-
-    /**
-     * @return void
-     */
-    public function minimumWpVersionError()
-    {
-        global $wp_version;
-        ?>
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		// check required WP version
+		if (! $this->minimumWordPressVersionRequired()) {
+			$this->request->unSetRequestParam('activate', true);
+			add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
+			$this->response->terminateRequest();
+			$this->response->deactivatePlugin();
+		}
+		// check recommended PHP version
+		if (! $this->minimumPhpVersionRecommended()) {
+			$this->displayMinimumRecommendedPhpVersionNotice();
+		}
+		// upcoming required version
+		if (! $this->upcomingRequiredPhpVersion()) {
+			$this->displayUpcomingRequiredVersion();
+		}
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
+
+
+	/**
+	 * Helper method to assess installed wp version against given values.
+	 * By default this compares the required minimum version of WP for EE against the installed version of WP
+	 * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
+	 * against) so consider that when sending in your values.
+	 *
+	 * @param string $version_to_check
+	 * @param string $operator
+	 * @return bool
+	 */
+	public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
+	{
+		global $wp_version;
+		return version_compare(
+			// first account for wp_version being pre-release
+			// (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
+			strpos($wp_version, '-') > 0
+				? substr($wp_version, 0, strpos($wp_version, '-'))
+				: $wp_version,
+			$version_to_check,
+			$operator
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumWordPressVersionRequired()
+	{
+		return RecommendedVersions::compareWordPressVersion();
+	}
+
+
+	/**
+	 * @param string $min_version
+	 * @return boolean
+	 */
+	private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
+	{
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumPhpVersionRecommended()
+	{
+		return $this->checkPhpVersion();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function minimumWpVersionError()
+	{
+		global $wp_version;
+		?>
         <div class="error">
             <p>
                 <?php
-                printf(
-                    esc_html__(
-                        'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
-                        'event_espresso'
-                    ),
-                    EE_MIN_WP_VER_REQUIRED,
-                    $wp_version,
-                    '<br/>',
-                    '<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
-                );
-                ?>
+				printf(
+					esc_html__(
+						'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
+						'event_espresso'
+					),
+					EE_MIN_WP_VER_REQUIRED,
+					$wp_version,
+					'<br/>',
+					'<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
+				);
+				?>
             </p>
         </div>
         <?php
-    }
-
-
-    /**
-     *    _display_minimum_recommended_php_version_notice
-     *
-     * @access private
-     * @return void
-     * @throws InvalidDataTypeException
-     */
-    private function displayMinimumRecommendedPhpVersionNotice()
-    {
-        if ($this->request->isAdmin()) {
-            new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
-                sprintf(
-                    esc_html__(
-                        'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                        'event_espresso'
-                    ),
-                    EE_MIN_PHP_VER_RECOMMENDED,
-                    PHP_VERSION,
-                    '<br/>',
-                    '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Returns whether the provided php version number is less than the current version of php installed on the server.
-     *
-     * @param string $version_required
-     * @return bool
-     */
-    private function upcomingRequiredPhpVersion($version_required = '5.5')
-    {
-        return true;
-        // return $this->checkPhpVersion($version_required);
-    }
-
-
-    /**
-     *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
-     */
-    private function displayUpcomingRequiredVersion()
-    {
-        if (
-            $this->request->isAdmin()
-            && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
-            && current_user_can('update_plugins')
-        ) {
-            add_action('admin_notices', function () {
-                echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
-                     . sprintf(
-                         esc_html__(
-                             'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
-                             'event_espresso'
-                         ),
-                         '<strong>',
-                         '</strong>',
-                         PHP_VERSION,
-                         '<a href="https://wordpress.org/support/upgrade-php/">',
-                         '</a>'
-                     )
-                     . '</p></div>';
-            });
-        }
-    }
+	}
+
+
+	/**
+	 *    _display_minimum_recommended_php_version_notice
+	 *
+	 * @access private
+	 * @return void
+	 * @throws InvalidDataTypeException
+	 */
+	private function displayMinimumRecommendedPhpVersionNotice()
+	{
+		if ($this->request->isAdmin()) {
+			new PersistentAdminNotice(
+				'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+				sprintf(
+					esc_html__(
+						'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+						'event_espresso'
+					),
+					EE_MIN_PHP_VER_RECOMMENDED,
+					PHP_VERSION,
+					'<br/>',
+					'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Returns whether the provided php version number is less than the current version of php installed on the server.
+	 *
+	 * @param string $version_required
+	 * @return bool
+	 */
+	private function upcomingRequiredPhpVersion($version_required = '5.5')
+	{
+		return true;
+		// return $this->checkPhpVersion($version_required);
+	}
+
+
+	/**
+	 *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
+	 */
+	private function displayUpcomingRequiredVersion()
+	{
+		if (
+			$this->request->isAdmin()
+			&& apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
+			&& current_user_can('update_plugins')
+		) {
+			add_action('admin_notices', function () {
+				echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
+					 . sprintf(
+						 esc_html__(
+							 'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
+							 'event_espresso'
+						 ),
+						 '<strong>',
+						 '</strong>',
+						 PHP_VERSION,
+						 '<a href="https://wordpress.org/support/upgrade-php/">',
+						 '</a>'
+					 )
+					 . '</p></div>';
+			});
+		}
+	}
 }

core/services/assets/AssetCollection.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
             /** @var Asset $asset */
             $asset = $this->current();
             if ($asset->type() === $type) {
-                $files[ $asset->handle() ] = $asset;
+                $files[$asset->handle()] = $asset;
             }
             $this->next();
         }
@@ -96,7 +96,7 @@ 
             /** @var JavascriptAsset $asset */
             $asset = $this->current();
             if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
-                $files[ $asset->handle() ] = $asset;
+                $files[$asset->handle()] = $asset;
             }
             $this->next();
         }

Indentation +188 added lines, -188 removed lines

@@ -21,192 +21,192 @@
 {
 
 
-    /**
-     * AssetCollection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('EventEspresso\core\domain\values\assets\Asset');
-    }
-
-
-    /**
-     * @return StylesheetAsset[]
-     * @since 4.9.62.p
-     */
-    public function getStylesheetAssets()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * @return JavascriptAsset[]
-     * @since 4.9.62.p
-     */
-    public function getJavascriptAssets()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_JS);
-    }
-
-
-    /**
-     * @return ManifestFile[]
-     * @since 4.9.62.p
-     */
-    public function getManifestFiles()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_MANIFEST);
-    }
-
-
-    /**
-     * @param $type
-     * @return JavascriptAsset[]|StylesheetAsset[]|ManifestFile[]
-     * @since 4.9.62.p
-     */
-    protected function getAssetsOfType($type)
-    {
-        $files = array();
-        $this->rewind();
-        while ($this->valid()) {
-            /** @var Asset $asset */
-            $asset = $this->current();
-            if ($asset->type() === $type) {
-                $files[ $asset->handle() ] = $asset;
-            }
-            $this->next();
-        }
-        $this->rewind();
-        return $files;
-    }
-
-
-    /**
-     * @return JavascriptAsset[]
-     * @since 4.9.62.p
-     */
-    public function getJavascriptAssetsWithData()
-    {
-        $files = array();
-        $this->rewind();
-        while ($this->valid()) {
-            /** @var JavascriptAsset $asset */
-            $asset = $this->current();
-            if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
-                $files[ $asset->handle() ] = $asset;
-            }
-            $this->next();
-        }
-        $this->rewind();
-        return $files;
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the object is within the Collection
-     * based on the supplied $identifier and type
-     *
-     * @param  mixed $identifier
-     * @param string $type
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasAssetOfType($identifier, $type = Asset::TYPE_JS)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
-                $this->rewind();
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the Javascript Asset is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasJavascriptAsset($identifier)
-    {
-        return $this->hasAssetOfType($identifier, Asset::TYPE_JS);
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the Stylesheet Asset is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasStylesheetAsset($identifier)
-    {
-        return $this->hasAssetOfType($identifier, Asset::TYPE_CSS);
-    }
-
-    /**
-     * returns the object from the Collection
-     * based on the supplied $identifier and type
-     *
-     * @param  mixed $identifier
-     * @param string $type
-     * @return JavascriptAsset|StylesheetAsset
-     * @since 4.9.63.p
-     */
-    public function getAssetOfType($identifier, $type = Asset::TYPE_JS)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
-                /** @var JavascriptAsset|StylesheetAsset $object */
-                $object = $this->current();
-                $this->rewind();
-                return $object;
-            }
-            $this->next();
-        }
-        return null;
-    }
-
-
-    /**
-     * returns the Stylesheet Asset from the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return StylesheetAsset
-     * @since 4.9.63.p
-     */
-    public function getStylesheetAsset($identifier)
-    {
-        return $this->getAssetOfType($identifier, Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * returns the Javascript Asset from the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return JavascriptAsset
-     * @since 4.9.63.p
-     */
-    public function getJavascriptAsset($identifier)
-    {
-        return $this->getAssetOfType($identifier, Asset::TYPE_JS);
-    }
+	/**
+	 * AssetCollection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('EventEspresso\core\domain\values\assets\Asset');
+	}
+
+
+	/**
+	 * @return StylesheetAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getStylesheetAssets()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * @return JavascriptAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getJavascriptAssets()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * @return ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	public function getManifestFiles()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_MANIFEST);
+	}
+
+
+	/**
+	 * @param $type
+	 * @return JavascriptAsset[]|StylesheetAsset[]|ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	protected function getAssetsOfType($type)
+	{
+		$files = array();
+		$this->rewind();
+		while ($this->valid()) {
+			/** @var Asset $asset */
+			$asset = $this->current();
+			if ($asset->type() === $type) {
+				$files[ $asset->handle() ] = $asset;
+			}
+			$this->next();
+		}
+		$this->rewind();
+		return $files;
+	}
+
+
+	/**
+	 * @return JavascriptAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getJavascriptAssetsWithData()
+	{
+		$files = array();
+		$this->rewind();
+		while ($this->valid()) {
+			/** @var JavascriptAsset $asset */
+			$asset = $this->current();
+			if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
+				$files[ $asset->handle() ] = $asset;
+			}
+			$this->next();
+		}
+		$this->rewind();
+		return $files;
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the object is within the Collection
+	 * based on the supplied $identifier and type
+	 *
+	 * @param  mixed $identifier
+	 * @param string $type
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasAssetOfType($identifier, $type = Asset::TYPE_JS)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
+				$this->rewind();
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the Javascript Asset is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasJavascriptAsset($identifier)
+	{
+		return $this->hasAssetOfType($identifier, Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the Stylesheet Asset is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasStylesheetAsset($identifier)
+	{
+		return $this->hasAssetOfType($identifier, Asset::TYPE_CSS);
+	}
+
+	/**
+	 * returns the object from the Collection
+	 * based on the supplied $identifier and type
+	 *
+	 * @param  mixed $identifier
+	 * @param string $type
+	 * @return JavascriptAsset|StylesheetAsset
+	 * @since 4.9.63.p
+	 */
+	public function getAssetOfType($identifier, $type = Asset::TYPE_JS)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
+				/** @var JavascriptAsset|StylesheetAsset $object */
+				$object = $this->current();
+				$this->rewind();
+				return $object;
+			}
+			$this->next();
+		}
+		return null;
+	}
+
+
+	/**
+	 * returns the Stylesheet Asset from the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return StylesheetAsset
+	 * @since 4.9.63.p
+	 */
+	public function getStylesheetAsset($identifier)
+	{
+		return $this->getAssetOfType($identifier, Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * returns the Javascript Asset from the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return JavascriptAsset
+	 * @since 4.9.63.p
+	 */
+	public function getJavascriptAsset($identifier)
+	{
+		return $this->getAssetOfType($identifier, Asset::TYPE_JS);
+	}
 }

core/domain/services/admin/privacy/forms/PrivacySettingsFormHandler.php

Indentation +100 added lines, -100 removed lines

@@ -28,112 +28,112 @@
 class PrivacySettingsFormHandler extends FormHandler
 {
 
-    /**
-     * @var EE_Config
-     */
-    protected $config;
+	/**
+	 * @var EE_Config
+	 */
+	protected $config;
 
 
-    /**
-     * PrivacySettingsFormHandler constructor.
-     *
-     * @param EE_Registry $registry
-     * @param EE_Config   $config
-     */
-    public function __construct(EE_Registry $registry, EE_Config $config)
-    {
-        $this->config = $config;
-        parent::__construct(
-            esc_html__('Privacy Settings', 'event_espresso'),
-            esc_html__('Privacy Settings', 'event_espresso'),
-            'privacy-settings',
-            '',
-            FormHandler::DO_NOT_SETUP_FORM,
-            $registry
-        );
-    }
+	/**
+	 * PrivacySettingsFormHandler constructor.
+	 *
+	 * @param EE_Registry $registry
+	 * @param EE_Config   $config
+	 */
+	public function __construct(EE_Registry $registry, EE_Config $config)
+	{
+		$this->config = $config;
+		parent::__construct(
+			esc_html__('Privacy Settings', 'event_espresso'),
+			esc_html__('Privacy Settings', 'event_espresso'),
+			'privacy-settings',
+			'',
+			FormHandler::DO_NOT_SETUP_FORM,
+			$registry
+		);
+	}
 
 
-    /**
-     * creates and returns the actual form
-     *
-     * @return EE_Form_Section_Proper
-     */
-    public function generate()
-    {
-        // this form makes use of the session for passing around invalid form submission data, so make sure its enabled
-        add_filter('FHEE__EE_Session___save_session_to_db__abort_session_save', '__return_false');
-        /**
-         * @var $reg_config EE_Registration_Config
-         */
-        $reg_config = $this->config->registration;
-        return new EE_Form_Section_Proper(
-            array(
-                'name'        => 'privacy_consent_settings',
-                'subsections' => array(
-                    'privacy_consent_form_hdr' => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(esc_html__('Privacy Policy Consent Settings', 'event_espresso'))
-                    ),
-                    'enable'                   => new EE_Select_Reveal_Input(
-                        array(
-                            'enable-privacy-consent' => esc_html__('Enabled', 'event_espresso'),
-                            'disable'                => esc_html__('Disabled', 'event_espresso'),
-                        ),
-                        array(
-                            'default'         => $reg_config->isConsentCheckboxEnabled()
-                                ? 'enable-privacy-consent'
-                                : 'disable',
-                            'html_label_text' => esc_html__('Privacy Consent Checkbox', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'When enabled, a checkbox appears in the registration form requiring users to consent to your site\'s privacy policy.',
-                                'event_espresso'
-                            ),
-                        )
-                    ),
-                    'enable-privacy-consent'   => new EE_Form_Section_Proper(
-                        array(
-                            'subsections' => array(
-                                'consent_assertion' => new EE_Text_Area_Input(
-                                    array(
-                                        'default'               => $reg_config->getConsentCheckboxLabelText(),
-                                        'html_label_text'       => esc_html__('Consent Text', 'event_espresso'),
-                                        'html_help_text'        => esc_html__(
-                                            'Text describing what the registrant is consenting to by submitting their personal data in the registration form. To reset to default value, remove all this text and save.',
-                                            'event_espresso'
-                                        ),
-                                        'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
-                                    )
-                                ),
-                            ),
-                        )
-                    ),
-                ),
-            )
-        );
-    }
+	/**
+	 * creates and returns the actual form
+	 *
+	 * @return EE_Form_Section_Proper
+	 */
+	public function generate()
+	{
+		// this form makes use of the session for passing around invalid form submission data, so make sure its enabled
+		add_filter('FHEE__EE_Session___save_session_to_db__abort_session_save', '__return_false');
+		/**
+		 * @var $reg_config EE_Registration_Config
+		 */
+		$reg_config = $this->config->registration;
+		return new EE_Form_Section_Proper(
+			array(
+				'name'        => 'privacy_consent_settings',
+				'subsections' => array(
+					'privacy_consent_form_hdr' => new EE_Form_Section_HTML(
+						EEH_HTML::h2(esc_html__('Privacy Policy Consent Settings', 'event_espresso'))
+					),
+					'enable'                   => new EE_Select_Reveal_Input(
+						array(
+							'enable-privacy-consent' => esc_html__('Enabled', 'event_espresso'),
+							'disable'                => esc_html__('Disabled', 'event_espresso'),
+						),
+						array(
+							'default'         => $reg_config->isConsentCheckboxEnabled()
+								? 'enable-privacy-consent'
+								: 'disable',
+							'html_label_text' => esc_html__('Privacy Consent Checkbox', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'When enabled, a checkbox appears in the registration form requiring users to consent to your site\'s privacy policy.',
+								'event_espresso'
+							),
+						)
+					),
+					'enable-privacy-consent'   => new EE_Form_Section_Proper(
+						array(
+							'subsections' => array(
+								'consent_assertion' => new EE_Text_Area_Input(
+									array(
+										'default'               => $reg_config->getConsentCheckboxLabelText(),
+										'html_label_text'       => esc_html__('Consent Text', 'event_espresso'),
+										'html_help_text'        => esc_html__(
+											'Text describing what the registrant is consenting to by submitting their personal data in the registration form. To reset to default value, remove all this text and save.',
+											'event_espresso'
+										),
+										'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
+									)
+								),
+							),
+						)
+					),
+				),
+			)
+		);
+	}
 
 
-    /**
-     * After validating the form data, update the registration config
-     *
-     * @param array $submitted_form_data
-     * @return bool
-     */
-    public function process($submitted_form_data = array())
-    {
-        try {
-            $valid_data = parent::process($submitted_form_data);
-            $reg_config = $this->config->registration;
-            $reg_config->setConsentCheckboxEnabled($valid_data['enable'] === 'enable-privacy-consent');
-            $reg_config->setConsentCheckboxLabelText(
-                $valid_data['enable-privacy-consent']['consent_assertion']
-            );
-            return $this->config->update_espresso_config(false, false);
-        } catch (InvalidFormSubmissionException $e) {
-            // the form was invalid, it should be re-displayed with errors
-            return false;
-        }
-    }
+	/**
+	 * After validating the form data, update the registration config
+	 *
+	 * @param array $submitted_form_data
+	 * @return bool
+	 */
+	public function process($submitted_form_data = array())
+	{
+		try {
+			$valid_data = parent::process($submitted_form_data);
+			$reg_config = $this->config->registration;
+			$reg_config->setConsentCheckboxEnabled($valid_data['enable'] === 'enable-privacy-consent');
+			$reg_config->setConsentCheckboxLabelText(
+				$valid_data['enable-privacy-consent']['consent_assertion']
+			);
+			return $this->config->update_espresso_config(false, false);
+		} catch (InvalidFormSubmissionException $e) {
+			// the form was invalid, it should be re-displayed with errors
+			return false;
+		}
+	}
 }
 // End of file PrivacySettingsFormHandler.php
 // Location: EventEspresso\core\domain\services\admin\privacy\forms/PrivacySettingsFormHandler.php

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

Indentation +54 added lines, -54 removed lines

@@ -11,61 +11,61 @@
 class EE_Radio_Button_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
 
-    /**
-     *
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = $this->get_input();
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        $html = '';
-        foreach ($input->options() as $value => $display_text) {
-            $value = $input->get_normalization_strategy()->unnormalize($value);
+	/**
+	 *
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->get_input();
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		$html = '';
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize($value);
 
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'radio');
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'radio');
 
-            $html .= $this->_opening_tag('label');
-            $html .= $this->_attributes_string(
-                array(
-                    'for' => $html_id,
-                    'id' => $html_id . '-lbl',
-                    'class' => apply_filters(
-                        'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
-                        $this,
-                        $input,
-                        $value
-                    )
-                )
-            );
-            $html .= '>';
-            $html .= EEH_HTML::nl(1, 'radio');
-            $html .= $this->_opening_tag('input');
-            $attributes = array(
-                'id' => $html_id,
-                'name' => $input->html_name(),
-                'class' => $input->html_class(),
-                'style' => $input->html_style(),
-                'type' => 'radio',
-                'value' => $value,
-                0 => $input->other_html_attributes(),
-                'data-question_label' => $input->html_label_id()
-            );
-            if ($input->raw_value() === $value) {
-                $attributes['checked'] = 'checked';
-            }
-            $html .= $this->_attributes_string($attributes);
+			$html .= $this->_opening_tag('label');
+			$html .= $this->_attributes_string(
+				array(
+					'for' => $html_id,
+					'id' => $html_id . '-lbl',
+					'class' => apply_filters(
+						'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
+						'ee-radio-label-after' . $label_size_class,
+						$this,
+						$input,
+						$value
+					)
+				)
+			);
+			$html .= '>';
+			$html .= EEH_HTML::nl(1, 'radio');
+			$html .= $this->_opening_tag('input');
+			$attributes = array(
+				'id' => $html_id,
+				'name' => $input->html_name(),
+				'class' => $input->html_class(),
+				'style' => $input->html_style(),
+				'type' => 'radio',
+				'value' => $value,
+				0 => $input->other_html_attributes(),
+				'data-question_label' => $input->html_label_id()
+			);
+			if ($input->raw_value() === $value) {
+				$attributes['checked'] = 'checked';
+			}
+			$html .= $this->_attributes_string($attributes);
 
-            $html .= '> ';
-            $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
-        }
-        $html .= EEH_HTML::div('', '', 'clear-float');
-        $html .= EEH_HTML::divx();
-        return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
-    }
+			$html .= '>&nbsp;';
+			$html .= $display_text;
+			$html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+		}
+		$html .= EEH_HTML::div('', '', 'clear-float');
+		$html .= EEH_HTML::divx();
+		return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -32,10 +32,10 @@ 
             $html .= $this->_attributes_string(
                 array(
                     'for' => $html_id,
-                    'id' => $html_id . '-lbl',
+                    'id' => $html_id.'-lbl',
                     'class' => apply_filters(
                         'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
+                        'ee-radio-label-after'.$label_size_class,
                         $this,
                         $input,
                         $value
@@ -62,7 +62,7 @@ 
 
             $html .= '> ';
             $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+            $html .= EEH_HTML::nl(-1, 'radio').'</label>';
         }
         $html .= EEH_HTML::div('', '', 'clear-float');
         $html .= EEH_HTML::divx();

core/domain/services/admin/privacy/erasure/EraseAttendeeData.php

Indentation +61 added lines, -61 removed lines

@@ -16,74 +16,74 @@
 class EraseAttendeeData implements PersonalDataEraserInterface
 {
 
-    /**
-     * @var EEM_Attendee
-     */
-    protected $attendee_model;
+	/**
+	 * @var EEM_Attendee
+	 */
+	protected $attendee_model;
 
 
-    /**
-     * EraseAttendeeData constructor.
-     *
-     * @param EEM_Attendee $attendee_model
-     */
-    public function __construct(EEM_Attendee $attendee_model)
-    {
-        $this->attendee_model = $attendee_model;
-    }
+	/**
+	 * EraseAttendeeData constructor.
+	 *
+	 * @param EEM_Attendee $attendee_model
+	 */
+	public function __construct(EEM_Attendee $attendee_model)
+	{
+		$this->attendee_model = $attendee_model;
+	}
 
 
-    /**
-     * Gets a translated string name for the data eraser
-     *
-     * @return string
-     */
-    public function name()
-    {
-        return esc_html__('Event Espresso Attendee Data', 'event_espresso');
-    }
+	/**
+	 * Gets a translated string name for the data eraser
+	 *
+	 * @return string
+	 */
+	public function name()
+	{
+		return esc_html__('Event Espresso Attendee Data', 'event_espresso');
+	}
 
 
-    /**
-     * Erases a "page" of personal user data
-     *
-     * @return array {
-     * @type boolean $items_removed  whether items were removed successfully or not
-     * @type boolean $items_retained whether any items were skipped or not
-     * @type array   $messages       values are messages to show
-     * @type boolean $done           whether this eraser is done or has more pages
-     *               }
-     * @throws \EE_Error
-     */
-    public function erase($email_address, $page = 1)
-    {
-        $rows_updated = $this->attendee_model->update(
-            array(
-                'ATT_fname'    => esc_html__('Anonymous', 'event_espresso'),
-                'ATT_lname'    => '',
-                'ATT_email'    => '',
-                'ATT_address'  => '',
-                'ATT_address2' => '',
-                'ATT_city'     => '',
-                'STA_ID'       => 0,
-                'CNT_ISO'      => '',
-                'ATT_zip'      => '',
-                'ATT_phone'    => '',
-            ),
-            array(
-                array(
-                    'ATT_email' => $email_address,
-                ),
-            )
-        );
+	/**
+	 * Erases a "page" of personal user data
+	 *
+	 * @return array {
+	 * @type boolean $items_removed  whether items were removed successfully or not
+	 * @type boolean $items_retained whether any items were skipped or not
+	 * @type array   $messages       values are messages to show
+	 * @type boolean $done           whether this eraser is done or has more pages
+	 *               }
+	 * @throws \EE_Error
+	 */
+	public function erase($email_address, $page = 1)
+	{
+		$rows_updated = $this->attendee_model->update(
+			array(
+				'ATT_fname'    => esc_html__('Anonymous', 'event_espresso'),
+				'ATT_lname'    => '',
+				'ATT_email'    => '',
+				'ATT_address'  => '',
+				'ATT_address2' => '',
+				'ATT_city'     => '',
+				'STA_ID'       => 0,
+				'CNT_ISO'      => '',
+				'ATT_zip'      => '',
+				'ATT_phone'    => '',
+			),
+			array(
+				array(
+					'ATT_email' => $email_address,
+				),
+			)
+		);
 
-        return array(
-            'items_removed'  => (bool) $rows_updated,
-            'items_retained' => false, // always false in this example
-            'messages'       => array(),
-            'done'           => true,
-        );
-    }
+		return array(
+			'items_removed'  => (bool) $rows_updated,
+			'items_retained' => false, // always false in this example
+			'messages'       => array(),
+			'done'           => true,
+		);
+	}
 }
 // End of file EraseAttendeeData.php
 // Location: EventEspresso\core\domain\services\privacy\erasure/EraseAttendeeData.php