diff --git a/Module.php b/Module.php index 7b087800a847e4c3cf41ca7668616fc7cd3c9038..23f1317296358c656a4bdea6f99b790c7c405c2c 100644 --- a/Module.php +++ b/Module.php @@ -1,5 +1,5 @@ <?php -namespace UnicaenOAuth; +namespace UnicaenOauth; class Module { diff --git a/composer.json b/composer.json index 960186b3a5b63dac70fa9f901c4e394b5059f2e9..c6cda506c09360ec6df4546670367fad7d328c30 100644 --- a/composer.json +++ b/composer.json @@ -23,10 +23,7 @@ }, "autoload": { "psr-0": { - "UnicaenOAuth": "src/" - }, - "classmap": [ - "./Module.php" - ] + "UnicaenOauth": "src/" + } } } diff --git a/config/module.config.php b/config/module.config.php index de309a919fef6a0cadd66473789bc8bfc271240a..6f5333ca0f691e49ce5e3d4e96ea11863fc69ab8 100644 --- a/config/module.config.php +++ b/config/module.config.php @@ -1,6 +1,6 @@ <?php -namespace UnicaenOAuth; +namespace UnicaenOauth; return array( 'router' => array( diff --git a/src/UnicaenOAuth/Cas/CasService.php b/src/UnicaenOauth/Cas/CasService.php similarity index 98% rename from src/UnicaenOAuth/Cas/CasService.php rename to src/UnicaenOauth/Cas/CasService.php index f0ae2fd76db2d9adbf56bf43e6f38684d5777cf8..b1a17c482e0236b9342141fae0648a11302878f0 100644 --- a/src/UnicaenOAuth/Cas/CasService.php +++ b/src/UnicaenOauth/Cas/CasService.php @@ -1,5 +1,5 @@ <?php -namespace UnicaenOAuth\Cas; +namespace UnicaenOauth\Cas; use Zend\ServiceManager\ServiceLocatorAwareInterface; use Zend\ServiceManager\ServiceLocatorAwareTrait; diff --git a/src/UnicaenOAuth/Cas/CasServiceFactory.php b/src/UnicaenOauth/Cas/CasServiceFactory.php similarity index 92% rename from src/UnicaenOAuth/Cas/CasServiceFactory.php rename to src/UnicaenOauth/Cas/CasServiceFactory.php index 2daf60ead9c3bbeb65bcf1e773fd90dc79336d54..58d48595ecaf2b8501e35fd21c8c8dcd0fd410bc 100644 --- a/src/UnicaenOAuth/Cas/CasServiceFactory.php +++ b/src/UnicaenOauth/Cas/CasServiceFactory.php @@ -1,6 +1,6 @@ <?php -namespace UnicaenOAuth\Cas; +namespace UnicaenOauth\Cas; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; diff --git a/src/UnicaenOAuth/Cas/CasServiceTrait.php b/src/UnicaenOauth/Cas/CasServiceTrait.php similarity index 93% rename from src/UnicaenOAuth/Cas/CasServiceTrait.php rename to src/UnicaenOauth/Cas/CasServiceTrait.php index 5589ef7514ff803a0a1e7d66bc87b5392117acb9..3ca0f221350eea1e2eddf52dc07cd34e92315cb2 100644 --- a/src/UnicaenOAuth/Cas/CasServiceTrait.php +++ b/src/UnicaenOauth/Cas/CasServiceTrait.php @@ -1,6 +1,6 @@ <?php -namespace UnicaenOAuth\Cas; +namespace UnicaenOauth\Cas; trait CasServiceTrait { diff --git a/src/UnicaenOAuth/Controller/CasController.php b/src/UnicaenOauth/Controller/CasController.php similarity index 84% rename from src/UnicaenOAuth/Controller/CasController.php rename to src/UnicaenOauth/Controller/CasController.php index 6ab8476c65af1e588a2a672735671b902d587e38..b7c8492d84dd27b9ca55d7a93d69f96cb58c2a80 100644 --- a/src/UnicaenOAuth/Controller/CasController.php +++ b/src/UnicaenOauth/Controller/CasController.php @@ -1,8 +1,8 @@ <?php -namespace UnicaenOAuth\Controller; +namespace UnicaenOauth\Controller; -use UnicaenOAuth\Cas\CasServiceTrait; +use UnicaenOauth\Cas\CasServiceTrait; use Zend\Mvc\Controller\AbstractActionController; class CasController extends AbstractActionController diff --git a/src/UnicaenOAuth/Controller/CasControllerFactory.php b/src/UnicaenOauth/Controller/CasControllerFactory.php similarity index 92% rename from src/UnicaenOAuth/Controller/CasControllerFactory.php rename to src/UnicaenOauth/Controller/CasControllerFactory.php index 625fa745c0ae29477750ca7a1b2a88e3cc3d519b..2d37ea9790e072b3e45ce2bc9d17b5304cc49632 100644 --- a/src/UnicaenOAuth/Controller/CasControllerFactory.php +++ b/src/UnicaenOauth/Controller/CasControllerFactory.php @@ -1,6 +1,6 @@ <?php -namespace UnicaenOAuth\Controller; +namespace UnicaenOauth\Controller; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; diff --git a/src/UnicaenOAuth/OAuth2/Adapter/StorageAdapter.php b/src/UnicaenOauth/OAuth2/Adapter/StorageAdapter.php similarity index 98% rename from src/UnicaenOAuth/OAuth2/Adapter/StorageAdapter.php rename to src/UnicaenOauth/OAuth2/Adapter/StorageAdapter.php index a5a932ceac11d3ba295fb358764cfa0352e44a69..86e9d7d55953cd840a843017a0843a591ab80d1a 100644 --- a/src/UnicaenOAuth/OAuth2/Adapter/StorageAdapter.php +++ b/src/UnicaenOauth/OAuth2/Adapter/StorageAdapter.php @@ -1,8 +1,8 @@ <?php -namespace UnicaenOAuth\OAuth2\Adapter; +namespace UnicaenOauth\OAuth2\Adapter; -use UnicaenOAuth\Cas\CasServiceTrait; +use UnicaenOauth\Cas\CasServiceTrait; use UnicaenLdap\Filter\People as PeopleFilter; use UnicaenLdap\Service\People as PeopleLdapService; use Zend\Authentication\Adapter\Ldap as LdapAuthAdapter; diff --git a/src/UnicaenOAuth/OAuth2/Adapter/StorageAdapterFactory.php b/src/UnicaenOauth/OAuth2/Adapter/StorageAdapterFactory.php similarity index 94% rename from src/UnicaenOAuth/OAuth2/Adapter/StorageAdapterFactory.php rename to src/UnicaenOauth/OAuth2/Adapter/StorageAdapterFactory.php index eac1f53edd181641c72ae837144626f1d68bbc05..576353b37fec1bf5f580f3ad7645b8fd000edf49 100644 --- a/src/UnicaenOAuth/OAuth2/Adapter/StorageAdapterFactory.php +++ b/src/UnicaenOauth/OAuth2/Adapter/StorageAdapterFactory.php @@ -1,8 +1,8 @@ <?php -namespace UnicaenOAuth\OAuth2\Adapter; +namespace UnicaenOauth\OAuth2\Adapter; -use UnicaenOAuth\Cas\CasService; +use UnicaenOauth\Cas\CasService; use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; use ZF\OAuth2\Controller\Exception; @@ -12,7 +12,7 @@ class StorageAdapterFactory implements FactoryInterface /** * @param ServiceLocatorInterface $services * @throws \ZF\OAuth2\Controller\Exception\RuntimeException - * @return \UnicaenOAuth\OAuth2\Adapter\PdoAdapter + * @return \UnicaenOauth\OAuth2\Adapter\PdoAdapter */ public function createService(ServiceLocatorInterface $services) { diff --git a/view/unicaen-oauth/cas/login.phtml b/view/unicaen-oauth/cas/login.phtml index 215dd7c07a94bf21f3e7beb8e272b056939c2843..91557b82b1f3ba39c66732c9ad309950a66a4174 100644 --- a/view/unicaen-oauth/cas/login.phtml +++ b/view/unicaen-oauth/cas/login.phtml @@ -8,7 +8,7 @@ <script type="text/javascript"> $(function () { var username = '<?php echo $username ?>'; - var passwordCasPrefix = '<?php echo \UnicaenOAuth\OAuth2\Adapter\StorageAdapter::PASSWORD_CAS_PREFIX ?>'; + var passwordCasPrefix = '<?php echo \UnicaenOauth\OAuth2\Adapter\StorageAdapter::PASSWORD_CAS_PREFIX ?>'; try { window.opener.app.authenticationWithCasComplete({ identification: username,