Skip to content
This repository has been archived by the owner on Mar 18, 2022. It is now read-only.

Update to Laravel 7 #8

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
language: php
sudo: false
dist: trusty
dist: bionic
php:
- 8.0
- 7.4
- 7.3
- 7.2
- 7.1
- nightly

matrix:
Expand Down
8 changes: 1 addition & 7 deletions Template/BladeProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ public function register()
{
$this->registerFilesystem();
$this->registerEvents();
$this->registerEngineResolver();
$this->registerViewFinder();
$this->registerFactory();
return $this;
parent::register();
}

/**
Expand All @@ -47,7 +44,6 @@ public function register()
public function registerFilesystem()
{
$this->app->bindIf('files', Filesystem::class, true);
return $this;
}

/**
Expand All @@ -56,7 +52,6 @@ public function registerFilesystem()
public function registerEvents()
{
$this->app->bindIf('events', Dispatcher::class, true);
return $this;
}

/**
Expand All @@ -72,6 +67,5 @@ public function registerViewFinder()
array_map([$finder, 'addNamespace'], array_keys($namespaces), $namespaces);
return $finder;
}, true);
return $this;
}
}
13 changes: 9 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,22 @@
}
},
"require": {
"php": ">=7.1",
"php": "^7.2.5 | ^8.0",
"composer/installers": "~1.0",
"illuminate/view": "~5.6",
"illuminate/config": "~5.6"
"illuminate/view": "~7.0",
"illuminate/config": "~7.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "~3.3.1"
"squizlabs/php_codesniffer": "~3.5"
},
"scripts": {
"test": [
"phpcs --ignore=vendor --extensions=php --standard=PSR2 ."
]
},
"config": {
"allow-plugins": {
"composer/installers": true
}
}
}
Loading