Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.x] Model::delete throw LogicException not Exception #36914

Merged
merged 2 commits into from
Apr 8, 2021
Merged

[8.x] Model::delete throw LogicException not Exception #36914

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28f28b6
Throw LogicException instead of Exception on delete model with missin…
lachlankrautz Apr 8, 2021
d426a55
Update Model.php
taylorotwell Apr 8, 2021
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
6 changes: 3 additions & 3 deletions src/Illuminate/Database/Eloquent/Model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Illuminate\Database\Eloquent;

use ArrayAccess;
use Exception;
use Illuminate\Contracts\Queue\QueueableCollection;
use Illuminate\Contracts\Queue\QueueableEntity;
use Illuminate\Contracts\Routing\UrlRoutable;
Expand All @@ -19,6 +18,7 @@
use Illuminate\Support\Str;
use Illuminate\Support\Traits\ForwardsCalls;
use JsonSerializable;
use LogicException;

abstract class Model implements Arrayable, ArrayAccess, Jsonable, JsonSerializable, QueueableEntity, UrlRoutable
{
Expand Down Expand Up @@ -932,14 +932,14 @@ public static function destroy($ids)
*
* @return bool|null
*
* @throws \Exception
* @throws \LogicException
*/
public function delete()
{
$this->mergeAttributesFromClassCasts();

if (is_null($this->getKeyName())) {
throw new Exception('No primary key defined on model.');
throw new LogicException('No primary key defined on model.');
}

// If the model doesn't exist, there is nothing to delete so we'll just return
Expand Down