Merge pull request #13 from pfilsx/tests

pfilsx · web-flow · commit 47ed9f54d0b1 · 2023-06-17T15:06:45.000+03:00
Tests
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,7 @@
-*.md export-ignore
 .* export-ignore
+*.md export-ignore
+/tests export-ignore
+/phpunit.xml.dist export-ignore
+/.github export-ignore
+/.php-cs-fixer.php export-ignore
 /docs export-ignore
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,42 @@
+name: CI
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+    branches: [ dev, master ]
+jobs:
+  tests:
+    runs-on: 'Ubuntu-20.04'
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.1', '8.2']
+
+    name: Tests PHP ${{ matrix.php }}
+    steps:
+      -   uses: actions/checkout@v2
+      -   uses: shivammathur/setup-php@v2
+          with:
+            php-version: '${{ matrix.php }}'
+            coverage: none
+            ini-values: 'memory_limit=-1'
+      -   uses: "ramsey/composer-install@v2"
+      -   name: Run Unit tests
+          run: vendor/bin/phpunit
+  style:
+    runs-on: 'Ubuntu-20.04'
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '8.2' ]
+    name: Style PHP ${{ matrix.php }}
+    steps:
+      -   uses: actions/checkout@v2
+      -   uses: shivammathur/setup-php@v2
+          with:
+            php-version: '${{ matrix.php }}'
+            coverage: none
+            ini-values: 'memory_limit=-1'
+      -   uses: "ramsey/composer-install@v2"
+      -   name: Run Style checks
+          run: vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --stop-on-violation
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /vendor
-/composer.lock
+/composer.lock
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -29,10 +29,17 @@
             "Pfilsx\\PostgreSQLDoctrine\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Pfilsx\\PostgreSQLDoctrine\\Tests\\": "tests/"
+        }
+    },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.13",
         "doctrine/orm": "^2.13",
         "symfony/serializer": ">=5.4",
-        "symfony/property-info": ">=5.4"
+        "symfony/property-info": ">=5.4",
+        "phpunit/phpunit": "^10.0",
+        "symfony/property-access": ">=5.4"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd">
+  <testsuites>
+    <testsuite name="PostgreSQLDoctrine">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+
+  <source>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </source>
+</phpunit>
diff --git a/src/DBAL/Platform/PostgreSQLPlatform.php b/src/DBAL/Platform/PostgreSQLPlatform.php
@@ -14,7 +14,7 @@
 use Pfilsx\PostgreSQLDoctrine\DBAL\Type\EnumType;
 use Pfilsx\PostgreSQLDoctrine\DBAL\Type\JsonModelType;
 
