Allow enum class const inheritance

src/code_info/classlike_info.rs

@@ -71,6 +71,11 @@ pub struct ClassLikeInfo {
  */
  pub required_classlikes: Vec<StrId>,
 
+ /**
+ * A trait can require extending classes and interfaces
+ */
+ pub enum_class_extends: Vec<StrId>,
+
  /**
  * Parent classes
  */
@@ -227,6 +232,7 @@ impl ClassLikeInfo {
  has_visitor_issues: false,
  preserve_constructor_signature: false,
  enforce_template_inheritance: false,
+ enum_class_extends: vec![],
 
  direct_class_interfaces: vec![],
  all_parent_classes: vec![],

src/code_info_builder/classlike_scanner.rs

@@ -272,6 +272,34 @@ pub(crate) fn scan(
  codebase.symbols.add_enum_class_name(class_name);
 
  if let Some(enum_node) = &classlike_node.enum_ {
+ for enum_extends in &enum_node.includes {
+ let extend_class = get_type_from_hint(
+ &enum_extends.1,
+ None,
+ &TypeResolutionContext::new(),
+ resolved_names,
+ file_source.file_path,
+ enum_node.base.0.start_offset() as u32,
+ )
+ .unwrap()
+ .get_single_owned();
+
+ if let TAtomic::TReference {
+ name, type_params, ..
+ } = extend_class
+ {
+ storage.enum_class_extends.push(name);
+
+ signature_end = enum_extends.0.end_offset() as u32;
+
+ if let Some(type_params) = type_params {
+ storage
+ .template_extended_offsets
+ .insert(name, type_params.into_iter().map(Arc::new).collect());
+ }
+ }
+ }
+
  storage.enum_type = Some(
  get_type_from_hint(
  &enum_node.base.1,

src/file_scanner_analyzer/populator.rs

@@ -449,6 +449,16 @@ fn populate_classlike_storage(
  );
  }
 
+ for direct_enum_extends in &storage.enum_class_extends.clone() {
+ populate_data_from_parent_classlike(
+ &mut storage,
+ codebase,
+ direct_enum_extends,
+ symbol_references,
+ safe_symbols,
+ );
+ }
+
  for direct_parent_interface in &storage.direct_parent_interfaces.clone() {
  populate_interface_data_from_parent_interface(
  &mut storage,
@@ -693,6 +703,15 @@ fn populate_data_from_trait(
  return;
  };
 
+ storage.constants.extend(
+ trait_storage
+ .constants
+ .iter()
+ .filter(|(k, _)| !storage.constants.contains_key(*k))
+ .map(|v| (*v.0, v.1.clone()))
+ .collect::<FxHashMap<_, _>>(),
+ );
+
  storage
  .all_class_interfaces
  .extend(trait_storage.direct_class_interfaces.clone());

src/ttype/type_comparator/atomic_type_comparator.rs

@@ -1,14 +1,9 @@
 use std::{collections::BTreeMap, sync::Arc};
 
-use crate::{
- get_arrayish_params, get_value_param,
- type_expander::{expand_union, TypeExpansionOptions},
- wrap_atomic,
-};
+use crate::{get_arrayish_params, get_value_param, wrap_atomic};
 use hakana_reflection_info::{
  class_constant_info::ConstantInfo,
  codebase_info::CodebaseInfo,
- data_flow::graph::DataFlowGraph,
  t_atomic::{DictKey, TAtomic},
  t_union::TUnion,
 };