Skip to content
This repository was archived by the owner on Apr 7, 2021. It is now read-only.

Commit 92f8a95

Browse files
austinheapaustinheap
committed
draft support for Laravel 5.8.x
1 parent a39b2f8 commit 92f8a95

39 files changed

+69
-53
lines changed

‎.scrutinizer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ build:
1515
format: 'clover'
1616
environment:
1717
php:
18-
version: 7.1, 7.2
18+
version: 7.2.13
1919
tools:
2020
php_loc:
2121
enabled: true

‎.travis.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@ matrix:
88
env: LARAVEL=56
99
- php: 7.1
1010
env: LARAVEL=57
11+
- php: 7.1
12+
env: LARAVEL=58
1113
- php: 7.2
1214
env: LARAVEL=55
1315
- php: 7.2
1416
env: LARAVEL=56
1517
- php: 7.2
1618
env: LARAVEL=57
19+
- php: 7.2
20+
env: LARAVEL=58
1721
- php: 7.3
1822
env: LARAVEL=55
1923
- php: 7.3
2024
env: LARAVEL=56
2125
- php: 7.3
2226
env: LARAVEL=57
27+
- php: 7.3
28+
env: LARAVEL=58
2329

2430
services:
2531
- mysql
@@ -55,8 +61,13 @@ script:
5561
# Packages: Laravel 5.7.x
5662
- if [ "$LARAVEL" = "57" ] ; then composer require "phpunit/phpunit:7.*" --no-update ; fi
5763
- if [ "$LARAVEL" = "57" ] ; then composer require "laravel/framework:5.7.*" --no-update ; fi
58-
- if [ "$LARAVEL" = "57" ] ; then composer require "orchestra/database:3.7.x-dev as 3.7" --no-update ; fi
64+
- if [ "$LARAVEL" = "57" ] ; then composer require "orchestra/database:3.7.*" --no-update ; fi
5965
- if [ "$LARAVEL" = "57" ] ; then composer require "orchestra/testbench:3.7.*" --no-update ; fi
66+
# Packages: Laravel 5.8.x
67+
- if [ "$LARAVEL" = "58" ] ; then composer require "phpunit/phpunit:7.*" --no-update ; fi
68+
- if [ "$LARAVEL" = "58" ] ; then composer require "laravel/framework:5.8.*" --no-update ; fi
69+
- if [ "$LARAVEL" = "58" ] ; then composer require "orchestra/database:3.8.*" --no-update ; fi
70+
- if [ "$LARAVEL" = "58" ] ; then composer require "orchestra/testbench:3.8.*" --no-update ; fi
6071
# Packages: Update
6172
- composer update --prefer-source --no-interaction
6273
# Tests: Run

