Merge 5d7a998 into 30515c1

austinheap · Dec 6, 2019 · 8bfa873 · 8bfa873
2 parents 30515c1 + 5d7a998
commit 8bfa873
Show file tree

Hide file tree

Showing 38 changed files with 61 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,8 @@ matrix:
       env: LARAVEL=57
     - php: 7.2
       env: LARAVEL=58
+    - php: 7.2
+      env: LARAVEL=6
     - php: 7.3
       env: LARAVEL=55
     - php: 7.3
@@ -26,6 +28,8 @@ matrix:
       env: LARAVEL=57
     - php: 7.3
       env: LARAVEL=58
+    - php: 7.3
+      env: LARAVEL=6
 
 services:
   - mysql
@@ -68,6 +72,11 @@ script:
   - if [ "$LARAVEL" = "58" ] ; then composer require "laravel/framework:5.8.*" --no-update ; fi
   - if [ "$LARAVEL" = "58" ] ; then composer require "orchestra/database:3.8.*" --no-update ; fi
   - if [ "$LARAVEL" = "58" ] ; then composer require "orchestra/testbench:3.8.*" --no-update ; fi
+  # Packages: Laravel 6.x.x
+  - if [ "$LARAVEL" = "6" ] ; then composer require "phpunit/phpunit:^8.0" --no-update ; fi
+  - if [ "$LARAVEL" = "6" ] ; then composer require "laravel/framework:^6.0" --no-update ; fi
+  - if [ "$LARAVEL" = "6" ] ; then composer require "orchestra/database:^4.0" --no-update ; fi
+  - if [ "$LARAVEL" = "6" ] ; then composer require "orchestra/testbench:^4.0" --no-update ; fi
   # Packages: Update
   - composer update --prefer-source --no-interaction
   # Tests: Run

diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ directory. The most logical place to start are the [docs for the `HasEncryptedAt
 
 ## Requirements
 
-* Laravel: 5.5, 5.6, 5.7, or 5.8
+* Laravel: 5.5, 5.6, 5.7, 5.8, or 6.x
 * PHP: 7.1, 7.2, or 7.3
 * PHP [OpenSSL extension](http://php.net/manual/en/book.openssl.php)
 
@@ -75,6 +75,7 @@ Laravel|[v5.5](https://laravel.com/docs/5.5/releases)|[v0.1.0](https://github.co
 Laravel|[v5.6](https://laravel.com/docs/5.6/releases)|[v0.1.1](https://github.com/austinheap/laravel-database-encryption/releases/tag/v0.1.1) ([Packagist](https://packagist.org/packages/austinheap/laravel-database-encryption#v0.1.1))|Stable|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.1.1)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.1.1)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.1.1)](https://travis-ci.org/austinheap/laravel-database-encryption)
 Laravel|[v5.7](https://laravel.com/docs/5.7/releases)|[v0.2.0](https://github.com/austinheap/laravel-database-encryption/releases/tag/v0.2.0) ([Packagist](https://packagist.org/packages/austinheap/laravel-database-encryption#v0.2.0))|Stable|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.2.0)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.2.0)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.2.0)](https://travis-ci.org/austinheap/laravel-database-encryption)
 Laravel|[v5.8](https://laravel.com/docs/5.8/releases)|[v0.2.1](https://github.com/austinheap/laravel-database-encryption/releases/tag/v0.2.1) ([Packagist](https://packagist.org/packages/austinheap/laravel-database-encryption#v0.2.1))|Stable|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.2.1)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.2.1)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.2.1)](https://travis-ci.org/austinheap/laravel-database-encryption)
+Laravel|[v6.x](https://laravel.com/docs/6.x/releases)|[v0.2.2](https://github.com/austinheap/laravel-database-encryption/releases/tag/v0.2.2) ([Packagist](https://packagist.org/packages/austinheap/laravel-database-encryption#v0.2.2))|Stable|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.2.2)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.2.2)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.2.2)](https://travis-ci.org/austinheap/laravel-database-encryption)
 
 ## Schemas
 

diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
         "laravel56 encryption",
         "laravel57 encryption",
         "laravel58 encryption",
+        "laravel6 encryption",
         "eloquent encryption",
         "model encryption",
         "attribute encryption",
@@ -54,12 +55,12 @@
     },
     "require": {
         "php": ">=7.1.0",
-        "laravel/framework": "5.5.*|5.6.*|5.7.*|5.8.*"
+        "laravel/framework": "5.5.*|5.6.*|5.7.*|5.8.*|6.*.*"
     },
     "require-dev": {
         "codeclimate/php-test-reporter": "dev-master",
         "phpunit/phpunit": "~6.0|~7.0",
-        "orchestra/testbench": "^3.5"
+        "orchestra/testbench": "^3.5|^4.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/config/database-encryption.php b/config/database-encryption.php
@@ -3,7 +3,7 @@
  * src/config/database-encryption.php.
  *
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 return [

diff --git a/src/Console/Commands/MigrateEncryptionCommand.php b/src/Console/Commands/MigrateEncryptionCommand.php
@@ -3,7 +3,7 @@
  * src/Console/Commands/MigrateEncryptionCommand.php.
  *
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 declare(strict_types=1);
 

diff --git a/src/EncryptionDefaults.php b/src/EncryptionDefaults.php
@@ -3,7 +3,7 @@
  * src/EncryptionDefaults.php.
  *
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 declare(strict_types=1);
 

diff --git a/src/EncryptionFacade.php b/src/EncryptionFacade.php
@@ -3,7 +3,7 @@
  * src/EncryptionFacade.php.
  *
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 declare(strict_types=1);
 

diff --git a/src/EncryptionHelper.php b/src/EncryptionHelper.php
@@ -3,7 +3,7 @@
  * src/EncryptionHelper.php.
  *
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 declare(strict_types=1);
 

diff --git a/src/EncryptionServiceProvider.php b/src/EncryptionServiceProvider.php
@@ -3,7 +3,7 @@
  * src/EncryptionServiceProvider.php.
  *
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 declare(strict_types=1);
 

diff --git a/src/Traits/HasEncryptedAttributes.php b/src/Traits/HasEncryptedAttributes.php
@@ -3,7 +3,7 @@
  * src/Traits/HasEncryptedAttributes.php.
  *
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 declare(strict_types=1);
 

diff --git a/src/helpers.php b/src/helpers.php
@@ -3,7 +3,7 @@
  * src/helpers.php.
  *
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 declare(strict_types=1);
 
@@ -96,3 +96,15 @@ function dbdecrypt(string $value): ?string
         return database_decrypt($value);
     }
 }
+
+if (! function_exists('str_random')) {
+
+    /**
+     * @param int $value
+     * @return string|null
+     */
+    function str_random(int $value = 16): ?string
+    {
+        return \Illuminate\Support\Str::random($value);
+    }
+}
diff --git a/tests/Console/MigrateEncryptionTest.php b/tests/Console/MigrateEncryptionTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Console;

diff --git a/tests/DatabaseTestCase.php b/tests/DatabaseTestCase.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests;

diff --git a/tests/Defaults/ControlCharactersTest.php b/tests/Defaults/ControlCharactersTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Defaults;

diff --git a/tests/Defaults/EnabledTest.php b/tests/Defaults/EnabledTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Defaults;

diff --git a/tests/Defaults/HelpersTest.php b/tests/Defaults/HelpersTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Defaults;

diff --git a/tests/Defaults/PrefixTest.php b/tests/Defaults/PrefixTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Defaults;

diff --git a/tests/Defaults/VersioningTest.php b/tests/Defaults/VersioningTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Defaults;

diff --git a/tests/Facade/FacadeTest.php b/tests/Facade/FacadeTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests;

diff --git a/tests/Helper/DisabledTest.php b/tests/Helper/DisabledTest.php
@@ -4,7 +4,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Helper;

diff --git a/tests/Helper/EnabledTest.php b/tests/Helper/EnabledTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Helper;

diff --git a/tests/Helper/HeaderPrefixTest.php b/tests/Helper/HeaderPrefixTest.php
@@ -4,7 +4,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Helper;

diff --git a/tests/Helper/PrefixTest.php b/tests/Helper/PrefixTest.php
@@ -4,7 +4,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Helper;

diff --git a/tests/Helper/SingletonTest.php b/tests/Helper/SingletonTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Helper;

diff --git a/tests/Helper/VersionPartsTest.php b/tests/Helper/VersionPartsTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Helper;

diff --git a/tests/Helper/VersioningTest.php b/tests/Helper/VersioningTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Helper;

diff --git a/tests/Helper/VersionlessTest.php b/tests/Helper/VersionlessTest.php
@@ -4,7 +4,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Helper;

diff --git a/tests/Models/DatabaseModel.php b/tests/Models/DatabaseModel.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Models;

diff --git a/tests/Models/DummyModel.php b/tests/Models/DummyModel.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Models;

diff --git a/tests/Models/FakeModel.php b/tests/Models/FakeModel.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Models;

diff --git a/tests/Models/RealModel.php b/tests/Models/RealModel.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Models;

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests;

diff --git a/tests/Traits/DatabaseTest.php b/tests/Traits/DatabaseTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Traits;

diff --git a/tests/Traits/DirtyTest.php b/tests/Traits/DirtyTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Traits;

diff --git a/tests/Traits/DummyTest.php b/tests/Traits/DummyTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Traits;

diff --git a/tests/Traits/ExceptionTest.php b/tests/Traits/ExceptionTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Traits;

diff --git a/tests/Traits/FloatTest.php b/tests/Traits/FloatTest.php
@@ -5,7 +5,7 @@
  * @package     laravel-database-encryption
  * @link        https://github.com/austinheap/laravel-database-encryption
  * @author      Austin Heap <me@austinheap.com>
- * @version     v0.2.1
+ * @version     v0.2.2
  */
 
 namespace AustinHeap\Database\Encryption\Tests\Traits;