Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastiaanluca committed Sep 6, 2019
2 parents 18f11eb + 573596f commit 73cf330
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 13 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ env:
matrix:
- LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-lowest"
- LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-stable"
- LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-lowest"
- LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-stable"
- LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
- LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"

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

script:
- vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1
- vendor/bin/phpunit

branches:
only:
- master
- develop

notifications:
email:
on_failure: change
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ All Notable changes to `sebastiaanluca/laravel-boolean-dates` will be documented

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

## Unreleased
## 3.0.0 (2019-09-06)

### Added

- Added support for Laravel 6.0

## 2.0.2 (2019-03-08)

Expand Down
22 changes: 17 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@
],
"require": {
"php": "^7.2",
"dms/phpunit-arraysubset-asserts": "^0.1.0",
"laravel/framework": "5.8.*",
"laravel/framework": "5.8.*|^6.0",
"nesbot/carbon": "^1.22|^2.0"
},
"require-dev": {
"dms/phpunit-arraysubset-asserts": "^0.1.0",
"kint-php/kint": "^3.1",
"mockery/mockery": "^1.2",
"orchestra/testbench": "3.8.*",
"phpunit/phpunit": "^8.0"
"orchestra/testbench": "3.8.*|^4.0",
"phpunit/phpunit": "^8.3",
"sebastiaanluca/php-codesniffer-ruleset": "^0.4.2"
},
"autoload": {
"psr-4": {
Expand All @@ -56,6 +57,9 @@
}
},
"scripts": {
"composer-validate": "@composer validate --no-check-all --strict --ansi",
"codesniffer-check": "vendor/bin/phpcs --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1",
"codesniffer-fix": "vendor/bin/phpcbf --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 || exit 0",
"test": "vendor/bin/phpunit",
"test-lowest": [
"composer update --prefer-lowest --prefer-dist --no-interaction --ansi",
Expand All @@ -64,6 +68,14 @@
"test-stable": [
"composer update --prefer-stable --prefer-dist --no-interaction --ansi",
"@test"
],
"check": [
"@composer-validate",
"@codesniffer-check",
"@test"
]
}
},
"minimum-stability": "dev",
"prefer-stable": true
}

9 changes: 9 additions & 0 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0"?>
<ruleset>
<arg name="basepath" value="."/>

<file>./src</file>
<file>./tests</file>

<rule ref="./vendor/sebastiaanluca/php-codesniffer-ruleset/ruleset.xml"/>
</ruleset>
6 changes: 5 additions & 1 deletion src/HasBooleanDates.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ trait HasBooleanDates
{
/**
* Initialize the trait.
*
* @return void
*/
public function initializeHasBooleanDates() : void
{
Expand Down Expand Up @@ -106,6 +108,8 @@ protected function getBooleanDate($key) : bool
/**
* @param string $key
* @param mixed $value
*
* @return void
*/
protected function setBooleanDate(string $key, $value) : void
{
Expand Down Expand Up @@ -155,7 +159,7 @@ protected function getBooleanDateField($key) : string
}

/**
* @param $value
* @param mixed $value
*
* @return string|null
*/
Expand Down
4 changes: 3 additions & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

namespace SebastiaanLuca\BooleanDates\Tests;

use Orchestra\Testbench\TestCase as BaseTestCase;
Expand All @@ -8,7 +10,7 @@
class TestCase extends BaseTestCase
{
/**
* @param $app
* @param \Illuminate\Foundation\Application $app
*
* @return array
*/
Expand Down

0 comments on commit 73cf330

Please sign in to comment.