‎README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,18 @@ directory. The most logical place to start are the [docs for the `HasEncryptedAt
6363

6464
## Requirements
6565

66-
* Laravel: 5.5, 5.6, or 5.7
66+
* Laravel: 5.5, 5.6, 5.7, or 5.8
6767
* PHP: 7.1, 7.2, or 7.3
6868
* PHP [OpenSSL extension](http://php.net/manual/en/book.openssl.php)
6969

7070
## Status
7171

7272
**Framework**|**Version**|**Release**|**Status**|**PHP v7.1**|**PHP v7.2**|**PHP v7.3**
7373
:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:
74-
Laravel|[v5.5](https://laravel.com/docs/5.5/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)
75-
Laravel|[v5.6](https://laravel.com/docs/5.6/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)
74+
Laravel|[v5.5](https://laravel.com/docs/5.5/releases)|[v0.1.0](https://github.com/austinheap/laravel-database-encryption/releases/tag/v0.1.0) ([Packagist](https://packagist.org/packages/austinheap/laravel-database-encryption#v0.1.0))|Stable|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.1.0)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.1.0)](https://travis-ci.org/austinheap/laravel-database-encryption)|[![Build Status](https://travis-ci.org/austinheap/laravel-database-encryption.svg?branch=v0.1.0)](https://travis-ci.org/austinheap/laravel-database-encryption)
75+
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)
7676
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)
77+
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))|Beta|[![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)
7778

7879
## Schemas
7980

‎composer.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
"laravel55",
1818
"laravel56",
1919
"laravel57",
20+
"laravel58",
2021
"l5",
2122
"laravel encryption",
2223
"laravel5 encryption",
2324
"laravel55 encryption",
2425
"laravel56 encryption",
2526
"laravel57 encryption",
27+
"laravel58 encryption",
2628
"eloquent encryption",
2729
"model encryption",
2830
"attribute encryption",
@@ -52,14 +54,13 @@
5254
},
5355
"require": {
5456
"php": ">=7.1.0",
55-
"laravel/framework": "5.5.*|5.6.*|5.7.*",
57+
"laravel/framework": "5.5.*|5.6.*|5.7.*|5.8.*",
5658
"paragonie/random_compat": "^2.0"
5759
},
5860
"require-dev": {
5961
"codeclimate/php-test-reporter": "dev-master",
6062
"phpunit/phpunit": "~6.0|~7.0",
61-
"orchestra/testbench": "^3.5",
62-
"barryvdh/laravel-ide-helper": "^2.5"
63+
"orchestra/testbench": "^3.5"
6364
},
6465
"autoload": {
6566
"psr-4": {
@@ -79,5 +80,8 @@
7980
"DatabaseEncryption": "AustinHeap\\Database\\Encryption\\EncryptionFacade"
8081
}
8182
}
83+
},
84+
"config": {
85+
"discard-changes": true
8286
}
8387
}

‎config/database-encryption.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* src/config/database-encryption.php.
44
*
55
* @author Austin Heap <me@austinheap.com>
6-
* @version v0.2.0
6+
* @version v0.2.1
77
*/
88

99
return [

‎src/Console/Commands/MigrateEncryptionCommand.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
* src/Console/Commands/MigrateEncryptionCommand.php.
44
*
55
* @author Austin Heap <me@austinheap.com>
6-
* @version v0.2.0
6+
* @version v0.2.1
77
*/
88
declare(strict_types=1);
99

1010
namespace AustinHeap\Database\Encryption\Console\Commands;
1111

12+
use AustinHeap\Database\Encryption\EncryptionFacade as DatabaseEncryption;
1213
use Exception;
13-
use RuntimeException;
14-
use Illuminate\Support\Facades\DB;
15-
use Illuminate\Support\Facades\Log;
1614
use Illuminate\Encryption\Encrypter;
1715
use Illuminate\Support\Facades\Config;
18-
use AustinHeap\Database\Encryption\EncryptionFacade as DatabaseEncryption;
16+
use Illuminate\Support\Facades\DB;
17+
use Illuminate\Support\Facades\Log;
18+
use RuntimeException;
1919

2020
/**
2121
* Class MigrateEncryptionCommand.

‎src/EncryptionDefaults.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* src/EncryptionDefaults.php.
44
*
55
* @author Austin Heap <me@austinheap.com>
6-
* @version v0.2.0
6+
* @version v0.2.1
77
*/
88
declare(strict_types=1);
99

‎src/EncryptionFacade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* src/EncryptionFacade.php.
44
*
55
* @author Austin Heap <me@austinheap.com>
6-
* @version v0.2.0
6+
* @version v0.2.1
77
*/
88
declare(strict_types=1);
99

‎src/EncryptionHelper.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
* src/EncryptionHelper.php.
44
*
55
* @author Austin Heap <me@austinheap.com>
6-
* @version v0.2.0
6+
* @version v0.2.1
77
*/
88
declare(strict_types=1);
99

1010
namespace AustinHeap\Database\Encryption;
1111

12-
use RuntimeException;
1312
use Illuminate\Support\Facades\Config;
13+
use RuntimeException;
1414

1515
/**
1616
* EncryptionHelper.

‎src/EncryptionServiceProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* src/EncryptionServiceProvider.php.
44
*
55
* @author Austin Heap <me@austinheap.com>
6-
* @version v0.2.0
6+
* @version v0.2.1
77
*/
88
declare(strict_types=1);
99

‎src/Traits/HasEncryptedAttributes.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
* src/Traits/HasEncryptedAttributes.php.
44
*
55
* @author Austin Heap <me@austinheap.com>
6-
* @version v0.2.0
6+
* @version v0.2.1
77
*/
88
declare(strict_types=1);
99

1010
namespace AustinHeap\Database\Encryption\Traits;
1111

12-
use Illuminate\Support\Facades\Log;
13-
use Illuminate\Support\Facades\Crypt;
12+
use AustinHeap\Database\Encryption\EncryptionFacade as DatabaseEncryption;
1413
use Illuminate\Contracts\Encryption\DecryptException;
1514
use Illuminate\Contracts\Encryption\EncryptException;
16-
use AustinHeap\Database\Encryption\EncryptionFacade as DatabaseEncryption;
15+
use Illuminate\Support\Facades\Crypt;
16+
use Illuminate\Support\Facades\Log;
1717

1818
/**
1919
* HasEncryptedAttributes.

‎src/helpers.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* src/helpers.php.
44
*
55
* @author Austin Heap <me@austinheap.com>
6-
* @version v0.2.0
6+
* @version v0.2.1
77
*/
88
declare(strict_types=1);
99

‎tests/Console/MigrateEncryptionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Console;

‎tests/DatabaseTestCase.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests;
@@ -22,13 +22,13 @@ class DatabaseTestCase extends TestCase
2222

2323
private $last_random_strings = null;
2424

25-
public function tearDown()
25+
public function tearDown(): void
2626
{
2727
$this->tearDownDatabase();
2828
parent::tearDown();
2929
}
3030

31-
protected function getEnvironmentSetUp($app)
31+
protected function getEnvironmentSetUp($app): void
3232
{
3333
if (is_null(self::$database)) {
3434
self::$database = 'laravel_database_encryption_testing_' . str_random(6);

‎tests/Defaults/ControlCharactersTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Defaults;

‎tests/Defaults/EnabledTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Defaults;

‎tests/Defaults/HelpersTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Defaults;

‎tests/Defaults/PrefixTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Defaults;

‎tests/Defaults/VersioningTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Defaults;

‎tests/Facade/FacadeTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests;

‎tests/Helper/DisabledTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @package laravel-database-encryption
55
* @link https://github.com/austinheap/laravel-database-encryption
66
* @author Austin Heap <me@austinheap.com>
7-
* @version v0.2.0
7+
* @version v0.2.1
88
*/
99

1010
namespace AustinHeap\Database\Encryption\Tests\Helper;

‎tests/Helper/EnabledTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Helper;

‎tests/Helper/HeaderPrefixTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @package laravel-database-encryption
55
* @link https://github.com/austinheap/laravel-database-encryption
66
* @author Austin Heap <me@austinheap.com>
7-
* @version v0.2.0
7+
* @version v0.2.1
88
*/
99

1010
namespace AustinHeap\Database\Encryption\Tests\Helper;

‎tests/Helper/PrefixTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @package laravel-database-encryption
55
* @link https://github.com/austinheap/laravel-database-encryption
66
* @author Austin Heap <me@austinheap.com>
7-
* @version v0.2.0
7+
* @version v0.2.1
88
*/
99

1010
namespace AustinHeap\Database\Encryption\Tests\Helper;

‎tests/Helper/SingletonTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Helper;

‎tests/Helper/VersionPartsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Helper;

‎tests/Helper/VersioningTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Helper;

‎tests/Helper/VersionlessTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @package laravel-database-encryption
55
* @link https://github.com/austinheap/laravel-database-encryption
66
* @author Austin Heap <me@austinheap.com>
7-
* @version v0.2.0
7+
* @version v0.2.1
88
*/
99

1010
namespace AustinHeap\Database\Encryption\Tests\Helper;

‎tests/Models/DatabaseModel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Models;

‎tests/Models/DummyModel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @package laravel-database-encryption
66
* @link https://github.com/austinheap/laravel-database-encryption
77
* @author Austin Heap <me@austinheap.com>
8-
* @version v0.2.0
8+
* @version v0.2.1
99
*/
1010

1111
namespace AustinHeap\Database\Encryption\Tests\Models;

0 commit comments

Comments
 (0)