eventespresso / event-espresso-core

modules/gateways/Invoice/lib/invoice_functions.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 {
     $files = [];
     // read our template dir and build an array of files
-    $directory_handle = opendir(dirname($class_file) . '/lib/templates/css/');
+    $directory_handle = opendir(dirname($class_file).'/lib/templates/css/');
     //if we managed to open the directory
     if ($directory_handle) {
         /** @var RequestInterface $request */
@@ -34,7 +34,7 @@ 
         while (false !== ($fname = readdir($directory_handle))) {
             // if the file is not this file, and does not start with a '.' or '..',
             // then store it for later display
-            if (! in_array($fname, $skip, true)) {
+            if ( ! in_array($fname, $skip, true)) {
                 $files[] = $fname;
             }
         }

Indentation +33 added lines, -33 removed lines

@@ -13,36 +13,36 @@ 
  */
 function espresso_invoice_template_files($class_file)
 {
-    $files = [];
-    // read our template dir and build an array of files
-    $directory_handle = opendir(dirname($class_file) . '/lib/templates/css/');
-    //if we managed to open the directory
-    if ($directory_handle) {
-        /** @var RequestInterface $request */
-        $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        $skip = [
-            '.',
-            '..',
-            '.DS_Store',
-            '.svn',
-            'images',
-            'index.php',
-            'print',
-            basename($request->getServerParam('PHP_SELF')),
-        ];
-        // loop through all of the files
-        while (false !== ($fname = readdir($directory_handle))) {
-            // if the file is not this file, and does not start with a '.' or '..',
-            // then store it for later display
-            if (! in_array($fname, $skip, true)) {
-                $files[] = $fname;
-            }
-        }
-        // close the directory
-        closedir($directory_handle);
-    }
+	$files = [];
+	// read our template dir and build an array of files
+	$directory_handle = opendir(dirname($class_file) . '/lib/templates/css/');
+	//if we managed to open the directory
+	if ($directory_handle) {
+		/** @var RequestInterface $request */
+		$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		$skip = [
+			'.',
+			'..',
+			'.DS_Store',
+			'.svn',
+			'images',
+			'index.php',
+			'print',
+			basename($request->getServerParam('PHP_SELF')),
+		];
+		// loop through all of the files
+		while (false !== ($fname = readdir($directory_handle))) {
+			// if the file is not this file, and does not start with a '.' or '..',
+			// then store it for later display
+			if (! in_array($fname, $skip, true)) {
+				$files[] = $fname;
+			}
+		}
+		// close the directory
+		closedir($directory_handle);
+	}
 
-    return $files;
+	return $files;
 }
 
 
@@ -56,8 +56,8 @@ 
  */
 function espresso_invoice_is_selected($input_item, $selected = '')
 {
-    if ($input_item === $selected) {
-        return 'selected';
-    }
-    return '';
+	if ($input_item === $selected) {
+		return 'selected';
+	}
+	return '';
 }
\ No newline at end of file

core/data_migration_scripts/EE_DMS_Core_4_12_0.dms.php

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@ 
 // unfortunately, this needs to be done upon INCLUSION of this file,
 // instead of construction, because it only gets constructed on first page load
 // (all other times it gets resurrected from a wordpress option)
-$stages            = glob(EE_CORE . 'data_migration_scripts/4_12_0_stages/*');
+$stages            = glob(EE_CORE.'data_migration_scripts/4_12_0_stages/*');
 $class_to_filepath = [];
 foreach ($stages as $filepath) {
     $matches = [];
     preg_match('~4_12_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+    $class_to_filepath[$matches[1]] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_12_0__autoloaded_stages', $class_to_filepath);
@@ -71,7 +71,7 @@ 
      */
     public function schema_changes_before_migration(): bool
     {
-        require_once EE_HELPERS . 'EEH_Activation.helper.php';
+        require_once EE_HELPERS.'EEH_Activation.helper.php';
 
         $table_name = 'esp_answer';
         $sql        = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,

Indentation +180 added lines, -180 removed lines

@@ -10,9 +10,9 @@ 
 $stages            = glob(EE_CORE . 'data_migration_scripts/4_12_0_stages/*');
 $class_to_filepath = [];
 foreach ($stages as $filepath) {
-    $matches = [];
-    preg_match('~4_12_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+	$matches = [];
+	preg_match('~4_12_0_stages/(.*).dmsstage.php~', $filepath, $matches);
+	$class_to_filepath[ $matches[1] ] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_12_0__autoloaded_stages', $class_to_filepath);
@@ -28,63 +28,63 @@ 
  */
 class EE_DMS_Core_4_12_0 extends EE_Data_Migration_Script_Base
 {
-    /**
-     *
-     * @param EE_DMS_Core_4_11_0 $dms_4_11
-     * @param TableManager|null  $table_manager
-     * @param TableAnalysis|null $table_analysis
-     */
-    public function __construct(
-        EE_DMS_Core_4_11_0 $dms_4_11,
-        TableManager $table_manager = null,
-        TableAnalysis $table_analysis = null
-    ) {
-        $this->previous_dms      = $dms_4_11;
-        $this->_pretty_name      = esc_html__("Data Update to Event Espresso 4.12.0", "event_espresso");
-        $this->_priority         = 10;
-        $this->_migration_stages = [
-            new EE_DMS_4_12_0_Event_Venues(),
-        ];
-        parent::__construct($table_manager, $table_analysis);
-    }
-
-
-    /**
-     * Whether to migrate or not.
-     *
-     * @param array $version_array
-     * @return bool
-     */
-    public function can_migrate_from_version($version_array): bool
-    {
-        $version_string = $version_array['Core'];
-        return $version_string
-               && version_compare($version_string, '4.12.0.decaf', '<')
-               && version_compare($version_string, '4.11.0.decaf', '>=');
-    }
-
-
-    /**
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function schema_changes_before_migration(): bool
-    {
-        require_once EE_HELPERS . 'EEH_Activation.helper.php';
-
-        $table_name = 'esp_answer';
-        $sql        = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+	/**
+	 *
+	 * @param EE_DMS_Core_4_11_0 $dms_4_11
+	 * @param TableManager|null  $table_manager
+	 * @param TableAnalysis|null $table_analysis
+	 */
+	public function __construct(
+		EE_DMS_Core_4_11_0 $dms_4_11,
+		TableManager $table_manager = null,
+		TableAnalysis $table_analysis = null
+	) {
+		$this->previous_dms      = $dms_4_11;
+		$this->_pretty_name      = esc_html__("Data Update to Event Espresso 4.12.0", "event_espresso");
+		$this->_priority         = 10;
+		$this->_migration_stages = [
+			new EE_DMS_4_12_0_Event_Venues(),
+		];
+		parent::__construct($table_manager, $table_analysis);
+	}
+
+
+	/**
+	 * Whether to migrate or not.
+	 *
+	 * @param array $version_array
+	 * @return bool
+	 */
+	public function can_migrate_from_version($version_array): bool
+	{
+		$version_string = $version_array['Core'];
+		return $version_string
+			   && version_compare($version_string, '4.12.0.decaf', '<')
+			   && version_compare($version_string, '4.11.0.decaf', '>=');
+	}
+
+
+	/**
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function schema_changes_before_migration(): bool
+	{
+		require_once EE_HELPERS . 'EEH_Activation.helper.php';
+
+		$table_name = 'esp_answer';
+		$sql        = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID),
 					KEY REG_ID (REG_ID),
 					KEY QST_ID (QST_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_attendee_meta';
-        $sql        = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_attendee_meta';
+		$sql        = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				ATT_ID bigint(20) unsigned NOT NULL,
 				ATT_fname varchar(45) NOT NULL,
 				ATT_lname varchar(45) NOT NULL,
@@ -101,10 +101,10 @@ 
 				KEY ATT_email (ATT_email(191)),
 				KEY ATT_lname (ATT_lname),
 				KEY ATT_fname (ATT_fname)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-        $table_name = 'esp_checkin';
-        $sql        = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql        = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				REG_ID int(10) unsigned NOT NULL,
 				DTT_ID int(10) unsigned NOT NULL,
 				CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -112,10 +112,10 @@ 
 				PRIMARY KEY  (CHK_ID),
 				KEY REG_ID (REG_ID),
 				KEY DTT_ID (DTT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_country';
-        $sql        = "CNT_ISO varchar(2) NOT NULL,
+		$table_name = 'esp_country';
+		$sql        = "CNT_ISO varchar(2) NOT NULL,
 				CNT_ISO3 varchar(3) NOT NULL,
 				RGN_ID tinyint(3) unsigned DEFAULT NULL,
 				CNT_name varchar(45) NOT NULL,
@@ -131,32 +131,32 @@ 
 				CNT_is_EU tinyint(1) DEFAULT '0',
 				CNT_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_currency';
-        $sql        = "CUR_code varchar(6) NOT NULL,
+		$table_name = 'esp_currency';
+		$sql        = "CUR_code varchar(6) NOT NULL,
 				CUR_single varchar(45) DEFAULT 'dollar',
 				CUR_plural varchar(45) DEFAULT 'dollars',
 				CUR_sign varchar(45) DEFAULT '$',
 				CUR_dec_plc varchar(1) NOT NULL DEFAULT '2',
 				CUR_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-
-        // note: although this table is no longer in use,
-        // it hasn't been removed because then queries to the model will have errors.
-        // but you should expect this table and its corresponding model to be removed in
-        // the next few months
-        $table_name = 'esp_currency_payment_method';
-        $sql        = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+
+		// note: although this table is no longer in use,
+		// it hasn't been removed because then queries to the model will have errors.
+		// but you should expect this table and its corresponding model to be removed in
+		// the next few months
+		$table_name = 'esp_currency_payment_method';
+		$sql        = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
 				CUR_code varchar(6) NOT NULL,
 				PMD_ID int(11) NOT NULL,
 				PRIMARY KEY  (CPM_ID),
 				KEY PMD_ID (PMD_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-        $table_name = 'esp_datetime';
-        $sql        = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_datetime';
+		$sql        = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 			    VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 				DTT_name varchar(255) NOT NULL DEFAULT '',
@@ -174,28 +174,28 @@ 
 				KEY DTT_EVT_start (DTT_EVT_start),
 				KEY EVT_ID (EVT_ID),
 				KEY DTT_is_primary (DTT_is_primary)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = "esp_datetime_ticket";
-        $sql        = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_datetime_ticket";
+		$sql        = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				DTT_ID int(10) unsigned NOT NULL,
 				TKT_ID int(10) unsigned NOT NULL,
 				PRIMARY KEY  (DTK_ID),
 				KEY DTT_ID (DTT_ID),
 				KEY TKT_ID (TKT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_event_message_template';
-        $sql        = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_message_template';
+		$sql        = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 				GRP_ID int(10) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EMT_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_event_meta';
-        $sql        = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_meta';
+		$sql        = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 			    VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 				EVT_display_desc tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -212,10 +212,10 @@ 
 				FSC_UUID varchar(25) DEFAULT NULL,
 				PRIMARY KEY  (EVTM_ID),
 				KEY EVT_ID (EVT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_event_question_group';
-        $sql        = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql        = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				QSG_ID int(10) unsigned NOT NULL,
 				EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
@@ -223,28 +223,28 @@ 
 				PRIMARY KEY  (EQG_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY QSG_ID (QSG_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_event_venue';
-        $sql        = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql        = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_extra_meta';
-        $sql        = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql        = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_extra_join';
-        $sql        = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_join';
+		$sql        = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
 				EXJ_first_model_id varchar(6) NOT NULL,
 				EXJ_first_model_name varchar(20) NOT NULL,
 				EXJ_second_model_id varchar(6) NOT NULL,
@@ -252,10 +252,10 @@ 
 				PRIMARY KEY  (EXJ_ID),
 				KEY first_model (EXJ_first_model_name,EXJ_first_model_id),
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-        $table_name = 'esp_form_element';
-        $sql        = "FIN_UUID varchar(25) NOT NULL,
+		$table_name = 'esp_form_element';
+		$sql        = "FIN_UUID varchar(25) NOT NULL,
 				FSC_UUID varchar(25) NOT NULL,
 				FIN_adminOnly tinyint(1) unsigned NOT NULL DEFAULT 0,
 				FIN_attributes text DEFAULT NULL,
@@ -272,10 +272,10 @@ 
 				KEY FSC_UUID (FSC_UUID),
 				KEY FIN_order (FIN_order),
 				KEY FIN_status (FIN_status)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_form_section';
-        $sql        = "FSC_UUID varchar(25) NOT NULL,
+		$table_name = 'esp_form_section';
+		$sql        = "FSC_UUID varchar(25) NOT NULL,
 				FSC_appliesTo tinytext NOT NULL,
 				FSC_attributes text DEFAULT NULL,
 				FSC_belongsTo varchar(25) DEFAULT NULL,
@@ -287,10 +287,10 @@ 
 				KEY FSC_belongsTo (FSC_belongsTo),
 				KEY FSC_order (FSC_order),
 				KEY FSC_status (FSC_status)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_form_submission';
-        $sql        = "FSB_UUID varchar(25) NOT NULL,
+		$table_name = 'esp_form_submission';
+		$sql        = "FSB_UUID varchar(25) NOT NULL,
                 FSC_UUID varchar(25) NOT NULL,
 				TXN_ID int(10) DEFAULT NULL,
 				FSB_data mediumtext DEFAULT NULL,
@@ -298,10 +298,10 @@ 
 				PRIMARY KEY  (FSB_UUID),
 				KEY FSC_UUID (FSC_UUID),
 				KEY TXN_ID (TXN_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name   = 'esp_line_item';
-        $sql          = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name   = 'esp_line_item';
+		$sql          = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(10) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -323,10 +323,10 @@ 
 				KEY txn_type_timestamp (TXN_ID,LIN_type,LIN_timestamp),
 				KEY txn_obj_id_obj_type (TXN_ID,OBJ_ID,OBJ_type),
 				KEY obj_id_obj_type (OBJ_ID,OBJ_type)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_log';
-        $sql        = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_log';
+		$sql        = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
 				LOG_time datetime DEFAULT NULL,
 				OBJ_ID varchar(45) DEFAULT NULL,
 				OBJ_type varchar(45) DEFAULT NULL,
@@ -337,10 +337,10 @@ 
 				KEY LOG_time (LOG_time),
 				KEY OBJ (OBJ_type,OBJ_ID),
 				KEY LOG_type (LOG_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_message';
-        $sql        = "MSG_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_message';
+		$sql        = "MSG_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 				GRP_ID int(10) unsigned NULL,
 				MSG_token varchar(255) NULL,
 				TXN_ID int(10) unsigned NULL,
@@ -372,20 +372,20 @@ 
 				KEY STS_ID (STS_ID),
 				KEY MSG_created (MSG_created),
 				KEY MSG_modified (MSG_modified)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_message_template';
-        $sql        = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_message_template';
+		$sql        = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				GRP_ID int(10) unsigned NOT NULL,
 				MTP_context varchar(50) NOT NULL,
 				MTP_template_field varchar(30) NOT NULL,
 				MTP_content text NOT NULL,
 				PRIMARY KEY  (MTP_ID),
 				KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_message_template_group';
-        $sql        = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_message_template_group';
+		$sql        = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				MTP_user_id int(10) NOT NULL DEFAULT '1',
 				MTP_name varchar(245) NOT NULL DEFAULT '',
 				MTP_description varchar(245) NOT NULL DEFAULT '',
@@ -397,10 +397,10 @@ 
 				MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 				PRIMARY KEY  (GRP_ID),
 				KEY MTP_user_id (MTP_user_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_payment';
-        $sql        = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_payment';
+		$sql        = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TXN_ID int(10) unsigned DEFAULT NULL,
 				STS_ID varchar(3) DEFAULT NULL,
 				PAY_timestamp datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -417,10 +417,10 @@ 
 				PRIMARY KEY  (PAY_ID),
 				KEY PAY_timestamp (PAY_timestamp),
 				KEY TXN_ID (TXN_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-        $table_name = 'esp_payment_method';
-        $sql        = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_payment_method';
+		$sql        = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
 				PMD_type varchar(124) DEFAULT NULL,
 				PMD_name varchar(255) DEFAULT NULL,
 				PMD_desc text,
@@ -436,10 +436,10 @@ 
 				PRIMARY KEY  (PMD_ID),
 				UNIQUE KEY PMD_slug_UNIQUE (PMD_slug),
 				KEY PMD_type (PMD_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-        $table_name = "esp_price";
-        $sql        = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_price";
+		$sql        = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				PRT_ID tinyint(3) unsigned NOT NULL,
 				PRC_amount decimal(12,6) NOT NULL DEFAULT '0.00',
 				PRC_name varchar(245) NOT NULL,
@@ -452,10 +452,10 @@ 
 				PRC_parent int(10) unsigned DEFAULT 0,
 				PRIMARY KEY  (PRC_ID),
 				KEY PRT_ID (PRT_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = "esp_price_type";
-        $sql        = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_price_type";
+		$sql        = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
 				PRT_name varchar(45) NOT NULL,
 				PBT_ID tinyint(3) unsigned NOT NULL DEFAULT '1',
 				PRT_is_percent tinyint(1) NOT NULL DEFAULT '0',
@@ -464,27 +464,27 @@ 
 				PRT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				UNIQUE KEY PRT_name_UNIQUE (PRT_name),
 				PRIMARY KEY  (PRT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-        $table_name = "esp_ticket_price";
-        $sql        = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_ticket_price";
+		$sql        = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TKT_ID int(10) unsigned NOT NULL,
 				PRC_ID int(10) unsigned NOT NULL,
 				PRIMARY KEY  (TKP_ID),
 				KEY TKT_ID (TKT_ID),
 				KEY PRC_ID (PRC_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = "esp_ticket_template";
-        $sql        = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_ticket_template";
+		$sql        = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TTM_name varchar(45) NOT NULL,
 				TTM_description text,
 				TTM_file varchar(45),
 				PRIMARY KEY  (TTM_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_question';
-        $sql        = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql        = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QST_display_text text NOT NULL,
 				QST_admin_label varchar(255) NOT NULL,
 				QST_system varchar(25) DEFAULT NULL,
@@ -498,10 +498,10 @@ 
 				QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QST_ID),
 				KEY QST_order (QST_order)';
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_question_group';
-        $sql        = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group';
+		$sql        = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSG_name varchar(255) NOT NULL,
 				QSG_identifier varchar(100) NOT NULL,
 				QSG_desc text NULL,
@@ -514,20 +514,20 @@ 
 				PRIMARY KEY  (QSG_ID),
 				UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 				KEY QSG_order (QSG_order)';
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_question_group_question';
-        $sql        = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql        = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSG_ID int(10) unsigned NOT NULL,
 				QST_ID int(10) unsigned NOT NULL,
 				QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QGQ_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSG_ID_order (QSG_ID,QGQ_order)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_question_option';
-        $sql        = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql        = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSO_value varchar(255) NOT NULL,
 				QSO_desc text NOT NULL,
 				QST_ID int(10) unsigned NOT NULL,
@@ -537,10 +537,10 @@ 
 				PRIMARY KEY  (QSO_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSO_order (QSO_order)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_registration';
-        $sql        = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_registration';
+		$sql        = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				ATT_ID bigint(20) unsigned NOT NULL,
 				TXN_ID int(10) unsigned NOT NULL,
@@ -564,20 +564,20 @@ 
 				KEY TKT_ID (TKT_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-        $table_name = 'esp_registration_payment';
-        $sql        = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_registration_payment';
+		$sql        = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  REG_ID int(10) unsigned NOT NULL,
 					  PAY_ID int(10) unsigned NULL,
 					  RPY_amount decimal(12,3) NOT NULL DEFAULT '0.00',
 					  PRIMARY KEY  (RPY_ID),
 					  KEY REG_ID (REG_ID),
 					  KEY PAY_ID (PAY_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-        $table_name = 'esp_state';
-        $sql        = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_state';
+		$sql        = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 				CNT_ISO varchar(2) NOT NULL,
 				STA_abbrev varchar(24) NOT NULL,
 				STA_name varchar(100) NOT NULL,
@@ -585,10 +585,10 @@ 
 				PRIMARY KEY  (STA_ID),
 				KEY STA_abbrev (STA_abbrev),
 				KEY CNT_ISO (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_status';
-        $sql        = "STS_ID varchar(3) NOT NULL,
+		$table_name = 'esp_status';
+		$sql        = "STS_ID varchar(3) NOT NULL,
 				STS_code varchar(45) NOT NULL,
 				STS_type varchar(45) NOT NULL,
 				STS_can_edit tinyint(1) NOT NULL DEFAULT 0,
@@ -596,10 +596,10 @@ 
 				STS_open tinyint(1) NOT NULL DEFAULT 1,
 				UNIQUE KEY STS_ID_UNIQUE (STS_ID),
 				KEY STS_type (STS_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = "esp_ticket";
-        $sql        = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = "esp_ticket";
+		$sql        = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TTM_ID int(10) unsigned NOT NULL,
 				TKT_name varchar(245) NOT NULL DEFAULT '',
 				TKT_description text NOT NULL,
@@ -624,10 +624,10 @@ 
 				TKT_visibility smallint(6) unsigned NOT NULL DEFAULT 100,
 				PRIMARY KEY  (TKT_ID),
 				KEY TKT_start_date (TKT_start_date)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_transaction';
-        $sql        = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_transaction';
+		$sql        = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TXN_timestamp datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
 				TXN_total decimal(12,3) DEFAULT '0.00',
 				TXN_paid decimal(12,3) NOT NULL DEFAULT '0.00',
@@ -639,10 +639,10 @@ 
 				PRIMARY KEY  (TXN_ID),
 				KEY TXN_timestamp (TXN_timestamp),
 				KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $table_name = 'esp_venue_meta';
-        $sql        = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_venue_meta';
+		$sql        = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
 			VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 			VNU_address varchar(255) DEFAULT NULL,
 			VNU_address2 varchar(255) DEFAULT NULL,
@@ -661,18 +661,18 @@ 
 			KEY VNU_ID (VNU_ID),
 			KEY STA_ID (STA_ID),
 			KEY CNT_ISO (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-        $this->previous_dms->insert_default_data();
-        return true;
-    }
+		$this->previous_dms->insert_default_data();
+		return true;
+	}
 
 
-    /**
-     * @return boolean
-     */
-    public function schema_changes_after_migration(): bool
-    {
-        return true;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function schema_changes_after_migration(): bool
+	{
+		return true;
+	}
 }

core/data_migration_scripts/4_12_0_stages/EE_DMS_4_12_0_Event_Venues.dmsstage.php

Indentation +46 added lines, -46 removed lines

@@ -12,54 +12,54 @@
  */
 class EE_DMS_4_12_0_Event_Venues extends EE_Data_Migration_Script_Stage_Table
 {
-    /**
-     * @var string
-     */
-    private $_event_meta;
+	/**
+	 * @var string
+	 */
+	private $_event_meta;
 
 
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__('Event Venue Relations', 'event_espresso');
-        $this->_old_table   = $wpdb->prefix . 'esp_event_venue';
-        $this->_event_meta  = $wpdb->prefix . 'esp_event_meta';
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__('Event Venue Relations', 'event_espresso');
+		$this->_old_table   = $wpdb->prefix . 'esp_event_venue';
+		$this->_event_meta  = $wpdb->prefix . 'esp_event_meta';
+		parent::__construct();
+	}
 
 
-    /**
-     * Copies Venue IDs from `wp_esp_event_venue` to `wp_esp_event_meta` for each Event
-     *
-     * @param array $old_row an associative array where keys are column names and values are their values.
-     * @return null
-     */
-    protected function _migrate_old_row($old_row): ?bool
-    {
-        $EVT_ID =
-            isset($old_row['EVT_ID'])
-                ? absint($old_row['EVT_ID'])
-                : 0;
-        $VNU_ID =
-            isset($old_row['VNU_ID'])
-                ? absint($old_row['VNU_ID'])
-                : 0;
-        if ($EVT_ID && $VNU_ID) {
-            global $wpdb;
-            // If the question group was also for primary attendees, we should just update that row.
-            // And we delete this row.
-            $result = $wpdb->update(
-                $this->_event_meta,
-                ['VNU_ID' => $VNU_ID],  // data
-                ['EVT_ID' => $EVT_ID],  // where
-                ['%d'],                 // data format
-                ['%d']                  // where format
-            );
-            return filter_var($result, FILTER_VALIDATE_BOOLEAN);
-        }
-        return false;
-    }
+	/**
+	 * Copies Venue IDs from `wp_esp_event_venue` to `wp_esp_event_meta` for each Event
+	 *
+	 * @param array $old_row an associative array where keys are column names and values are their values.
+	 * @return null
+	 */
+	protected function _migrate_old_row($old_row): ?bool
+	{
+		$EVT_ID =
+			isset($old_row['EVT_ID'])
+				? absint($old_row['EVT_ID'])
+				: 0;
+		$VNU_ID =
+			isset($old_row['VNU_ID'])
+				? absint($old_row['VNU_ID'])
+				: 0;
+		if ($EVT_ID && $VNU_ID) {
+			global $wpdb;
+			// If the question group was also for primary attendees, we should just update that row.
+			// And we delete this row.
+			$result = $wpdb->update(
+				$this->_event_meta,
+				['VNU_ID' => $VNU_ID],  // data
+				['EVT_ID' => $EVT_ID],  // where
+				['%d'],                 // data format
+				['%d']                  // where format
+			);
+			return filter_var($result, FILTER_VALIDATE_BOOLEAN);
+		}
+		return false;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -25,8 +25,8 @@ 
     {
         global $wpdb;
         $this->_pretty_name = esc_html__('Event Venue Relations', 'event_espresso');
-        $this->_old_table   = $wpdb->prefix . 'esp_event_venue';
-        $this->_event_meta  = $wpdb->prefix . 'esp_event_meta';
+        $this->_old_table   = $wpdb->prefix.'esp_event_venue';
+        $this->_event_meta  = $wpdb->prefix.'esp_event_meta';
         parent::__construct();
     }
 
@@ -53,9 +53,9 @@ 
             // And we delete this row.
             $result = $wpdb->update(
                 $this->_event_meta,
-                ['VNU_ID' => $VNU_ID],  // data
-                ['EVT_ID' => $EVT_ID],  // where
-                ['%d'],                 // data format
+                ['VNU_ID' => $VNU_ID], // data
+                ['EVT_ID' => $EVT_ID], // where
+                ['%d'], // data format
                 ['%d']                  // where format
             );
             return filter_var($result, FILTER_VALIDATE_BOOLEAN);

core/db_models/EEM_Venue.model.php

Spacing +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
             'WP_User'           => new EE_Belongs_To_Relation(),
         );
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
         $this->model_chain_to_password = '';
         parent::__construct($timezone);
     }

Indentation +182 added lines, -182 removed lines

@@ -10,189 +10,189 @@
  */
 class EEM_Venue extends EEM_CPT_Base
 {
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
 
 
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Venue', 'event_espresso');
-        $this->plural_item = esc_html__('Venues', 'event_espresso');
-        $this->_tables = array(
-            'Venue_CPT'  => new EE_Primary_Table('posts', 'ID'),
-            'Venue_Meta' => new EE_Secondary_Table('esp_venue_meta', 'VNUM_ID', 'VNU_ID'),
-        );
-        $this->_fields = array(
-            'Venue_CPT'  => array(
-                'VNU_ID'         => new EE_Primary_Key_Int_Field('ID', esc_html__("Venue ID", "event_espresso")),
-                'VNU_name'       => new EE_Plain_Text_Field(
-                    'post_title',
-                    esc_html__("Venue Name", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'VNU_desc'       => new EE_Post_Content_Field(
-                    'post_content',
-                    esc_html__("Venue Description", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'VNU_identifier' => new EE_Slug_Field('post_name', esc_html__("Venue Identifier", "event_espresso"), false, ''),
-                'VNU_created'    => new EE_Datetime_Field(
-                    'post_date',
-                    esc_html__("Date Venue Created", "event_espresso"),
-                    false,
-                    EE_Datetime_Field::now
-                ),
-                'VNU_short_desc' => new EE_Plain_Text_Field(
-                    'post_excerpt',
-                    esc_html__("Short Description of Venue", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'VNU_modified'   => new EE_Datetime_Field(
-                    'post_modified',
-                    esc_html__("Venue Modified Date", "event_espresso"),
-                    false,
-                    EE_Datetime_Field::now
-                ),
-                'VNU_wp_user'    => new EE_WP_User_Field(
-                    'post_author',
-                    esc_html__("Venue Creator ID", "event_espresso"),
-                    false
-                ),
-                'parent'         => new EE_Integer_Field(
-                    'post_parent',
-                    esc_html__("Venue Parent ID", "event_espresso"),
-                    false,
-                    0
-                ),
-                'VNU_order'      => new EE_Integer_Field('menu_order', esc_html__("Venue order", "event_espresso"), false, 1),
-                'post_type'      => new EE_WP_Post_Type_Field('espresso_venues'),
-                'password' => new EE_Password_Field(
-                    'post_password',
-                    esc_html__('Password', 'event_espresso'),
-                    false,
-                    '',
-                    array(
-                        'VNU_desc',
-                        'VNU_short_desc',
-                        'VNU_address',
-                        'VNU_address2',
-                        'VNU_city',
-                        'STA_ID',
-                        'CNT_ISO',
-                        'VNU_zip',
-                        'VNU_phone',
-                        'VNU_capacity',
-                        'VNU_url',
-                        'VNU_virtual_phone',
-                        'VNU_virtual_url',
-                        'VNU_google_map_link',
-                        'VNU_enable_for_gmap',
-                    )
-                )
-            ),
-            'Venue_Meta' => array(
-                'VNUM_ID'             => new EE_DB_Only_Int_Field(
-                    'VNUM_ID',
-                    esc_html__("ID of Venue Meta Row", "event_espresso"),
-                    false
-                ),
-                'VNU_ID_fk'           => new EE_DB_Only_Int_Field(
-                    'VNU_ID',
-                    esc_html__("Foreign Key to Venue Post ", "event_espresso"),
-                    false
-                ),
-                'VNU_address'         => new EE_Plain_Text_Field(
-                    'VNU_address',
-                    esc_html__("Venue Address line 1", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'VNU_address2'        => new EE_Plain_Text_Field(
-                    'VNU_address2',
-                    esc_html__("Venue Address line 2", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'VNU_city'            => new EE_Plain_Text_Field(
-                    'VNU_city',
-                    esc_html__("Venue City", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'STA_ID'              => new EE_Foreign_Key_Int_Field(
-                    'STA_ID',
-                    esc_html__("State ID", "event_espresso"),
-                    true,
-                    null,
-                    'State'
-                ),
-                'CNT_ISO'             => new EE_Foreign_Key_String_Field(
-                    'CNT_ISO',
-                    esc_html__("Country Code", "event_espresso"),
-                    true,
-                    null,
-                    'Country'
-                ),
-                'VNU_zip'             => new EE_Plain_Text_Field(
-                    'VNU_zip',
-                    esc_html__("Venue Zip/Postal Code", "event_espresso"),
-                    true
-                ),
-                'VNU_phone'           => new EE_Plain_Text_Field(
-                    'VNU_phone',
-                    esc_html__("Venue Phone", "event_espresso"),
-                    true
-                ),
-                'VNU_capacity'        => new EE_Infinite_Integer_Field(
-                    'VNU_capacity',
-                    esc_html__("Venue Capacity", "event_espresso"),
-                    true,
-                    EE_INF
-                ),
-                'VNU_url'             => new EE_Plain_Text_Field(
-                    'VNU_url',
-                    esc_html__('Venue Website', 'event_espresso'),
-                    true
-                ),
-                'VNU_virtual_phone'   => new EE_Plain_Text_Field(
-                    'VNU_virtual_phone',
-                    esc_html__('Call in Number', 'event_espresso'),
-                    true
-                ),
-                'VNU_virtual_url'     => new EE_Plain_Text_Field(
-                    'VNU_virtual_url',
-                    esc_html__('Virtual URL', 'event_espresso'),
-                    true
-                ),
-                'VNU_google_map_link' => new EE_Plain_Text_Field(
-                    'VNU_google_map_link',
-                    esc_html__('Google Map Link', 'event_espresso'),
-                    true
-                ),
-                'VNU_enable_for_gmap' => new EE_Boolean_Field(
-                    'VNU_enable_for_gmap',
-                    esc_html__('Show Google Map?', 'event_espresso'),
-                    false,
-                    false
-                ),
-            ),
-        );
-        $this->_model_relations = array(
-            'Country'           => new EE_Belongs_To_Relation(),
-            'Event'             => new EE_Has_Many_Relation(),
-            'Datetime'          => new EE_Has_Many_Relation(),
-            'State'             => new EE_Belongs_To_Relation(),
-            'Term_Relationship' => new EE_Has_Many_Relation(),
-            'Term_Taxonomy'     => new EE_HABTM_Relation('Term_Relationship'),
-            'WP_User'           => new EE_Belongs_To_Relation(),
-        );
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->model_chain_to_password = '';
-        parent::__construct($timezone);
-    }
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Venue', 'event_espresso');
+		$this->plural_item = esc_html__('Venues', 'event_espresso');
+		$this->_tables = array(
+			'Venue_CPT'  => new EE_Primary_Table('posts', 'ID'),
+			'Venue_Meta' => new EE_Secondary_Table('esp_venue_meta', 'VNUM_ID', 'VNU_ID'),
+		);
+		$this->_fields = array(
+			'Venue_CPT'  => array(
+				'VNU_ID'         => new EE_Primary_Key_Int_Field('ID', esc_html__("Venue ID", "event_espresso")),
+				'VNU_name'       => new EE_Plain_Text_Field(
+					'post_title',
+					esc_html__("Venue Name", "event_espresso"),
+					false,
+					''
+				),
+				'VNU_desc'       => new EE_Post_Content_Field(
+					'post_content',
+					esc_html__("Venue Description", "event_espresso"),
+					false,
+					''
+				),
+				'VNU_identifier' => new EE_Slug_Field('post_name', esc_html__("Venue Identifier", "event_espresso"), false, ''),
+				'VNU_created'    => new EE_Datetime_Field(
+					'post_date',
+					esc_html__("Date Venue Created", "event_espresso"),
+					false,
+					EE_Datetime_Field::now
+				),
+				'VNU_short_desc' => new EE_Plain_Text_Field(
+					'post_excerpt',
+					esc_html__("Short Description of Venue", "event_espresso"),
+					true,
+					''
+				),
+				'VNU_modified'   => new EE_Datetime_Field(
+					'post_modified',
+					esc_html__("Venue Modified Date", "event_espresso"),
+					false,
+					EE_Datetime_Field::now
+				),
+				'VNU_wp_user'    => new EE_WP_User_Field(
+					'post_author',
+					esc_html__("Venue Creator ID", "event_espresso"),
+					false
+				),
+				'parent'         => new EE_Integer_Field(
+					'post_parent',
+					esc_html__("Venue Parent ID", "event_espresso"),
+					false,
+					0
+				),
+				'VNU_order'      => new EE_Integer_Field('menu_order', esc_html__("Venue order", "event_espresso"), false, 1),
+				'post_type'      => new EE_WP_Post_Type_Field('espresso_venues'),
+				'password' => new EE_Password_Field(
+					'post_password',
+					esc_html__('Password', 'event_espresso'),
+					false,
+					'',
+					array(
+						'VNU_desc',
+						'VNU_short_desc',
+						'VNU_address',
+						'VNU_address2',
+						'VNU_city',
+						'STA_ID',
+						'CNT_ISO',
+						'VNU_zip',
+						'VNU_phone',
+						'VNU_capacity',
+						'VNU_url',
+						'VNU_virtual_phone',
+						'VNU_virtual_url',
+						'VNU_google_map_link',
+						'VNU_enable_for_gmap',
+					)
+				)
+			),
+			'Venue_Meta' => array(
+				'VNUM_ID'             => new EE_DB_Only_Int_Field(
+					'VNUM_ID',
+					esc_html__("ID of Venue Meta Row", "event_espresso"),
+					false
+				),
+				'VNU_ID_fk'           => new EE_DB_Only_Int_Field(
+					'VNU_ID',
+					esc_html__("Foreign Key to Venue Post ", "event_espresso"),
+					false
+				),
+				'VNU_address'         => new EE_Plain_Text_Field(
+					'VNU_address',
+					esc_html__("Venue Address line 1", "event_espresso"),
+					true,
+					''
+				),
+				'VNU_address2'        => new EE_Plain_Text_Field(
+					'VNU_address2',
+					esc_html__("Venue Address line 2", "event_espresso"),
+					true,
+					''
+				),
+				'VNU_city'            => new EE_Plain_Text_Field(
+					'VNU_city',
+					esc_html__("Venue City", "event_espresso"),
+					true,
+					''
+				),
+				'STA_ID'              => new EE_Foreign_Key_Int_Field(
+					'STA_ID',
+					esc_html__("State ID", "event_espresso"),
+					true,
+					null,
+					'State'
+				),
+				'CNT_ISO'             => new EE_Foreign_Key_String_Field(
+					'CNT_ISO',
+					esc_html__("Country Code", "event_espresso"),
+					true,
+					null,
+					'Country'
+				),
+				'VNU_zip'             => new EE_Plain_Text_Field(
+					'VNU_zip',
+					esc_html__("Venue Zip/Postal Code", "event_espresso"),
+					true
+				),
+				'VNU_phone'           => new EE_Plain_Text_Field(
+					'VNU_phone',
+					esc_html__("Venue Phone", "event_espresso"),
+					true
+				),
+				'VNU_capacity'        => new EE_Infinite_Integer_Field(
+					'VNU_capacity',
+					esc_html__("Venue Capacity", "event_espresso"),
+					true,
+					EE_INF
+				),
+				'VNU_url'             => new EE_Plain_Text_Field(
+					'VNU_url',
+					esc_html__('Venue Website', 'event_espresso'),
+					true
+				),
+				'VNU_virtual_phone'   => new EE_Plain_Text_Field(
+					'VNU_virtual_phone',
+					esc_html__('Call in Number', 'event_espresso'),
+					true
+				),
+				'VNU_virtual_url'     => new EE_Plain_Text_Field(
+					'VNU_virtual_url',
+					esc_html__('Virtual URL', 'event_espresso'),
+					true
+				),
+				'VNU_google_map_link' => new EE_Plain_Text_Field(
+					'VNU_google_map_link',
+					esc_html__('Google Map Link', 'event_espresso'),
+					true
+				),
+				'VNU_enable_for_gmap' => new EE_Boolean_Field(
+					'VNU_enable_for_gmap',
+					esc_html__('Show Google Map?', 'event_espresso'),
+					false,
+					false
+				),
+			),
+		);
+		$this->_model_relations = array(
+			'Country'           => new EE_Belongs_To_Relation(),
+			'Event'             => new EE_Has_Many_Relation(),
+			'Datetime'          => new EE_Has_Many_Relation(),
+			'State'             => new EE_Belongs_To_Relation(),
+			'Term_Relationship' => new EE_Has_Many_Relation(),
+			'Term_Taxonomy'     => new EE_HABTM_Relation('Term_Relationship'),
+			'WP_User'           => new EE_Belongs_To_Relation(),
+		);
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->model_chain_to_password = '';
+		parent::__construct($timezone);
+	}
 }

core/domain/services/graphql/types/Event.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function __construct(EEM_Event $event_model)
     {
-        $this->setName($this->namespace . 'Event');
+        $this->setName($this->namespace.'Event');
         $this->setIsCustomPostType(true);
         parent::__construct($event_model);
     }
@@ -82,7 +82,7 @@ 
             ),
             new GraphQLField(
                 'defaultRegStatus',
-                $this->namespace . 'RegistrationStatusEnum',
+                $this->namespace.'RegistrationStatusEnum',
                 'default_registration_status',
                 esc_html__('Default Event Registration Status', 'event_espresso')
             ),
@@ -215,7 +215,7 @@ 
                 null,
                 esc_html__('Event venue ID', 'event_espresso'),
                 null,
-                function (EE_Event $source) {
+                function(EE_Event $source) {
                     $venue_ID = $source->venue_ID();
                     return $venue_ID
                     // Since venue is a CPT, $type will be 'post'

Indentation +218 added lines, -218 removed lines

@@ -24,227 +24,227 @@
  */
 class Event extends TypeBase
 {
-    /**
-     * Event constructor.
-     *
-     * @param EEM_Event $event_model
-     */
-    public function __construct(EEM_Event $event_model)
-    {
-        $this->setName($this->namespace . 'Event');
-        $this->setIsCustomPostType(true);
-        parent::__construct($event_model);
-    }
+	/**
+	 * Event constructor.
+	 *
+	 * @param EEM_Event $event_model
+	 */
+	public function __construct(EEM_Event $event_model)
+	{
+		$this->setName($this->namespace . 'Event');
+		$this->setIsCustomPostType(true);
+		parent::__construct($event_model);
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    public function getFields(): array
-    {
-        $fields = [
-            new GraphQLField(
-                'allowDonations',
-                'Boolean',
-                'donations',
-                esc_html__('Accept Donations?', 'event_espresso')
-            ),
-            new GraphQLField(
-                'allowOverflow',
-                'Boolean',
-                'allow_overflow',
-                esc_html__('Enable Wait List for Event', 'event_espresso')
-            ),
-            new GraphQLField(
-                'altRegPage',
-                'String',
-                'external_url',
-                esc_html__('URL of Event Page if hosted elsewhere', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'cacheId',
-                ['non_null' => 'String'],
-                null,
-                esc_html__('The cache ID of the object.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'created',
-                'String',
-                'created',
-                esc_html__('Date/Time Event Created', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'dbId',
-                ['non_null' => 'Int'],
-                'ID',
-                esc_html__('The event ID.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'defaultRegStatus',
-                $this->namespace . 'RegistrationStatusEnum',
-                'default_registration_status',
-                esc_html__('Default Event Registration Status', 'event_espresso')
-            ),
-            new GraphQLField(
-                'description',
-                'String',
-                'description',
-                esc_html__('Event Description', 'event_espresso')
-            ),
-            new GraphQLField(
-                'displayDescription',
-                'Boolean',
-                'display_description',
-                esc_html__('Display Description Flag', 'event_espresso')
-            ),
-            new GraphQLField(
-                'displayTicketSelector',
-                'Boolean',
-                'display_ticket_selector',
-                esc_html__('Display Ticket Selector Flag', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isActive',
-                'Boolean',
-                'is_active',
-                esc_html__('Flag indicating event is active', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isCancelled',
-                'Boolean',
-                'is_cancelled',
-                esc_html__('Flag indicating whether the event is marked as cancelled', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isExpired',
-                'Boolean',
-                'is_expired',
-                esc_html__('Flag indicating event is expired or not', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isInactive',
-                'Boolean',
-                'is_inactive',
-                esc_html__('Flag indicating event is inactive', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isPostponed',
-                'Boolean',
-                'is_postponed',
-                esc_html__('Flag indicating whether the event is marked as postponed', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isSoldOut',
-                'Boolean',
-                'is_sold_out',
-                esc_html__(
-                    'Flag indicating whether the tickets sold for the event, met or exceed the registration limit',
-                    'event_espresso'
-                )
-            ),
-            new GraphQLOutputField(
-                'isUpcoming',
-                'Boolean',
-                'is_upcoming',
-                esc_html__('Whether the event is upcoming', 'event_espresso')
-            ),
-            new GraphQLInputField(
-                'manager',
-                'String',
-                null,
-                esc_html__('Globally unique event ID for the event manager', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'manager',
-                'User',
-                null,
-                esc_html__('Event Manager', 'event_espresso')
-            ),
-            new GraphQLField(
-                'maxRegistrations',
-                'Int',
-                'additional_limit',
-                esc_html__('Limit of Additional Registrations on Same Transaction', 'event_espresso')
-            ),
-            new GraphQLField(
-                'memberOnly',
-                'Boolean',
-                'member_only',
-                esc_html__('Member-Only Event Flag', 'event_espresso')
-            ),
-            new GraphQLField(
-                'name',
-                'String',
-                'name',
-                esc_html__('Event Name', 'event_espresso')
-            ),
-            new GraphQLField(
-                'order',
-                'Int',
-                'order',
-                esc_html__('Event Menu Order', 'event_espresso')
-            ),
-            new GraphQLField(
-                'phoneNumber',
-                'String',
-                'phone',
-                esc_html__('Event Phone Number', 'event_espresso')
-            ),
-            new GraphQLField(
-                'shortDescription',
-                'String',
-                'short_description',
-                esc_html__('Event Short Description', 'event_espresso')
-            ),
-            new GraphQLField(
-                'timezoneString',
-                'String',
-                'timezone_string',
-                esc_html__('Timezone (name) for Event times', 'event_espresso')
-            ),
-            new GraphQLField(
-                'visibleOn',
-                'String',
-                'visible_on',
-                esc_html__('Event Visible Date', 'event_espresso')
-            ),
-            new GraphQLField(
-                'venue',
-                'String',
-                null,
-                esc_html__('Event venue ID', 'event_espresso'),
-                null,
-                function (EE_Event $source) {
-                    $venue_ID = $source->venue_ID();
-                    return $venue_ID
-                    // Since venue is a CPT, $type will be 'post'
-                    ? Relay::toGlobalId('post', $venue_ID)
-                    : null;
-                }
-            ),
-        ];
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	public function getFields(): array
+	{
+		$fields = [
+			new GraphQLField(
+				'allowDonations',
+				'Boolean',
+				'donations',
+				esc_html__('Accept Donations?', 'event_espresso')
+			),
+			new GraphQLField(
+				'allowOverflow',
+				'Boolean',
+				'allow_overflow',
+				esc_html__('Enable Wait List for Event', 'event_espresso')
+			),
+			new GraphQLField(
+				'altRegPage',
+				'String',
+				'external_url',
+				esc_html__('URL of Event Page if hosted elsewhere', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'cacheId',
+				['non_null' => 'String'],
+				null,
+				esc_html__('The cache ID of the object.', 'event_espresso')
+			),
+			new GraphQLField(
+				'created',
+				'String',
+				'created',
+				esc_html__('Date/Time Event Created', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'dbId',
+				['non_null' => 'Int'],
+				'ID',
+				esc_html__('The event ID.', 'event_espresso')
+			),
+			new GraphQLField(
+				'defaultRegStatus',
+				$this->namespace . 'RegistrationStatusEnum',
+				'default_registration_status',
+				esc_html__('Default Event Registration Status', 'event_espresso')
+			),
+			new GraphQLField(
+				'description',
+				'String',
+				'description',
+				esc_html__('Event Description', 'event_espresso')
+			),
+			new GraphQLField(
+				'displayDescription',
+				'Boolean',
+				'display_description',
+				esc_html__('Display Description Flag', 'event_espresso')
+			),
+			new GraphQLField(
+				'displayTicketSelector',
+				'Boolean',
+				'display_ticket_selector',
+				esc_html__('Display Ticket Selector Flag', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isActive',
+				'Boolean',
+				'is_active',
+				esc_html__('Flag indicating event is active', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isCancelled',
+				'Boolean',
+				'is_cancelled',
+				esc_html__('Flag indicating whether the event is marked as cancelled', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isExpired',
+				'Boolean',
+				'is_expired',
+				esc_html__('Flag indicating event is expired or not', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isInactive',
+				'Boolean',
+				'is_inactive',
+				esc_html__('Flag indicating event is inactive', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isPostponed',
+				'Boolean',
+				'is_postponed',
+				esc_html__('Flag indicating whether the event is marked as postponed', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isSoldOut',
+				'Boolean',
+				'is_sold_out',
+				esc_html__(
+					'Flag indicating whether the tickets sold for the event, met or exceed the registration limit',
+					'event_espresso'
+				)
+			),
+			new GraphQLOutputField(
+				'isUpcoming',
+				'Boolean',
+				'is_upcoming',
+				esc_html__('Whether the event is upcoming', 'event_espresso')
+			),
+			new GraphQLInputField(
+				'manager',
+				'String',
+				null,
+				esc_html__('Globally unique event ID for the event manager', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'manager',
+				'User',
+				null,
+				esc_html__('Event Manager', 'event_espresso')
+			),
+			new GraphQLField(
+				'maxRegistrations',
+				'Int',
+				'additional_limit',
+				esc_html__('Limit of Additional Registrations on Same Transaction', 'event_espresso')
+			),
+			new GraphQLField(
+				'memberOnly',
+				'Boolean',
+				'member_only',
+				esc_html__('Member-Only Event Flag', 'event_espresso')
+			),
+			new GraphQLField(
+				'name',
+				'String',
+				'name',
+				esc_html__('Event Name', 'event_espresso')
+			),
+			new GraphQLField(
+				'order',
+				'Int',
+				'order',
+				esc_html__('Event Menu Order', 'event_espresso')
+			),
+			new GraphQLField(
+				'phoneNumber',
+				'String',
+				'phone',
+				esc_html__('Event Phone Number', 'event_espresso')
+			),
+			new GraphQLField(
+				'shortDescription',
+				'String',
+				'short_description',
+				esc_html__('Event Short Description', 'event_espresso')
+			),
+			new GraphQLField(
+				'timezoneString',
+				'String',
+				'timezone_string',
+				esc_html__('Timezone (name) for Event times', 'event_espresso')
+			),
+			new GraphQLField(
+				'visibleOn',
+				'String',
+				'visible_on',
+				esc_html__('Event Visible Date', 'event_espresso')
+			),
+			new GraphQLField(
+				'venue',
+				'String',
+				null,
+				esc_html__('Event venue ID', 'event_espresso'),
+				null,
+				function (EE_Event $source) {
+					$venue_ID = $source->venue_ID();
+					return $venue_ID
+					// Since venue is a CPT, $type will be 'post'
+					? Relay::toGlobalId('post', $venue_ID)
+					: null;
+				}
+			),
+		];
 
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_types__event_fields',
-            $fields,
-            $this->name,
-            $this->model
-        );
-    }
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_types__event_fields',
+			$fields,
+			$this->name,
+			$this->model
+		);
+	}
 
 
-    /**
-     * Extends the existing WP GraphQL mutations.
-     *
-     * @since $VID:$
-     */
-    public function extendMutations()
-    {
-        add_action(
-            'graphql_post_object_mutation_update_additional_data',
-            EventUpdate::mutateFields($this->model, $this),
-            10,
-            6
-        );
-    }
+	/**
+	 * Extends the existing WP GraphQL mutations.
+	 *
+	 * @since $VID:$
+	 */
+	public function extendMutations()
+	{
+		add_action(
+			'graphql_post_object_mutation_update_additional_data',
+			EventUpdate::mutateFields($this->model, $this),
+			10,
+			6
+		);
+	}
 }

core/domain/services/graphql/connections/RootQueryStatesConnection.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         return [
             'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'State',
-            'fromFieldName'      => lcfirst($this->namespace) . 'States',
+            'toType'             => $this->namespace.'State',
+            'fromFieldName'      => lcfirst($this->namespace).'States',
             'connectionTypeName' => "{$this->namespace}RootQueryStatesConnection",
             'connectionArgs'     => self::get_connection_args(),
             'resolve'            => [$this, 'resolveConnection'],

Indentation +85 added lines, -85 removed lines

@@ -18,95 +18,95 @@
  */
 class RootQueryStatesConnection extends AbstractRootQueryConnection
 {
-    /**
-     * StateConnection constructor.
-     *
-     * @param EEM_State               $model
-     */
-    public function __construct(EEM_State $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * StateConnection constructor.
+	 *
+	 * @param EEM_State               $model
+	 */
+	public function __construct(EEM_State $model)
+	{
+		parent::__construct($model);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function config(): array
-    {
-        return [
-            'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'State',
-            'fromFieldName'      => lcfirst($this->namespace) . 'States',
-            'connectionTypeName' => "{$this->namespace}RootQueryStatesConnection",
-            'connectionArgs'     => self::get_connection_args(),
-            'resolve'            => [$this, 'resolveConnection'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function config(): array
+	{
+		return [
+			'fromType'           => 'RootQuery',
+			'toType'             => $this->namespace . 'State',
+			'fromFieldName'      => lcfirst($this->namespace) . 'States',
+			'connectionTypeName' => "{$this->namespace}RootQueryStatesConnection",
+			'connectionArgs'     => self::get_connection_args(),
+			'resolve'            => [$this, 'resolveConnection'],
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return StateConnectionResolver
-     * @throws Exception
-     */
-    public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
-    {
-        return new StateConnectionResolver($entity, $args, $context, $info);
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return StateConnectionResolver
+	 * @throws Exception
+	 */
+	public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
+	{
+		return new StateConnectionResolver($entity, $args, $context, $info);
+	}
 
-    /**
-     * Given an optional array of args, this returns the args to be used in the connection
-     *
-     * @param array $args The args to modify the defaults
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public static function get_connection_args(array $args = []): array
-    {
-        $newArgs = [
-            'orderby'      => [
-                'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
-                'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
-            ],
-            'in' => [
-                'type'        => ['list_of' => 'ID'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given state IDs.',
-                    'event_espresso'
-                ),
-            ],
-            'countryIsoIn' => [
-                'type'        => ['list_of' => 'String'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country ISOs.',
-                    'event_espresso'
-                ),
-            ],
-            'search' => [
-                'type'        => 'String',
-                'description' => esc_html__('The search keywords', 'event_espresso'),
-            ],
-            'activeOnly' => [
-                'type'        => 'Boolean',
-                'description' => esc_html__(
-                    'Limit the result to the active states.',
-                    'event_espresso'
-                ),
-            ],
-        ];
+	/**
+	 * Given an optional array of args, this returns the args to be used in the connection
+	 *
+	 * @param array $args The args to modify the defaults
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public static function get_connection_args(array $args = []): array
+	{
+		$newArgs = [
+			'orderby'      => [
+				'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
+				'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
+			],
+			'in' => [
+				'type'        => ['list_of' => 'ID'],
+				'description' => esc_html__(
+					'Limit the result to the set of given state IDs.',
+					'event_espresso'
+				),
+			],
+			'countryIsoIn' => [
+				'type'        => ['list_of' => 'String'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country ISOs.',
+					'event_espresso'
+				),
+			],
+			'search' => [
+				'type'        => 'String',
+				'description' => esc_html__('The search keywords', 'event_espresso'),
+			],
+			'activeOnly' => [
+				'type'        => 'Boolean',
+				'description' => esc_html__(
+					'Limit the result to the active states.',
+					'event_espresso'
+				),
+			],
+		];
 
-        $newArgs = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connections__state_args',
-            $newArgs,
-            $args
-        );
-        return array_merge(
-            $newArgs,
-            $args
-        );
-    }
+		$newArgs = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connections__state_args',
+			$newArgs,
+			$args
+		);
+		return array_merge(
+			$newArgs,
+			$args
+		);
+	}
 }

core/domain/services/graphql/connections/RootQueryCountriesConnection.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         return [
             'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Country',
-            'fromFieldName'      => lcfirst($this->namespace . 'Countries'),
+            'toType'             => $this->namespace.'Country',
+            'fromFieldName'      => lcfirst($this->namespace.'Countries'),
             'connectionTypeName' => "{$this->namespace}RootQueryCountriesConnection",
             'connectionArgs'     => RootQueryCountriesConnection::get_connection_args(),
             'resolve'            => [$this, 'resolveConnection'],

Indentation +95 added lines, -95 removed lines

@@ -18,105 +18,105 @@
  */
 class RootQueryCountriesConnection extends AbstractRootQueryConnection
 {
-    /**
-     * CountryConnection constructor.
-     *
-     * @param EEM_Country               $model
-     */
-    public function __construct(EEM_Country $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * CountryConnection constructor.
+	 *
+	 * @param EEM_Country               $model
+	 */
+	public function __construct(EEM_Country $model)
+	{
+		parent::__construct($model);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function config(): array
-    {
-        return [
-            'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Country',
-            'fromFieldName'      => lcfirst($this->namespace . 'Countries'),
-            'connectionTypeName' => "{$this->namespace}RootQueryCountriesConnection",
-            'connectionArgs'     => RootQueryCountriesConnection::get_connection_args(),
-            'resolve'            => [$this, 'resolveConnection'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function config(): array
+	{
+		return [
+			'fromType'           => 'RootQuery',
+			'toType'             => $this->namespace . 'Country',
+			'fromFieldName'      => lcfirst($this->namespace . 'Countries'),
+			'connectionTypeName' => "{$this->namespace}RootQueryCountriesConnection",
+			'connectionArgs'     => RootQueryCountriesConnection::get_connection_args(),
+			'resolve'            => [$this, 'resolveConnection'],
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return CountryConnectionResolver
-     * @throws Exception
-     */
-    public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
-    {
-        return new CountryConnectionResolver($entity, $args, $context, $info);
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return CountryConnectionResolver
+	 * @throws Exception
+	 */
+	public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
+	{
+		return new CountryConnectionResolver($entity, $args, $context, $info);
+	}
 
-    /**
-     * Given an optional array of args, this returns the args to be used in the connection
-     *
-     * @param array $args The args to modify the defaults
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public static function get_connection_args(array $args = []): array
-    {
-        $newArgs = [
-            'orderby'      => [
-                'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
-                'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
-            ],
-            'in' => [
-                'type'        => ['list_of' => 'ID'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country IDs.',
-                    'event_espresso'
-                ),
-            ],
-            'isoIn' => [
-                'type'        => ['list_of' => 'String'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country ISOs.',
-                    'event_espresso'
-                ),
-            ],
-            'iso3In' => [
-                'type'        => ['list_of' => 'String'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country ISO3s.',
-                    'event_espresso'
-                ),
-            ],
-            'search' => [
-                'type'        => 'String',
-                'description' => esc_html__(
-                    'Limit the result to the given search query.',
-                    'event_espresso'
-                ),
-            ],
-            'activeOnly' => [
-                'type'        => 'Boolean',
-                'description' => esc_html__(
-                    'Limit the result to the active countries.',
-                    'event_espresso'
-                ),
-            ],
-        ];
+	/**
+	 * Given an optional array of args, this returns the args to be used in the connection
+	 *
+	 * @param array $args The args to modify the defaults
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public static function get_connection_args(array $args = []): array
+	{
+		$newArgs = [
+			'orderby'      => [
+				'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
+				'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
+			],
+			'in' => [
+				'type'        => ['list_of' => 'ID'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country IDs.',
+					'event_espresso'
+				),
+			],
+			'isoIn' => [
+				'type'        => ['list_of' => 'String'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country ISOs.',
+					'event_espresso'
+				),
+			],
+			'iso3In' => [
+				'type'        => ['list_of' => 'String'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country ISO3s.',
+					'event_espresso'
+				),
+			],
+			'search' => [
+				'type'        => 'String',
+				'description' => esc_html__(
+					'Limit the result to the given search query.',
+					'event_espresso'
+				),
+			],
+			'activeOnly' => [
+				'type'        => 'Boolean',
+				'description' => esc_html__(
+					'Limit the result to the active countries.',
+					'event_espresso'
+				),
+			],
+		];
 
-        $newArgs = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connections__country_args',
-            $newArgs,
-            $args
-        );
-        return array_merge(
-            $newArgs,
-            $args
-        );
-    }
+		$newArgs = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connections__country_args',
+			$newArgs,
+			$args
+		);
+		return array_merge(
+			$newArgs,
+			$args
+		);
+	}
 }

core/domain/services/graphql/inputs/StatesConnectionOrderbyInput.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyInput');
+        $this->setName($this->namespace.'StatesConnectionOrderbyInput');
         $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
         parent::__construct();
     }
@@ -36,7 +36,7 @@ 
         return [
             new GraphQLField(
                 'field',
-                ['non_null' => $this->namespace . 'StatesConnectionOrderbyEnum']
+                ['non_null' => $this->namespace.'StatesConnectionOrderbyEnum']
             ),
             new GraphQLField(
                 'order',

Indentation +25 added lines, -25 removed lines

@@ -16,31 +16,31 @@
  */
 class StatesConnectionOrderbyInput extends InputBase
 {
-    /**
-     * StatesConnectionOrderbyInput constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyInput');
-        $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * StatesConnectionOrderbyInput constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'StatesConnectionOrderbyInput');
+		$this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    protected function getFields(): array
-    {
-        return [
-            new GraphQLField(
-                'field',
-                ['non_null' => $this->namespace . 'StatesConnectionOrderbyEnum']
-            ),
-            new GraphQLField(
-                'order',
-                'OrderEnum'
-            ),
-        ];
-    }
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	protected function getFields(): array
+	{
+		return [
+			new GraphQLField(
+				'field',
+				['non_null' => $this->namespace . 'StatesConnectionOrderbyEnum']
+			),
+			new GraphQLField(
+				'order',
+				'OrderEnum'
+			),
+		];
+	}
 }

core/domain/services/graphql/inputs/CountriesConnectionOrderbyInput.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyInput');
+        $this->setName($this->namespace.'CountriesConnectionOrderbyInput');
         $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
         parent::__construct();
     }
@@ -36,7 +36,7 @@ 
         return [
             new GraphQLField(
                 'field',
-                ['non_null' => $this->namespace . 'CountriesConnectionOrderbyEnum']
+                ['non_null' => $this->namespace.'CountriesConnectionOrderbyEnum']
             ),
             new GraphQLField(
                 'order',

Indentation +25 added lines, -25 removed lines

@@ -16,31 +16,31 @@
  */
 class CountriesConnectionOrderbyInput extends InputBase
 {
-    /**
-     * CountriesConnectionOrderbyInput constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyInput');
-        $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * CountriesConnectionOrderbyInput constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'CountriesConnectionOrderbyInput');
+		$this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    protected function getFields(): array
-    {
-        return [
-            new GraphQLField(
-                'field',
-                ['non_null' => $this->namespace . 'CountriesConnectionOrderbyEnum']
-            ),
-            new GraphQLField(
-                'order',
-                'OrderEnum'
-            ),
-        ];
-    }
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	protected function getFields(): array
+	{
+		return [
+			new GraphQLField(
+				'field',
+				['non_null' => $this->namespace . 'CountriesConnectionOrderbyEnum']
+			),
+			new GraphQLField(
+				'order',
+				'OrderEnum'
+			),
+		];
+	}
 }