Merge branch 'release/v1.0.1'

* release/v1.0.1:
  Bump version
  Fix MySQL / PostgreSQL json column compatibility
  Add PHP 7.3 support to travis
  Update readme
  Update composer dependencies
  #18 add missing use statement
  Update copyright year
  Fix minor grammar typos
  Enforce consistent composer package version constrains

Author: Omranic

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
 
 env:
   matrix:

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 
 
+## [v1.0.1] - 2018-12-22
+- Add missing use statement
+- Update composer dependencies
+- Add PHP 7.3 support to travis
+- Fix MySQL / PostgreSQL json column compatibility
+
 ## [v1.0.0] - 2018-10-01
 - Enforce Consistency
 - Support Laravel 5.7+
@@ -70,6 +76,7 @@ This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 ## v0.0.1 - 2017-09-08
 - Tag first release
 
+[v1.0.1]: https://github.com/rinvex/laravel-bookings/compare/v1.0.0...v1.0.1
 [v1.0.0]: https://github.com/rinvex/laravel-bookings/compare/v0.0.3...v1.0.0
 [v0.0.3]: https://github.com/rinvex/laravel-bookings/compare/v0.0.2...v0.0.3
 [v0.0.2]: https://github.com/rinvex/laravel-bookings/compare/v0.0.1...v0.0.2

CONTRIBUTING.md

@@ -15,8 +15,8 @@ Releases will be numbered with the following format:
 And constructed with the following guidelines:
 
 - Breaking backward compatibility bumps the major and resets the minor and patch.
-- New additions without breaking backward compatibility bumps the minor and resets the patch.
-- Bug fixes and misc changes bumps the patch.
+- New additions without breaking backward compatibility bump the minor and reset the patch.
+- Bug fixes and misc changes bump the patch.
 
 
 ## Pull Requests

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2018, Rinvex LLC,
+Copyright (c) 2016-2019, Rinvex LLC,
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -30,7 +30,12 @@
     php artisan rinvex:migrate:bookings
     ```
 
-3. Done!
+3. **Optional** if you want to change the configurations:
+    ```shell
+    php artisan rinvex:publish:bookings
+    ```
+
+4. Done!
 
 
 ## Usage
@@ -307,4 +312,4 @@ Rinvex is a software solutions startup, specialized in integrated enterprise sol
 
 This software is released under [The MIT License (MIT)](LICENSE).
 
-(c) 2016-2018 Rinvex LLC, Some rights reserved.
+(c) 2016-2019 Rinvex LLC, Some rights reserved.

composer.json

@@ -44,17 +44,16 @@
         "illuminate/console": "~5.7.0",
         "illuminate/database": "~5.7.0",
         "illuminate/support": "~5.7.0",
-        "nesbot/carbon": "~1.22",
         "rinvex/laravel-cacheable": "^1.0.0",
-        "rinvex/laravel-support": "v1.0.0",
+        "rinvex/laravel-support": "^1.0.0",
         "spatie/eloquent-sortable": "^3.4.0",
-        "spatie/laravel-schemaless-attributes": "~1.1.0",
+        "spatie/laravel-schemaless-attributes": "~1.3.0",
         "spatie/laravel-sluggable": "^2.1.0",
-        "spatie/laravel-translatable": "^2.1.0",
+        "spatie/laravel-translatable": "^3.1.0",
         "watson/validating": "^3.1.0"
     },
     "require-dev": {
-        "codedungeon/phpunit-result-printer": "^0.22.0",
+        "codedungeon/phpunit-result-printer": "^0.23.0",
         "illuminate/container": "~5.7.0",
         "phpunit/phpunit": "^7.0.0"
     },

database/migrations/2017_06_27_143745_create_bookable_bookings_table.php

@@ -53,8 +53,10 @@ public function down(): void
      */
     protected function jsonable(): string
     {
-        return DB::connection()->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME) === 'mysql'
-               && version_compare(DB::connection()->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION), '5.7.8', 'ge')
-            ? 'json' : 'text';
+        $driverName = DB::connection()->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME);
+        $dbVersion = DB::connection()->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);
+        $isOldVersion = version_compare($dbVersion, '5.7.8', 'lt');
+
+        return $driverName === 'mysql' && $isOldVersion ? 'text' : 'json';
     }
 }

database/migrations/2018_04_04_154842_create_ticketable_tickets_table.php

@@ -49,8 +49,10 @@ public function down()
      */
     protected function jsonable(): string
     {
-        return DB::connection()->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME) === 'mysql'
-               && version_compare(DB::connection()->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION), '5.7.8', 'ge')
-            ? 'json' : 'text';
+        $driverName = DB::connection()->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME);
+        $dbVersion = DB::connection()->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);
+        $isOldVersion = version_compare($dbVersion, '5.7.8', 'lt');
+
+        return $driverName === 'mysql' && $isOldVersion ? 'text' : 'json';
     }
 }

src/Traits/Bookable.php

@@ -4,6 +4,7 @@
 
 namespace Rinvex\Bookings\Traits;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Rinvex\Bookings\Models\BookableBooking;
 use Illuminate\Database\Eloquent\Relations\MorphMany;