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.

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

[11.x] Simplify condition structure and add @throw to docblock for resolve method #50863

Conversation

saMahmoudzadeh
Copy link
Contributor

This PR updates the resolve method to exception handling by including RuntimeException in its throws clause within the doc block and simplifying the conditional structure.

We encounter the following code snippet in the resolve method:

if (! array_key_exists('driver', $config)) {
    throw new \RuntimeException("Instance [{$name}] does not specify a driver.");
}

Therefore, we can add the @throws RuntimeException to the doc block

Simplifying the conditional structure

if (isset($this->customCreators[$config['driver']])) {
    return $this->callCustomCreator($config);
} else {
    $driverMethod = 'create'.ucfirst($config['driver']).'Driver';

    if (method_exists($this, $driverMethod)) {
        return $this->{$driverMethod}($config);
    } else {
        throw new InvalidArgumentException("Instance driver [{$config['driver']}] is not supported.");
    }
}

In the above code, if the first if statement is executed, the else part will never be executed because a value is returned in this if, the same scenario happens in the else part as well. Therefore, we can simplify it a bit:

if (isset($this->customCreators[$config['driver']])) {
    return $this->callCustomCreator($config);
}

$driverMethod = 'create'.ucfirst($config['driver']).'Driver';

if (method_exists($this, $driverMethod)) {
    return $this->{$driverMethod}($config);
}

throw new InvalidArgumentException("Instance driver [{$config['driver']}] is not supported.");

@crynobone crynobone changed the title [11.x] Fix(multipleInstanceManager.php): Simplify condition structure and add @throw to doc block for resolve method [11.x] Simplify condition structure and add @throw to docblock for resolve method Mar 31, 2024
@taylorotwell
Copy link
Member

Thanks for your pull request to Laravel!

Unfortunately, I'm going to delay merging this code for now. To preserve our ability to adequately maintain the framework, we need to be very careful regarding the amount of code we include.

If possible, please consider releasing your code as a package so that the community can still take advantage of your contributions!

If you feel absolutely certain that this code corrects a bug in the framework, please "@" mention me in a follow-up comment with further explanation so that GitHub will send me a notification of your response.

@saMahmoudzadeh saMahmoudzadeh deleted the fix/multiple-instance-manager branch April 1, 2024 06:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants