Skip to content

Commit

Permalink
Merge pull request #8 from dsgrillo/master
Browse files Browse the repository at this point in the history
Update dependencies to work with Laravel 8. Thanks, @dsgrillo !
  • Loading branch information
gazugafan authored Apr 11, 2021
2 parents d30ea64 + 32c0914 commit c8a9158
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Normally you're only going to care about the current versions of things, so by d

## Requirements

- This has been unit tested, but only on Laravel 5.4 with PHP 7.1 and Laravel 6.0 with PHP 7.2. Let me know if you find it works on older versions!
- This has been unit tested, but only on Laravel 5.4 with PHP 7.1, Laravel 6.0 with PHP 7.2 and Laravel 8.0 with PHP 8.0.3. Let me know if you find it works on older versions!
- Also only tested with MySQL/MariaDB. Likely will not work with SQLite, but let me know if you find it works with other databases!

## Installation
Expand All @@ -26,6 +26,11 @@ For Laravel 6.0 use the version 2.0
composer require gazugafan/laravel-temporal:2.0
```

For Laravel 8.0 use the version 4.0
```bash
composer require gazugafan/laravel-temporal:4.0
```

## Overview

Temporal models get three new fields...
Expand Down
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
machine:
php:
version: 7.2.28
version: 8.0.3
test:
override:
- phpunit tests --coverage-clover build/logs/clover.xml
- php vendor/bin/coveralls -v
dependencies:
override:
- mkdir -p build/logs
- composer install --prefer-source --no-interaction
- composer install --prefer-source --no-interaction
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
"homepage": "https://github.com/gazugafan/laravel-temporal",
"license": "MIT",
"require": {
"php" : ">=7.2.0",
"illuminate/database": "^6.0",
"illuminate/events": "^6.0",
"php" : ">=8.0",
"illuminate/database": "^8.0",
"illuminate/events": "^8.0",
"doctrine/dbal": "^2.5",
"laravel/helpers": "^1.2"
},
"require-dev": {
"phpunit/phpunit" : "^7.5.15|^8.4|^9.0",
"mockery/mockery": "^0.9.4",
"satooshi/php-coveralls": "1.*"
"satooshi/php-coveralls": "*"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Temporal.php
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public function save(array $options = [])
* @param \Illuminate\Database\Eloquent\Builder $query
* @return \Illuminate\Database\Eloquent\Builder
*/
protected function setKeysForSaveQuery(Builder $query)
protected function setKeysForSaveQuery($query)
{
$query->where($this->getKeyName(), '=', $this->getKeyForSaveQuery());
$query->where($this->getVersionColumn(), '=', $this->{$this->getVersionColumn()});
Expand Down

0 comments on commit c8a9158

Please sign in to comment.