bump to php7.4

README.md

@@ -72,9 +72,9 @@ services:
   {
       /**
        * @var string
-       * @Column(name="title", type="string", nullable=false)
+       * [#Column(name:"title", type:"string", nullable:false)]
        */
-      private $title;
+      private string $title;
 
       /**
        * @var TsVector
@@ -84,9 +84,9 @@ services:
 
       /**
        * @var string
-       * @Column(name="body", type="text", nullable=true)
+       * [#Column(name:"body", type:"text", nullable:true)]
        */
-      private $body;
+      private ?string $body;
 
        /**
        * @var TsVector

composer.json

@@ -10,17 +10,23 @@
     "license": "MIT",
     "type": "library",
     "require": {
-        "doctrine/orm": "~2.4",
-        "php": ">=5.4"
+        "doctrine/orm": "^2.10 || ^3.0",
+        "php": ">=8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.4",
-        "phpunit/phpunit-mock-objects": "~2.3"
+        "phpunit/phpunit": "*",
+        "phpunit/phpunit-mock-objects": "*",
+        "rector/rector": "^0.13.8",
+        "symfony/cache": "^6.3 || ^7.0"
     },
     "autoload": {
         "psr-4": {
             "VertigoLabs\\DoctrineFullTextPostgres\\": "src/"
         }
     },
-    "minimum-stability": "dev"
+    "autoload-dev": {
+        "psr-4": {
+            "Base\\": "tests/VertigoLabs/Base"
+        }
+    }
 }

phpstan.neon

@@ -0,0 +1,9 @@
+parameters:
+    level: 0
+#    inferPrivatePropertyTypeFromConstructor: true
+    paths:
+        - ./src
+    excludePaths:
+      - 'src/Resources/skeleton'
+      - */cache/*
+

tests/phpunit.xml → phpunit.xml

@@ -2,13 +2,9 @@
 <phpunit backupGlobals="false"
         backupStaticAttributes="false"
         colors="true"
-        convertErrorsToExections="true"
-        convertNoticesToExecptions="true"
-        convertWarningsToExeceptions="true"
         processIsolation="false"
-        stopOnFailure="false"
-        syntaxCheck="false"
-        bootstrap="./bootstrap.php">
+        stopOnFailure="true"
+        bootstrap="./tests/bootstrap.php">
     <testsuites>
         <testsuite name="TsVector Extension">
             <directory suffix="Test.php">./VertigoLabs/TsVector</directory>
@@ -20,4 +16,4 @@
             <directory suffix="Test.php">./VertigoLabs/TsRank</directory>
         </testsuite>
     </testsuites>
-</phpunit>
+</phpunit>

rector.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\PHPUnit\Set\PHPUnitSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src'
+    ]);
+
+    // register a single rule
+//    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+
+    // define sets of rules
+        $rectorConfig->sets([
+            PHPUnitSetList::PHPUNIT_80,
+            LevelSetList::UP_TO_PHP_74
+        ]);
+};

rector.sav

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\Set\ValueObject\LevelSetList;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Rector\PHPUnit\Set\PHPUnitSetList;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    // get parameters
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::PATHS, [
+        __DIR__ . '/tests',
+        __DIR__ . '/src',
+    ]);
+
+    // Define what rule sets will be applied
+
+    // rector.php
+//    $containerConfigurator->import(LevelSetList::UP_TO_PHP_74);
+    $containerConfigurator->import(PHPUnitSetList::PHPUNIT_50);
+
+    // get services (needed for register a single rule)
+    // $services = $containerConfigurator->services();
+
+    // register a single rule
+    // $services->set(TypedPropertyRector::class);
+};

src/Common/TsVectorSubscriber.php

@@ -8,6 +8,7 @@
 
 namespace VertigoLabs\DoctrineFullTextPostgres\Common;
 
+use App\Entity\Media;
 use Doctrine\Common\Annotations\AnnotationException;
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
@@ -60,7 +61,7 @@ public function __construct()
      *
      * @return array
      */
-    public function getSubscribedEvents()
+    public function getSubscribedEvents(): array
     {
         return [
             Events::loadClassMetadata,
@@ -73,9 +74,40 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
     {
         /** @var ClassMetadata $metaData */
         $metaData = $eventArgs->getClassMetadata();
-
         $class = $metaData->getReflectionClass();
+
         foreach ($class->getProperties() as $prop) {
+            // check for php8 attributes on the class properties
+            if (method_exists($prop, 'getAttributes')) {
+                foreach ($prop->getAttributes() as $reflectionAttribute) {
+                    if ($reflectionAttribute->getName() === TsVector::class) {
+//                    /** @var TsVector $attribute */
+                    $attribute = new ($reflectionAttribute->getName())(...$reflectionAttribute->getArguments()); // crazy, something is wrong here.
+                    $this->checkWatchFields($class, $prop, $attribute);
+
+            $metaData->mapField([
+                'fieldName' => $prop->getName(),
+                'columnName' => $this->getColumnName($prop, $attribute),
+                'type' => 'tsvector',
+                'weight' => strtoupper($attribute->weight),
+                'language' => strtolower($attribute->language),
+                'nullable' => true, // pre-populating $this->isWatchFieldNullable($class, $attribute)
+            ]);
+
+                    }
+                }
+            }
+
+//            $this->checkWatchFields($class, $prop, $attribute);
+//            $metaData->mapField([
+//                'fieldName' => $prop->getName(),
+//                'columnName' => $this->getColumnName($prop, $annotation),
+//                'type' => 'tsvector',
+//                'weight' => strtoupper($annotation->weight),
+//                'language' => strtolower($annotation->language),
+//                'nullable' => $this->isWatchFieldNullable($class, $annotation)
+//            ]);
+
             /** @var TsVector $annotation */
             $annotation = $this->reader->getPropertyAnnotation($prop, self::ANNOTATION_NS.self::ANNOTATION_TSVECTOR);
             if (null === $annotation) {
@@ -161,30 +193,53 @@ private function getColumnName(\ReflectionProperty $property, TsVector $annotati
         return $name;
     }
 
-    private function checkWatchFields(\ReflectionClass $class, \ReflectionProperty $targetProperty, TsVector $annotation)
+    private function checkWatchFields(\ReflectionClass $reflectionClass, \ReflectionProperty $targetProperty, TsVector $annotation)
     {
+        foreach ($reflectionClass->getAttributes(\VertigoLabs\DoctrineFullTextPostgres\ORM\Attribute\TsVector::class) as $attribute) {
+            dd($attribute);
+        }
+
         foreach ($annotation->fields as $fieldName) {
-            if ($class->hasMethod($fieldName)) {
+            if ($reflectionClass->hasMethod($fieldName)) {
                 continue;
             }
 
-            if (!$class->hasProperty($fieldName)) {
+            if (!$reflectionClass->hasProperty($fieldName)) {
                 throw new MappingException(sprintf('Class does not contain %s property or getter', $fieldName));
             }
 
-            $property = $class->getProperty($fieldName);
+            $reflectionProperty = $reflectionClass->getProperty($fieldName);
+
             /** @var Column $propAnnot */
-            $propAnnot = $this->reader->getPropertyAnnotation($property, Column::class);
-            if (!in_array($propAnnot->type, self::$supportedTypes)) {
-                throw new AnnotationException(sprintf(
-                    '%s::%s TsVector field can only be assigned to ( "%s" ) columns. %1$s::%s has the type %s',
-                    $class->getName(),
-                    $targetProperty->getName(),
-                    implode('" | "', self::$supportedTypes),
-                    $fieldName,
-                    $propAnnot->type
-                ));
+            if (!$propAnnot = $this->reader->getPropertyAnnotation($reflectionProperty, Column::class)) {
+                foreach ($reflectionProperty->getAttributes(Column::class) as $columnAttribute) {
+                    if (!in_array($columnAttribute->getArguments()['type'], self::$supportedTypes)) {
+                        throw new AnnotationException(sprintf(
+                            '%s::%s TsVector field can only be assigned to ( "%s" ) columns. %1$s::%s has the type %s',
+                            $reflectionClass->getName(),
+                            $targetProperty->getName(),
+                            implode('" | "', self::$supportedTypes),
+                            $fieldName,
+                            $propAnnot->type
+                        ));
+                    }
+
+                }
+            } else {
+                // use annotation
+                if (!in_array($propAnnot->type, self::$supportedTypes)) {
+                    throw new AnnotationException(sprintf(
+                        '%s::%s TsVector field can only be assigned to ( "%s" ) columns. %1$s::%s has the type %s',
+                        $reflectionClass->getName(),
+                        $targetProperty->getName(),
+                        implode('" | "', self::$supportedTypes),
+                        $fieldName,
+                        $propAnnot->type
+                    ));
+                }
             }
+
+
         }
     }
 
@@ -197,9 +252,19 @@ private function isWatchFieldNullable(\ReflectionClass $class, TsVector $annotat
 
             $property = $class->getProperty($fieldName);
             /** @var Column $propAnnot */
-            $propAnnot = $this->reader->getPropertyAnnotation($property, Column::class);
-            if (false === $propAnnot->nullable) {
-                return false;
+            if ($propAnnot = $this->reader->getPropertyAnnotation($property, Column::class)) {
+                if (false === $propAnnot->nullable) {
+                    return false;
+                }
+            } else {
+                $reflectionProperty = $class->getProperty($fieldName);
+                foreach ($reflectionProperty->getAttributes(Column::class) as $propAttr) {
+                    $attr = $propAttr->getArguments();
+                    if (false === $attr['nullable'] ?? false) {
+                        return false;
+                    }
+
+                }
             }
         }
 

src/DBAL/Types/TsVector.php

@@ -31,7 +31,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
         return 'tsvector';
     }
 
-    public function canRequireSQLConversion()
+    public function canRequireSQLConversion(): bool
     {
         return true;
     }
@@ -59,14 +59,16 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
      *
      * @return mixed the database representation of the value
      */
-    public function convertToDatabaseValueSQL($sqlExp, AbstractPlatform $platform)
+    public function convertToDatabaseValueSQL($sqlExp, AbstractPlatform $platform): string
     {
-        return sprintf("to_tsvector('english', ?)", $sqlExp);
+        return sprintf("to_tsvector('english', %s)", $sqlExp);
     }
 
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        return $value['data'];
+        if ($value) {
+            return $value['data'];
+        }
     }
 
     /**

src/ORM/Mapping/TsVector.php

@@ -8,33 +8,29 @@
 
 namespace VertigoLabs\DoctrineFullTextPostgres\ORM\Mapping;
 
-use Doctrine\Common\Annotations\Annotation;
-use Doctrine\Common\Annotations\Annotation\Target;
+//use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
+use \Attribute;
+use Doctrine\ORM\Mapping\MappingAttribute;
 
 /**
  * Class TsVector.
  *
- * @Annotation
- * @Target("PROPERTY")
  */
-final class TsVector extends Annotation
+#[Attribute(Attribute::TARGET_PROPERTY)]
+final class TsVector implements MappingAttribute
 {
-    /**
-     * @var array<string>
-     * @Annotation\Required()
-     */
-    public $fields = [];
-    /**
-     * @var string
-     */
-    public $name;
-    /**
-     * @var string
-     * @Annotation\Enum({"A","B","C","D"})
-     */
-    public $weight = 'D';
-    /**
-     * @var string
-     */
-    public $language = 'english';
+    public function __construct(public string $name, public array $fields=[], public string $weight='D', public string $language = 'english')
+    {
+    }
+
+    public function getWeight(): string
+    {
+        return $this->weight;
+    }
+
+    public function getLanguage(): string
+    {
+        return $this->language;
+    }
+
 }