Skip to content

Commit

Permalink
Merge branch '5.x'
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

# Conflicts:
#	composer.json
  • Loading branch information
crynobone committed Feb 20, 2020
2 parents d37fbef + bb190ae commit 799532b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 24 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ dist: bionic
language: php

php:
- 7.2
- 7.3
- 7.4

Expand Down Expand Up @@ -33,7 +32,7 @@ after_script:

matrix:
include:
- php: 7.2
- php: 7.3
env: setup=coveralls coverage=yes
allow_failures:
- php: nightly
Expand Down
18 changes: 3 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,14 @@ Laravel | View
5.7.x | 3.7.x
5.8.x | 3.8.x
6.x | 4.x
7.x | 5.x

## Installation

To install through composer, simply put the following in your `composer.json` file:

```json
{
"require": {
"orchestra/view": "^4.0"
}
}
```

And then run `composer install` from the terminal.

### Quick Installation

Above installation can also be simplify by using the following command:
To install through composer, run the following command from terminal:

composer require "orchestra/view=^4.0"
composer require "orchestra/view"

## Configuration

Expand Down
18 changes: 11 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,19 @@
}
},
"require": {
"php": ">=7.2",
"illuminate/view": "dev-master",
"orchestra/contracts": "dev-master",
"orchestra/memory": "dev-master",
"orchestra/support": "dev-master"
"php": ">=7.3",
"illuminate/view": "^8.0",
"orchestra/contracts": "^6.0",
"orchestra/memory": "^6.0",
"orchestra/support": "^6.0"
},
"require-dev": {
"mockery/mockery": "^1.3.1",
"orchestra/testbench": "dev-master"
"orchestra/testbench": "^6.0"
},
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
}
},
"config": {
"sort-packages": true
Expand Down

0 comments on commit 799532b

Please sign in to comment.