Skip to content

Commit

Permalink
Fix use of deprecated methods.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Nov 21, 2017
1 parent a822393 commit a3bec46
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/ORM/Query.php
Expand Up @@ -1068,7 +1068,7 @@ protected function _transformQuery()
}

if (empty($this->_parts['from'])) {
$this->from([$this->_repository->getAlias() => $this->_repository->table()]);
$this->from([$this->_repository->getAlias() => $this->_repository->getTable()]);
}
$this->_addDefaultFields();
$this->getEagerLoader()->attachAssociations($this, $this->_repository, !$this->_hasFields);
Expand Down Expand Up @@ -1156,7 +1156,7 @@ protected function _dirty()
*/
public function update($table = null)
{
$table = $table ?: $this->repository()->table();
$table = $table ?: $this->repository()->getTable();

return parent::update($table);
}
Expand All @@ -1173,7 +1173,7 @@ public function update($table = null)
public function delete($table = null)
{
$repo = $this->repository();
$this->from([$repo->getAlias() => $repo->table()]);
$this->from([$repo->getAlias() => $repo->getTable()]);

return parent::delete();
}
Expand All @@ -1193,7 +1193,7 @@ public function delete($table = null)
*/
public function insert(array $columns, array $types = [])
{
$table = $this->repository()->table();
$table = $this->repository()->getTable();
$this->into($table);

return parent::insert($columns, $types);
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/ResultSet.php
Expand Up @@ -585,7 +585,7 @@ protected function _groupResult($row)
$results[$defaultAlias]['_matchingData'] = $results['_matchingData'];
}

$options['source'] = $this->_defaultTable->registryAlias();
$options['source'] = $this->_defaultTable->getRegistryAlias();
if (isset($results[$defaultAlias])) {
$results = $results[$defaultAlias];
}
Expand Down

0 comments on commit a3bec46

Please sign in to comment.