Upgrade to Pest 2 (#88)

* upgrade to pest 2

* Fix PHPStan

---------

Co-authored-by: Matan Yadaev <[email protected]>

Author: MatanYadaev

composer.json

@@ -22,8 +22,8 @@
     "jubeki/laravel-code-style": "^1.2",
     "nunomaduro/larastan": "^1.0|^2.4",
     "orchestra/testbench": "^8.0",
-    "pestphp/pest": "^1.22.4",
-    "pestphp/pest-plugin-laravel": "^1.4"
+    "pestphp/pest": "^2.0",
+    "pestphp/pest-plugin-laravel": "^2.0"
   },
   "autoload": {
     "psr-4": {

phpstan.neon

@@ -7,15 +7,5 @@ parameters:
   excludePaths:
     - src/Factory.php
   level: max
-  ignoreErrors:
-    -
-      message: '#^Call to an undefined method Pest\\Expectation\|Pest\\Support\\Extendable\:\:.+\(\)\.$#'
-      path: tests/*.php
-    -
-      message: '#^Access to an undefined property Pest\\Expectation\|Pest\\Support\\Extendable\:\:\$.+\.$#'
-      path: tests/*.php
-    -
-      message: '#^Call to an undefined method Pest\\Expectation\:\:.+\(\)\.$#'
-      path: tests/*.php
   checkMissingIterableValueType: true
   checkGenericClassInNonGenericObjectType: false

phpunit.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         verbose="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
 >
   <testsuites>
     <testsuite name="Test Suite">

tests/DoctrineTypesTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Doctrine\DBAL\Types\Type;
 use Illuminate\Support\Facades\DB;
 use MatanYadaev\EloquentSpatial\Doctrine\GeometryCollectionType;
 use MatanYadaev\EloquentSpatial\Doctrine\LineStringType;
@@ -9,36 +10,20 @@
 use MatanYadaev\EloquentSpatial\Doctrine\PointType;
 use MatanYadaev\EloquentSpatial\Doctrine\PolygonType;
 
-it('uses custom Doctrine types for spatial columns', function (): void {
+it('uses custom Doctrine types for spatial columns', function (string $column, string $typeClass, string $typeName): void {
+  /** @var class-string<Type> $typeClass */
   $doctrineSchemaManager = DB::connection()->getDoctrineSchemaManager();
 
   $columns = $doctrineSchemaManager->listTableColumns('test_places');
 
-  expect($columns['point']->getType())
-    ->toBeInstanceOf(PointType::class)
-    ->getName()->toBe('point');
-
-  expect($columns['line_string']->getType())
-    ->toBeInstanceOf(LineStringType::class)
-    ->getName()->toBe('linestring');
-
-  expect($columns['multi_point']->getType())
-    ->toBeInstanceOf(MultiPointType::class)
-    ->getName()->toBe('multipoint');
-
-  expect($columns['polygon']->getType())
-    ->toBeInstanceOf(PolygonType::class)
-    ->getName()->toBe('polygon');
-
-  expect($columns['multi_line_string']->getType())
-    ->toBeInstanceOf(MultiLineStringType::class)
-    ->getName()->toBe('multilinestring');
-
-  expect($columns['multi_polygon']->getType())
-    ->toBeInstanceOf(MultiPolygonType::class)
-    ->getName()->toBe('multipolygon');
-
-  expect($columns['geometry_collection']->getType())
-    ->toBeInstanceOf(GeometryCollectionType::class)
-    ->getName()->toBe('geometrycollection');
-});
+  expect($columns[$column]->getType())->toBeInstanceOf($typeClass)
+    ->and($columns[$column]->getType()->getName())->toBe($typeName);
+})->with([
+  'point' => ['point', PointType::class, 'point'],
+  'line_string' => ['line_string', LineStringType::class, 'linestring'],
+  'multi_point' => ['multi_point', MultiPointType::class, 'multipoint'],
+  'polygon' => ['polygon', PolygonType::class, 'polygon'],
+  'multi_line_string' => ['multi_line_string', MultiLineStringType::class, 'multilinestring'],
+  'multi_polygon' => ['multi_polygon', MultiPolygonType::class, 'multipolygon'],
+  'geometry_collection' => ['geometry_collection', GeometryCollectionType::class, 'geometrycollection'],
+]);

tests/GeometryCastTest.php

@@ -37,7 +37,6 @@
   expect(function () use ($testPlace, $pointFromAttributes): void {
     $testPlace->update(['point' => $pointFromAttributes]);
   })->not->toThrow(InvalidArgumentException::class);
-  expect(true)->toBeTrue(); // because of Pest's bug: https://github.com/pestphp/pest/issues/657
 });
 
 it('updates a model record with null geometry', function (): void {