Skip to content

Commit 73cf330

Browse files
Merge branch 'release/3.0.0'
2 parents 18f11eb + 573596f commit 73cf330

File tree

6 files changed

+42
-13
lines changed

6 files changed

+42
-13
lines changed

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ env:
1313
matrix:
1414
- LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-lowest"
1515
- LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-stable"
16+
- LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-lowest"
17+
- LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-stable"
1618
- LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
1719
- LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"
1820

@@ -34,13 +36,9 @@ install:
3436
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
3537

3638
script:
39+
- vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
3740
- vendor/bin/phpunit
3841

39-
branches:
40-
only:
41-
- master
42-
- develop
43-
4442
notifications:
4543
email:
4644
on_failure: change

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ All Notable changes to `sebastiaanluca/laravel-boolean-dates` will be documented
44

55
Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
66

7-
## Unreleased
7+
## 3.0.0 (2019-09-06)
8+
9+
### Added
10+
11+
- Added support for Laravel 6.0
812

913
## 2.0.2 (2019-03-08)
1014

composer.json

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525
],
2626
"require": {
2727
"php": "^7.2",
28-
"dms/phpunit-arraysubset-asserts": "^0.1.0",
29-
"laravel/framework": "5.8.*",
28+
"laravel/framework": "5.8.*|^6.0",
3029
"nesbot/carbon": "^1.22|^2.0"
3130
},
3231
"require-dev": {
32+
"dms/phpunit-arraysubset-asserts": "^0.1.0",
3333
"kint-php/kint": "^3.1",
3434
"mockery/mockery": "^1.2",
35-
"orchestra/testbench": "3.8.*",
36-
"phpunit/phpunit": "^8.0"
35+
"orchestra/testbench": "3.8.*|^4.0",
36+
"phpunit/phpunit": "^8.3",
37+
"sebastiaanluca/php-codesniffer-ruleset": "^0.4.2"
3738
},
3839
"autoload": {
3940
"psr-4": {
@@ -56,6 +57,9 @@
5657
}
5758
},
5859
"scripts": {
60+
"composer-validate": "@composer validate --no-check-all --strict --ansi",
61+
"codesniffer-check": "vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1",
62+
"codesniffer-fix": "vendor/bin/phpcbf --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 || exit 0",
5963
"test": "vendor/bin/phpunit",
6064
"test-lowest": [
6165
"composer update --prefer-lowest --prefer-dist --no-interaction --ansi",
@@ -64,6 +68,14 @@
6468
"test-stable": [
6569
"composer update --prefer-stable --prefer-dist --no-interaction --ansi",
6670
"@test"
71+
],
72+
"check": [
73+
"@composer-validate",
74+
"@codesniffer-check",
75+
"@test"
6776
]
68-
}
77+
},
78+
"minimum-stability": "dev",
79+
"prefer-stable": true
6980
}
81+

phpcs.xml.dist

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0"?>
2+
<ruleset>
3+
<arg name="basepath" value="."/>
4+
5+
<file>./src</file>
6+
<file>./tests</file>
7+
8+
<rule ref="./vendor/sebastiaanluca/php-codesniffer-ruleset/ruleset.xml"/>
9+
</ruleset>

src/HasBooleanDates.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ trait HasBooleanDates
1010
{
1111
/**
1212
* Initialize the trait.
13+
*
14+
* @return void
1315
*/
1416
public function initializeHasBooleanDates() : void
1517
{
@@ -106,6 +108,8 @@ protected function getBooleanDate($key) : bool
106108
/**
107109
* @param string $key
108110
* @param mixed $value
111+
*
112+
* @return void
109113
*/
110114
protected function setBooleanDate(string $key, $value) : void
111115
{
@@ -155,7 +159,7 @@ protected function getBooleanDateField($key) : string
155159
}
156160

157161
/**
158-
* @param $value
162+
* @param mixed $value
159163
*
160164
* @return string|null
161165
*/

tests/TestCase.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace SebastiaanLuca\BooleanDates\Tests;
46

57
use Orchestra\Testbench\TestCase as BaseTestCase;
@@ -8,7 +10,7 @@
810
class TestCase extends BaseTestCase
911
{
1012
/**
11-
* @param $app
13+
* @param \Illuminate\Foundation\Application $app
1214
*
1315
* @return array
1416
*/

0 commit comments

Comments
 (0)