From 18215df83a0904da9bb492860286125600cca01f Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Thu, 27 Oct 2016 10:16:18 +0200
Subject: [PATCH] hotline #47906 fix indent
---
cosmogramme/php/classes/classe_abonne.php | 3 +--
cosmogramme/tests/php/classes/AbonneIntegrationTest.php | 2 +-
library/Class/Users.php | 4 ++--
library/ZendAfi/Auth/Adapter/CommSigb.php | 8 ++++----
tests/library/ZendAfi/Auth/Adapter/AuthCommSigbTest.php | 4 ++--
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/cosmogramme/php/classes/classe_abonne.php b/cosmogramme/php/classes/classe_abonne.php
index b35672679ac..19cf19ed34b 100644
--- a/cosmogramme/php/classes/classe_abonne.php
+++ b/cosmogramme/php/classes/classe_abonne.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
/**
* Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
*
@@ -199,7 +199,6 @@ class abonne
}
return $result;
}
-
}
?>
\ No newline at end of file
diff --git a/cosmogramme/tests/php/classes/AbonneIntegrationTest.php b/cosmogramme/tests/php/classes/AbonneIntegrationTest.php
index a87233b74fc..56d375400ac 100644
--- a/cosmogramme/tests/php/classes/AbonneIntegrationTest.php
+++ b/cosmogramme/tests/php/classes/AbonneIntegrationTest.php
@@ -452,7 +452,7 @@ class AbonneIntegrationXMLWithRoutoInDbTest extends AbonneIntegrationXMLTestCase
$this->abon_config->importFicheXml($champs_sigb_xml);
$this->zozio_after_import = Class_Users::findFirstby(['login'=>'0100 3080',
- 'id_site' => 2]);
+ 'id_site' => 2]);
}
/** @test **/
diff --git a/library/Class/Users.php b/library/Class/Users.php
index d2ad442fabf..d3e5fa53178 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -43,8 +43,8 @@ class UsersLoader extends Storm_Model_Loader {
}
- public function findMatchingPatron($patron,$bib) {
- if (!$bib || !$patron)
+ public function findMatchingPatron($patron, $bib) {
+ if (!$patron || !$bib)
return null;
if (($ordreabon = $patron->getOrdreabon())
diff --git a/library/ZendAfi/Auth/Adapter/CommSigb.php b/library/ZendAfi/Auth/Adapter/CommSigb.php
index 8ad3062b4fe..3e478cbb1dc 100644
--- a/library/ZendAfi/Auth/Adapter/CommSigb.php
+++ b/library/ZendAfi/Auth/Adapter/CommSigb.php
@@ -52,9 +52,9 @@ class ZendAfi_Auth_Adapter_CommSigb implements Zend_Auth_Adapter_Interface {
public function authenticate() {
return
$this->authResult(
- $this->matchingProcessSIGBUserInDB(
- $this->getUserFromSigb(Class_Users::newInstance(['login' => $this->_identity,
- 'password' => $this->_credential]))));
+ $this->matchingProcessSIGBUserInDB(
+ $this->getUserFromSigb(Class_Users::newInstance(['login' => $this->_identity,
+ 'password' => $this->_credential]))));
}
@@ -84,7 +84,6 @@ class ZendAfi_Auth_Adapter_CommSigb implements Zend_Auth_Adapter_Interface {
public function getUserFromSigb($user) {
-
$bibs = $this->getBibsToAuthenticateTo($user);
foreach($bibs as $bib) {
@@ -122,6 +121,7 @@ class ZendAfi_Auth_Adapter_CommSigb implements Zend_Auth_Adapter_Interface {
public function authResult($user) {
$result = new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $this->_identity);
+
if(!$user)
return new Zend_Auth_Result(Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND, $this->_identity);
diff --git a/tests/library/ZendAfi/Auth/Adapter/AuthCommSigbTest.php b/tests/library/ZendAfi/Auth/Adapter/AuthCommSigbTest.php
index b498932b0eb..baa6540765b 100644
--- a/tests/library/ZendAfi/Auth/Adapter/AuthCommSigbTest.php
+++ b/tests/library/ZendAfi/Auth/Adapter/AuthCommSigbTest.php
@@ -315,7 +315,7 @@ class AuthCommSigbSuccessfullAuthenticationWithExistingFamilleUserTest extends A
/** @test */
public function zorkGirlShouldBeAbonneSIGB() {
- $this->assertTrue(Class_Users::find(85)->isAbonne());
+ $this->assertTrue($this->_zork_girl->isAbonne());
}
}
@@ -436,7 +436,7 @@ class AuthCommSigbAuthenticationSetupInvalidUserTest extends AuthCommSigbWithWeb
/** @test */
- public function noUserShouldHaveBeenSaved() {
+ public function noUserShouldHaveBeenAdded() {
$this->assertCount(1, Class_Users::findAll());
}
--
GitLab