mirror of
https://gitlab.com/TheGamecraft/c-cms.git
synced 2026-04-26 04:39:09 -04:00
ALPHA 3.0.2a
This commit is contained in:
@@ -43,13 +43,15 @@ class ControllerMakeCommand extends GeneratorCommand
|
||||
$stub = '/stubs/controller.nested.stub';
|
||||
} elseif ($this->option('model')) {
|
||||
$stub = '/stubs/controller.model.stub';
|
||||
} elseif ($this->option('invokable')) {
|
||||
$stub = '/stubs/controller.invokable.stub';
|
||||
} elseif ($this->option('resource')) {
|
||||
$stub = '/stubs/controller.stub';
|
||||
}
|
||||
|
||||
if ($this->option('api') && is_null($stub)) {
|
||||
$stub = '/stubs/controller.api.stub';
|
||||
} elseif ($this->option('api') && ! is_null($stub)) {
|
||||
} elseif ($this->option('api') && ! is_null($stub) && ! $this->option('invokable')) {
|
||||
$stub = str_replace('.stub', '.api.stub', $stub);
|
||||
}
|
||||
|
||||
@@ -173,11 +175,9 @@ class ControllerMakeCommand extends GeneratorCommand
|
||||
{
|
||||
return [
|
||||
['model', 'm', InputOption::VALUE_OPTIONAL, 'Generate a resource controller for the given model.'],
|
||||
|
||||
['resource', 'r', InputOption::VALUE_NONE, 'Generate a resource controller class.'],
|
||||
|
||||
['invokable', 'i', InputOption::VALUE_NONE, 'Generate a single method, invokable controller class.'],
|
||||
['parent', 'p', InputOption::VALUE_OPTIONAL, 'Generate a nested resource controller class.'],
|
||||
|
||||
['api', null, InputOption::VALUE_NONE, 'Exclude the create and edit methods from the controller.'],
|
||||
];
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ class Redirector
|
||||
* Create a new redirect response to a named route.
|
||||
*
|
||||
* @param string $route
|
||||
* @param array $parameters
|
||||
* @param mixed $parameters
|
||||
* @param int $status
|
||||
* @param array $headers
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
@@ -161,7 +161,7 @@ class Redirector
|
||||
* Create a new redirect response to a controller action.
|
||||
*
|
||||
* @param string $action
|
||||
* @param array $parameters
|
||||
* @param mixed $parameters
|
||||
* @param int $status
|
||||
* @param array $headers
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
|
||||
@@ -80,6 +80,8 @@ class RouteAction
|
||||
*
|
||||
* @param string $action
|
||||
* @return string
|
||||
*
|
||||
* @throws \UnexpectedValueException
|
||||
*/
|
||||
protected static function makeInvokable($action)
|
||||
{
|
||||
|
||||
@@ -21,6 +21,7 @@ use InvalidArgumentException;
|
||||
* @method \Illuminate\Routing\RouteRegistrar name(string $value)
|
||||
* @method \Illuminate\Routing\RouteRegistrar namespace(string $value)
|
||||
* @method \Illuminate\Routing\RouteRegistrar prefix(string $prefix)
|
||||
* @method \Illuminate\Routing\RouteRegistrar where(array $where)
|
||||
*/
|
||||
class RouteRegistrar
|
||||
{
|
||||
@@ -53,7 +54,7 @@ class RouteRegistrar
|
||||
* @var array
|
||||
*/
|
||||
protected $allowedAttributes = [
|
||||
'as', 'domain', 'middleware', 'name', 'namespace', 'prefix',
|
||||
'as', 'domain', 'middleware', 'name', 'namespace', 'prefix', 'where',
|
||||
];
|
||||
|
||||
/**
|
||||
@@ -175,6 +176,8 @@ class RouteRegistrar
|
||||
* @param string $method
|
||||
* @param array $parameters
|
||||
* @return \Illuminate\Routing\Route|$this
|
||||
*
|
||||
* @throws \BadMethodCallException
|
||||
*/
|
||||
public function __call($method, $parameters)
|
||||
{
|
||||
|
||||
@@ -425,7 +425,7 @@ class Router implements RegistrarContract, BindingRegistrar
|
||||
* @param \Closure|array|string|null $action
|
||||
* @return \Illuminate\Routing\Route
|
||||
*/
|
||||
protected function addRoute($methods, $uri, $action)
|
||||
public function addRoute($methods, $uri, $action)
|
||||
{
|
||||
return $this->routes->add($this->createRoute($methods, $uri, $action));
|
||||
}
|
||||
@@ -1131,7 +1131,7 @@ class Router implements RegistrarContract, BindingRegistrar
|
||||
// Authentication Routes...
|
||||
$this->get('login', 'Auth\LoginController@showLoginForm')->name('login');
|
||||
$this->post('login', 'Auth\LoginController@login');
|
||||
$this->get('logout', 'Auth\LoginController@logout')->name('logout');
|
||||
$this->post('logout', 'Auth\LoginController@logout')->name('logout');
|
||||
|
||||
// Registration Routes...
|
||||
$this->get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
|
||||
|
||||
Reference in New Issue
Block a user