diff --git a/FEATURES/52054 b/FEATURES/52054 index 6851ef650af564b27cda0f34e8935fafb41b5720..0747ed0deaa3dc7b7460819b19ed0cb5e5911392 100644 --- a/FEATURES/52054 +++ b/FEATURES/52054 @@ -1,6 +1,6 @@ '52054' => - ['Label' => $this->_('Aspiration des notices de MusicMe'), - 'Desc' => 'Moissonnage des notices de MusicMe', + ['Label' => $this->_('Aspiration des notices de musicMe'), + 'Desc' => 'Moissonnage des notices de musicMe', 'Image' => '', 'Video' => '', 'Category' => 'Ressources Numériques', diff --git a/application/modules/opac/controllers/AuthController.php b/application/modules/opac/controllers/AuthController.php index 274354ea62fef09b1d354a5533c972dfcbb2c222..0088ec3d381fd8826c5b79ce5e598426db41331e 100644 --- a/application/modules/opac/controllers/AuthController.php +++ b/application/modules/opac/controllers/AuthController.php @@ -738,7 +738,7 @@ class Auth_Strategy_Logged extends Auth_Strategy_Abstract{ class Auth_Strategy_Cas_Abstract extends Auth_Strategy_Abstract{ public function urlServiceCas() { - if ($url_musicme = $this->redirectMusicMe()) + if ($url_musicme = $this->redirectMusicme()) return $url_musicme; $ticket = (new Class_CasTicket())->getTicketForCurrentUser(); @@ -755,9 +755,9 @@ class Auth_Strategy_Cas_Abstract extends Auth_Strategy_Abstract{ } - public function redirectMusicMe() { + public function redirectMusicme() { if (strpos($this->controller->getCasServerUrl(),'musicme') !== false) { - $module_menu = Class_DigitalResource::getInstance()->getModuleMenuFor('MusicMe'); + $module_menu = Class_DigitalResource::getInstance()->getModuleMenuFor('Musicme'); return $module_menu->getDynamiqueUrl(); } diff --git a/application/modules/opac/controllers/CasServerController.php b/application/modules/opac/controllers/CasServerController.php index 2662ce7e0295760e195bf4cd8cba234b9bbc2fb3..54cb4e97d842b003ddf65aefad088d65f2bf5cbb 100644 --- a/application/modules/opac/controllers/CasServerController.php +++ b/application/modules/opac/controllers/CasServerController.php @@ -41,7 +41,7 @@ class CasServerController extends ZendAfi_Controller_Action { } - public function returnValidMusicMeResponse($user) { + public function returnValidMusicmeResponse($user) { $this->getResponse()->setHeader('Content-Type', 'application/xml;charset=utf-8'); $this->getResponse()->setBody( '<User> <ID>'.$user->getId().'</ID> @@ -54,7 +54,7 @@ class CasServerController extends ZendAfi_Controller_Action { } - public function returnMusicMeFailureTicketResponse($error,$ticket=null) { + public function returnMusicmeFailureTicketResponse($error,$ticket=null) { $this->getResponse()->setHeader('Content-Type', 'application/xml;charset=utf-8'); $xml="<User />"; $this->getResponse()->setBody($xml); @@ -77,13 +77,13 @@ class CasServerController extends ZendAfi_Controller_Action { $ticket=$this->_request->getParam('ticket'); if (strlen($ticket)<1 || strlen($bibid)<1) { - return $this->returnMusicMeFailureTicketResponse('INVALID_REQUEST'); + return $this->returnMusicmeFailureTicketResponse('INVALID_REQUEST'); } if ($user = (new Class_CasTicket())->userForTicket($ticket)) - return $this->returnValidMusicMeResponse($user); + return $this->returnValidMusicmeResponse($user); - return $this->returnMusicMeFailureTicketResponse('INVALID_TICKET',$ticket); + return $this->returnMusicmeFailureTicketResponse('INVALID_TICKET',$ticket); } diff --git a/cosmogramme/sql/patch/patch_339.php b/cosmogramme/sql/patch/patch_339.php index 8f97fde36650069a738bee826b02de816481684b..0d1654f79b3d52be015fee9d7993c7954cce5535 100644 --- a/cosmogramme/sql/patch/patch_339.php +++ b/cosmogramme/sql/patch/patch_339.php @@ -1,3 +1,3 @@ <?php -(new Class_Migration_DigitalResource_MusicMe())->run(); +(new Class_Migration_DigitalResource_Musicme())->run(); ?> \ No newline at end of file diff --git a/library/Class/Migration/DigitalResource/MusicMe.php b/library/Class/Migration/DigitalResource/Musicme.php similarity index 85% rename from library/Class/Migration/DigitalResource/MusicMe.php rename to library/Class/Migration/DigitalResource/Musicme.php index 2d515e72a0949e892ea5d6219c6ff6ed4e37faac..847d6805e5de3ddd9a8d022bc8949beb511eefce 100644 --- a/library/Class/Migration/DigitalResource/MusicMe.php +++ b/library/Class/Migration/DigitalResource/Musicme.php @@ -20,7 +20,7 @@ */ -class Class_Migration_DigitalResource_MusicMe extends Class_Migration_DigitalResource_Abstract { +class Class_Migration_DigitalResource_Musicme extends Class_Migration_DigitalResource_Abstract { protected function _getOldRightToken() { return 7; @@ -28,13 +28,13 @@ class Class_Migration_DigitalResource_MusicMe extends Class_Migration_DigitalRes protected function _getAdminVarMapping() { - return ['MUSICME_URL' => 'MusicMe_URL', - 'MUSICME_BIB_ID' => 'MusicMe_BIB_ID']; + return ['MUSICME_URL' => 'Musicme_URL', + 'MUSICME_BIB_ID' => 'Musicme_BIB_ID']; } protected function _getConfig() { - return MusicMe_Config::getInstance(); + return Musicme_Config::getInstance(); } diff --git a/library/Class/MusicMeLink.php b/library/Class/MusicMeLink.php deleted file mode 100644 index a24c51d27333131fc5646674d7a788548100ca23..0000000000000000000000000000000000000000 --- a/library/Class/MusicMeLink.php +++ /dev/null @@ -1,61 +0,0 @@ -<?php -/** - * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved. - * - * BOKEH is free software; you can redistribute it and/or modify - * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by - * the Free Software Foundation. - * - * There are special exceptions to the terms and conditions of the AGPL as it - * is applied to this software (see README file). - * - * BOKEH is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE - * along with BOKEH; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -class Class_MusicMeLink { - use Trait_TimeSource; - - const CVS_SOURCEXPIRATIONTIME = 30; - - protected $_user; - - public static function forUser($user) { - return new self($user); - } - - - public function __construct($user) { - $this->_user = $user; - } - - - public static function staticLink() { - return BASE_URL.'/modules/musicme'; - } - - - public function baseUrl() { - $url = Class_AdminVar::get('MUSICME_URL'); - return $url; - } - - - public function url() { - $bib_id = Class_AdminVar::get('MUSICME_BIB_ID'); - $iduser = strtolower($this->_user->getLogin()); - $formatted_date=date('YmdHi',$this->getCurrentTime()); - $params = ['iduser' => $iduser, - 'ticket' => (new Class_CasTicket())->getTicketForUser($this->_user), - 'MediaLibraryID' => $bib_id - ]; - $params['service'] = $this->baseUrl().'?'.http_build_query(array_filter($params)); - return $this->baseUrl().'?'.http_build_query(array_filter($params)); - } -} \ No newline at end of file diff --git a/library/Class/Systeme/ModulesMenu/MusicMe.php b/library/Class/Systeme/ModulesMenu/MusicMe.php deleted file mode 100644 index 46d8df9159e93d0f047126d74b2d7b4fd6dd95ce..0000000000000000000000000000000000000000 --- a/library/Class/Systeme/ModulesMenu/MusicMe.php +++ /dev/null @@ -1,53 +0,0 @@ -<?php -/** - * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved. - * - * BOKEH is free software; you can redistribute it and/or modify - * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by - * the Free Software Foundation. - * - * There are special exceptions to the terms and conditions of the AGPL as it - * is applied to this software (see README file). - * - * BOKEH is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE - * along with BOKEH; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -class Class_Systeme_ModulesMenu_MusicMe extends Class_Systeme_ModulesMenu_SSOAbstract { - - protected - $_group = Class_Systeme_ModulesMenu::GROUP_MENU_ABONNES, - $_type_module = 'MusicMe', - $_url = ['controller' => 'modules', - 'action' => 'musicme']; - - - public function __construct() { - parent::__construct(); - $this->_libelle = $this->_('Lien vers MusicMe'); - } - - - public function urlForUser($user) { - if (!$user->hasRightAccesMusicMe()) - return ''; - - $musicme_link=Class_MusicMeLink::forUser($user); - $url=$musicme_link->url(); - if (!strlen($url)>0) - $this->setMessage($musicme_link->getMessage()); - - return $url; - } - - - public function isVisibleForProfil($profil) { - return Class_AdminVar::isMusicMeEnabled(); - } -} \ No newline at end of file diff --git a/library/digital_resources/MusicMe/Config.php b/library/digital_resources/MusicMe/Config.php deleted file mode 100644 index d01f2cae78d26e447a366df48316c12f0feb6b93..0000000000000000000000000000000000000000 --- a/library/digital_resources/MusicMe/Config.php +++ /dev/null @@ -1,68 +0,0 @@ -<?php -/** - * Copyright (c) 2012-2016, Agence Française Informatique (AFI). All rights reserved. - * - * BOKEH is free software; you can redistribute it and/or modify - * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by - * the Free Software Foundation. - * - * There are special exceptions to the terms and conditions of the AGPL as it - * is applied to this software (see README file). - * - * BOKEH is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE - * along with BOKEH; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -class Musicme_Config extends Class_DigitalResource_Config { - - public function getConfig() { - return [ - 'DocTypeLabel' => $this->_('musicMe'), - 'PermissionLabel' => $this->_('Bibliothèque numérique: accéder à musicMe'), - 'MenuLabel' => $this->_('Lien vers musicMe'), - 'Introduction' => $this->_('Plateforme d\'écoute et de téléchargement de musique.'), - 'NotAllowedMessage' => $this->_('Votre abonnement ne permet pas l\'accès à cette ressource.'), - - 'HelpLink' => 'http://wiki.bokeh-library-portal.org/index.php/MusicMe', - 'Url' => 'http://www.musicme.com/', - 'Icon' => 'https://mmcdn2.hosting-media.net/pict/v5/musicme_logo.png', - 'Mail' => 'support@musicme.com', - 'MailUrl' => 'https://www.musicme.com/#/support.php?cat=2', - - 'AdminVars' => [ - 'BIB_ID' => Class_AdminVar_Meta::newDefault($this->_('Identifiant fournit par musicMe'))->bePrivate(), - 'URL' => Class_AdminVar_Meta::newDefault($this->_('Url fournit par musicMe'))->bePrivate() - ], - - 'SsoAction' => true, - 'Batch' => 'Musicme_Batch', - 'Service' => 'Musicme_Service', - 'ModuleMenu' => 'Musicme_ModuleMenu', - ]; - } - - - public function getSsoUrl($user) { - $iduser = strtolower($user->getLogin()); - - $formatted_date = date('YmdHi',$this->getCurrentTime()); - - $params = ['iduser' => $iduser, - 'ticket' => (new Class_CasTicket())->getTicketForUser($user), - 'MediaLibraryID' => $this->getAdminVar('BIB_ID')]; - - $params['service'] = $this->getAdminVar('URL') . '?' . http_build_query(array_filter($params)); - return $this->getAdminVar('URL') . '?' . http_build_query(array_filter($params)); - } - - - public function isEnabled() { - return '' != $this->getAdminVar('BIB_ID'); - } -} diff --git a/library/digital_resources/Musicme/Batch.php b/library/digital_resources/Musicme/Batch.php index 4c0b7d24f3a02c139c0e207856cfc3aa932020f3..f5725fb5096d2c627543c04578a0af8cdb53ebfb 100644 --- a/library/digital_resources/Musicme/Batch.php +++ b/library/digital_resources/Musicme/Batch.php @@ -20,7 +20,4 @@ */ -class MusicMe_Batch extends Class_DigitalResource_Batch { - -} -?> \ No newline at end of file +class Musicme_Batch extends Class_DigitalResource_Batch {} \ No newline at end of file diff --git a/library/digital_resources/Musicme/Config.php b/library/digital_resources/Musicme/Config.php index 532ccd8f0778a9cad77ce66fd240f6f79d017f54..d01f2cae78d26e447a366df48316c12f0feb6b93 100644 --- a/library/digital_resources/Musicme/Config.php +++ b/library/digital_resources/Musicme/Config.php @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -class MusicMe_Config extends Class_DigitalResource_Config { +class Musicme_Config extends Class_DigitalResource_Config { public function getConfig() { return [ - 'DocTypeLabel' => $this->_('MusicMe'), - 'PermissionLabel' => $this->_('Bibliothèque numérique: accéder à MusicMe'), - 'MenuLabel' => $this->_('Lien vers MusicMe'), + 'DocTypeLabel' => $this->_('musicMe'), + 'PermissionLabel' => $this->_('Bibliothèque numérique: accéder à musicMe'), + 'MenuLabel' => $this->_('Lien vers musicMe'), 'Introduction' => $this->_('Plateforme d\'écoute et de téléchargement de musique.'), 'NotAllowedMessage' => $this->_('Votre abonnement ne permet pas l\'accès à cette ressource.'), @@ -36,14 +36,14 @@ class MusicMe_Config extends Class_DigitalResource_Config { 'MailUrl' => 'https://www.musicme.com/#/support.php?cat=2', 'AdminVars' => [ - 'BIB_ID' => Class_AdminVar_Meta::newDefault($this->_('Identifiant fournit par MusicMe'))->bePrivate(), - 'URL' => Class_AdminVar_Meta::newDefault($this->_('Url fournit par MusicMe'))->bePrivate() + 'BIB_ID' => Class_AdminVar_Meta::newDefault($this->_('Identifiant fournit par musicMe'))->bePrivate(), + 'URL' => Class_AdminVar_Meta::newDefault($this->_('Url fournit par musicMe'))->bePrivate() ], 'SsoAction' => true, - 'Batch' => 'MusicMe_Batch', - 'Service' => 'MusicMe_Service', - 'ModuleMenu' => 'MusicMe_ModuleMenu', + 'Batch' => 'Musicme_Batch', + 'Service' => 'Musicme_Service', + 'ModuleMenu' => 'Musicme_ModuleMenu', ]; } diff --git a/library/digital_resources/Musicme/ModuleMenu.php b/library/digital_resources/Musicme/ModuleMenu.php index ed6971033ba72fb0ea59ca65d26dcbc837c22416..0ba69433233315ef96de51b4f08bbd021f37c81b 100644 --- a/library/digital_resources/Musicme/ModuleMenu.php +++ b/library/digital_resources/Musicme/ModuleMenu.php @@ -20,4 +20,4 @@ */ -class MusicMe_ModuleMenu extends Class_DigitalResource_ModuleMenu {} \ No newline at end of file +class Musicme_ModuleMenu extends Class_DigitalResource_ModuleMenu {} \ No newline at end of file diff --git a/library/digital_resources/Musicme/tests/MusicMeTest.php b/library/digital_resources/Musicme/tests/MusicmeTest.php similarity index 100% rename from library/digital_resources/Musicme/tests/MusicMeTest.php rename to library/digital_resources/Musicme/tests/MusicmeTest.php diff --git a/tests/application/modules/admin/controllers/UserGroupControllerTest.php b/tests/application/modules/admin/controllers/UserGroupControllerTest.php index f58a398f5923cb6b6ff4f51f97677c8c572d2b87..7b8430ac3daece7d9749925b21783521e69a3ed7 100644 --- a/tests/application/modules/admin/controllers/UserGroupControllerTest.php +++ b/tests/application/modules/admin/controllers/UserGroupControllerTest.php @@ -1065,7 +1065,7 @@ class Admin_UserGroupControllerRessourcesNumeriquesTest extends Admin_UserGroupC ['Numilog', 'Numilog'], ['CVS', 'CVS'], ['ToutApprendre', 'Tout Apprendre'], - ['MusicMe', 'Music Me'], + ['Musicme', 'Music Me'], ['NumeriquePremium', 'Numérique Premium']]; } diff --git a/tests/application/modules/opac/controllers/AuthControllerTest.php b/tests/application/modules/opac/controllers/AuthControllerTest.php index 30a600fe6692bb0c001ed70562034f52544f6c2a..95234f89f68d935a144a63f1c553abc456265dfa 100644 --- a/tests/application/modules/opac/controllers/AuthControllerTest.php +++ b/tests/application/modules/opac/controllers/AuthControllerTest.php @@ -945,8 +945,8 @@ abstract class AuthControllerPostSimpleSuccessfulTestCase extends AuthController ['id' => 20, 'libelle' => 'Multimedia']); - MusicMe_Config::getInstance()->getPermissions(); - $permission_id = Class_Permission::findFirstBy(['code' => 'MusicMe'])->getId(); + Musicme_Config::getInstance()->getPermissions(); + $permission_id = Class_Permission::findFirstBy(['code' => 'Musicme'])->getId(); $this->fixture('Class_UserGroup_Permission', ['id' => 1, @@ -1202,10 +1202,10 @@ class AuthControllerPostSuccessfulFromLecturaClientTest extends AuthControllerLe -class AuthControllerPostSuccessfulFromMusicMeCASClientTest extends AuthControllerPostSimpleSuccessfulTestCase { +class AuthControllerPostSuccessfulFromMusicmeCASClientTest extends AuthControllerPostSimpleSuccessfulTestCase { public function setUp() { parent::setUp(); - RessourcesNumeriquesFixtures::activateMusicMe(); + RessourcesNumeriquesFixtures::activateMusicme(); $this->postDispatch('/opac/auth/login', ['username' => 'foo', 'password' => 'bar', @@ -1214,14 +1214,14 @@ class AuthControllerPostSuccessfulFromMusicMeCASClientTest extends AuthControlle /** @test */ - public function responseShouldRedirectToMusicMeCasClientWithTicketAndBibId() { + public function responseShouldRedirectToMusicmeCasClientWithTicketAndBibId() { $ticket='ST-'.md5(Zend_Session::getId(). '2'); $this->assertRedirectTo('http://musicmeurl/?iduser=foo&ticket='.$ticket.'&MediaLibraryID=888&service=http%3A%2F%2Fmusicmeurl%2F%3Fiduser%3Dfoo%26ticket%3D'.$ticket.'%26MediaLibraryID%3D888'); } /** @test */ - public function userFooMusicMeShouldBeLogged() { + public function userFooMusicmeShouldBeLogged() { $this->assertEquals('foo', Class_Users::getIdentity()->getLogin()); } } diff --git a/tests/application/modules/opac/controllers/CasServerControllerTest.php b/tests/application/modules/opac/controllers/CasServerControllerTest.php index 135f1da0ffa4f91cf7bbec9e306e60955d9846e3..b6e0b7b135343a1ee3ed2069c87560dde3ca7ab7 100644 --- a/tests/application/modules/opac/controllers/CasServerControllerTest.php +++ b/tests/application/modules/opac/controllers/CasServerControllerTest.php @@ -152,7 +152,7 @@ class CasServerControllerValidateActionTest extends AbstractControllerTestCase { -class CasServerControllerMusicMeValidateActionTest extends AbstractControllerTestCase { +class CasServerControllerMusicmeValidateActionTest extends AbstractControllerTestCase { protected $session_file_contents_logged; protected $session_file_contents_nologin; @@ -167,14 +167,14 @@ class CasServerControllerMusicMeValidateActionTest extends AbstractControllerTes /** @test */ - public function requestMusicMeWithNoTicketShouldRespondAccountDisabledXML() { + public function requestMusicmeWithNoTicketShouldRespondAccountDisabledXML() { $this->dispatch('/opac/cas-server/validate-musicme?MediaLibraryID=150&ticket=ST-0a1b2c3d'); $this->assertContains('<User />',$this->_response->getBody()); } /** @test */ - public function requestMusicMeWithValidTicketShouldRespondValidXML() { + public function requestMusicmeWithValidTicketShouldRespondValidXML() { $this->dispatch('/opac/cas-server/validate-musicme?ticket=ST-'.md5(Zend_Session::getId().'300').'&MediaLibraryID=http://test.com'); $this->assertContains('<ID>300</ID>',$this->_response->getBody()); } @@ -183,7 +183,7 @@ class CasServerControllerMusicMeValidateActionTest extends AbstractControllerTes /** @test */ public function musicmeUrlShouldContainsTicket0a1b2c3d() { $expected_ticket = 'ST-'.md5(Zend_Session::getId().'300'); - $this->assertContains('ticket='.$expected_ticket.'&', Class_MusicMeLink::forUser(Class_Users::find(300))->url()); + $this->assertContains('ticket='.$expected_ticket.'&', Class_MusicmeLink::forUser(Class_Users::find(300))->url()); } diff --git a/tests/db/UpgradeDBTest.php b/tests/db/UpgradeDBTest.php index 10ba64c0257e7862798665458a911380259db3ea..bed578786f6bc03d0e1de4f8a98815bf44a573b7 100644 --- a/tests/db/UpgradeDBTest.php +++ b/tests/db/UpgradeDBTest.php @@ -1885,5 +1885,5 @@ class UpgradeDB_339_Test extends UpgradeDBTestCase { public function prepare() {} /** @test */ - public function placeholderForMusicMeMigrationPatch() {} + public function placeholderForMusicmeMigrationPatch() {} } diff --git a/tests/fixtures/RessourcesNumeriquesFixtures.php b/tests/fixtures/RessourcesNumeriquesFixtures.php index d0110a4bb2ca531780c434f6502c52e8cadc66fd..3f0c9482648de85112a48fdcb4e89c6074aec41c 100644 --- a/tests/fixtures/RessourcesNumeriquesFixtures.php +++ b/tests/fixtures/RessourcesNumeriquesFixtures.php @@ -29,7 +29,7 @@ class RessourcesNumeriquesFixtures { self::deactivateNumeriquePremium(); self::deactivateTypo3(); self::disableCVS(); - self::deactivateMusicMe(); + self::deactivateMusicme(); self::deactivate1Dtouch(); self::deactivateMyCow(); self::deactivatePlanetNemo(); @@ -51,7 +51,7 @@ class RessourcesNumeriquesFixtures { self::activateNumeriquePremium(); self::activateTypo3(); self::activateCVS(); - self::activateMusicMe(); + self::activateMusicme(); self::activate1Dtouch(); self::activateOrphea(); self::activateMyCow(); @@ -163,15 +163,15 @@ class RessourcesNumeriquesFixtures { } - public static function activateMusicMe() { - Class_AdminVar::newInstanceWithId('MusicMe_URL',['valeur' => 'http://musicmeurl/']); - Class_AdminVar::newInstanceWithId('MusicMe_BIB_ID',['valeur' => '888']); + public static function activateMusicme() { + Class_AdminVar::newInstanceWithId('Musicme_URL',['valeur' => 'http://musicmeurl/']); + Class_AdminVar::newInstanceWithId('Musicme_BIB_ID',['valeur' => '888']); } - public static function deactivateMusicMe() { - Class_AdminVar::newInstanceWithId('MusicMe_URL',['valeur' => '']); - Class_AdminVar::newInstanceWithId('MusicMe_BIB_ID',['valeur' => '']); + public static function deactivateMusicme() { + Class_AdminVar::newInstanceWithId('Musicme_URL',['valeur' => '']); + Class_AdminVar::newInstanceWithId('Musicme_BIB_ID',['valeur' => '']); } diff --git a/tests/library/Class/Migration/DigitalResource/MusicMeTest.php b/tests/library/Class/Migration/DigitalResource/MusicMeTest.php index e50707b1f63da8b61dd94c2fbaa65d0934b17fca..143d2900055f41fd544043a870a41c1e1b3b8882 100644 --- a/tests/library/Class/Migration/DigitalResource/MusicMeTest.php +++ b/tests/library/Class/Migration/DigitalResource/MusicMeTest.php @@ -20,7 +20,7 @@ */ -class Class_Migration_DigitialResource_MusicMeTest extends ModelTestCase { +class Class_Migration_DigitialResource_MusicmeTest extends ModelTestCase { protected $_storm_default_to_volatile = true, $_migration; @@ -44,7 +44,7 @@ class Class_Migration_DigitialResource_MusicMeTest extends ModelTestCase { 'sous_menus' => ''], ['type_menu' => 'MUSICME', - 'libelle' => 'Lien vers MusicMe', + 'libelle' => 'Lien vers Musicme', 'preferences' => [], 'picto' => 'vide.gif'] ]]]]]; @@ -93,7 +93,7 @@ class Class_Migration_DigitialResource_MusicMeTest extends ModelTestCase { ['id' => 'MUSICME_BIB_ID', 'valeur' => '123']); - $this->_migration = (new Class_Migration_DigitalResource_MusicMe()) + $this->_migration = (new Class_Migration_DigitalResource_Musicme()) ->setMemoryCleaner(function(){}) ->run(); } @@ -106,32 +106,32 @@ class Class_Migration_DigitialResource_MusicMeTest extends ModelTestCase { /** @test */ - public function adminVarMusicMeUrlShoudBeUpdated() { + public function adminVarMusicmeUrlShoudBeUpdated() { $this->assertEquals(2, Class_AdminVar::count()); - $this->assertNotNull(Class_AdminVar::findFirstBy(['clef' => 'MusicMe_URL', + $this->assertNotNull(Class_AdminVar::findFirstBy(['clef' => 'Musicme_URL', 'valeur' => 'http://mediathequefr.musicme.com/'])); } /** @test */ - public function adminVarMusicMeBibIdShoudBeUpdated() { + public function adminVarMusicmeBibIdShoudBeUpdated() { $this->assertEquals(2, Class_AdminVar::count()); - $this->assertNotNull(Class_AdminVar::findFirstBy(['clef' => 'MusicMe_BIB_ID', + $this->assertNotNull(Class_AdminVar::findFirstBy(['clef' => 'Musicme_BIB_ID', 'valeur' => '123'])); } /** @test */ - public function profilMenuWithAssimilShouldContainsMusicMe() { - $this->assertEquals('MusicMe', Class_Profil::find(22)->getCfgMenusAsArray()['H']['menus'][0]['sous_menus'][1]['type_menu']); + public function profilMenuWithAssimilShouldContainsMusicme() { + $this->assertEquals('Musicme', Class_Profil::find(22)->getCfgMenusAsArray()['H']['menus'][0]['sous_menus'][1]['type_menu']); } /** @test */ - public function teamOneShouldHavePermissionOnMusicMe() { + public function teamOneShouldHavePermissionOnMusicme() { if (!$permissions = Class_UserGroup::find(2)->getPermissions()) return $this->fail(); - $this->assertEquals('MusicMe', array_shift($permissions)->getCode()); + $this->assertEquals('Musicme', array_shift($permissions)->getCode()); } diff --git a/tests/library/Class/MusicMeLinkTest.php b/tests/library/Class/MusicMeLinkTest.php index ff7bd2c03948908e6b1fe691ae13f0b5a6eaa31d..ca6a866bf0a9af50275b1c3b3cd7951f7c8104df 100644 --- a/tests/library/Class/MusicMeLinkTest.php +++ b/tests/library/Class/MusicMeLinkTest.php @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -abstract class MusicMeLinkTestCase extends Storm_Test_ModelTestCase { +abstract class MusicmeLinkTestCase extends Storm_Test_ModelTestCase { protected $_http_client; protected $_jerry; public function setUp() { @@ -27,7 +27,7 @@ abstract class MusicMeLinkTestCase extends Storm_Test_ModelTestCase { $this->_http_client = Storm_Test_ObjectWrapper::mock(); Class_WebService_Abstract::setDefaultHttpClient($this->_http_client); - RessourcesNumeriquesFixtures::activateMusicMe(); + RessourcesNumeriquesFixtures::activateMusicme(); $this->_jerry = Class_Users::getLoader() ->newInstanceWithId(4) ->setIdabon(34) @@ -41,14 +41,14 @@ abstract class MusicMeLinkTestCase extends Storm_Test_ModelTestCase { ->setNaissance('1977-06-27') ->setBib(Class_Bib::newInstanceWithId(34, ['libelle' => 'Annecy'])); - $this->_musicme = Class_MusicMeLink::forUser($this->_jerry); + $this->_musicme = Class_MusicmeLink::forUser($this->_jerry); } } -class MusicMeLinkWithAbonTest extends MusicMeLinkTestCase { +class MusicmeLinkWithAbonTest extends MusicmeLinkTestCase { /** @test */ public function urlWithLogginShouldBeMusicmeSSO() { $this->assertEquals('http://musicmeurl/', diff --git a/tests/library/Class/Systeme/ModulesMenu/MusicMeTest.php b/tests/library/Class/Systeme/ModulesMenu/MusicMeTest.php index 2b5b54ba249e2531a19b9828b2d25b0d010b7548..fa8de36dffec614c2b8816b3221d644285b94fab 100644 --- a/tests/library/Class/Systeme/ModulesMenu/MusicMeTest.php +++ b/tests/library/Class/Systeme/ModulesMenu/MusicMeTest.php @@ -16,15 +16,15 @@ * * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE * along with BOKEH; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -class Class_Systeme_ModulesMenu_MusicMeTest extends Storm_Test_ModelTestCase { +class Class_Systeme_ModulesMenu_MusicmeTest extends Storm_Test_ModelTestCase { public function setUp() { parent::setUp(); RessourcesNumeriquesFixtures::activate(); - $this->menu = new Class_Systeme_ModulesMenu_MusicMe(); + $this->menu = new Class_Systeme_ModulesMenu_Musicme(); $this->user = $this->fixture('Class_Users', [ 'id'=> 34 , 'password' => 'toto' , @@ -33,8 +33,8 @@ class Class_Systeme_ModulesMenu_MusicMeTest extends Storm_Test_ModelTestCase { 'date_debut' => '1999-02-10', 'date_fin' => '2025-09-12', 'user_groups' => [$this->fixture('Class_UserGroup', [ - 'id' => 20, - 'libelle' => 'MusicMe' + 'id' => 20, + 'libelle' => 'Musicme' ])->addRight(Class_UserGroup::RIGHT_ACCES_MUSICME)] ])->beAbonneSIGB(); ZendAfi_Auth::getInstance()->logUser($this->user); @@ -51,7 +51,7 @@ class Class_Systeme_ModulesMenu_MusicMeTest extends Storm_Test_ModelTestCase { /** @test */ public function urlWithAbonnementInvalidShouldBeJSAlertAbonnementInvalid() { $this->user->setDateFin('2000-03-01'); - $url = $this->menu->getDynamiqueUrl(); + $url = $this->menu->getDynamiqueUrl(); $this->assertContains('Votre abonnement ne permet pas', $this->menu->getMessage()); } } diff --git a/tests/library/Class/Systeme/ModulesMenuTest.php b/tests/library/Class/Systeme/ModulesMenuTest.php index a410fe1a13277c9e8df46c9ddeeda23f6bf90261..e096899645344efa9ad0161025a3d87207a32f84 100644 --- a/tests/library/Class/Systeme/ModulesMenuTest.php +++ b/tests/library/Class/Systeme/ModulesMenuTest.php @@ -25,7 +25,7 @@ abstract class ModulesMenuBibNumeriqueTestCase extends Storm_Test_ModelTestCase public function availableServices() { return [ ['VODECLIC', 'Vodeclic'], - ['MUSICME', 'MusicMe'], + ['MUSICME', 'Musicme'], ['LEKIOSK', 'LeKiosk'], ['TOUTAPPRENDRE', 'Tout Apprendre'], ['NUMILOG', 'Numilog'], diff --git a/tests/library/ZendAfi/View/Helper/Status/JsonTest.php b/tests/library/ZendAfi/View/Helper/Status/JsonTest.php index 05a316a898c77fa5ce24ad5bea76405cf017c1cc..d955325960c6ab8e62341bfdc9dc650b9b02886d 100644 --- a/tests/library/ZendAfi/View/Helper/Status/JsonTest.php +++ b/tests/library/ZendAfi/View/Helper/Status/JsonTest.php @@ -181,9 +181,9 @@ class ZendAfi_View_Helper_Status_JsonTest extends ZendAfi_View_Helper_Status_Tes /** @test */ - public function MusicMeShouldEnabled() { + public function MusicmeShouldEnabled() { $this->assertContains(["code" => "MUSICME", - "label" => "MusicMe", + "label" => "Musicme", "enabled" => true, "features" => ["SSO"] ],