eventespresso / event-espresso-core

core/domain/services/graphql/data/loaders/FormElementLoader.php

Indentation +22 added lines, -22 removed lines

@@ -15,27 +15,27 @@
  */
 class FormElementLoader extends AbstractLoader
 {
-    /**
-     * @return EEM_Base
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function getQuery(): EEM_Base
-    {
-        return EEM_Form_Element::instance();
-    }
+	/**
+	 * @return EEM_Base
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function getQuery(): EEM_Base
+	{
+		return EEM_Form_Element::instance();
+	}
 
-    /**
-     * @param array $keys
-     * @return array
-     */
-    protected function getWhereParams(array $keys): array
-    {
-        return [
-            'FIN_UUID' => ['IN', $keys],
-        ];
-    }
+	/**
+	 * @param array $keys
+	 * @return array
+	 */
+	protected function getWhereParams(array $keys): array
+	{
+		return [
+			'FIN_UUID' => ['IN', $keys],
+		];
+	}
 }

core/domain/services/graphql/abstracts/AbstractRootQueryConnection.php

Indentation +22 added lines, -22 removed lines

@@ -19,28 +19,28 @@
 {
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return AbstractConnectionResolver
-     * @throws Exception
-     */
-    abstract public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver;
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return AbstractConnectionResolver
+	 * @throws Exception
+	 */
+	abstract public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver;
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return mixed|array|Deferred
-     * @throws Exception
-     */
-    public function resolveConnection($entity, $args, $context, $info)
-    {
-        $resolver = $this->getConnectionResolver($entity, $args, $context, $info);
-        return $resolver->get_connection();
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return mixed|array|Deferred
+	 * @throws Exception
+	 */
+	public function resolveConnection($entity, $args, $context, $info)
+	{
+		$resolver = $this->getConnectionResolver($entity, $args, $context, $info);
+		return $resolver->get_connection();
+	}
 }

core/domain/entities/routing/handlers/shared/GQLRequests.php

Indentation +211 added lines, -211 removed lines

@@ -19,223 +19,223 @@
  */
 class GQLRequests extends Route
 {
-    /**
-     * @var AssetManifestFactory
-     */
-    private $manifest_factory;
+	/**
+	 * @var AssetManifestFactory
+	 */
+	private $manifest_factory;
 
 
-    /**
-     * AssetRequests constructor.
-     *
-     * @param EE_Dependency_Map    $dependency_map
-     * @param LoaderInterface      $loader
-     * @param RequestInterface     $request
-     * @param AssetManifestFactory $manifest_factory
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        AssetManifestFactory $manifest_factory
-    ) {
-        $this->manifest_factory = $manifest_factory;
-        parent::__construct($dependency_map, $loader, $request);
-    }
+	/**
+	 * AssetRequests constructor.
+	 *
+	 * @param EE_Dependency_Map    $dependency_map
+	 * @param LoaderInterface      $loader
+	 * @param RequestInterface     $request
+	 * @param AssetManifestFactory $manifest_factory
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		AssetManifestFactory $manifest_factory
+	) {
+		$this->manifest_factory = $manifest_factory;
+		parent::__construct($dependency_map, $loader, $request);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        global $pagenow;
-        return (
-                   $this->request->isGQL()
-                   || $this->request->isUnitTesting()
-                   || (
-                       $this->request->isAdmin()
-                       && $this->request->getRequestParam('page') === 'espresso_events'
-                       && (
-                           $this->request->getRequestParam('action') === 'create_new'
-                           || $this->request->getRequestParam('action') === 'edit'
-                       )
-                   )
-                   || (
-                       $pagenow
-                       && (
-                           $pagenow === 'post-new.php'
-                           || (
-                               $pagenow === 'post.php'
-                               && $this->request->getRequestParam('action') === 'edit'
-                           )
-                       )
-                   )
-               );
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		global $pagenow;
+		return (
+				   $this->request->isGQL()
+				   || $this->request->isUnitTesting()
+				   || (
+					   $this->request->isAdmin()
+					   && $this->request->getRequestParam('page') === 'espresso_events'
+					   && (
+						   $this->request->getRequestParam('action') === 'create_new'
+						   || $this->request->getRequestParam('action') === 'edit'
+					   )
+				   )
+				   || (
+					   $pagenow
+					   && (
+						   $pagenow === 'post-new.php'
+						   || (
+							   $pagenow === 'post.php'
+							   && $this->request->getRequestParam('action') === 'edit'
+						   )
+					   )
+				   )
+			   );
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\GraphQLManager',
-            [
-                'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\TypesManager',
-            [
-                'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\InputsManager',
-            [
-                'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\EnumsManager',
-            [
-                'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\ConnectionsManager',
-            [
-                'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\DataLoaderManager',
-            [
-                'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Datetime',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Attendee',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Event',
-            ['EEM_Event' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\FormElement',
-            ['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\FormSection',
-            ['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Ticket',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Price',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\PriceType',
-            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Venue',
-            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\State',
-            ['EEM_State' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Country',
-            ['EEM_Country' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryFormElementsConnection',
-            ['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryFormSectionsConnection',
-            ['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
-            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
-            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\GraphQLManager',
+			[
+				'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\TypesManager',
+			[
+				'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\InputsManager',
+			[
+				'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\EnumsManager',
+			[
+				'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\ConnectionsManager',
+			[
+				'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\DataLoaderManager',
+			[
+				'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Datetime',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Attendee',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Event',
+			['EEM_Event' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\FormElement',
+			['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\FormSection',
+			['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Ticket',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Price',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\PriceType',
+			['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Venue',
+			['EEM_Venue' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\State',
+			['EEM_State' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Country',
+			['EEM_Country' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryFormElementsConnection',
+			['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryFormSectionsConnection',
+			['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
+			['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
+			['EEM_Venue' => EE_Dependency_Map::load_from_cache]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler(): bool
-    {
-        if (! class_exists('WPGraphQL')) {
-            require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
-        }
-        // load handler for EE GraphQL requests
-        $graphQL_manager = $this->loader->getShared(
-            'EventEspresso\core\services\graphql\GraphQLManager'
-        );
-        $graphQL_manager->init();
-        $manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
-        $manifest->initialize();
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler(): bool
+	{
+		if (! class_exists('WPGraphQL')) {
+			require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
+		}
+		// load handler for EE GraphQL requests
+		$graphQL_manager = $this->loader->getShared(
+			'EventEspresso\core\services\graphql\GraphQLManager'
+		);
+		$graphQL_manager->init();
+		$manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
+		$manifest->initialize();
+		return true;
+	}
 }

core/services/graphql/Utils.php

Indentation +14 added lines, -14 removed lines

@@ -13,18 +13,18 @@
 class Utils
 {
 
-    /**
-     * Given a string, formats it as GraphQL ENUM value
-     *
-     * @param string $str The string to format
-     *
-     * @return string
-     */
-    public static function formatEnumKey($str)
-    {
-        // Replace any non-alph-anumeric by underscore
-        $str = preg_replace('/[^a-zA-Z0-9]/', '_', $str);
-        // Convert to uppercase.
-        return strtoupper($str);
-    }
+	/**
+	 * Given a string, formats it as GraphQL ENUM value
+	 *
+	 * @param string $str The string to format
+	 *
+	 * @return string
+	 */
+	public static function formatEnumKey($str)
+	{
+		// Replace any non-alph-anumeric by underscore
+		$str = preg_replace('/[^a-zA-Z0-9]/', '_', $str);
+		// Convert to uppercase.
+		return strtoupper($str);
+	}
 }

core/services/graphql/types/TypeBase.php

Indentation +266 added lines, -266 removed lines

@@ -35,270 +35,270 @@
 abstract class TypeBase implements TypeInterface
 {
 
-    /**
-     * @var string $namespace The graphql namespace/prefix.
-     */
-    protected $namespace = 'Espresso';
-
-    /**
-     * @var EEM_Base $model
-     */
-    protected $model;
-
-    /**
-     * @var string $name
-     */
-    protected $name = '';
-
-    /**
-     * @var string $description
-     */
-    protected $description = '';
-
-    /**
-     * @var GraphQLFieldInterface[] $fields
-     */
-    protected $fields = [];
-
-    /**
-     * @var array $graphql_to_model_map
-     */
-    protected $graphql_to_model_map = [];
-
-    /**
-     * @var FieldResolver $field_resolver
-     */
-    protected $field_resolver;
-
-    /**
-     * @var bool $is_custom_post_type
-     */
-    protected $is_custom_post_type = false;
-
-
-    /**
-     * TypeBase constructor.
-     *
-     * @param EEM_Base|null $model
-     */
-    public function __construct(EEM_Base $model = null)
-    {
-        $this->model = $model;
-        $this->setFields($this->getFields());
-        $this->field_resolver = new FieldResolver(
-            $this->model,
-            $this->getFieldsForResolver()
-        );
-    }
-
-
-    /**
-     * @return GraphQLFieldInterface[]
-     * @since $VID:$
-     */
-    abstract protected function getFields(): array;
-
-
-    /**
-     * @return string
-     */
-    public function name(): string
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * @param string $name
-     */
-    protected function setName(string $name)
-    {
-        $this->name = $name;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function description(): string
-    {
-        return $this->description;
-    }
-
-
-    /**
-     * @param string $description
-     */
-    protected function setDescription(string $description)
-    {
-        $this->description = $description;
-    }
-
-
-    /**
-     * @return GraphQLFieldInterface[]
-     * @since $VID:$
-     */
-    public function fields(): array
-    {
-        return (array) $this->fields;
-    }
-
-
-    /**
-     * @param GraphQLFieldInterface[] $fields
-     */
-    protected function setFields(array $fields)
-    {
-        foreach ($fields as $field) {
-            if ($field instanceof GraphQLField) {
-                $this->fields[] = $field;
-            }
-        }
-    }
-
-
-    /**
-     * Creates a key map for internal resolver.
-     *
-     * @return array
-     * @since $VID:$
-     */
-    public function getFieldsForResolver(): array
-    {
-        $fields = [];
-        foreach ($this->fields() as $field) {
-            if ($field->useForOutput()) {
-                $fields[ $field->name() ] = $field;
-            }
-        }
-        return $fields;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isCustomPostType(): bool
-    {
-        return $this->is_custom_post_type;
-    }
-
-
-    /**
-     * @param bool $is_custom_post_type
-     */
-    protected function setIsCustomPostType(bool $is_custom_post_type)
-    {
-        $this->is_custom_post_type = filter_var($is_custom_post_type, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @param int|float $value
-     * @return int
-     * @since $VID:$
-     */
-    public function parseInfiniteValue($value): int
-    {
-        $value = trim($value);
-        return $value === null
-               || $value === ''
-               || $value === '∞'
-               || $value === 'INF'
-               || $value === INF
-               || $value === EE_INF
-               || is_infinite((float) $value)
-            ? -1
-            : $value;
-    }
-
-
-    /**
-     * @param mixed $source
-     * @return EE_Base_Class|null
-     * @throws EE_Error
-     */
-    private function getModel($source): ?EE_Base_Class
-    {
-        // If it comes from a custom connection
-        // where the $source is already instantiated.
-        if ($source instanceof EE_Base_Class) {
-            return $source;
-        }
-        return $source instanceof Post ? $this->model->get_one_by_ID($source->ID) : null;
-    }
-
-
-    /**
-     * @param mixed       $source  The source that's passed down the GraphQL queries
-     * @param array       $args    The inputArgs on the field
-     * @param AppContext  $context The AppContext passed down the GraphQL tree
-     * @param ResolveInfo $info    The ResolveInfo passed down the GraphQL tree
-     * @return EE_Base_Class|Deferred|string|null
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws UnexpectedEntityException
-     * @throws UserError
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function resolveField($source, array $args, AppContext $context, ResolveInfo $info)
-    {
-        $source = $source instanceof RootQuery ? $source : $this->getModel($source);
-
-        return $this->field_resolver->resolve($source, $args, $context, $info);
-    }
-
-
-    /**
-     * @param mixed      $payload The payload returned after mutation
-     * @param array      $args    The inputArgs on the field
-     * @param AppContext $context The AppContext passed down the GraphQL tree
-     * @return EE_Base_Class|EE_Soft_Delete_Base_Class|null
-     * @throws EE_Error
-     */
-    public function resolveFromPayload($payload, array $args, AppContext $context)
-    {
-        if (empty($payload['id'])) {
-            return null;
-        }
-        return $this->model->get_one_by_ID($payload['id']);
-    }
-
-
-    /**
-     * Prepares a datetime value in ISO8601/RFC3339 format.
-     * It is assumed that the value of $datetime is in the format
-     * returned by EE_Base_Class::get_format().
-     *
-     * @param string        $datetime The datetime value.
-     * @param EE_Base_Class $source   The source object.
-     * @return string ISO8601/RFC3339 formatted datetime.
-     */
-    public function formatDatetime(string $datetime, EE_Base_Class $source): string
-    {
-        $format   = $source->get_format();
-        // create date object based on local timezone
-        $datetime = DateTime::createFromFormat($format, $datetime, new DateTimeZone($source->get_timezone()));
-        // change the timezone to UTC
-        $datetime->setTimezone(new DateTimeZone('UTC'));
-
-        return $datetime->format(DateTime::RFC3339);
-    }
-
-
-    /**
-     * Converts an object to JSON. The object must have a "toJson" method.
-     *
-     * @param string        $object   The object/value.
-     * @param EE_Base_Class $source   The source object.
-     * @return string JSON representation of the object.
-     */
-    public function toJson(JsonableInterface $object, EE_Base_Class $source): string
-    {
-        return $object->toJson();
-    }
+	/**
+	 * @var string $namespace The graphql namespace/prefix.
+	 */
+	protected $namespace = 'Espresso';
+
+	/**
+	 * @var EEM_Base $model
+	 */
+	protected $model;
+
+	/**
+	 * @var string $name
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string $description
+	 */
+	protected $description = '';
+
+	/**
+	 * @var GraphQLFieldInterface[] $fields
+	 */
+	protected $fields = [];
+
+	/**
+	 * @var array $graphql_to_model_map
+	 */
+	protected $graphql_to_model_map = [];
+
+	/**
+	 * @var FieldResolver $field_resolver
+	 */
+	protected $field_resolver;
+
+	/**
+	 * @var bool $is_custom_post_type
+	 */
+	protected $is_custom_post_type = false;
+
+
+	/**
+	 * TypeBase constructor.
+	 *
+	 * @param EEM_Base|null $model
+	 */
+	public function __construct(EEM_Base $model = null)
+	{
+		$this->model = $model;
+		$this->setFields($this->getFields());
+		$this->field_resolver = new FieldResolver(
+			$this->model,
+			$this->getFieldsForResolver()
+		);
+	}
+
+
+	/**
+	 * @return GraphQLFieldInterface[]
+	 * @since $VID:$
+	 */
+	abstract protected function getFields(): array;
+
+
+	/**
+	 * @return string
+	 */
+	public function name(): string
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * @param string $name
+	 */
+	protected function setName(string $name)
+	{
+		$this->name = $name;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function description(): string
+	{
+		return $this->description;
+	}
+
+
+	/**
+	 * @param string $description
+	 */
+	protected function setDescription(string $description)
+	{
+		$this->description = $description;
+	}
+
+
+	/**
+	 * @return GraphQLFieldInterface[]
+	 * @since $VID:$
+	 */
+	public function fields(): array
+	{
+		return (array) $this->fields;
+	}
+
+
+	/**
+	 * @param GraphQLFieldInterface[] $fields
+	 */
+	protected function setFields(array $fields)
+	{
+		foreach ($fields as $field) {
+			if ($field instanceof GraphQLField) {
+				$this->fields[] = $field;
+			}
+		}
+	}
+
+
+	/**
+	 * Creates a key map for internal resolver.
+	 *
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function getFieldsForResolver(): array
+	{
+		$fields = [];
+		foreach ($this->fields() as $field) {
+			if ($field->useForOutput()) {
+				$fields[ $field->name() ] = $field;
+			}
+		}
+		return $fields;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isCustomPostType(): bool
+	{
+		return $this->is_custom_post_type;
+	}
+
+
+	/**
+	 * @param bool $is_custom_post_type
+	 */
+	protected function setIsCustomPostType(bool $is_custom_post_type)
+	{
+		$this->is_custom_post_type = filter_var($is_custom_post_type, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @param int|float $value
+	 * @return int
+	 * @since $VID:$
+	 */
+	public function parseInfiniteValue($value): int
+	{
+		$value = trim($value);
+		return $value === null
+			   || $value === ''
+			   || $value === '∞'
+			   || $value === 'INF'
+			   || $value === INF
+			   || $value === EE_INF
+			   || is_infinite((float) $value)
+			? -1
+			: $value;
+	}
+
+
+	/**
+	 * @param mixed $source
+	 * @return EE_Base_Class|null
+	 * @throws EE_Error
+	 */
+	private function getModel($source): ?EE_Base_Class
+	{
+		// If it comes from a custom connection
+		// where the $source is already instantiated.
+		if ($source instanceof EE_Base_Class) {
+			return $source;
+		}
+		return $source instanceof Post ? $this->model->get_one_by_ID($source->ID) : null;
+	}
+
+
+	/**
+	 * @param mixed       $source  The source that's passed down the GraphQL queries
+	 * @param array       $args    The inputArgs on the field
+	 * @param AppContext  $context The AppContext passed down the GraphQL tree
+	 * @param ResolveInfo $info    The ResolveInfo passed down the GraphQL tree
+	 * @return EE_Base_Class|Deferred|string|null
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws UnexpectedEntityException
+	 * @throws UserError
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function resolveField($source, array $args, AppContext $context, ResolveInfo $info)
+	{
+		$source = $source instanceof RootQuery ? $source : $this->getModel($source);
+
+		return $this->field_resolver->resolve($source, $args, $context, $info);
+	}
+
+
+	/**
+	 * @param mixed      $payload The payload returned after mutation
+	 * @param array      $args    The inputArgs on the field
+	 * @param AppContext $context The AppContext passed down the GraphQL tree
+	 * @return EE_Base_Class|EE_Soft_Delete_Base_Class|null
+	 * @throws EE_Error
+	 */
+	public function resolveFromPayload($payload, array $args, AppContext $context)
+	{
+		if (empty($payload['id'])) {
+			return null;
+		}
+		return $this->model->get_one_by_ID($payload['id']);
+	}
+
+
+	/**
+	 * Prepares a datetime value in ISO8601/RFC3339 format.
+	 * It is assumed that the value of $datetime is in the format
+	 * returned by EE_Base_Class::get_format().
+	 *
+	 * @param string        $datetime The datetime value.
+	 * @param EE_Base_Class $source   The source object.
+	 * @return string ISO8601/RFC3339 formatted datetime.
+	 */
+	public function formatDatetime(string $datetime, EE_Base_Class $source): string
+	{
+		$format   = $source->get_format();
+		// create date object based on local timezone
+		$datetime = DateTime::createFromFormat($format, $datetime, new DateTimeZone($source->get_timezone()));
+		// change the timezone to UTC
+		$datetime->setTimezone(new DateTimeZone('UTC'));
+
+		return $datetime->format(DateTime::RFC3339);
+	}
+
+
+	/**
+	 * Converts an object to JSON. The object must have a "toJson" method.
+	 *
+	 * @param string        $object   The object/value.
+	 * @param EE_Base_Class $source   The source object.
+	 * @return string JSON representation of the object.
+	 */
+	public function toJson(JsonableInterface $object, EE_Base_Class $source): string
+	{
+		return $object->toJson();
+	}
 }

core/services/container/Mirror.php

Indentation +294 added lines, -294 removed lines

@@ -21,298 +21,298 @@
 class Mirror
 {
 
-    /**
-     * @var ReflectionClass[]
-     */
-    private $classes = [];
-
-    /**
-     * @var ReflectionMethod[]
-     */
-    private $constructors = [];
-
-    /**
-     * @var ReflectionParameter[][]
-     */
-    private $parameters = [];
-
-    /**
-     * @var ReflectionParameter[][]
-     */
-    private $parameter_classes = [];
-
-    /**
-     * @var ReflectionProperty[][]
-     */
-    private $properties = [];
-
-    /**
-     * @var ReflectionMethod[][]
-     */
-    private $methods = [];
-
-    /**
-     * @var array
-     */
-    private $default_properties = [];
-
-    /**
-     * @var array
-     */
-    private $static_properties = [];
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionClass
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     */
-    public function getReflectionClass(string $class_name): ReflectionClass
-    {
-        if (! is_string($class_name)) {
-            throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
-        }
-        if (! isset($this->classes[ $class_name ])) {
-            $this->classes[ $class_name ] = new ReflectionClass($class_name);
-        }
-        return $this->classes[ $class_name ];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionMethod|null
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getConstructor(string $class_name): ?ReflectionMethod
-    {
-        if (! is_string($class_name)) {
-            throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
-        }
-        if (! isset($this->constructors[ $class_name ])) {
-            $reflection_class                  = $this->getReflectionClass($class_name);
-            $this->constructors[ $class_name ] = $reflection_class->getConstructor();
-        }
-        return $this->constructors[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionMethod|null
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getConstructorFromReflection(ReflectionClass $reflection_class): ?ReflectionMethod
-    {
-        return $this->getConstructor($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getParameters(string $class_name): array
-    {
-        if (! isset($this->parameters[ $class_name ])) {
-            $constructor                     = $this->getConstructor($class_name);
-            $this->parameters[ $class_name ] = $constructor->getParameters();
-        }
-        return $this->parameters[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getParametersFromReflection(ReflectionClass $reflection_class): array
-    {
-        return $this->getParameters($reflection_class->getName());
-    }
-
-
-    /**
-     * @param ReflectionMethod $constructor
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getParametersFromReflectionConstructor(ReflectionMethod $constructor): array
-    {
-        return $this->getParameters($constructor->getDeclaringClass());
-    }
-
-
-    /**
-     * returns array of ReflectionParameter objects for parameters that are NOT optional
-     *
-     * @param string $class_name
-     * @return ReflectionParameter[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getRequiredParameters(string $class_name): array
-    {
-        $required_parameters = [];
-        $parameters          = $this->getParameters($class_name);
-        foreach ($parameters as $parameter) {
-            if ($parameter instanceof ReflectionParameter && ! $parameter->isOptional()) {
-                $required_parameters[] = $parameter;
-            }
-        }
-        return $required_parameters;
-    }
-
-
-    /**
-     * @param ReflectionParameter $param
-     * @param string              $class_name
-     * @param string              $index
-     * @return string|null
-     */
-    public function getParameterClassName(ReflectionParameter $param, string $class_name, string $index): ?string
-    {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
-        }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
-        }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
-        }
-        // ReflectionParameter::getClass() is deprecated in PHP 8+
-        if (PHP_VERSION_ID >= 80000) {
-            $this->parameter_classes[ $class_name ][ $index ]['param_class_name'] =
-                $param->getType() instanceof ReflectionNamedType
-                    ? $param->getType()->getName()
-                    : null;
-        } else {
-            $this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = $param->getClass()
-                    ? $param->getClass()->getName()
-                    : null;
-        }
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
-    }
-
-
-    /**
-     * @param ReflectionParameter $param
-     * @param string              $class_name
-     * @param string              $index
-     * @return array|string|null
-     * @throws ReflectionException
-     */
-    public function getParameterDefaultValue(ReflectionParameter $param, string $class_name, string $index)
-    {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
-        }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
-        }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
-        }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
-            ? $param->getDefaultValue()
-            : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionProperty[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getProperties(string $class_name): array
-    {
-        if (! isset($this->properties[ $class_name ])) {
-            $reflection_class                = $this->getReflectionClass($class_name);
-            $this->properties[ $class_name ] = $reflection_class->getProperties();
-        }
-        return $this->properties[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionProperty[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getPropertiesFromReflection(ReflectionClass $reflection_class): array
-    {
-        return $this->getProperties($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionMethod[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getMethods(string $class_name): array
-    {
-        if (! isset($this->methods[ $class_name ])) {
-            $reflection_class             = $this->getReflectionClass($class_name);
-            $this->methods[ $class_name ] = $reflection_class->getMethods();
-        }
-        return $this->methods[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class )
-     * @return ReflectionMethod[]
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getMethodsFromReflection(ReflectionClass $reflection_class): array
-    {
-        return $this->getMethods($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return array
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getDefaultProperties(string $class_name): array
-    {
-        if (! isset($this->default_properties[ $class_name ])) {
-            $reflection_class                        = $this->getReflectionClass($class_name);
-            $this->default_properties[ $class_name ] = $reflection_class->getDefaultProperties();
-        }
-        return $this->default_properties[ $class_name ];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return array
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function getStaticProperties(string $class_name): array
-    {
-        if (! isset($this->static_properties[ $class_name ])) {
-            $reflection_class                       = $this->getReflectionClass($class_name);
-            $this->static_properties[ $class_name ] = $reflection_class->getStaticProperties();
-        }
-        return $this->static_properties[ $class_name ];
-    }
+	/**
+	 * @var ReflectionClass[]
+	 */
+	private $classes = [];
+
+	/**
+	 * @var ReflectionMethod[]
+	 */
+	private $constructors = [];
+
+	/**
+	 * @var ReflectionParameter[][]
+	 */
+	private $parameters = [];
+
+	/**
+	 * @var ReflectionParameter[][]
+	 */
+	private $parameter_classes = [];
+
+	/**
+	 * @var ReflectionProperty[][]
+	 */
+	private $properties = [];
+
+	/**
+	 * @var ReflectionMethod[][]
+	 */
+	private $methods = [];
+
+	/**
+	 * @var array
+	 */
+	private $default_properties = [];
+
+	/**
+	 * @var array
+	 */
+	private $static_properties = [];
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionClass
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 */
+	public function getReflectionClass(string $class_name): ReflectionClass
+	{
+		if (! is_string($class_name)) {
+			throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
+		}
+		if (! isset($this->classes[ $class_name ])) {
+			$this->classes[ $class_name ] = new ReflectionClass($class_name);
+		}
+		return $this->classes[ $class_name ];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionMethod|null
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getConstructor(string $class_name): ?ReflectionMethod
+	{
+		if (! is_string($class_name)) {
+			throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
+		}
+		if (! isset($this->constructors[ $class_name ])) {
+			$reflection_class                  = $this->getReflectionClass($class_name);
+			$this->constructors[ $class_name ] = $reflection_class->getConstructor();
+		}
+		return $this->constructors[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionMethod|null
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getConstructorFromReflection(ReflectionClass $reflection_class): ?ReflectionMethod
+	{
+		return $this->getConstructor($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getParameters(string $class_name): array
+	{
+		if (! isset($this->parameters[ $class_name ])) {
+			$constructor                     = $this->getConstructor($class_name);
+			$this->parameters[ $class_name ] = $constructor->getParameters();
+		}
+		return $this->parameters[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getParametersFromReflection(ReflectionClass $reflection_class): array
+	{
+		return $this->getParameters($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param ReflectionMethod $constructor
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getParametersFromReflectionConstructor(ReflectionMethod $constructor): array
+	{
+		return $this->getParameters($constructor->getDeclaringClass());
+	}
+
+
+	/**
+	 * returns array of ReflectionParameter objects for parameters that are NOT optional
+	 *
+	 * @param string $class_name
+	 * @return ReflectionParameter[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getRequiredParameters(string $class_name): array
+	{
+		$required_parameters = [];
+		$parameters          = $this->getParameters($class_name);
+		foreach ($parameters as $parameter) {
+			if ($parameter instanceof ReflectionParameter && ! $parameter->isOptional()) {
+				$required_parameters[] = $parameter;
+			}
+		}
+		return $required_parameters;
+	}
+
+
+	/**
+	 * @param ReflectionParameter $param
+	 * @param string              $class_name
+	 * @param string              $index
+	 * @return string|null
+	 */
+	public function getParameterClassName(ReflectionParameter $param, string $class_name, string $index): ?string
+	{
+		if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
+			return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+		}
+		if (! isset($this->parameter_classes[ $class_name ])) {
+			$this->parameter_classes[ $class_name ] = [];
+		}
+		if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
+			$this->parameter_classes[ $class_name ][ $index ] = [];
+		}
+		// ReflectionParameter::getClass() is deprecated in PHP 8+
+		if (PHP_VERSION_ID >= 80000) {
+			$this->parameter_classes[ $class_name ][ $index ]['param_class_name'] =
+				$param->getType() instanceof ReflectionNamedType
+					? $param->getType()->getName()
+					: null;
+		} else {
+			$this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = $param->getClass()
+					? $param->getClass()->getName()
+					: null;
+		}
+		return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+	}
+
+
+	/**
+	 * @param ReflectionParameter $param
+	 * @param string              $class_name
+	 * @param string              $index
+	 * @return array|string|null
+	 * @throws ReflectionException
+	 */
+	public function getParameterDefaultValue(ReflectionParameter $param, string $class_name, string $index)
+	{
+		if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
+			return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+		}
+		if (! isset($this->parameter_classes[ $class_name ])) {
+			$this->parameter_classes[ $class_name ] = [];
+		}
+		if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
+			$this->parameter_classes[ $class_name ][ $index ] = [];
+		}
+		$this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
+			? $param->getDefaultValue()
+			: null;
+		return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionProperty[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getProperties(string $class_name): array
+	{
+		if (! isset($this->properties[ $class_name ])) {
+			$reflection_class                = $this->getReflectionClass($class_name);
+			$this->properties[ $class_name ] = $reflection_class->getProperties();
+		}
+		return $this->properties[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionProperty[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getPropertiesFromReflection(ReflectionClass $reflection_class): array
+	{
+		return $this->getProperties($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionMethod[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getMethods(string $class_name): array
+	{
+		if (! isset($this->methods[ $class_name ])) {
+			$reflection_class             = $this->getReflectionClass($class_name);
+			$this->methods[ $class_name ] = $reflection_class->getMethods();
+		}
+		return $this->methods[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class )
+	 * @return ReflectionMethod[]
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getMethodsFromReflection(ReflectionClass $reflection_class): array
+	{
+		return $this->getMethods($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return array
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getDefaultProperties(string $class_name): array
+	{
+		if (! isset($this->default_properties[ $class_name ])) {
+			$reflection_class                        = $this->getReflectionClass($class_name);
+			$this->default_properties[ $class_name ] = $reflection_class->getDefaultProperties();
+		}
+		return $this->default_properties[ $class_name ];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return array
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function getStaticProperties(string $class_name): array
+	{
+		if (! isset($this->static_properties[ $class_name ])) {
+			$reflection_class                       = $this->getReflectionClass($class_name);
+			$this->static_properties[ $class_name ] = $reflection_class->getStaticProperties();
+		}
+		return $this->static_properties[ $class_name ];
+	}
 }

Spacing +40 added lines, -40 removed lines

@@ -70,13 +70,13 @@ 
      */
     public function getReflectionClass(string $class_name): ReflectionClass
     {
-        if (! is_string($class_name)) {
+        if ( ! is_string($class_name)) {
             throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
         }
-        if (! isset($this->classes[ $class_name ])) {
-            $this->classes[ $class_name ] = new ReflectionClass($class_name);
+        if ( ! isset($this->classes[$class_name])) {
+            $this->classes[$class_name] = new ReflectionClass($class_name);
         }
-        return $this->classes[ $class_name ];
+        return $this->classes[$class_name];
     }
 
 
@@ -88,14 +88,14 @@ 
      */
     public function getConstructor(string $class_name): ?ReflectionMethod
     {
-        if (! is_string($class_name)) {
+        if ( ! is_string($class_name)) {
             throw new InvalidDataTypeException($class_name, '$class_name', 'string (fully qualified class name)');
         }
-        if (! isset($this->constructors[ $class_name ])) {
+        if ( ! isset($this->constructors[$class_name])) {
             $reflection_class                  = $this->getReflectionClass($class_name);
-            $this->constructors[ $class_name ] = $reflection_class->getConstructor();
+            $this->constructors[$class_name] = $reflection_class->getConstructor();
         }
-        return $this->constructors[ $class_name ];
+        return $this->constructors[$class_name];
     }
 
 
@@ -119,11 +119,11 @@ 
      */
     public function getParameters(string $class_name): array
     {
-        if (! isset($this->parameters[ $class_name ])) {
+        if ( ! isset($this->parameters[$class_name])) {
             $constructor                     = $this->getConstructor($class_name);
-            $this->parameters[ $class_name ] = $constructor->getParameters();
+            $this->parameters[$class_name] = $constructor->getParameters();
         }
-        return $this->parameters[ $class_name ];
+        return $this->parameters[$class_name];
     }
 
 
@@ -180,27 +180,27 @@ 
      */
     public function getParameterClassName(ReflectionParameter $param, string $class_name, string $index): ?string
     {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+        if (isset($this->parameter_classes[$class_name][$index]['param_class_name'])) {
+            return $this->parameter_classes[$class_name][$index]['param_class_name'];
         }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
+        if ( ! isset($this->parameter_classes[$class_name])) {
+            $this->parameter_classes[$class_name] = [];
         }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
+        if ( ! isset($this->parameter_classes[$class_name][$index])) {
+            $this->parameter_classes[$class_name][$index] = [];
         }
         // ReflectionParameter::getClass() is deprecated in PHP 8+
         if (PHP_VERSION_ID >= 80000) {
-            $this->parameter_classes[ $class_name ][ $index ]['param_class_name'] =
+            $this->parameter_classes[$class_name][$index]['param_class_name'] =
                 $param->getType() instanceof ReflectionNamedType
                     ? $param->getType()->getName()
                     : null;
         } else {
-            $this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = $param->getClass()
+            $this->parameter_classes[$class_name][$index]['param_class_name'] = $param->getClass()
                     ? $param->getClass()->getName()
                     : null;
         }
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+        return $this->parameter_classes[$class_name][$index]['param_class_name'];
     }
 
 
@@ -213,19 +213,19 @@ 
      */
     public function getParameterDefaultValue(ReflectionParameter $param, string $class_name, string $index)
     {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+        if (isset($this->parameter_classes[$class_name][$index]['param_class_default'])) {
+            return $this->parameter_classes[$class_name][$index]['param_class_default'];
         }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
+        if ( ! isset($this->parameter_classes[$class_name])) {
+            $this->parameter_classes[$class_name] = [];
         }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
+        if ( ! isset($this->parameter_classes[$class_name][$index])) {
+            $this->parameter_classes[$class_name][$index] = [];
         }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
+        $this->parameter_classes[$class_name][$index]['param_class_default'] = $param->isDefaultValueAvailable()
             ? $param->getDefaultValue()
             : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+        return $this->parameter_classes[$class_name][$index]['param_class_default'];
     }
 
 
@@ -237,11 +237,11 @@ 
      */
     public function getProperties(string $class_name): array
     {
-        if (! isset($this->properties[ $class_name ])) {
+        if ( ! isset($this->properties[$class_name])) {
             $reflection_class                = $this->getReflectionClass($class_name);
-            $this->properties[ $class_name ] = $reflection_class->getProperties();
+            $this->properties[$class_name] = $reflection_class->getProperties();
         }
-        return $this->properties[ $class_name ];
+        return $this->properties[$class_name];
     }
 
 
@@ -265,11 +265,11 @@ 
      */
     public function getMethods(string $class_name): array
     {
-        if (! isset($this->methods[ $class_name ])) {
+        if ( ! isset($this->methods[$class_name])) {
             $reflection_class             = $this->getReflectionClass($class_name);
-            $this->methods[ $class_name ] = $reflection_class->getMethods();
+            $this->methods[$class_name] = $reflection_class->getMethods();
         }
-        return $this->methods[ $class_name ];
+        return $this->methods[$class_name];
     }
 
 
@@ -293,11 +293,11 @@ 
      */
     public function getDefaultProperties(string $class_name): array
     {
-        if (! isset($this->default_properties[ $class_name ])) {
+        if ( ! isset($this->default_properties[$class_name])) {
             $reflection_class                        = $this->getReflectionClass($class_name);
-            $this->default_properties[ $class_name ] = $reflection_class->getDefaultProperties();
+            $this->default_properties[$class_name] = $reflection_class->getDefaultProperties();
         }
-        return $this->default_properties[ $class_name ];
+        return $this->default_properties[$class_name];
     }
 
 
@@ -309,10 +309,10 @@ 
      */
     public function getStaticProperties(string $class_name): array
     {
-        if (! isset($this->static_properties[ $class_name ])) {
+        if ( ! isset($this->static_properties[$class_name])) {
             $reflection_class                       = $this->getReflectionClass($class_name);
-            $this->static_properties[ $class_name ] = $reflection_class->getStaticProperties();
+            $this->static_properties[$class_name] = $reflection_class->getStaticProperties();
         }
-        return $this->static_properties[ $class_name ];
+        return $this->static_properties[$class_name];
     }
 }

core/services/form/meta/JsonableInterface.php

Indentation +9 added lines, -9 removed lines

@@ -11,15 +11,15 @@
  */
 interface JsonableInterface
 {
-    /**
-     * @param string $json
-     * @return mixed
-     */
-    public static function fromJson(string $json);
+	/**
+	 * @param string $json
+	 * @return mixed
+	 */
+	public static function fromJson(string $json);
 
 
-    /**
-     * @return string
-     */
-    public function toJson(): string;
+	/**
+	 * @return string
+	 */
+	public function toJson(): string;
 }

core/services/form/meta/Attributes.php

Indentation +180 added lines, -180 removed lines

@@ -17,184 +17,184 @@
 class Attributes implements JsonableInterface
 {
 
-    /**
-     * @var JsonDataHandler
-     */
-    private $json_data_handler;
-
-    /**
-     * @var InputTypes
-     */
-    private $input_types;
-
-    /**
-     * @var array
-     */
-    private $attributes = [];
-
-    /**
-     * @var array
-     */
-    private $attribute_types = [
-        'accept'          => 'string',
-        'accesskey'       => 'string',
-        'alt'             => 'string',
-        'autocomplete'    => 'bool',
-        'autofocus'       => 'bool',
-        'checked'         => 'bool',
-        // Custom HTML classes to be applied to the form input's container
-        'class'           => 'string',
-        'contenteditable' => 'bool',
-        'dir'             => 'string',
-        'disabled'        => 'bool',
-        'height'          => 'string',
-        'hidden'          => 'bool',
-        'id'              => 'string',
-        'list'            => 'string',
-        // Maximum numeric value allowed for form input answer.
-        'max'             => 'int',
-        // Maximum characters allowed for form input answer.
-        'maxlength'       => 'int',
-        // Minimum numeric value allowed for form input answer.
-        'min'             => 'int',
-        'multiple'        => 'bool',
-        'name'            => 'string',
-        'pattern'         => 'string',
-        // Example text displayed within an input to assist users with completing the form.
-        'placeholder'     => 'string',
-        'readonly'        => 'bool',
-        'size'            => 'int',
-        'spellcheck'      => 'bool',
-        'step'            => 'float',
-        'style'           => 'string',
-        'tabindex'        => 'int',
-        'title'           => 'string',
-        'translate'       => 'bool',
-        // Form input type. Values correspond to the Input::TYPE_* constants.
-        'type'            => 'string',
-        'value'           => 'string',
-        'width'           => 'string',
-    ];
-
-
-    /**
-     * Attributes constructor.
-     *
-     * @param JsonDataHandler $json_data_handler
-     * @param InputTypes      $element_types
-     * @param array           $attributes
-     */
-    public function __construct(JsonDataHandler $json_data_handler, array $attributes, InputTypes $element_types)
-    {
-        $this->json_data_handler = $json_data_handler;
-        $this->input_types       = $element_types;
-        $this->setAttributes($attributes);
-    }
-
-
-    /**
-     * @param string $json
-     * @return Attributes
-     */
-    public static function fromJson(string $json): Attributes
-    {
-        $json_data_handler = new JsonDataHandler();
-        $json_data_handler->configure(JsonDataHandler::DATA_TYPE_ARRAY);
-        $attributes = $json_data_handler->decodeJson($json);
-        /** @var InputTypes */
-        $element_types = LoaderFactory::getShared('EventEspresso\core\services\form\meta\InputTypes');
-        return LoaderFactory::getNew(Attributes::class, [ $json_data_handler, $attributes, $element_types ]);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return $this->attributes();
-    }
-
-
-    /**
-     * @return string
-     */
-    public function toJson(): string
-    {
-        return $this->json_data_handler->encodeData($this->attributes());
-    }
-
-
-    /**
-     * @param string                $attribute
-     * @param bool|float|int|string $value
-     * @return bool|float|int|string
-     */
-    private function sanitize(string $attribute, $value)
-    {
-        if ($attribute === 'type') {
-            $valid_types = $this->input_types->validTypeOptions();
-            return in_array($value, $valid_types, true) ?: Text::TYPE_TEXT;
-        }
-        $type = $this->attribute_types[ $attribute ] ?? 'string';
-        switch ($type) {
-            case 'bool':
-                return filter_var($value, FILTER_VALIDATE_BOOLEAN);
-            case 'int':
-                return filter_var($value, FILTER_SANITIZE_NUMBER_INT);
-            case 'float':
-                return filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-            case 'string':
-            default:
-                return filter_var(
-                    $value,
-                    FILTER_SANITIZE_STRING,
-                    FILTER_FLAG_ENCODE_LOW | FILTER_FLAG_ENCODE_HIGH | FILTER_FLAG_ENCODE_AMP
-                );
-        }
-    }
-
-
-    /**
-     * Custom HTML classes to be applied to this form input's help text.
-     * returns a concatenated string unless $as_array is set to true
-     *
-     * @return array
-     */
-    public function attributes(): array
-    {
-        return $this->attributes;
-    }
-
-
-    /**
-     * @param string                $attribute
-     * @param bool|float|int|string $value
-     */
-    public function addAttribute(string $attribute, $value): void
-    {
-        if (array_key_exists($attribute, $this->attribute_types)) {
-            $this->attributes[ $attribute ] = $this->sanitize($attribute, $value);
-        }
-    }
-
-
-    /**
-     * @param string $attribute
-     */
-    public function removeAttribute(string $attribute): void
-    {
-        unset($this->attributes[ $attribute ]);
-    }
-
-
-    /**
-     * @param array $attributes array where keys are the attribute name and values are the attribute's value
-     */
-    public function setAttributes(array $attributes): void
-    {
-        foreach ($attributes as $attribute => $value) {
-            $this->addAttribute($attribute, $value);
-        }
-    }
+	/**
+	 * @var JsonDataHandler
+	 */
+	private $json_data_handler;
+
+	/**
+	 * @var InputTypes
+	 */
+	private $input_types;
+
+	/**
+	 * @var array
+	 */
+	private $attributes = [];
+
+	/**
+	 * @var array
+	 */
+	private $attribute_types = [
+		'accept'          => 'string',
+		'accesskey'       => 'string',
+		'alt'             => 'string',
+		'autocomplete'    => 'bool',
+		'autofocus'       => 'bool',
+		'checked'         => 'bool',
+		// Custom HTML classes to be applied to the form input's container
+		'class'           => 'string',
+		'contenteditable' => 'bool',
+		'dir'             => 'string',
+		'disabled'        => 'bool',
+		'height'          => 'string',
+		'hidden'          => 'bool',
+		'id'              => 'string',
+		'list'            => 'string',
+		// Maximum numeric value allowed for form input answer.
+		'max'             => 'int',
+		// Maximum characters allowed for form input answer.
+		'maxlength'       => 'int',
+		// Minimum numeric value allowed for form input answer.
+		'min'             => 'int',
+		'multiple'        => 'bool',
+		'name'            => 'string',
+		'pattern'         => 'string',
+		// Example text displayed within an input to assist users with completing the form.
+		'placeholder'     => 'string',
+		'readonly'        => 'bool',
+		'size'            => 'int',
+		'spellcheck'      => 'bool',
+		'step'            => 'float',
+		'style'           => 'string',
+		'tabindex'        => 'int',
+		'title'           => 'string',
+		'translate'       => 'bool',
+		// Form input type. Values correspond to the Input::TYPE_* constants.
+		'type'            => 'string',
+		'value'           => 'string',
+		'width'           => 'string',
+	];
+
+
+	/**
+	 * Attributes constructor.
+	 *
+	 * @param JsonDataHandler $json_data_handler
+	 * @param InputTypes      $element_types
+	 * @param array           $attributes
+	 */
+	public function __construct(JsonDataHandler $json_data_handler, array $attributes, InputTypes $element_types)
+	{
+		$this->json_data_handler = $json_data_handler;
+		$this->input_types       = $element_types;
+		$this->setAttributes($attributes);
+	}
+
+
+	/**
+	 * @param string $json
+	 * @return Attributes
+	 */
+	public static function fromJson(string $json): Attributes
+	{
+		$json_data_handler = new JsonDataHandler();
+		$json_data_handler->configure(JsonDataHandler::DATA_TYPE_ARRAY);
+		$attributes = $json_data_handler->decodeJson($json);
+		/** @var InputTypes */
+		$element_types = LoaderFactory::getShared('EventEspresso\core\services\form\meta\InputTypes');
+		return LoaderFactory::getNew(Attributes::class, [ $json_data_handler, $attributes, $element_types ]);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		return $this->attributes();
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function toJson(): string
+	{
+		return $this->json_data_handler->encodeData($this->attributes());
+	}
+
+
+	/**
+	 * @param string                $attribute
+	 * @param bool|float|int|string $value
+	 * @return bool|float|int|string
+	 */
+	private function sanitize(string $attribute, $value)
+	{
+		if ($attribute === 'type') {
+			$valid_types = $this->input_types->validTypeOptions();
+			return in_array($value, $valid_types, true) ?: Text::TYPE_TEXT;
+		}
+		$type = $this->attribute_types[ $attribute ] ?? 'string';
+		switch ($type) {
+			case 'bool':
+				return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+			case 'int':
+				return filter_var($value, FILTER_SANITIZE_NUMBER_INT);
+			case 'float':
+				return filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			case 'string':
+			default:
+				return filter_var(
+					$value,
+					FILTER_SANITIZE_STRING,
+					FILTER_FLAG_ENCODE_LOW | FILTER_FLAG_ENCODE_HIGH | FILTER_FLAG_ENCODE_AMP
+				);
+		}
+	}
+
+
+	/**
+	 * Custom HTML classes to be applied to this form input's help text.
+	 * returns a concatenated string unless $as_array is set to true
+	 *
+	 * @return array
+	 */
+	public function attributes(): array
+	{
+		return $this->attributes;
+	}
+
+
+	/**
+	 * @param string                $attribute
+	 * @param bool|float|int|string $value
+	 */
+	public function addAttribute(string $attribute, $value): void
+	{
+		if (array_key_exists($attribute, $this->attribute_types)) {
+			$this->attributes[ $attribute ] = $this->sanitize($attribute, $value);
+		}
+	}
+
+
+	/**
+	 * @param string $attribute
+	 */
+	public function removeAttribute(string $attribute): void
+	{
+		unset($this->attributes[ $attribute ]);
+	}
+
+
+	/**
+	 * @param array $attributes array where keys are the attribute name and values are the attribute's value
+	 */
+	public function setAttributes(array $attributes): void
+	{
+		foreach ($attributes as $attribute => $value) {
+			$this->addAttribute($attribute, $value);
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -103,7 +103,7 @@ 
         $attributes = $json_data_handler->decodeJson($json);
         /** @var InputTypes */
         $element_types = LoaderFactory::getShared('EventEspresso\core\services\form\meta\InputTypes');
-        return LoaderFactory::getNew(Attributes::class, [ $json_data_handler, $attributes, $element_types ]);
+        return LoaderFactory::getNew(Attributes::class, [$json_data_handler, $attributes, $element_types]);
     }
 
 
@@ -136,7 +136,7 @@ 
             $valid_types = $this->input_types->validTypeOptions();
             return in_array($value, $valid_types, true) ?: Text::TYPE_TEXT;
         }
-        $type = $this->attribute_types[ $attribute ] ?? 'string';
+        $type = $this->attribute_types[$attribute] ?? 'string';
         switch ($type) {
             case 'bool':
                 return filter_var($value, FILTER_VALIDATE_BOOLEAN);
@@ -174,7 +174,7 @@ 
     public function addAttribute(string $attribute, $value): void
     {
         if (array_key_exists($attribute, $this->attribute_types)) {
-            $this->attributes[ $attribute ] = $this->sanitize($attribute, $value);
+            $this->attributes[$attribute] = $this->sanitize($attribute, $value);
         }
     }
 
@@ -184,7 +184,7 @@ 
      */
     public function removeAttribute(string $attribute): void
     {
-        unset($this->attributes[ $attribute ]);
+        unset($this->attributes[$attribute]);
     }
 
 

core/services/form/meta/FormStatus.php

Indentation +59 added lines, -59 removed lines

@@ -15,74 +15,74 @@
 class FormStatus
 {
 
-    /**
-     * indicates that element is not archived or trashed
-     */
-    public const ACTIVE = 'active';
+	/**
+	 * indicates that element is not archived or trashed
+	 */
+	public const ACTIVE = 'active';
 
-    /**
-     * indicates that element is archived and should no longer be displayed on public forms
-     * but may still be required due to existing answers when form was completed prior to input being archived
-     */
-    public const ARCHIVED = 'archived';
+	/**
+	 * indicates that element is archived and should no longer be displayed on public forms
+	 * but may still be required due to existing answers when form was completed prior to input being archived
+	 */
+	public const ARCHIVED = 'archived';
 
-    /**
-     * indicates that element should be automatically added to newly created forms
-     */
-    public const DEFAULT = 'default';
+	/**
+	 * indicates that element should be automatically added to newly created forms
+	 */
+	public const DEFAULT = 'default';
 
-    /**
-     * indicates that a copy of the form section will be saved for use in other events but not loaded by default
-     */
-    public const SHARED = 'shared';
+	/**
+	 * indicates that a copy of the form section will be saved for use in other events but not loaded by default
+	 */
+	public const SHARED = 'shared';
 
-    /**
-     * indicates that element is no longer needed, has no existing answers, and can be moved to the trash
-     */
-    public const TRASHED = 'trashed';
+	/**
+	 * indicates that element is no longer needed, has no existing answers, and can be moved to the trash
+	 */
+	public const TRASHED = 'trashed';
 
-    /**
-     * @var array
-     */
-    private $valid_status_options;
+	/**
+	 * @var array
+	 */
+	private $valid_status_options;
 
 
-    public function __construct()
-    {
-        $this->valid_status_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_FormStatus__valid_status_options',
-            [
-                FormStatus::ACTIVE   => esc_html__('Active', 'event_espresso'),
-                FormStatus::ARCHIVED => esc_html__('Archived', 'event_espresso'),
-                FormStatus::DEFAULT  => esc_html__('Default', 'event_espresso'),
-                FormStatus::SHARED   => esc_html__('Shared', 'event_espresso'),
-                FormStatus::TRASHED  => esc_html__('Trashed', 'event_espresso'),
-            ]
-        );
-    }
+	public function __construct()
+	{
+		$this->valid_status_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_FormStatus__valid_status_options',
+			[
+				FormStatus::ACTIVE   => esc_html__('Active', 'event_espresso'),
+				FormStatus::ARCHIVED => esc_html__('Archived', 'event_espresso'),
+				FormStatus::DEFAULT  => esc_html__('Default', 'event_espresso'),
+				FormStatus::SHARED   => esc_html__('Shared', 'event_espresso'),
+				FormStatus::TRASHED  => esc_html__('Trashed', 'event_espresso'),
+			]
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getFormStatusValues(): array
-    {
-        $values = [];
-        foreach ($this->valid_status_options as $value => $description) {
-            $values[ GQLUtils::formatEnumKey($value) ] = compact('value', 'description');
-        }
-        return $values;
-    }
+	/**
+	 * @return array
+	 */
+	public function getFormStatusValues(): array
+	{
+		$values = [];
+		foreach ($this->valid_status_options as $value => $description) {
+			$values[ GQLUtils::formatEnumKey($value) ] = compact('value', 'description');
+		}
+		return $values;
+	}
 
 
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validStatusOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_status_options)
-            : $this->valid_status_options;
-    }
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validStatusOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_status_options)
+			: $this->valid_status_options;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
     {
         $values = [];
         foreach ($this->valid_status_options as $value => $description) {
-            $values[ GQLUtils::formatEnumKey($value) ] = compact('value', 'description');
+            $values[GQLUtils::formatEnumKey($value)] = compact('value', 'description');
         }
         return $values;
     }