Added more types

ankane · ankane · commit 92abe7f4ff6e · 2025-02-02T11:19:22.000-08:00
diff --git a/src/HalfVector.php b/src/HalfVector.php
@@ -4,9 +4,9 @@
 
 class HalfVector
 {
-    protected $value;
+    protected array $value;
 
-    public function __construct($value)
+    public function __construct(mixed $value)
     {
         if (is_string($value)) {
             try {
@@ -35,12 +35,12 @@ public function __construct($value)
         $this->value = $value;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return json_encode($this->value, JSON_THROW_ON_ERROR, 1);
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return $this->value;
     }
diff --git a/src/SparseVector.php b/src/SparseVector.php
@@ -4,11 +4,11 @@
 
 class SparseVector
 {
-    protected $dimensions;
-    protected $indices;
-    protected $values;
+    protected int $dimensions;
+    protected array $indices;
+    protected array $values;
 
-    public function __construct($value, $dimensions = null)
+    public function __construct(mixed $value, mixed $dimensions = null)
     {
         $numArgs = func_num_args();
 
@@ -35,7 +35,7 @@ public function __construct($value, $dimensions = null)
         }
     }
 
-    private function fromDense($value)
+    private function fromDense(array $value)
     {
         $this->dimensions = count($value);
         $this->indices = [];
@@ -49,7 +49,7 @@ private function fromDense($value)
         }
     }
 
-    private function fromMap($map, $dimensions)
+    private function fromMap(array $map, mixed $dimensions)
     {
         $this->dimensions = intval($dimensions);
         $this->indices = [];
@@ -66,7 +66,7 @@ private function fromMap($map, $dimensions)
         }
     }
 
-    private function fromString($value)
+    private function fromString(string $value)
     {
         $parts = explode('/', $value, 2);
 
@@ -82,7 +82,7 @@ private function fromString($value)
         }
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         $elements = [];
         for ($i = 0; $i < count($this->indices); $i++) {
@@ -91,22 +91,22 @@ public function __toString()
         return '{' . implode(',', $elements) . '}/' . $this->dimensions;
     }
 
-    public function dimensions()
+    public function dimensions(): int
     {
         return $this->dimensions;
     }
 
-    public function indices()
+    public function indices(): array
     {
         return $this->indices;
     }
 
-    public function values()
+    public function values(): array
     {
         return $this->values;
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         $result = array_fill(0, $this->dimensions, 0.0);
         for ($i = 0; $i < count($this->indices); $i++) {
diff --git a/src/Vector.php b/src/Vector.php
@@ -4,9 +4,9 @@
 
 class Vector
 {
-    protected $value;
+    protected array $value;
 
-    public function __construct($value)
+    public function __construct(mixed $value)
     {
         if (is_string($value)) {
             try {
@@ -35,12 +35,12 @@ public function __construct($value)
         $this->value = $value;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return json_encode($this->value, JSON_THROW_ON_ERROR, 1);
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return $this->value;
     }
diff --git a/src/laravel/PgvectorServiceProvider.php b/src/laravel/PgvectorServiceProvider.php
@@ -8,20 +8,16 @@ class PgvectorServiceProvider extends ServiceProvider
 {
     /**
      * Register services.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         //
     }
 
     /**
      * Bootstrap services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         $this->loadMigrationsFrom(__DIR__.'/migrations');
 
diff --git a/src/laravel/Schema.php b/src/laravel/Schema.php
@@ -8,53 +8,53 @@
 
 class Schema
 {
-    public static function register()
+    public static function register(): void
     {
-        PostgresGrammar::macro('typeVector', function (ColumnDefinition $column) {
+        PostgresGrammar::macro('typeVector', function (ColumnDefinition $column): string {
             if ($column->get('dimensions')) {
                 return 'vector(' . intval($column->get('dimensions')) . ')';
             } else {
                 return 'vector';
             }
         });
 
-        PostgresGrammar::macro('typeHalfvec', function (ColumnDefinition $column) {
+        PostgresGrammar::macro('typeHalfvec', function (ColumnDefinition $column): string {
             if ($column->get('dimensions')) {
                 return 'halfvec(' . intval($column->get('dimensions')) . ')';
             } else {
                 return 'halfvec';
             }
         });
 
-        PostgresGrammar::macro('typeBit', function (ColumnDefinition $column) {
+        PostgresGrammar::macro('typeBit', function (ColumnDefinition $column): string {
             if ($column->get('length')) {
                 return 'bit(' . intval($column->get('length')) . ')';
             } else {
                 return 'bit';
             }
         });
 
-        PostgresGrammar::macro('typeSparsevec', function (ColumnDefinition $column) {
+        PostgresGrammar::macro('typeSparsevec', function (ColumnDefinition $column): string {
             if ($column->get('dimensions')) {
                 return 'sparsevec(' . intval($column->get('dimensions')) . ')';
             } else {
                 return 'sparsevec';
             }
         });
 
-        Blueprint::macro('vector', function ($column, $dimensions = null) {
+        Blueprint::macro('vector', function (string $column, mixed $dimensions = null): ColumnDefinition {
             return $this->addColumn('vector', $column, compact('dimensions'));
         });
 
-        Blueprint::macro('halfvec', function ($column, $dimensions = null) {
+        Blueprint::macro('halfvec', function (string $column, mixed $dimensions = null): ColumnDefinition {
             return $this->addColumn('halfvec', $column, compact('dimensions'));
         });
 
-        Blueprint::macro('bit', function ($column, $length = null) {
+        Blueprint::macro('bit', function (string $column, mixed $length = null): ColumnDefinition {
             return $this->addColumn('bit', $column, compact('length'));
         });
 
-        Blueprint::macro('sparsevec', function ($column, $dimensions = null) {
+        Blueprint::macro('sparsevec', function (string $column, mixed $dimensions = null): ColumnDefinition {
             return $this->addColumn('sparsevec', $column, compact('dimensions'));
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`class HalfVector`
`6`	`6`	`{`
`7`		`- protected $value;`
	`7`	`+ protected array $value;`
`8`	`8`
`9`		`- public function __construct($value)`
	`9`	`+ public function __construct(mixed $value)`
`10`	`10`	`{`
`11`	`11`	`if (is_string($value)) {`
`12`	`12`	`try {`
`@@ -35,12 +35,12 @@ public function __construct($value)`
`35`	`35`	`$this->value = $value;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function __toString()`
	`38`	`+ public function __toString(): string`
`39`	`39`	`{`
`40`	`40`	`return json_encode($this->value, JSON_THROW_ON_ERROR, 1);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function toArray()`
	`43`	`+ public function toArray(): array`
`44`	`44`	`{`
`45`	`45`	`return $this->value;`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`
`5`	`5`	`class SparseVector`
`6`	`6`	`{`
`7`		`- protected $dimensions;`
`8`		`- protected $indices;`
`9`		`- protected $values;`
	`7`	`+ protected int $dimensions;`
	`8`	`+ protected array $indices;`
	`9`	`+ protected array $values;`
`10`	`10`
`11`		`- public function __construct($value, $dimensions = null)`
	`11`	`+ public function __construct(mixed $value, mixed $dimensions = null)`
`12`	`12`	`{`
`13`	`13`	`$numArgs = func_num_args();`
`14`	`14`
`@@ -35,7 +35,7 @@ public function __construct($value, $dimensions = null)`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`- private function fromDense($value)`
	`38`	`+ private function fromDense(array $value)`
`39`	`39`	`{`
`40`	`40`	`$this->dimensions = count($value);`
`41`	`41`	`$this->indices = [];`
`@@ -49,7 +49,7 @@ private function fromDense($value)`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- private function fromMap($map, $dimensions)`
	`52`	`+ private function fromMap(array $map, mixed $dimensions)`
`53`	`53`	`{`
`54`	`54`	`$this->dimensions = intval($dimensions);`
`55`	`55`	`$this->indices = [];`
`@@ -66,7 +66,7 @@ private function fromMap($map, $dimensions)`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- private function fromString($value)`
	`69`	`+ private function fromString(string $value)`
`70`	`70`	`{`
`71`	`71`	`$parts = explode('/', $value, 2);`
`72`	`72`
`@@ -82,7 +82,7 @@ private function fromString($value)`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`- public function __toString()`
	`85`	`+ public function __toString(): string`
`86`	`86`	`{`
`87`	`87`	`$elements = [];`
`88`	`88`	`for ($i = 0; $i < count($this->indices); $i++) {`
`@@ -91,22 +91,22 @@ public function __toString()`
`91`	`91`	`return '{' . implode(',', $elements) . '}/' . $this->dimensions;`
`92`	`92`	`}`
`93`	`93`
`94`		`- public function dimensions()`
	`94`	`+ public function dimensions(): int`
`95`	`95`	`{`
`96`	`96`	`return $this->dimensions;`
`97`	`97`	`}`
`98`	`98`
`99`		`- public function indices()`
	`99`	`+ public function indices(): array`
`100`	`100`	`{`
`101`	`101`	`return $this->indices;`
`102`	`102`	`}`
`103`	`103`
`104`		`- public function values()`
	`104`	`+ public function values(): array`
`105`	`105`	`{`
`106`	`106`	`return $this->values;`
`107`	`107`	`}`
`108`	`108`
`109`		`- public function toArray()`
	`109`	`+ public function toArray(): array`
`110`	`110`	`{`
`111`	`111`	`$result = array_fill(0, $this->dimensions, 0.0);`
`112`	`112`	`for ($i = 0; $i < count($this->indices); $i++) {`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`class Vector`
`6`	`6`	`{`
`7`		`- protected $value;`
	`7`	`+ protected array $value;`
`8`	`8`
`9`		`- public function __construct($value)`
	`9`	`+ public function __construct(mixed $value)`
`10`	`10`	`{`
`11`	`11`	`if (is_string($value)) {`
`12`	`12`	`try {`
`@@ -35,12 +35,12 @@ public function __construct($value)`
`35`	`35`	`$this->value = $value;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function __toString()`
	`38`	`+ public function __toString(): string`
`39`	`39`	`{`
`40`	`40`	`return json_encode($this->value, JSON_THROW_ON_ERROR, 1);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function toArray()`
	`43`	`+ public function toArray(): array`
`44`	`44`	`{`
`45`	`45`	`return $this->value;`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,20 +8,16 @@ class PgvectorServiceProvider extends ServiceProvider`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Register services.`
`11`		`- *`
`12`		`- * @return void`
`13`	`11`	`*/`
`14`		`- public function register()`
	`12`	`+ public function register(): void`
`15`	`13`	`{`
`16`	`14`	`//`
`17`	`15`	`}`
`18`	`16`
`19`	`17`	`/**`
`20`	`18`	`* Bootstrap services.`
`21`		`- *`
`22`		`- * @return void`
`23`	`19`	`*/`
`24`		`- public function boot()`
	`20`	`+ public function boot(): void`
`25`	`21`	`{`
`26`	`22`	`$this->loadMigrationsFrom(__DIR__.'/migrations');`
`27`	`23`