Version 2.0 (#22)

* updated composer dependencies to support PHP 7.2 and Laravel 6.0

* removed author annotation (email is defunct)

* Fixed test suite, added additional typehints

* applied PSR-2 styling

* updated travis php build versions

.gitignore

@@ -1,3 +1,5 @@
 /vendor/
 /composer.lock
 /coverage/
+/.idea/
+.phpunit.result.cache

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 php:
-  - '7.0'
-  - '7.1'
+  - '7.2'
+  - '7.3'
 env:
   matrix:
     - PREFER_LOWEST="--prefer-lowest"
@@ -12,7 +12,7 @@ script:
   - mkdir -p build/logs
   - phpunit --coverage-clover build/logs/clover.xml
 after_script:
-  - php vendor/bin/coveralls -v
+  - php vendor/bin/php-coveralls -v
 branches:
   only:
   - master

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+# 2.0.0
+- Moved minimum requirements to PHP 7.2 and Laravel 5.6+
+- Added a number of missing return types.
+
+## 1.1.0 - 2018-05-15
+- Added `whereDoesntHaveMeta()` query scope (Thanks @tormjens!)
+
 ## 1.0.4 - 2017-08-20
 - Added Laravel 5.5 package autodiscovery
 - Meta keys are now correctly case sensitive throughout the package (Thanks @Luukvdo!)

composer.json

@@ -15,14 +15,15 @@
         }
     },
     "require": {
-        "php": ">=7.0.0",
-        "illuminate/support": "~5.2",
-        "illuminate/database": "~5.2"
+        "php": ">=7.2.0",
+        "ext-json": "*",
+        "illuminate/support": "^5.6|^6.0",
+        "illuminate/database": "^5.6|^6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.2",
-        "phpunit/phpunit": "~5.7",
-        "satooshi/php-coveralls": "^1.0.1"
+        "orchestra/testbench": "^3.3|^4.0",
+        "phpunit/phpunit": "^8.0",
+        "php-coveralls/php-coveralls": "^2.1"
     },
     "autoload-dev":{
         "classmap": ["tests/"]

migrations/2017_01_01_000000_create_meta_table.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateMetaTable extends Migration
 {

migrations/2017_01_01_000000_create_sample_classes_tables.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateSampleClassesTables extends Migration
 {

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

src/DataType/ArrayHandler.php

@@ -4,31 +4,29 @@
 
 /**
  * Handle serialization of arrays.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 class ArrayHandler implements HandlerInterface
 {
     /**
      * {@inheritdoc}
      */
-    public function getDataType() : string
+    public function getDataType(): string
     {
         return 'array';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function canHandleValue($value) : bool
+    public function canHandleValue($value): bool
     {
         return is_array($value);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function serializeValue($value) : string
+    public function serializeValue($value): string
     {
         return json_encode($value);
     }

src/DataType/BooleanHandler.php

@@ -4,8 +4,6 @@
 
 /**
  * Handle serialization of booleans.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 class BooleanHandler extends ScalarHandler
 {

src/DataType/DateTimeHandler.php

@@ -7,8 +7,6 @@
 
 /**
  * Handle serialization of DateTimeInterface objects.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 class DateTimeHandler implements HandlerInterface
 {
@@ -22,23 +20,23 @@ class DateTimeHandler implements HandlerInterface
     /**
      * {@inheritdoc}
      */
-    public function getDataType() : string
+    public function getDataType(): string
     {
         return 'datetime';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function canHandleValue($value) : bool
+    public function canHandleValue($value): bool
     {
         return $value instanceof DateTimeInterface;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function serializeValue($value) : string
+    public function serializeValue($value): string
     {
         return $value->format($this->format);
     }

src/DataType/FloatHandler.php

@@ -4,8 +4,6 @@
 
 /**
  * Handle serialization of floats.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 class FloatHandler extends ScalarHandler
 {
@@ -17,7 +15,7 @@ class FloatHandler extends ScalarHandler
     /**
      * {@inheritdoc}
      */
-    public function getDataType() : string
+    public function getDataType(): string
     {
         return 'float';
     }

src/DataType/HandlerInterface.php

@@ -4,8 +4,6 @@
 
 /**
  * Provides means to serialize and unserialize values of different data types.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 interface HandlerInterface
 {
@@ -14,7 +12,7 @@ interface HandlerInterface
      *
      * @return string
      */
-    public function getDataType() : string;
+    public function getDataType(): string;
 
     /**
      * Determine if the value is of the correct type for this handler.
@@ -23,7 +21,7 @@ public function getDataType() : string;
      *
      * @return bool
      */
-    public function canHandleValue($value) : bool;
+    public function canHandleValue($value): bool;
 
     /**
      * Convert the value to a string, so that it can be stored in the database.
@@ -32,7 +30,7 @@ public function canHandleValue($value) : bool;
      *
      * @return string
      */
-    public function serializeValue($value) : string;
+    public function serializeValue($value): string;
 
     /**
      * Convert a serialized string back to its original value.

src/DataType/IntegerHandler.php

@@ -4,8 +4,6 @@
 
 /**
  * Handle serialization of integers.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 class IntegerHandler extends ScalarHandler
 {

src/DataType/ModelCollectionHandler.php

@@ -6,41 +6,39 @@
 
 /**
  * Handle serialization of Eloquent collections.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 class ModelCollectionHandler implements HandlerInterface
 {
     /**
      * {@inheritdoc}
      */
-    public function getDataType() : string
+    public function getDataType(): string
     {
         return 'collection';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function canHandleValue($value) : bool
+    public function canHandleValue($value): bool
     {
         return $value instanceof Collection;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function serializeValue($value) : string
+    public function serializeValue($value): string
     {
         $items = [];
         foreach ($value as $key => $model) {
             $items[$key] = [
                 'class' => get_class($model),
-                'key'   => $model->exists ? $model->getKey() : null,
+                'key' => $model->exists ? $model->getKey() : null,
             ];
         }
 
-        return json_encode(['class'=> get_class($value), 'items' => $items]);
+        return json_encode(['class' => get_class($value), 'items' => $items]);
     }
 
     /**

src/DataType/ModelHandler.php

@@ -6,34 +6,32 @@
 
 /**
  * Handle serialization of Eloquent Models.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 class ModelHandler implements HandlerInterface
 {
     /**
      * {@inheritdoc}
      */
-    public function getDataType() : string
+    public function getDataType(): string
     {
         return 'model';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function canHandleValue($value) : bool
+    public function canHandleValue($value): bool
     {
         return $value instanceof Model;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function serializeValue($value) : string
+    public function serializeValue($value): string
     {
         if ($value->exists) {
-            return get_class($value).'#'.$value->getKey();
+            return get_class($value) . '#' . $value->getKey();
         }
 
         return get_class($value);

src/DataType/NullHandler.php

@@ -4,8 +4,6 @@
 
 /**
  * Handle serialization of null values.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 class NullHandler extends ScalarHandler
 {
@@ -17,7 +15,7 @@ class NullHandler extends ScalarHandler
     /**
      * {@inheritdoc}
      */
-    public function getDataType() : string
+    public function getDataType(): string
     {
         return 'null';
     }

src/DataType/ObjectHandler.php

@@ -4,31 +4,29 @@
 
 /**
  * Handle serialization of plain objects.
- *
- * @author Sean Fraser <sean@plankdesign.com>
  */
 class ObjectHandler implements HandlerInterface
 {
     /**
      * {@inheritdoc}
      */
-    public function getDataType() : string
+    public function getDataType(): string
     {
         return 'object';
     }
 
     /**
      * {@inheritdoc}
      */
-    public function canHandleValue($value) : bool
+    public function canHandleValue($value): bool
     {
         return is_object($value);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function serializeValue($value) : string
+    public function serializeValue($value): string
     {
         return json_encode($value);
     }