Skip to content

Commit

Permalink
Merge branch 'release/v2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiovier committed May 16, 2017
2 parents 3dd0173 + a7c879f commit 6804c2c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# CHANGELOG

## v 2.0.1 16/05/2017
* Vuelve version para PHP 5.6 a 7+

## v 2.0.0 10/05/2017
* Version para PHP 7+

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "http://toba.siu.edu.ar",
"license": "SIU",
"require": {
"php": ">=7.0.0",
"php": ">=5.6.0",
"doctrine/cache": "~1.4",
"siu-toba/ssl-cert-utils": "1.0",
"siu-toba/jwt-util": "~1.0.0"
Expand Down
9 changes: 2 additions & 7 deletions src/SIUToba/rest/seguridad/firewall.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,10 @@ public function manejar($ruta, $request)
// buscamos algun mecanismo de auth que atienda el pedido
$authentication = null;

if (count($this->authentications) == 1) { //BC
// current ya invoca la closure
$auth = current($this->authentications);
$authentication = $auth();
if (count($this->authentications) == 1) {
$authentication = current($this->authentications);
} else {
foreach ($this->authentications as $auth){
// invocamos la closure
$auth = $auth();

// basic|digest son el ultimo metodo, no atienden antes de redirect
if ($auth instanceof autenticacion\autenticacion_basic_http ||
$auth instanceof autenticacion\autenticacion_digest_http ||
Expand Down

0 comments on commit 6804c2c

Please sign in to comment.