Merge branch 'release/2.0.0'

Author: DannyvdSluijs

.travis.yml

@@ -16,6 +16,9 @@ matrix:
     - php: 7.4
     - php: 7.4
       env: COMPOSER_UPDATE_FLAGS='--prefer-lowest --prefer-stable'
+    - php: 8.0
+    - php: 8.0
+      env: COMPOSER_UPDATE_FLAGS='--prefer-lowest --prefer-stable'
 
       # Ignore the platform requirements for the upcoming PHP version
     - php: nightly
@@ -32,6 +35,7 @@ branches:
   only:
     - master
     - develop
+    - 2.x
 
 install:
   - curl -s http://getcomposer.org/installer | php

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0]
+## Changed
+- Update to version ^2.0 JsonMapper and LaravelPackage
+### Added
+ - Add PHP8 support to the build matrix. [PR#4](https://github.com/JsonMapper/EloquentMiddleware/pull/4)
+
 ## [1.0.0] - 2020-09-03
 ### Added
 - Allow Eloquent models to be populated from Json.

Version

@@ -1 +1 @@
-1.0.0
+2.0.0

composer.json

@@ -19,21 +19,22 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "JsonMapper\\EloquentMiddleware\\Tests\\": "tests/"
+            "JsonMapper\\EloquentMiddleware\\Tests\\": "tests/",
+            "JsonMapper\\Tests\\": "vendor/json-mapper/json-mapper/tests/"
         }
     },
     "require": {
-        "json-mapper/laravel-package": "^1.1",
+        "json-mapper/laravel-package": "^2.0",
         "php": "^7.2 || ^8.0",
         "doctrine/dbal": "^2.3",
-        "json-mapper/json-mapper": "^1.1"
+        "json-mapper/json-mapper": "^2.0"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.5",
         "phpstan/phpstan": "^0.12.19",
         "php-coveralls/php-coveralls": "^2.2",
         "orchestra/testbench": "^5.3",
-        "phpunit/phpunit": "^8.0|^9.0"
+        "phpunit/phpunit": "^8.5 || ^9.0"
     },
     "scripts": {
         "phpcs": "phpcs --standard=PSR12 src tests --ignore=tests/database",

src/EloquentMiddleware.php

@@ -11,6 +11,7 @@
 use JsonMapper\JsonMapperInterface;
 use JsonMapper\Middleware\AbstractMiddleware;
 use JsonMapper\ValueObjects\PropertyMap;
+use JsonMapper\ValueObjects\PropertyType;
 use JsonMapper\Wrapper\ObjectWrapper;
 use Psr\SimpleCache\CacheInterface;
 
@@ -131,10 +132,9 @@ protected function discoverPropertiesFromTable(Model $model, PropertyMap $proper
 
             $property = PropertyBuilder::new()
                 ->setName($name)
-                ->setType($type)
+                ->addType($type, false)
                 ->setIsNullable(!$column->getNotnull())
                 ->setVisibility(Visibility::PUBLIC())
-                ->setIsArray(false)
                 ->build();
             $propertyMap->addProperty($property);
         }
@@ -188,7 +188,7 @@ protected function discoverPropertiesCasts(Model $model, PropertyMap $propertyMa
             $realType = $this->checkForCustomLaravelCasts($realType);
 
             $builder = $propertyMap->getProperty($name)->asBuilder();
-            $property = $builder->setType($realType)->build();
+            $property = $builder->setTypes(new PropertyType($realType, false))->build();
             $propertyMap->addProperty($property);
         }
     }

tests/Unit/EloquentMiddlewareTest.php

@@ -8,22 +8,25 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Types\Type;
-use Doctrine\DBAL\Types\Types;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Eloquent\Model;
 use JsonMapper\Cache\NullCache;
 use JsonMapper\EloquentMiddleware\EloquentMiddleware;
+use JsonMapper\Enums\Visibility;
 use JsonMapper\JsonMapperInterface;
+use JsonMapper\Tests\Helpers\AssertThatPropertyTrait;
 use JsonMapper\ValueObjects\PropertyMap;
 use JsonMapper\Wrapper\ObjectWrapper;
 use Orchestra\Testbench\TestCase;
 
 class EloquentMiddlewareTest extends TestCase
 {
+    use AssertThatPropertyTrait;
+
     /**
      * @covers \JsonMapper\EloquentMiddleware\EloquentMiddleware
      */
-    public function testNonEloquentModelRetunsEmptyPropertyMap(): void
+    public function testNonEloquentModelReturnsEmptyPropertyMap(): void
     {
         $middleware = new EloquentMiddleware(new NullCache());
         $propertyMap = new PropertyMap();
@@ -47,7 +50,11 @@ public function testColumnsFromTheDatabaseAreReturned(): void
         $middleware->handle(new \stdClass(), new ObjectWrapper($model), $propertyMap, $mapper);
 
         self::assertTrue($propertyMap->hasProperty('id'));
-        self::assertEquals('integer', $propertyMap->getProperty('id')->getType());
+        $this->assertThatProperty($propertyMap->getProperty('id'))
+            ->hasName('id')
+            ->onlyHasType('integer', false)
+            ->hasVisibility(Visibility::PUBLIC())
+            ->isNotNullable();
     }
 
     private function prepareMockedModel(Column ...$columns): Model