dev #59639 Multimedia supprimer besoin auth pour question devices : fix retour revue tech

application/modules/opac/controllers/MultimediaController.php

@@ -38,7 +38,7 @@ class MultimediaController extends ZendAfi_Controller_Action {
     $response = new StdClass();
     $response->auth = 0;
 
-    $request = Class_Multimedia_AuthenticateRequest::getInstance()->authenticate($this->_request);
+    $request = (new Class_Multimedia_AuthenticateRequest())->authenticate($this->_request);
 
     if (!$request->isValid()) {
       $response->error = $request->getError();
@@ -61,7 +61,7 @@ class MultimediaController extends ZendAfi_Controller_Action {
     $response = new StdClass();
     $response->auth = 0;
 
-    $request = Class_Multimedia_HoldRequest::getInstance()->holdDevice($this->_request);
+    $request = (new Class_Multimedia_HoldRequest())->holdDevice($this->_request);
 
     if ($user = $request->getUser())
       $response = $this->_initInfosUser($user, $response);
@@ -87,7 +87,7 @@ class MultimediaController extends ZendAfi_Controller_Action {
     $response = new StdClass();
     $response->auth = 0;
 
-    $request = Class_Multimedia_HoldRequest::getInstance()->closeHoldingDevice($this->_request);
+    $request = (new Class_Multimedia_HoldRequest())>closeHoldingDevice($this->_request);
 
     if (!$request->isValid()) {
       $response->error = $request->getError();
@@ -106,7 +106,7 @@ class MultimediaController extends ZendAfi_Controller_Action {
 
     $response = new StdClass();
 
-    $request = Class_Multimedia_HoldRequest::getInstance()->isHoldableDay($this->_request);
+    $request = (new Class_Multimedia_HoldRequest())->isHoldableDay($this->_request);
 
     if (!$request->isValid()) {
       $response->error = $request->getError();

library/Class/Multimedia/AbstractRequest.php

@@ -47,9 +47,9 @@ class Class_Multimedia_AbstractRequest {
     if (!$auth->authenticateLoginPassword($login,
                                           $password,
                                           [$auth->newAuthSIGB(), $auth->newAuthDb()])) {
-      if (Class_Users::findFirstBy(['login' => $login]))
-        return $this->_error('PasswordIsWrong');
-      return  $this->_error('UserNotFound');
+      return (Class_Users::findFirstBy(['login' => $login]))
+        ? $this->_error('PasswordIsWrong')
+        :  $this->_error('UserNotFound');
     }
 
     $user = Class_Users::getIdentity();

library/Class/Multimedia/AuthenticateRequest.php

@@ -21,17 +21,6 @@
 
 class Class_Multimedia_AuthenticateRequest extends Class_Multimedia_AbstractRequest{
 
-
-  /**
-   * @param Zend_Controller_Request_Abstract
-   * @return Class_Multimedia_AuthenticateRequest
-   */
-
-  public static function getInstance() {
-    return new self();
-  }
-
-
   /**
    * @param Zend_Controller_Request_Abstract
    * @return Class_Multimedia_AuthenticateRequest

library/Class/Multimedia/HoldRequest.php

@@ -37,17 +37,6 @@ class Class_Multimedia_HoldRequest extends Class_Multimedia_AbstractRequest{
     /** @var boolean */
   protected $_successHolding = false;
 
-
-  /**
-   * @param Zend_Controller_Request_Abstract
-   * @return Class_Multimedia_HoldRequest
-   */
-
-  public static function getInstance() {
-    return new self();
-  }
-
-
   /**
    * @param Zend_Controller_Request_Abstract
    * @return Class_Multimedia_HoldRequest