Prevent aliasing self class in use statements (#1830)

async-aws · Jan 13, 2025 · 0201fac · 0201fac
1 parent d11b2c3
commit 0201fac
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git a/src/CodeGenerator/src/Generator/PhpGenerator/ClassBuilder.php b/src/CodeGenerator/src/Generator/PhpGenerator/ClassBuilder.php
@@ -50,6 +50,10 @@ public function getClassName(): ClassName
 
     public function addUse(string $name): self
     {
+        if ($name === $this->className->getFqdn()) {
+            return $this;
+        }
+
         $this->namespace->addUse($name);
 
         return $this;

diff --git a/src/Service/DynamoDb/CHANGELOG.md b/src/Service/DynamoDb/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - AWS api-change: This change adds support for global tables with multi-Region strong consistency (in preview). The UpdateTable API now supports a new attribute MultiRegionConsistency to set consistency when creating global tables. The DescribeTable output now optionally includes the MultiRegionConsistency attribute.
 
+### Changed
+
+- Avoid usage of `alias` when use statement refers to self
+
 ## 3.3.1
 
 ### Changed

diff --git a/src/Service/DynamoDb/src/ValueObject/AttributeValue.php b/src/Service/DynamoDb/src/ValueObject/AttributeValue.php
@@ -2,8 +2,6 @@
 
 namespace AsyncAws\DynamoDb\ValueObject;
 
-use AsyncAws\DynamoDb\ValueObject\AttributeValue as AttributeValue1;
-
 /**
  * Represents the data for an attribute.
  *
@@ -133,8 +131,8 @@ public function __construct(array $input)
         $this->ss = $input['SS'] ?? null;
         $this->ns = $input['NS'] ?? null;
         $this->bs = $input['BS'] ?? null;
-        $this->m = isset($input['M']) ? array_map([AttributeValue1::class, 'create'], $input['M']) : null;
-        $this->l = isset($input['L']) ? array_map([AttributeValue1::class, 'create'], $input['L']) : null;
+        $this->m = isset($input['M']) ? array_map([AttributeValue::class, 'create'], $input['M']) : null;
+        $this->l = isset($input['L']) ? array_map([AttributeValue::class, 'create'], $input['L']) : null;
         $this->null = $input['NULL'] ?? null;
         $this->bool = $input['BOOL'] ?? null;
     }

diff --git a/src/Service/RdsDataService/CHANGELOG.md b/src/Service/RdsDataService/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## NOT RELEASED
 
+### Changed
+
+- Avoid usage of `alias` when use statement refers to self
+
 ## 2.2.0
 
 ### Added

diff --git a/src/Service/RdsDataService/src/ValueObject/ArrayValue.php b/src/Service/RdsDataService/src/ValueObject/ArrayValue.php
@@ -2,8 +2,6 @@
 
 namespace AsyncAws\RdsDataService\ValueObject;
 
-use AsyncAws\RdsDataService\ValueObject\ArrayValue as ArrayValue1;
-
 /**
  * Contains an array.
  */
@@ -59,7 +57,7 @@ public function __construct(array $input)
         $this->longValues = $input['longValues'] ?? null;
         $this->doubleValues = $input['doubleValues'] ?? null;
         $this->stringValues = $input['stringValues'] ?? null;
-        $this->arrayValues = isset($input['arrayValues']) ? array_map([ArrayValue1::class, 'create'], $input['arrayValues']) : null;
+        $this->arrayValues = isset($input['arrayValues']) ? array_map([ArrayValue::class, 'create'], $input['arrayValues']) : null;
     }
 
     /**

diff --git a/src/Service/S3/CHANGELOG.md b/src/Service/S3/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Changed
 
+- Avoid usage of `alias` when use statement refers to self
 - AWS enhancement: Documentation updates.
 
 ## 2.6.0

diff --git a/src/Service/S3/src/ValueObject/EventBridgeConfiguration.php b/src/Service/S3/src/ValueObject/EventBridgeConfiguration.php
@@ -2,15 +2,13 @@
 
 namespace AsyncAws\S3\ValueObject;
 
-use AsyncAws\S3\ValueObject\EventBridgeConfiguration as EventBridgeConfiguration1;
-
 /**
  * A container for specifying the configuration for Amazon EventBridge.
  */
 final class EventBridgeConfiguration
 {
     /**
-     * @param array|EventBridgeConfiguration1 $input
+     * @param array|EventBridgeConfiguration $input
      */
     public static function create($input): self
     {

diff --git a/src/Service/TimestreamQuery/CHANGELOG.md b/src/Service/TimestreamQuery/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## NOT RELEASED
 
+### Changed
+
+- Avoid usage of `alias` when use statement refers to self
+
 ## 2.1.0
 
 ### Added

diff --git a/src/Service/TimestreamQuery/src/ValueObject/Datum.php b/src/Service/TimestreamQuery/src/ValueObject/Datum.php
@@ -2,8 +2,6 @@
 
 namespace AsyncAws\TimestreamQuery\ValueObject;
 
-use AsyncAws\TimestreamQuery\ValueObject\Datum as Datum1;
-
 /**
  * Datum represents a single data point in a query result.
  */
@@ -57,7 +55,7 @@ public function __construct(array $input)
     {
         $this->scalarValue = $input['ScalarValue'] ?? null;
         $this->timeSeriesValue = isset($input['TimeSeriesValue']) ? array_map([TimeSeriesDataPoint::class, 'create'], $input['TimeSeriesValue']) : null;
-        $this->arrayValue = isset($input['ArrayValue']) ? array_map([Datum1::class, 'create'], $input['ArrayValue']) : null;
+        $this->arrayValue = isset($input['ArrayValue']) ? array_map([Datum::class, 'create'], $input['ArrayValue']) : null;
         $this->rowValue = isset($input['RowValue']) ? Row::create($input['RowValue']) : null;
         $this->nullValue = $input['NullValue'] ?? null;
     }