-final class PostgreSQLPlatform extends BasePlatform
+class PostgreSQLPlatform extends BasePlatform
 {
     public function createSchemaManager(Connection $connection): PostgreSQLSchemaManager
     {
diff --git a/src/DBAL/Schema/EnumTypeUsageAsset.php b/src/DBAL/Schema/EnumTypeUsageAsset.php
@@ -12,7 +12,7 @@ final class EnumTypeUsageAsset
 
     private ?string $default;
 
-    public function __construct(string $table, string $column, ?string $default = null)
+    public function __construct(string $table, string $column, string $default = null)
     {
         $this->table = $table;
         $this->column = $column;
diff --git a/src/DBAL/Schema/PostgreSQLSchemaManager.php b/src/DBAL/Schema/PostgreSQLSchemaManager.php
@@ -61,7 +61,7 @@ public function createComparator(): Comparator
         return new Comparator($this->_platform);
     }
 
-    protected function selectTableColumns(string $databaseName, ?string $tableName = null): Result
+    protected function selectTableColumns(string $databaseName, string $tableName = null): Result
     {
         $sql = 'SELECT';
 
diff --git a/src/DBAL/Schema/Schema.php b/src/DBAL/Schema/Schema.php
@@ -18,7 +18,7 @@ final class Schema extends BaseSchema
     public function __construct(
         array $tables = [],
         array $sequences = [],
-        ?SchemaConfig $schemaConfig = null,
+        SchemaConfig $schemaConfig = null,
         array $namespaces = [],
         array $types = []
     ) {
diff --git a/src/DBAL/Schema/SchemaDiff.php b/src/DBAL/Schema/SchemaDiff.php
@@ -22,7 +22,7 @@ public function __construct(
         array $createdTables = [],
         array $alteredTables = [],
         array $droppedTables = [],
-        ?Schema $fromSchema = null,
+        Schema $fromSchema = null,
         array $createdSchemas = [],
         array $droppedSchemas = [],
         array $createdSequences = [],
diff --git a/src/DBAL/Schema/Table.php b/src/DBAL/Schema/Table.php
@@ -27,7 +27,7 @@ public function addColumn($name, $typeName, array $options = []): Column
      *
      * @return self
      */
-    public function modifyColumn($name, array $options, ?string $enumClass = null): self
+    public function modifyColumn($name, array $options, string $enumClass = null): self
     {
         $column = $this->getColumn($name);
         $column->setOptions($options);
diff --git a/src/DBAL/Type/JsonModelType.php b/src/DBAL/Type/JsonModelType.php
@@ -32,7 +32,7 @@ public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform)
             return null;
         }
 
-        if (!\is_object($value)) {
+        if (!\is_object($value) || get_class($value) !== static::getModelClass()) {
             throw ConversionException::conversionFailed($value, $this->getName());
         }
 
diff --git a/src/Tools/ArrayTypeTool.php b/src/Tools/ArrayTypeTool.php
@@ -45,7 +45,7 @@ final class ArrayTypeTool
      *
      * @return string
      */
-    public static function convertPHPArrayToDatabaseArrayString(array $array, ArrayTypeEnum $type, ?AbstractPlatform $platform = null): string
+    public static function convertPHPArrayToDatabaseArrayString(array $array, ArrayTypeEnum $type, AbstractPlatform $platform = null): string
     {
         if ($array === []) {
             return '{}';
@@ -55,7 +55,7 @@ public static function convertPHPArrayToDatabaseArrayString(array $array, ArrayT
             ArrayTypeEnum::SmallIntArray, ArrayTypeEnum::IntArray, ArrayTypeEnum::BigIntArray => self::convertIntPHPArrayToDatabaseArray($array, $type),
             ArrayTypeEnum::TextArray => self::convertStringPHPArrayToDatabaseArray($array),
             ArrayTypeEnum::BooleanArray => self::convertBooleanPHPArrayToDatabaseArray($array, $platform),
-            ArrayTypeEnum::JsonArray => array_map(static fn ($row) => '"' . json_encode($row) . '"', $array),
+            ArrayTypeEnum::JsonArray => array_map(static fn ($row) => '"' . addcslashes(json_encode($row), '"') . '"', $array),
         };
 
         return '{' . implode(',', $preparedArray) . '}';
@@ -70,7 +70,7 @@ public static function convertPHPArrayToDatabaseArrayString(array $array, ArrayT
      *
      * @return bool[]|int[]|string[]
      */
-    public static function convertDatabaseArrayStringToPHPArray(string $value, ArrayTypeEnum $type, ?AbstractPlatform $platform = null): array
+    public static function convertDatabaseArrayStringToPHPArray(string $value, ArrayTypeEnum $type, AbstractPlatform $platform = null): array
     {
         if ($value === '{}') {
             return [];
@@ -153,7 +153,7 @@ private static function convertBooleanPHPArrayToDatabaseArray(array $array, ?Abs
                 continue;
             }
 
-            throw new \InvalidArgumentException(\sprintf('Item at key %s has invalid type. Expected boolean, 0, 1 or boolean string literal, "%s" provided.', $key, \var_export($value, true)));
+            throw new \InvalidArgumentException(\sprintf('Item at key %s has invalid type. Expected boolean, 0, 1 or boolean string literal, %s provided.', $key, \var_export($value, true)));
         }
 
         return $array;
@@ -193,10 +193,10 @@ private static function convertDatabaseArrayStringToStringPHPArray(string $value
         $array = \str_getcsv(\trim($value, '{}'));
 
         foreach ($array as $key => $item) {
-            if ($item === null) {
-                unset($array[$key]);
+            if ($item === 'null') {
+                $array[$key] = null;
 
-                break;
+                continue;
             }
 
             $array[$key] = \stripslashes($item);
diff --git a/src/Tools/SchemaTool.php b/src/Tools/SchemaTool.php
@@ -294,11 +294,11 @@ private function processingNotRequired(
         ClassMetadata $class,
         array $processedClasses
     ): bool {
-        return isset($processedClasses[$class->name]) ||
-            $class->isMappedSuperclass ||
-            $class->isEmbeddedClass ||
-            ($class->isInheritanceTypeSingleTable() && $class->name !== $class->rootEntityName) ||
-            in_array($class->name, $this->em->getConfiguration()->getSchemaIgnoreClasses());
+        return isset($processedClasses[$class->name])
+            || $class->isMappedSuperclass
+            || $class->isEmbeddedClass
+            || ($class->isInheritanceTypeSingleTable() && $class->name !== $class->rootEntityName)
+            || in_array($class->name, $this->em->getConfiguration()->getSchemaIgnoreClasses());
     }
 
     private function gatherColumns(ClassMetadata $class, Table $table): void
@@ -673,8 +673,8 @@ private function addDiscriminatorColumnDefinition(ClassMetadata $class, Table $t
         $discrColumn = $class->discriminatorColumn;
 
         if (
-            !isset($discrColumn['type']) ||
-            (strtolower($discrColumn['type']) === 'string' && !isset($discrColumn['length']))
+            !isset($discrColumn['type'])
+            || (strtolower($discrColumn['type']) === 'string' && !isset($discrColumn['length']))
         ) {
             $discrColumn['type'] = 'string';
             $discrColumn['length'] = 255;
diff --git a/tests/Fixtures/Enum/TestEnumInterfaceEnum.php b/tests/Fixtures/Enum/TestEnumInterfaceEnum.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Pfilsx\PostgreSQLDoctrine\Tests\Fixtures\Enum;
+
+use Pfilsx\PostgreSQLDoctrine\DBAL\Contract\EnumInterface;
+
+final class TestEnumInterfaceEnum implements EnumInterface
+{
+    public const CASE1 = 'Case1';
+
+    public const CASE2 = 'Case2';
+
+    public const CASE3 = 'Case3';
+
+    public static function cases(): array
+    {
+        return [self::CASE1, self::CASE2, self::CASE3];
+    }
+}
diff --git a/tests/Fixtures/Enum/TestIntBackedEnum.php b/tests/Fixtures/Enum/TestIntBackedEnum.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Pfilsx\PostgreSQLDoctrine\Tests\Fixtures\Enum;
+
+enum TestIntBackedEnum: int
+{
+    case Case1 = 1;
+    case Case2 = 2;
+    case Case3 = 3;
+}
diff --git a/tests/Fixtures/Enum/TestStringBackedEnum.php b/tests/Fixtures/Enum/TestStringBackedEnum.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Pfilsx\PostgreSQLDoctrine\Tests\Fixtures\Enum;
+
+enum TestStringBackedEnum: string
+{
+    case Case1 = 'Case1';
+    case Case2 = 'Case2';
+    case Case3 = 'Case3';
+}
diff --git a/tests/Fixtures/Enum/TestUnitEnum.php b/tests/Fixtures/Enum/TestUnitEnum.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Pfilsx\PostgreSQLDoctrine\Tests\Fixtures\Enum;
+
+enum TestUnitEnum
+{
+    case Case1;
+    case Case2;
+    case Case3;
+}
diff --git a/tests/Fixtures/Model/TestModel.php b/tests/Fixtures/Model/TestModel.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pfilsx\PostgreSQLDoctrine\Tests\Fixtures\Model;
+
+
+final class TestModel
+{
+    public int $id;
+
+    private string $text;
+
+    public function getText(): string
+    {
+        return $this->text;
+    }
+
+    public function setText(string $text): self
+    {
+        $this->text = $text;
+        return $this;
+    }
+}
diff --git a/tests/Fixtures/Type/TestJsonModelType.php b/tests/Fixtures/Type/TestJsonModelType.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pfilsx\PostgreSQLDoctrine\Tests\Fixtures\Type;
+
+
+use Pfilsx\PostgreSQLDoctrine\DBAL\Type\JsonModelType;
+use Pfilsx\PostgreSQLDoctrine\Tests\Fixtures\Model\TestModel;
+
+final class TestJsonModelType extends JsonModelType
+{
+    public static function getTypeName(): string
+    {
+        return 'test_json_model_type';
+    }
+
+    protected static function getModelClass(): string
+    {
+        return TestModel::class;
+    }
+}
diff --git a/tests/Unit/DBAL/Type/ArrayTypesTest.php b/tests/Unit/DBAL/Type/ArrayTypesTest.php
diff --git a/tests/Unit/DBAL/Type/EnumTypeTest.php b/tests/Unit/DBAL/Type/EnumTypeTest.php
diff --git a/tests/Unit/DBAL/Type/JsonModelTypeTest.php b/tests/Unit/DBAL/Type/JsonModelTypeTest.php
diff --git a/tests/Unit/Tools/ArrayTypeToolTest.php b/tests/Unit/Tools/ArrayTypeToolTest.php
diff --git a/tests/Unit/Tools/EnumToolTest.php b/tests/Unit/Tools/EnumToolTest.php

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,17 @@`
`29`	`29`	`"Pfilsx\\PostgreSQLDoctrine\\": "src/"`
`30`	`30`	`}`
`31`	`31`	`},`
	`32`	`+ "autoload-dev": {`
	`33`	`+ "psr-4": {`
	`34`	`+ "Pfilsx\\PostgreSQLDoctrine\\Tests\\": "tests/"`
	`35`	`+ }`
	`36`	`+ },`
`32`	`37`	`"require-dev": {`
`33`	`38`	`"friendsofphp/php-cs-fixer": "^3.13",`
`34`	`39`	`"doctrine/orm": "^2.13",`
`35`	`40`	`"symfony/serializer": ">=5.4",`
`36`		`- "symfony/property-info": ">=5.4"`
	`41`	`+ "symfony/property-info": ">=5.4",`
	`42`	`+ "phpunit/phpunit": "^10.0",`
	`43`	`+ "symfony/property-access": ">=5.4"`
`37`	`44`	`}`
`38`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use Pfilsx\PostgreSQLDoctrine\DBAL\Type\EnumType;`
`15`	`15`	`use Pfilsx\PostgreSQLDoctrine\DBAL\Type\JsonModelType;`
`16`	`16`
`17`		`-final class PostgreSQLPlatform extends BasePlatform`
	`17`	`+class PostgreSQLPlatform extends BasePlatform`
`18`	`18`	`{`
`19`	`19`	`public function createSchemaManager(Connection $connection): PostgreSQLSchemaManager`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ final class EnumTypeUsageAsset`
`12`	`12`
`13`	`13`	`private ?string $default;`
`14`	`14`
`15`		`- public function __construct(string $table, string $column, ?string $default = null)`
	`15`	`+ public function __construct(string $table, string $column, string $default = null)`
`16`	`16`	`{`
`17`	`17`	`$this->table = $table;`
`18`	`18`	`$this->column = $column;`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function createComparator(): Comparator`
`61`	`61`	`return new Comparator($this->_platform);`
`62`	`62`	`}`
`63`	`63`
`64`		`- protected function selectTableColumns(string $databaseName, ?string $tableName = null): Result`
	`64`	`+ protected function selectTableColumns(string $databaseName, string $tableName = null): Result`
`65`	`65`	`{`
`66`	`66`	`$sql = 'SELECT';`
`67`	`67`