PHPLIB-1598 Use named types for enums (#1570)

GromNaN · web-flow · commit acfe2aca7696 · 2025-01-24T11:03:41.000+01:00
diff --git a/generator/config/accumulator/bottom.yaml b/generator/config/accumulator/bottom.yaml
@@ -12,7 +12,7 @@ arguments:
     -
         name: sortBy
         type:
-            - object # SortSpec
+            - sortBy
         description: |
             Specifies the order of results, with syntax similar to $sort.
     -
diff --git a/generator/config/accumulator/bottomN.yaml b/generator/config/accumulator/bottomN.yaml
@@ -19,7 +19,7 @@ arguments:
     -
         name: sortBy
         type:
-            - object # SortSpec
+            - sortBy
         description: |
             Specifies the order of results, with syntax similar to $sort.
     -
diff --git a/generator/config/accumulator/median.yaml b/generator/config/accumulator/median.yaml
@@ -22,7 +22,7 @@ arguments:
     -
         name: method
         type:
-            - string # AccumulatorPercentile
+            - accumulatorPercentile
         description: |
             The method that mongod uses to calculate the 50th percentile value. The method must be 'approximate'.
 tests:
diff --git a/generator/config/accumulator/percentile.yaml b/generator/config/accumulator/percentile.yaml
@@ -32,7 +32,7 @@ arguments:
     -
         name: method
         type:
-            - string # AccumulatorPercentile
+            - accumulatorPercentile
         description: |
             The method that mongod uses to calculate the percentile value. The method must be 'approximate'.
 tests:
diff --git a/generator/config/accumulator/top.yaml b/generator/config/accumulator/top.yaml
@@ -13,7 +13,7 @@ arguments:
     -
         name: sortBy
         type:
-            - object # SortSpec
+            - sortBy
         description: |
             Specifies the order of results, with syntax similar to $sort.
     -
diff --git a/generator/config/accumulator/topN.yaml b/generator/config/accumulator/topN.yaml
@@ -19,7 +19,7 @@ arguments:
     -
         name: sortBy
         type:
-            - object # SortSpec
+            - sortBy
         description: |
             Specifies the order of results, with syntax similar to $sort.
     -
diff --git a/generator/config/expression/median.yaml b/generator/config/expression/median.yaml
@@ -22,7 +22,7 @@ arguments:
     -
         name: method
         type:
-            - string # AccumulatorPercentile
+            - accumulatorPercentile
         description: |
             The method that mongod uses to calculate the 50th percentile value. The method must be 'approximate'.
 tests:
diff --git a/generator/config/expression/percentile.yaml b/generator/config/expression/percentile.yaml
@@ -32,7 +32,7 @@ arguments:
     -
         name: method
         type:
-            - string # AccumulatorPercentile
+            - accumulatorPercentile
         description: |
             The method that mongod uses to calculate the percentile value. The method must be 'approximate'.
 tests:
diff --git a/generator/config/expression/sortArray.yaml b/generator/config/expression/sortArray.yaml
@@ -18,9 +18,9 @@ arguments:
     -
         name: sortBy
         type:
-            - object # SortSpec
             - int
             - sortSpec
+            - sortBy
         description: |
             The document specifies a sort ordering.
 tests:
diff --git a/generator/config/expressions.php b/generator/config/expressions.php
@@ -131,45 +131,36 @@
     ],
 
     // @todo add enum values
