Merge pull request #14 from distinctm/php71-support

Support for PHP 7.1
This commit is contained in:
Jani Gyllenberg
2019-08-23 10:08:47 -04:00
committed by GitHub

View File

@@ -8,6 +8,7 @@ use distinctm\LaravelDataSync\Exceptions\NoCriteriaException;
use distinctm\LaravelDataSync\Exceptions\NoRecordsInvalidJSONException; use distinctm\LaravelDataSync\Exceptions\NoRecordsInvalidJSONException;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\File;
use stdClass;
class Updater class Updater
{ {
@@ -144,13 +145,13 @@ class Updater
/** /**
* Filter record criteria. * Filter record criteria.
* *
* @param object $record * @param stdClass $record
* *
* @throws \distinctm\LaravelDataSync\Exceptions\NoCriteriaException * @throws \distinctm\LaravelDataSync\Exceptions\NoCriteriaException
* *
* @return \Illuminate\Support\Collection * @return \Illuminate\Support\Collection
*/ */
protected function getCriteria(object $record) protected function getCriteria(stdClass $record)
{ {
$criteria = collect($record)->filter(function ($value, $key) { $criteria = collect($record)->filter(function ($value, $key) {
return $this->isCriteria($key); return $this->isCriteria($key);
@@ -168,11 +169,11 @@ class Updater
/** /**
* Filter record values. * Filter record values.
* *
* @param object $record * @param stdClass $record
* *
* @return \Illuminate\Support\Collection * @return \Illuminate\Support\Collection
*/ */
protected function getValues(object $record) protected function getValues(stdClass $record)
{ {
return collect($record)->reject(function ($value, $key) { return collect($record)->reject(function ($value, $key) {
if ($this->isCriteria($key)) { if ($this->isCriteria($key)) {
@@ -235,11 +236,11 @@ class Updater
* Return ID for nested key-value pairs. * Return ID for nested key-value pairs.
* *
* @param string $key * @param string $key
* @param object $values * @param stdClass $values
* *
* @return array * @return array
*/ */
protected function resolveId(string $key, object $values) protected function resolveId(string $key, stdClass $values)
{ {
$model = $this->getModel($key); $model = $this->getModel($key);