Fix some tests

symfony · Nyholm · Dec 5, 2023 · Dec 5, 2023 · Dec 5, 2023 · Dec 5, 2023
commit fea6eeb852c0a60cebe051afd55b390b49fe2c85
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -615,6 +615,7 @@ protected static function getBundleDefaultConfig()
                 'enabled' => true,
                 'enable_attributes' => !class_exists(FullStack::class),
                 'mapping' => ['paths' => []],
+                'auto_normalizer' => ['paths'=>[]],
             ],
             'property_access' => [
                 'enabled' => true,

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -64,6 +64,7 @@
     'serializer' => [
         'enabled' => true,
         'enable_attributes' => true,
+        'auto_normalizer' => ['paths'=>[]],
         'name_converter' => 'serializer.name_converter.camel_case_to_snake_case',
         'circular_reference_handler' => 'my.circular.reference.handler',
         'max_depth_handler' => 'my.max.depth.handler',

diff --git a/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/AttributeTest.php b/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/AttributeTest.php
@@ -11,28 +11,28 @@
 
 namespace Symfony\Component\Serializer\Tests\Builder\CodeGenerator;
 
-use App\CodeGenerator\_Attribute;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Serializer\Builder\CodeGenerator\Attribute;
 
 class AttributeTest extends TestCase
 {
     public function testNoParameters()
     {
-        $output = _Attribute::create('Foobar')->toString();
+        $output = Attribute::create('Foobar')->toString();
         $this->assertEquals('#[Foobar]', $output);
 
-        $output = _Attribute::create('Foo\\Bar')->toString();
+        $output = Attribute::create('Foo\\Bar')->toString();
         $this->assertEquals('#[Foo\\Bar]', $output);
     }
 
     public function testParameters()
     {
-        $output = _Attribute::create('Foobar')
+        $output = Attribute::create('Foobar')
             ->addParameter(null, 7)
             ->toString();
         $this->assertEquals('#[Foobar(7)]', $output);
 
-        $output = _Attribute::create('Foobar')
+        $output = Attribute::create('Foobar')
             ->addParameter(null, 7)
             ->addParameter(null, true)
             ->addParameter(null, false)
@@ -46,12 +46,12 @@ public function testParameters()
 
     public function testNamedParameters()
     {
-        $output = _Attribute::create('Foobar')
+        $output = Attribute::create('Foobar')
             ->addParameter('seven', 7)
             ->toString();
         $this->assertEquals('#[Foobar(seven: 7)]', $output);
 
-        $output = _Attribute::create('Foobar')
+        $output = Attribute::create('Foobar')
             ->addParameter('seven', 7)
             ->addParameter('true', true)
             ->addParameter('false', false)
@@ -65,10 +65,10 @@ public function testNamedParameters()
 
     public function testNested()
     {
-        $nested = _Attribute::create('Baz')
+        $nested = Attribute::create('Baz')
             ->addParameter('name', 'tobias');
 
-        $output = _Attribute::create('Foobar')
+        $output = Attribute::create('Foobar')
             ->addParameter('seven', 7)
             ->addParameter('nested', $nested)
             ->toString();

diff --git a/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/ClassGeneratorTest.php b/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/ClassGeneratorTest.php
@@ -11,28 +11,29 @@
 
 namespace Symfony\Component\Serializer\Tests\Builder\CodeGenerator;
 
-use App\CodeGenerator\_Attribute;
-use App\CodeGenerator\_Method;
-use App\CodeGenerator\_Property;
-use App\CodeGenerator\ClassGenerator;
+
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Serializer\Builder\CodeGenerator\Attribute;
+use Symfony\Component\Serializer\Builder\CodeGenerator\ClassGenerator;
+use Symfony\Component\Serializer\Builder\CodeGenerator\Method;
+use Symfony\Component\Serializer\Builder\CodeGenerator\Property;
 
 class ClassGeneratorTest extends TestCase
 {
     public function testPerson()
     {
         $generator = new ClassGenerator('Person', 'Test\\CodeGenerator\\Fixtures');
 
-        $generator->addProperty(_Property::create('name')
+        $generator->addProperty(Property::create('name')
             ->setVisibility('private')
             ->setType('string')
         );
-        $generator->addProperty(_Property::create('age')
+        $generator->addProperty(Property::create('age')
             ->setVisibility('private')
             ->setType('int')
         );
 
-        $generator->addMethod(_Method::create('__construct')
+        $generator->addMethod(Method::create('__construct')
             ->addArgument('name', 'string')
             ->addArgument('age', 'int')
             ->setBody(<<<PHP
@@ -41,12 +42,12 @@ public function testPerson()
 PHP
             ));
 
-        $generator->addMethod(_Method::create('getName')
+        $generator->addMethod(Method::create('getName')
             ->setReturnType('string')
             ->setBody('return $this->name;')
         );
 
-        $generator->addMethod(_Method::create('getAge')
+        $generator->addMethod(Method::create('getAge')
             ->setReturnType('int')
             ->setBody('return $this->age;')
         );
@@ -62,17 +63,17 @@ public function testCat()
     {
         $generator = new ClassGenerator('Cat', 'Test\\CodeGenerator\\Fixtures');
 
-        $generator->addMethod(_Method::create('__construct')
+        $generator->addMethod(Method::create('__construct')
             ->addArgument('name', 'private string')
             ->addArgument('age', 'private int')
         );
 
-        $generator->addMethod(_Method::create('getName')
+        $generator->addMethod(Method::create('getName')
             ->setReturnType('string')
             ->setBody('return $this->name;')
         );
 
-        $generator->addMethod(_Method::create('getAge')
+        $generator->addMethod(Method::create('getAge')
             ->setReturnType('int')
             ->setBody('return $this->age;')
         );
@@ -104,19 +105,19 @@ public function testFull()
 TEXT
         );
 
-        $generator->addProperty(_Property::create('name')
+        $generator->addProperty(Property::create('name')
             ->setVisibility('private')
             ->setType('string')
         );
 
-        $generator->addMethod(_Method::create('__construct')
+        $generator->addMethod(Method::create('__construct')
             ->addArgument('name', 'string', 'foobar')
             ->setBody(<<<PHP
 \$this->name = \$name;
 PHP
             ));
 
-        $generator->addMethod(_Method::create('getName')
+        $generator->addMethod(Method::create('getName')
             ->setReturnType('string')
             ->setBody('return $this->name;')
             ->setComment(<<<TEXT
@@ -125,7 +126,7 @@ public function testFull()
 @return string
 TEXT));
 
-        $generator->addAttribute(_Attribute::create('MyAttribute')
+        $generator->addAttribute(Attribute::create('MyAttribute')
             ->addParameter('name', 'test')
         );
 

diff --git a/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/Fixtures/Cat.php b/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/Fixtures/Cat.php
@@ -1,15 +1,6 @@
 <?php
 
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Serializer\Tests\Builder\CodeGenerator\Fixtures;
+namespace Test\CodeGenerator\Fixtures;
 
 class Cat
 {
@@ -26,4 +17,5 @@ public function getAge(): int
     {
         return $this->age;
     }
+
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/Fixtures/Full.php b/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/Fixtures/Full.php
@@ -1,27 +1,23 @@
 <?php
 
 /*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * This is a fixture class.
+ * We use it for verifying the code generation.
  */
 
-namespace Symfony\Component\Serializer\Tests\Builder\CodeGenerator\Fixtures;
+namespace Test\CodeGenerator\Fixtures;
 
-use Test\CodeGenerator\Fixtures\Bar;
 use Test\CodeGenerator\Fixtures\Cat;
 use Test\CodeGenerator\Fixtures\Foo;
+use Test\CodeGenerator\Fixtures\Bar;
 use Test\CodeGenerator\Fixtures\MyAttribute;
 
 /**
  * Perfect class comment.
- *
+ * 
  * It has some lines
  */
-#[MyAttribute(name: 'test')]
+#[MyAttribute(name: "test")]
 class Full extends Cat implements Foo, Bar
 {
     private string $name;
@@ -32,10 +28,13 @@ public function __construct(string $name = 'foobar')
     }
 
     /**
-     * Returns the name of the cat.
+     * Returns the name of the cat
+     * 
+     * @return string
      */
     public function getName(): string
     {
         return $this->name;
     }
+
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/Fixtures/Person.php b/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/Fixtures/Person.php
@@ -1,15 +1,6 @@
 <?php
 
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Serializer\Tests\Builder\CodeGenerator\Fixtures;
+namespace Test\CodeGenerator\Fixtures;
 
 class Person
 {
@@ -31,4 +22,5 @@ public function getAge(): int
     {
         return $this->age;
     }
+
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/MethodTest.php b/src/Symfony/Component/Serializer/Tests/Builder/CodeGenerator/MethodTest.php
@@ -11,65 +11,66 @@
 
 namespace Symfony\Component\Serializer\Tests\Builder\CodeGenerator;
 
-use App\CodeGenerator\_Method;
+
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Serializer\Builder\CodeGenerator\Method;
 
 class MethodTest extends TestCase
 {
     public function testEmpty()
     {
-        $output = _Method::create('foobar')->toString();
+        $output = Method::create('foobar')->toString();
         $this->assertEquals('public function foobar()
 {
 }', $output);
     }
 
     public function testAbstractMethod()
     {
-        $output = _Method::create('foobar')->setVisibility('protected')->setBody(null)->toString();
+        $output = Method::create('foobar')->setVisibility('protected')->setBody(null)->toString();
         $this->assertEquals('abstract protected function foobar();', $output);
     }
 
     public function testVisibility()
     {
-        $output = _Method::create('foobar')->setVisibility('private')->toString();
+        $output = Method::create('foobar')->setVisibility('private')->toString();
         $this->assertEquals('private function foobar()
 {
 }', $output);
 
-        $output = _Method::create('foobar')->setVisibility('protected')->toString();
+        $output = Method::create('foobar')->setVisibility('protected')->toString();
         $this->assertEquals('protected function foobar()
 {
 }', $output);
 
         // We dont care about logic
-        $output = _Method::create('foobar')->setVisibility('crazy')->toString();
+        $output = Method::create('foobar')->setVisibility('crazy')->toString();
         $this->assertEquals('crazy function foobar()
 {
 }', $output);
     }
 
     public function testReturnType()
     {
-        $output = _Method::create('foobar')->setReturnType('int')->toString();
+        $output = Method::create('foobar')->setReturnType('int')->toString();
         $this->assertEquals('public function foobar(): int
 {
 }', $output);
 
-        $output = _Method::create('foobar')->setReturnType('mixed')->toString();
+        $output = Method::create('foobar')->setReturnType('mixed')->toString();
         $this->assertEquals('public function foobar(): mixed
 {
 }', $output);
 
-        $output = _Method::create('foobar')->setReturnType('?string')->toString();
+        $output = Method::create('foobar')->setReturnType('?string')->toString();
         $this->assertEquals('public function foobar(): ?string
 {
 }', $output);
     }
 
     public function testArguments()
     {
-        $output = _Method::create('foobar')
+        $output = Method::create('foobar')
             ->addArgument('foo')
             ->addArgument('bar', null, 'test')
             ->addArgument('baz', null, null)
@@ -78,7 +79,7 @@ public function testArguments()
 {
 }', $output);
 
-        $output = _Method::create('foobar')
+        $output = Method::create('foobar')
             ->addArgument('foo', 'int')
             ->addArgument('bar', 'string')
             ->addArgument('baz', '?string', null)
@@ -90,7 +91,7 @@ public function testArguments()
 
     public function testBody()
     {
-        $output = _Method::create('foobar')
+        $output = Method::create('foobar')
             ->setBody('return 2;')
             ->toString('    ');
         $this->assertEquals('public function foobar()