-    'Granularity' => [
+    'granularity' => [
         'acceptedTypes' => [...$bsonTypes['string']],
     ],
-    'FullDocument' => [
+    'fullDocument' => [
         'acceptedTypes' => [...$bsonTypes['string']],
     ],
-    'FullDocumentBeforeChange' => [
+    'fullDocumentBeforeChange' => [
         'acceptedTypes' => [...$bsonTypes['string']],
     ],
-    'AccumulatorPercentile' => [
+    'accumulatorPercentile' => [
         'acceptedTypes' => [...$bsonTypes['string']],
     ],
-    'WhenMatched' => [
+    'whenMatched' => [
         'acceptedTypes' => [...$bsonTypes['string']],
     ],
-    'WhenNotMatched' => [
+    'whenNotMatched' => [
         'acceptedTypes' => [...$bsonTypes['string']],
     ],
 
     // @todo create specific model classes factories
-    'OutCollection' => [
+    'outCollection' => [
         'acceptedTypes' => [...$bsonTypes['object']],
     ],
-    'CollStats' => [
+    'range' => [
         'acceptedTypes' => [...$bsonTypes['object']],
     ],
-    'Range' => [
+    'sortBy' => [
         'acceptedTypes' => [...$bsonTypes['object']],
     ],
-    'FillOut' => [
-        'acceptedTypes' => [...$bsonTypes['object']],
-    ],
-    'SortSpec' => [
-        'acceptedTypes' => [...$bsonTypes['object']],
-    ],
-    'Window' => [
-        'acceptedTypes' => [...$bsonTypes['object']],
-    ],
-    'GeoPoint' => [
+    'geoPoint' => [
         'acceptedTypes' => [...$bsonTypes['object']],
     ],
 
diff --git a/generator/config/schema.json b/generator/config/schema.json
@@ -9,7 +9,7 @@
                 "name": {
                     "$comment": "The name of the operator. Must start with a $",
                     "type": "string",
-                    "pattern": "^\\$[a-z0-9][a-zA-Z0-9]*$"
+                    "pattern": "^\\$?[a-z][a-zA-Z0-9]*$"
                 },
                 "link": {
                     "$comment": "The link to the operator's documentation on MongoDB's website.",
@@ -122,6 +122,16 @@
                             "timeUnit",
                             "sortSpec",
                             "any",
+                            "granularity",
+                            "fullDocument",
+                            "fullDocumentBeforeChange",
+                            "accumulatorPercentile",
+                            "whenMatched",
+                            "whenNotMatched",
+                            "outCollection",
+                            "range",
+                            "sortBy",
+                            "geoPoint",
                             "resolvesToNumber", "numberFieldPath", "number",
                             "resolvesToDouble", "doubleFieldPath", "double",
                             "resolvesToString", "stringFieldPath", "string",
diff --git a/generator/config/stage/bucketAuto.yaml b/generator/config/stage/bucketAuto.yaml
@@ -30,7 +30,7 @@ arguments:
     -
         name: granularity
         type:
-            - object # Granularity
+            - granularity
         optional: true
         description: |
             A string that specifies the preferred number series to use to ensure that the calculated boundary edges end on preferred round numbers or their powers of 10.
diff --git a/generator/config/stage/changeStream.yaml b/generator/config/stage/changeStream.yaml
@@ -17,14 +17,14 @@ arguments:
     -
         name: fullDocument
         type:
-            - string # FullDocument
+            - fullDocument
         optional: true
         description: |
             Specifies whether change notifications include a copy of the full document when modified by update operations.
     -
         name: fullDocumentBeforeChange
         type:
-            - string # FullDocumentBeforeChange
+            - fullDocumentBeforeChange
         optional: true
         description: |
             Valid values are "off", "whenAvailable", or "required". If set to "off", the "fullDocumentBeforeChange" field of the output document is always omitted. If set to "whenAvailable", the "fullDocumentBeforeChange" field will be populated with the pre-image of the document modified by the current change event if such a pre-image is available, and will be omitted otherwise. If set to "required", then the "fullDocumentBeforeChange" field is always populated and an exception is thrown if the pre-image is not              available.
diff --git a/generator/config/stage/densify.yaml b/generator/config/stage/densify.yaml
@@ -25,7 +25,7 @@ arguments:
     -
         name: range
         type:
-            - object # Range
+            - range
         description: |
             Specification for range based densification.
 tests:
diff --git a/generator/config/stage/fill.yaml b/generator/config/stage/fill.yaml
@@ -29,7 +29,7 @@ arguments:
     -
         name: sortBy
         type:
-            - object # SortSpec
+            - sortBy
         optional: true
         description: |
             Specifies the field or fields to sort the documents within each partition. Uses the same syntax as the $sort stage.
diff --git a/generator/config/stage/geoNear.yaml b/generator/config/stage/geoNear.yaml
@@ -54,7 +54,7 @@ arguments:
     -
         name: near
         type:
-            - object # GeoPoint
+            - geoPoint
             - resolvesToObject
         description: |
             The point for which to find the closest documents.
diff --git a/generator/config/stage/merge.yaml b/generator/config/stage/merge.yaml
@@ -12,7 +12,7 @@ arguments:
         name: into
         type:
             - string
-            - object # OutCollection
+            - outCollection
         description: |
             The output collection.
     -
@@ -33,15 +33,15 @@ arguments:
     -
         name: whenMatched
         type:
-            - string # WhenMatched
+            - whenMatched
             - pipeline
         optional: true
         description: |
             The behavior of $merge if a result document and an existing document in the collection have the same value for the specified on field(s).
     -
         name: whenNotMatched
         type:
-            - string # WhenNotMatched
+            - whenNotMatched
         optional: true
         description: |
             The behavior of $merge if a result document does not match an existing document in the out collection.
diff --git a/generator/config/stage/out.yaml b/generator/config/stage/out.yaml
@@ -10,7 +10,7 @@ arguments:
     -   name: coll
         type:
             - string
-            - object # OutCollection
+            - outCollection
         description: |
             Target database name to write documents from $out to.
 tests:
diff --git a/generator/config/stage/setWindowFields.yaml b/generator/config/stage/setWindowFields.yaml
@@ -11,7 +11,7 @@ arguments:
     -
         name: sortBy
         type:
-            - object # SortSpec
+            - sortBy
         description: |
             Specifies the field(s) to sort the documents by in the partition. Uses the same syntax as the $sort stage. Default is no sorting.
     -
diff --git a/src/Builder/Stage/BucketAutoStage.php b/src/Builder/Stage/BucketAutoStage.php
diff --git a/src/Builder/Stage/FactoryTrait.php b/src/Builder/Stage/FactoryTrait.php
diff --git a/src/Builder/Stage/FluentFactoryTrait.php b/src/Builder/Stage/FluentFactoryTrait.php

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ arguments:`
`12`	`12`	`-`
`13`	`13`	`name: sortBy`
`14`	`14`	`type:`
`15`		`- - object # SortSpec`
	`15`	`+ - sortBy`
`16`	`16`	`description: \|`
`17`	`17`	`Specifies the order of results, with syntax similar to $sort.`
`18`	`18`	`-`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ arguments:`
`19`	`19`	`-`
`20`	`20`	`name: sortBy`
`21`	`21`	`type:`
`22`		`- - object # SortSpec`
	`22`	`+ - sortBy`
`23`	`23`	`description: \|`
`24`	`24`	`Specifies the order of results, with syntax similar to $sort.`
`25`	`25`	`-`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ arguments:`
`22`	`22`	`-`
`23`	`23`	`name: method`
`24`	`24`	`type:`
`25`		`- - string # AccumulatorPercentile`
	`25`	`+ - accumulatorPercentile`
`26`	`26`	`description: \|`
`27`	`27`	`The method that mongod uses to calculate the 50th percentile value. The method must be 'approximate'.`
`28`	`28`	`tests:`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ arguments:`
`32`	`32`	`-`
`33`	`33`	`name: method`
`34`	`34`	`type:`
`35`		`- - string # AccumulatorPercentile`
	`35`	`+ - accumulatorPercentile`
`36`	`36`	`description: \|`
`37`	`37`	`The method that mongod uses to calculate the percentile value. The method must be 'approximate'.`
`38`	`38`	`tests:`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ arguments:`
`13`	`13`	`-`
`14`	`14`	`name: sortBy`
`15`	`15`	`type:`
`16`		`- - object # SortSpec`
	`16`	`+ - sortBy`
`17`	`17`	`description: \|`
`18`	`18`	`Specifies the order of results, with syntax similar to $sort.`
`19`	`19`	`-`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ arguments:`
`30`	`30`	`-`
`31`	`31`	`name: granularity`
`32`	`32`	`type:`
`33`		`- - object # Granularity`
	`33`	`+ - granularity`
`34`	`34`	`optional: true`
`35`	`35`	`description: \|`
`36`	`36`	`A string that specifies the preferred number series to use to ensure that the calculated boundary edges end on preferred round numbers or their powers of 10.`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ arguments:`
`25`	`25`	`-`
`26`	`26`	`name: range`
`27`	`27`	`type:`
`28`		`- - object # Range`
	`28`	`+ - range`
`29`	`29`	`description: \|`
`30`	`30`	`Specification for range based densification.`
`31`	`31`	`tests:`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ arguments:`
`29`	`29`	`-`
`30`	`30`	`name: sortBy`
`31`	`31`	`type:`
`32`		`- - object # SortSpec`
	`32`	`+ - sortBy`
`33`	`33`	`optional: true`
`34`	`34`	`description: \|`
`35`	`35`	`Specifies the field or fields to sort the documents within each partition. Uses the same syntax as the $sort stage.`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ arguments:`
`54`	`54`	`-`
`55`	`55`	`name: near`
`56`	`56`	`type:`
`57`		`- - object # GeoPoint`
	`57`	`+ - geoPoint`
`58`	`58`	`- resolvesToObject`
`59`	`59`	`description: \|`
`60`	`60`	`The point for which to find the closest documents.`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ arguments:`
`11`	`11`	`-`
`12`	`12`	`name: sortBy`
`13`	`13`	`type:`
`14`		`- - object # SortSpec`
	`14`	`+ - sortBy`
`15`	`15`	`description: \|`
`16`	`16`	`Specifies the field(s) to sort the documents by in the partition. Uses the same syntax as the $sort stage. Default is no sorting.`
`17`	`17`	`-`