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

Use the middleware without adding it to the container #12

Merged
merged 2 commits into from
Nov 3, 2016
Merged

Use the middleware without adding it to the container #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed1137c
Less container, more happy heads :)
DavidePastore Nov 1, 2016
2d57416
Update documentation
DavidePastore Nov 2, 2016
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
152 changes: 59 additions & 93 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,19 @@ use Respect\Validation\Validator as v;

$app = new \Slim\App();

// Fetch DI Container
$container = $app->getContainer();

// Register provider
$container['apiValidation'] = function () {
//Create the validators
$usernameValidator = v::alnum()->noWhitespace()->length(1, 10);
$ageValidator = v::numeric()->positive()->between(1, 20);
$validators = array(
'username' => $usernameValidator,
'age' => $ageValidator
);

return new \DavidePastore\Slim\Validation\Validation($validators);
};
//Create the validators
$usernameValidator = v::alnum()->noWhitespace()->length(1, 10);
$ageValidator = v::numeric()->positive()->between(1, 20);
$validators = array(
'username' => $usernameValidator,
'age' => $ageValidator
);

$app->get('/api/myEndPoint',function ($req, $res, $args) {
//Here you expect 'username' and 'age' parameters
if($this->apiValidation->hasErrors()){
if($req->getAttribute('has_errors')){
//There are errors, read them
$errors = $this->apiValidation->getErrors();
$errors = $req->getAttribute('errors');

/* $errors contain:
array(
Expand All @@ -70,7 +62,7 @@ $app->get('/api/myEndPoint',function ($req, $res, $args) {
//No errors
}

})->add($container->get('apiValidation'));
})->add(new \DavidePastore\Slim\Validation\Validation($validators));

$app->run();
```
Expand All @@ -83,31 +75,23 @@ use Respect\Validation\Validator as v;

$app = new \Slim\App();

// Fetch DI Container
$container = $app->getContainer();

// Register provider
$container['validation'] = function () {
//Create the validators
$usernameValidator = v::alnum()->noWhitespace()->length(1, 10);
$ageValidator = v::numeric()->positive()->between(1, 20);
$validators = array(
'username' => $usernameValidator,
'age' => $ageValidator
);

return new \DavidePastore\Slim\Validation\Validation($validators);
};
//Create the validators
$usernameValidator = v::alnum()->noWhitespace()->length(1, 10);
$ageValidator = v::numeric()->positive()->between(1, 20);
$validators = array(
'username' => $usernameValidator,
'age' => $ageValidator
);

// Register middleware for all routes
// If you are implementing per-route checks you must not add this
$app->add($container->get('validation'));
$app->add(return new \DavidePastore\Slim\Validation\Validation($validators));

$app->get('/foo', function ($req, $res, $args) {
//Here you expect 'username' and 'age' parameters
if($this->validation->hasErrors()){
if($req->getAttribute('has_errors')){
//There are errors, read them
$errors = $this->validation->getErrors();
$errors = $req->getAttribute('errors');

/* $errors contain:
array(
Expand All @@ -126,9 +110,9 @@ $app->get('/foo', function ($req, $res, $args) {

$app->post('/bar', function ($req, $res, $args) {
//Here you expect 'username' and 'age' parameters
if($this->validation->hasErrors()){
if($req->getAttribute('has_errors')){
//There are errors, read them
$errors = $this->validation->getErrors();
$errors = $req->getAttribute('errors');
} else {
//No errors
}
Expand Down Expand Up @@ -162,28 +146,22 @@ use Respect\Validation\Validator as v;

$app = new \Slim\App();

// Fetch DI Container
$container = $app->getContainer();
$container['apiValidation'] = function () {
//Create the validators
$typeValidator = v::alnum()->noWhitespace()->length(3, 5);
$emailNameValidator = v::alnum()->noWhitespace()->length(1, 2);
$validators = array(
'type' => $typeValidator,
'email' => array(
'name' => $emailNameValidator,
),
);

return new \DavidePastore\Slim\Validation\Validation($validators);
};
//Create the validators
$typeValidator = v::alnum()->noWhitespace()->length(3, 5);
$emailNameValidator = v::alnum()->noWhitespace()->length(1, 2);
$validators = array(
'type' => $typeValidator,
'email' => array(
'name' => $emailNameValidator,
),
);
```

If you'll have an error, the result would be:

```php
//In your route
$errors = $this->apiValidation->getErrors();
$errors = $req->getAttribute('errors');

print_r($errors);
/*
Expand Down Expand Up @@ -225,29 +203,23 @@ use Respect\Validation\Validator as v;

$app = new \Slim\App();

// Fetch DI Container
$container = $app->getContainer();
$container['apiValidation'] = function () {
//Create the validators
$typeValidator = v::alnum()->noWhitespace()->length(3, 5);
$emailNameValidator = v::alnum()->noWhitespace()->length(1, 2);
$validators = array(
'type' => $typeValidator,
'email' => array(
'name' => $emailNameValidator,
),
);

return new \DavidePastore\Slim\Validation\Validation($validators);
};
//Create the validators
$typeValidator = v::alnum()->noWhitespace()->length(3, 5);
$emailNameValidator = v::alnum()->noWhitespace()->length(1, 2);
$validators = array(
'type' => $typeValidator,
'email' => array(
'name' => $emailNameValidator,
),
);
```


If you'll have an error, the result would be:

```php
//In your route
$errors = $this->apiValidation->getErrors();
$errors = $req->getAttribute('errors');

print_r($errors);
/*
Expand All @@ -272,31 +244,25 @@ use Respect\Validation\Validator as v;

$app = new \Slim\App();

// Fetch DI Container
$container = $app->getContainer();

// Register provider
$container['validation'] = function () {
//Create the validators
$usernameValidator = v::alnum()->noWhitespace()->length(1, 10);
$ageValidator = v::numeric()->positive()->between(1, 20);
$validators = array(
'username' => $usernameValidator,
'age' => $ageValidator
);

$translator = function($message){
$messages = [
'These rules must pass for {{name}}' => 'Queste regole devono passare per {{name}}',
'{{name}} must be a string' => '{{name}} deve essere una stringa',
'{{name}} must have a length between {{minValue}} and {{maxValue}}' => '{{name}} deve avere una dimensione di caratteri compresa tra {{minValue}} e {{maxValue}}',
];
return $messages[$message];
};

return new \DavidePastore\Slim\Validation\Validation($validators, $translator);
//Create the validators
$usernameValidator = v::alnum()->noWhitespace()->length(1, 10);
$ageValidator = v::numeric()->positive()->between(1, 20);
$validators = array(
'username' => $usernameValidator,
'age' => $ageValidator
);

$translator = function($message){
$messages = [
'These rules must pass for {{name}}' => 'Queste regole devono passare per {{name}}',
'{{name}} must be a string' => '{{name}} deve essere una stringa',
'{{name}} must have a length between {{minValue}} and {{maxValue}}' => '{{name}} deve avere una dimensione di caratteri compresa tra {{minValue}} e {{maxValue}}',
];
return $messages[$message];
};

$middleware = new \DavidePastore\Slim\Validation\Validation($validators, $translator);

// Register middleware for all routes or only for one...

$app->run();
Expand Down
33 changes: 33 additions & 0 deletions src/Validation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,34 @@ class Validation
*/
protected $errors = [];

/**
* The 'errors' attribute name.
*
* @var string
*/
protected $errors_name = 'errors';

/**
* The 'has_error' attribute name.
*
* @var string
*/
protected $has_errors_name = 'has_errors';

/**
* The 'validators' attribute name.
*
* @var string
*/
protected $validators_name = 'validators';

/**
* The 'translator' attribute name.
*
* @var string
*/
protected $translator_name = 'translator';

/**
* Create new Validator service provider.
*
Expand Down Expand Up @@ -62,6 +90,11 @@ public function __invoke($request, $response, $next)
$params = $request->getParams();
$this->validate($params, $this->validators);

$request = $request->withAttribute($this->errors_name, $this->getErrors());
$request = $request->withAttribute($this->has_errors_name, $this->hasErrors());
$request = $request->withAttribute($this->validators_name, $this->getValidators());
$request = $request->withAttribute($this->translator_name, $this->getTranslator());

return $next($request, $response);
}

Expand Down
Loading