Fix

OskarStark · OskarStark · commit cf923b9733a1 · 2021-01-20T11:20:16.000+01:00
diff --git a/src/Symfony/Component/Uid/Tests/Fixtures/CustomUlid.php b/src/Symfony/Component/Uid/Tests/Fixtures/CustomUlid.php
@@ -9,14 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Uid\Tests\Fixture;
+namespace Symfony\Component\Uid\Tests\Fixtures;
 
 use Symfony\Component\Uid\Ulid;
 
 final class CustomUlid extends Ulid
 {
-    public function __construct(string $ulid = null)
-    {
-        parent::__construct($ulid);
-    }
 }
diff --git a/src/Symfony/Component/Uid/Tests/Fixtures/CustomUuid.php b/src/Symfony/Component/Uid/Tests/Fixtures/CustomUuid.php
@@ -9,14 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Uid\Tests\Fixture;
+namespace Symfony\Component\Uid\Tests\Fixtures;
 
 use Symfony\Component\Uid\Uuid;
 
 final class CustomUuid extends Uuid
 {
-    public function __construct(string $uuid)
-    {
-        parent::__construct($uuid);
-    }
 }
diff --git a/src/Symfony/Component/Uid/Tests/UlidTest.php b/src/Symfony/Component/Uid/Tests/UlidTest.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Uid\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Uid\Tests\Fixture\CustomUlid;
+use Symfony\Component\Uid\Tests\Fixtures\CustomUlid;
 use Symfony\Component\Uid\Ulid;
 use Symfony\Component\Uid\UuidV4;
 
diff --git a/src/Symfony/Component/Uid/Tests/UuidTest.php b/src/Symfony/Component/Uid/Tests/UuidTest.php
@@ -13,7 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Uid\NilUuid;
-use Symfony\Component\Uid\Tests\Fixture\CustomUuid;
+use Symfony\Component\Uid\Tests\Fixtures\CustomUuid;
 use Symfony\Component\Uid\Ulid;
 use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Uid\UuidV1;
diff --git a/src/Symfony/Component/Uid/Uuid.php b/src/Symfony/Component/Uid/Uuid.php
@@ -74,7 +74,7 @@ public static function fromString(string $uuid): parent
             case NilUuid::TYPE: return new NilUuid();
         }
 
-        return new static($uuid);
+        return new self($uuid);
     }
 
     final public static function v1(): UuidV1

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,10 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Symfony\Component\Uid\Tests\Fixture;`
	`12`	`+namespace Symfony\Component\Uid\Tests\Fixtures;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Uid\Ulid;`
`15`	`15`
`16`	`16`	`final class CustomUlid extends Ulid`
`17`	`17`	`{`
`18`		`- public function __construct(string $ulid = null)`
`19`		`- {`
`20`		`- parent::__construct($ulid);`
`21`		`- }`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public static function fromString(string $uuid): parent`
`74`	`74`	`case NilUuid::TYPE: return new NilUuid();`
`75`	`75`	`}`
`76`	`76`
`77`		`- return new static($uuid);`
	`77`	`+ return new self($uuid);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`final public static function v1(): UuidV1`