From eddb4051b831a91141cc41ab260180036bfaf342 Mon Sep 17 00:00:00 2001
From: Matthieu Riegler <kyro38@gmail.com>
Date: Wed, 8 May 2024 03:07:26 +0200
Subject: [PATCH] refactor(forms): remove deprecated symbols (#55723)

Follow-up of #55698 to help remove the symbols from G3.

PR Close #55723
---
 goldens/public-api/forms/index.md             | 18 ++------
 .../forms_reactive/bundle.golden_symbols.json |  9 ----
 .../bundle.golden_symbols.json                |  9 ----
 packages/forms/src/forms.ts                   |  3 --
 packages/forms/src/model/abstract_model.ts    | 44 ++++++-------------
 5 files changed, 16 insertions(+), 67 deletions(-)

diff --git a/goldens/public-api/forms/index.md b/goldens/public-api/forms/index.md
index 928ed08432f..8b0f931ee59 100644
--- a/goldens/public-api/forms/index.md
+++ b/goldens/public-api/forms/index.md
@@ -800,11 +800,7 @@ export class PatternValidator extends AbstractValidatorDirective {
 }
 
 // @public
-export class PristineChangeEvent extends PristineEvent {
-}
-
-// @public @deprecated (undocumented)
-export class PristineEvent extends ControlEvent {
+export class PristineChangeEvent extends ControlEvent {
     constructor(pristine: boolean, source: AbstractControl);
     // (undocumented)
     readonly pristine: boolean;
@@ -898,11 +894,7 @@ export class SelectMultipleControlValueAccessor extends BuiltInControlValueAcces
 export type SetDisabledStateOption = 'whenDisabledForLegacyCode' | 'always';
 
 // @public
-export class StatusChangeEvent extends StatusEvent {
-}
-
-// @public @deprecated (undocumented)
-export class StatusEvent extends ControlEvent {
+export class StatusChangeEvent extends ControlEvent {
     constructor(status: FormControlStatus, source: AbstractControl);
     // (undocumented)
     readonly source: AbstractControl;
@@ -911,11 +903,7 @@ export class StatusEvent extends ControlEvent {
 }
 
 // @public
-export class TouchedChangeEvent extends TouchedEvent {
-}
-
-// @public @deprecated (undocumented)
-export class TouchedEvent extends ControlEvent {
+export class TouchedChangeEvent extends ControlEvent {
     constructor(touched: boolean, source: AbstractControl);
     // (undocumented)
     readonly source: AbstractControl;
diff --git a/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json b/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
index 69ba424d789..33b5a398311 100644
--- a/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json
@@ -479,9 +479,6 @@
   {
     "name": "PristineChangeEvent"
   },
-  {
-    "name": "PristineEvent"
-  },
   {
     "name": "R3Injector"
   },
@@ -551,9 +548,6 @@
   {
     "name": "StatusChangeEvent"
   },
-  {
-    "name": "StatusEvent"
-  },
   {
     "name": "Subject"
   },
@@ -593,9 +587,6 @@
   {
     "name": "TouchedChangeEvent"
   },
-  {
-    "name": "TouchedEvent"
-  },
   {
     "name": "USE_VALUE"
   },
diff --git a/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json b/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
index c74e4d306ca..c1c459b04cf 100644
--- a/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
+++ b/packages/core/test/bundling/forms_template_driven/bundle.golden_symbols.json
@@ -464,9 +464,6 @@
   {
     "name": "PristineChangeEvent"
   },
-  {
-    "name": "PristineEvent"
-  },
   {
     "name": "R3Injector"
   },
@@ -533,9 +530,6 @@
   {
     "name": "StatusChangeEvent"
   },
-  {
-    "name": "StatusEvent"
-  },
   {
     "name": "Subject"
   },
@@ -581,9 +575,6 @@
   {
     "name": "TouchedChangeEvent"
   },
-  {
-    "name": "TouchedEvent"
-  },
   {
     "name": "USE_VALUE"
   },
diff --git a/packages/forms/src/forms.ts b/packages/forms/src/forms.ts
index 6d5f2cd67ea..7e381ff1d3d 100644
--- a/packages/forms/src/forms.ts
+++ b/packages/forms/src/forms.ts
@@ -76,9 +76,6 @@ export {
   FormControlStatus,
   FormResetEvent,
   FormSubmittedEvent,
-  PristineEvent,
-  StatusEvent,
-  TouchedEvent,
   PristineChangeEvent,
   StatusChangeEvent,
   TouchedChangeEvent,
diff --git a/packages/forms/src/model/abstract_model.ts b/packages/forms/src/model/abstract_model.ts
index e9d37c678eb..a0ef2e710f1 100644
--- a/packages/forms/src/model/abstract_model.ts
+++ b/packages/forms/src/model/abstract_model.ts
@@ -102,33 +102,13 @@ export class ValueChangeEvent<T> extends ControlEvent<T> {
   }
 }
 
-/**
- * @deprecated use `PristineChangeEvent` symbol instead.
- */
-
-export class PristineEvent extends ControlEvent {
-  constructor(
-    public readonly pristine: boolean,
-    public readonly source: AbstractControl,
-  ) {
-    super();
-  }
-}
-
 /**
  * Event fired when the control's pristine state changes (pristine <=> dirty).
  *
- * @publicApi
- */
-
-export class PristineChangeEvent extends PristineEvent {}
-
-/**
- * @deprecated use `TouchedChangeEvent` symbol instead.
- */
-export class TouchedEvent extends ControlEvent {
+ * @publicApi */
+export class PristineChangeEvent extends ControlEvent {
   constructor(
-    public readonly touched: boolean,
+    public readonly pristine: boolean,
     public readonly source: AbstractControl,
   ) {
     super();
@@ -140,14 +120,9 @@ export class TouchedEvent extends ControlEvent {
  *
  * @publicApi
  */
-export class TouchedChangeEvent extends TouchedEvent {}
-
-/**
- * @deprecated use `StatusChangeEvent` symbol instead.
- */
-export class StatusEvent extends ControlEvent {
+export class TouchedChangeEvent extends ControlEvent {
   constructor(
-    public readonly status: FormControlStatus,
+    public readonly touched: boolean,
     public readonly source: AbstractControl,
   ) {
     super();
@@ -159,7 +134,14 @@ export class StatusEvent extends ControlEvent {
  *
  * @publicApi
  */
-export class StatusChangeEvent extends StatusEvent {}
+export class StatusChangeEvent extends ControlEvent {
+  constructor(
+    public readonly status: FormControlStatus,
+    public readonly source: AbstractControl,
+  ) {
+    super();
+  }
+}
 
 /**
  * Event fired when a form is submitted