Skip to content

Commit a23a918

Browse files
committed
Merge branch 'release/1.1.3'
2 parents 2259c41 + ae4b56e commit a23a918

File tree

6 files changed

+58
-3
lines changed

6 files changed

+58
-3
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ matrix:
2828
- php: nightly
2929
fast_finish: true
3030

31+
branches:
32+
only:
33+
- master
34+
- develop
35+
3136
install:
3237
- curl -s http://getcomposer.org/installer | php
3338
- php composer.phar install --dev --no-interaction $COMPOSER_FLAGS

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [1.1.3] - 2020-09-14
10+
### Added
11+
- Add support for Laravel 8
12+
913
## [1.1.2] - 2020-07-12
1014
### Fixed
1115
- Late config binding added for runtime override

Version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.2
1+
1.1.3

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"require": {
1515
"json-mapper/json-mapper": "^1.0",
1616
"php": "^7.2 || ^8.0",
17-
"illuminate/support": "^5.5|^6|^7"
17+
"illuminate/support": "^5.5|^6|^7|^8"
1818
},
1919
"autoload": {
2020
"psr-4": {
@@ -44,6 +44,6 @@
4444
"phpstan/phpstan": "^0.12.19",
4545
"php-coveralls/php-coveralls": "^2.2",
4646
"phpunit/phpunit": "^8.0",
47-
"orchestra/testbench": "^5.3"
47+
"orchestra/testbench": "^5.3|^6.0"
4848
}
4949
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace JsonMapper\LaravelPackage\Tests\Implementation;
6+
7+
8+
class EloquentModel
9+
{
10+
11+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
6+
7+
class CreateEloquentModelsTable extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*
12+
* @return void
13+
*/
14+
public function up()
15+
{
16+
Schema::create('eloquent_models', function (Blueprint $table) {
17+
$table->id();
18+
$table->string('name');
19+
$table->string('email')->unique();
20+
$table->timestamp('email_verified_at')->nullable();
21+
$table->string('password');
22+
$table->timestamps();
23+
});
24+
}
25+
26+
/**
27+
* Reverse the migrations.
28+
*
29+
* @return void
30+
*/
31+
public function down()
32+
{
33+
Schema::dropIfExists('eloquent_models');
34+
}
35+
}

0 commit comments

Comments
 (0)