Merge pull request #328 from manuakasam/hotfix/license-docblock-rebased

Changes "@Licence" with "@license"
ZF-Commons · Mar 22, 2016 · 4a8fe9a · 4a8fe9a
2 parents b459677 + 30446a8
commit 4a8fe9a
Show file tree

Hide file tree

Showing 57 changed files with 61 additions and 57 deletions.
diff --git a/src/ZfcRbac/Assertion/AssertionInterface.php b/src/ZfcRbac/Assertion/AssertionInterface.php
@@ -26,7 +26,7 @@
  * @author  Michaël Gallego <[email protected]>
  * @author  Aeneas Rekkas
  * @author  Daniel Gimenes  <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 interface AssertionInterface
 {

diff --git a/src/ZfcRbac/Assertion/AssertionPluginManager.php b/src/ZfcRbac/Assertion/AssertionPluginManager.php
@@ -25,7 +25,7 @@
  * Plugin manager to create assertions
  * 
  * @author  Aeneas Rekkas
- * @licence MIT
+ * @license MIT
  *
  * @method AssertionInterface get($name)
  */

diff --git a/src/ZfcRbac/Collector/RbacCollector.php b/src/ZfcRbac/Collector/RbacCollector.php
@@ -35,7 +35,7 @@
  * RbacCollector
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RbacCollector implements CollectorInterface, Serializable
 {

diff --git a/src/ZfcRbac/Exception/ExceptionInterface.php b/src/ZfcRbac/Exception/ExceptionInterface.php
@@ -22,7 +22,7 @@
  * Base exception interface for ZfcRbac
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 interface ExceptionInterface
 {

diff --git a/src/ZfcRbac/Exception/InvalidArgumentException.php b/src/ZfcRbac/Exception/InvalidArgumentException.php
@@ -24,7 +24,7 @@
  * InvalidArgumentException
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class InvalidArgumentException extends BaseInvalidArgumentException implements ExceptionInterface
 {

diff --git a/src/ZfcRbac/Exception/RoleNotFoundException.php b/src/ZfcRbac/Exception/RoleNotFoundException.php
@@ -24,7 +24,7 @@
  * Exception that is thrown when a role cannot be found (for instance from a provider)
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RoleNotFoundException extends BaseRuntimeException implements ExceptionInterface
 {

diff --git a/src/ZfcRbac/Exception/RuntimeException.php b/src/ZfcRbac/Exception/RuntimeException.php
@@ -24,7 +24,7 @@
  * RuntimeException
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RuntimeException extends BaseRuntimeException implements ExceptionInterface
 {

diff --git a/src/ZfcRbac/Exception/UnauthorizedException.php b/src/ZfcRbac/Exception/UnauthorizedException.php
@@ -24,7 +24,7 @@
  * Unauthorized exception
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class UnauthorizedException extends BaseRuntimeException implements UnauthorizedExceptionInterface
 {

diff --git a/src/ZfcRbac/Exception/UnauthorizedExceptionInterface.php b/src/ZfcRbac/Exception/UnauthorizedExceptionInterface.php
@@ -22,7 +22,7 @@
  * Interface for an unauthorized exception
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 interface UnauthorizedExceptionInterface extends ExceptionInterface
 {

diff --git a/src/ZfcRbac/Factory/AssertionPluginManagerFactory.php b/src/ZfcRbac/Factory/AssertionPluginManagerFactory.php
@@ -27,7 +27,7 @@
  * Factory to create a assertion plugin manager
  * 
  * @author  Aeneas Rekkas
- * @licence MIT
+ * @license MIT
  */
 class AssertionPluginManagerFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/AuthenticationIdentityProviderFactory.php b/src/ZfcRbac/Factory/AuthenticationIdentityProviderFactory.php
@@ -26,7 +26,7 @@
  * Factory to create the authentication identity provider
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class AuthenticationIdentityProviderFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/AuthorizationServiceFactory.php b/src/ZfcRbac/Factory/AuthorizationServiceFactory.php
@@ -26,7 +26,7 @@
  * Factory to create the authorization service
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class AuthorizationServiceFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/ControllerGuardFactory.php b/src/ZfcRbac/Factory/ControllerGuardFactory.php
@@ -27,7 +27,7 @@
  * Create a controller guard
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class ControllerGuardFactory implements FactoryInterface, MutableCreationOptionsInterface
 {

diff --git a/src/ZfcRbac/Factory/ControllerPermissionsGuardFactory.php b/src/ZfcRbac/Factory/ControllerPermissionsGuardFactory.php
@@ -28,7 +28,7 @@
  * Create a controller guard for checking permissions
  *
  * @author  JM Lerouxw <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class ControllerPermissionsGuardFactory implements FactoryInterface, MutableCreationOptionsInterface
 {

diff --git a/src/ZfcRbac/Factory/GuardPluginManagerFactory.php b/src/ZfcRbac/Factory/GuardPluginManagerFactory.php
@@ -27,7 +27,7 @@
  * Factory to create a guard plugin manager
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class GuardPluginManagerFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/GuardsFactory.php b/src/ZfcRbac/Factory/GuardsFactory.php
@@ -25,7 +25,7 @@
  * Create a list of guards
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class GuardsFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/HasRoleViewHelperFactory.php b/src/ZfcRbac/Factory/HasRoleViewHelperFactory.php
@@ -27,7 +27,7 @@
  * Create the HasRole view helper
  *
  * @author  JM Leroux <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class HasRoleViewHelperFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/IsGrantedPluginFactory.php b/src/ZfcRbac/Factory/IsGrantedPluginFactory.php
@@ -26,7 +26,7 @@
  * Create the IsGranted controller plugin
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class IsGrantedPluginFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/IsGrantedViewHelperFactory.php b/src/ZfcRbac/Factory/IsGrantedViewHelperFactory.php
@@ -26,7 +26,7 @@
  * Create the IsGranted view helper
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class IsGrantedViewHelperFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/ModuleOptionsFactory.php b/src/ZfcRbac/Factory/ModuleOptionsFactory.php
@@ -26,7 +26,7 @@
  * Factory for the module options
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class ModuleOptionsFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/ObjectRepositoryRoleProviderFactory.php b/src/ZfcRbac/Factory/ObjectRepositoryRoleProviderFactory.php
@@ -28,7 +28,7 @@
  * Factory used to create an object repository role provider
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class ObjectRepositoryRoleProviderFactory implements FactoryInterface, MutableCreationOptionsInterface
 {

diff --git a/src/ZfcRbac/Factory/RbacFactory.php b/src/ZfcRbac/Factory/RbacFactory.php
@@ -26,7 +26,7 @@
 
 /**
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RbacFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/RedirectStrategyFactory.php b/src/ZfcRbac/Factory/RedirectStrategyFactory.php
@@ -26,7 +26,7 @@
  * Factory to create a redirect strategy
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RedirectStrategyFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/RoleProviderPluginManagerFactory.php b/src/ZfcRbac/Factory/RoleProviderPluginManagerFactory.php
@@ -27,7 +27,7 @@
  * Factory to create a role provider plugin manager
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RoleProviderPluginManagerFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/RoleServiceFactory.php b/src/ZfcRbac/Factory/RoleServiceFactory.php
@@ -27,7 +27,7 @@
  * Factory to create the role service
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RoleServiceFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Factory/RouteGuardFactory.php b/src/ZfcRbac/Factory/RouteGuardFactory.php
@@ -27,7 +27,7 @@
  * Create a route guard
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RouteGuardFactory implements FactoryInterface, MutableCreationOptionsInterface
 {

diff --git a/src/ZfcRbac/Factory/RoutePermissionsGuardFactory.php b/src/ZfcRbac/Factory/RoutePermissionsGuardFactory.php
@@ -29,7 +29,7 @@
  *
  * @author  Michaël Gallego <[email protected]>
  * @author  JM Lerouxw <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RoutePermissionsGuardFactory implements FactoryInterface, MutableCreationOptionsInterface
 {

diff --git a/src/ZfcRbac/Factory/UnauthorizedStrategyFactory.php b/src/ZfcRbac/Factory/UnauthorizedStrategyFactory.php
@@ -26,7 +26,7 @@
  * Factory to create an unauthorized strategy
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class UnauthorizedStrategyFactory implements FactoryInterface
 {

diff --git a/src/ZfcRbac/Guard/AbstractGuard.php b/src/ZfcRbac/Guard/AbstractGuard.php
@@ -27,7 +27,7 @@
  * Abstract guard that hook on the MVC workflow
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 abstract class AbstractGuard implements GuardInterface
 {

diff --git a/src/ZfcRbac/Guard/ControllerGuard.php b/src/ZfcRbac/Guard/ControllerGuard.php
@@ -25,7 +25,7 @@
  * A controller guard can protect a controller and a set of actions
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class ControllerGuard extends AbstractGuard
 {

diff --git a/src/ZfcRbac/Guard/ControllerPermissionsGuard.php b/src/ZfcRbac/Guard/ControllerPermissionsGuard.php
@@ -26,7 +26,7 @@
  *
  * @author  Michaël Gallego <[email protected]>
  * @author  JM Leroux <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class ControllerPermissionsGuard extends AbstractGuard
 {

diff --git a/src/ZfcRbac/Guard/GuardInterface.php b/src/ZfcRbac/Guard/GuardInterface.php
@@ -32,7 +32,7 @@
  * proper authorization service (see the doc for more details)
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 interface GuardInterface extends ListenerAggregateInterface
 {

diff --git a/src/ZfcRbac/Guard/GuardPluginManager.php b/src/ZfcRbac/Guard/GuardPluginManager.php
@@ -27,8 +27,12 @@
  * @method GuardInterface get($name)
  *
  * @author  Michaël Gallego <[email protected]>
+<<<<<<< b459677bbe1c328d819969eed3fe7df68cb1112b
  * @author  JM Leroux <[email protected]>
- * @licence MIT
+ * @license MIT
+=======
+ * @license MIT
+>>>>>>> changes "@license" with "@license"
  */
 class GuardPluginManager extends AbstractPluginManager
 {

diff --git a/src/ZfcRbac/Guard/ProtectionPolicyTrait.php b/src/ZfcRbac/Guard/ProtectionPolicyTrait.php
@@ -22,7 +22,7 @@
  * Trait that is can be used for any guard that uses the protection policy pattern
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 trait ProtectionPolicyTrait
 {

diff --git a/src/ZfcRbac/Guard/RouteGuard.php b/src/ZfcRbac/Guard/RouteGuard.php
@@ -26,7 +26,7 @@
  * A route guard can protect a route or a hierarchy of routes (using simple wildcard pattern)
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RouteGuard extends AbstractGuard
 {

diff --git a/src/ZfcRbac/Guard/RoutePermissionsGuard.php b/src/ZfcRbac/Guard/RoutePermissionsGuard.php
@@ -26,7 +26,7 @@
  *
  * @author  Michaël Gallego <[email protected]>
  * @author  JM Leroux <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RoutePermissionsGuard extends AbstractGuard
 {

diff --git a/src/ZfcRbac/Identity/AuthenticationIdentityProvider.php b/src/ZfcRbac/Identity/AuthenticationIdentityProvider.php
@@ -25,7 +25,7 @@
  * This provider uses the Zend authentication service to fetch the identity
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class AuthenticationIdentityProvider implements IdentityProviderInterface
 {

diff --git a/src/ZfcRbac/Identity/IdentityInterface.php b/src/ZfcRbac/Identity/IdentityInterface.php
@@ -22,7 +22,7 @@
  * Interface for an identity
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 interface IdentityInterface
 {

diff --git a/src/ZfcRbac/Identity/IdentityProviderInterface.php b/src/ZfcRbac/Identity/IdentityProviderInterface.php
@@ -22,7 +22,7 @@
  * An identity provider is an object that returns an object that implement ZfcRbac\Identity\IdentityInterface
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 interface IdentityProviderInterface
 {

diff --git a/src/ZfcRbac/Module.php b/src/ZfcRbac/Module.php
@@ -26,7 +26,7 @@
  * Module class for ZfcRbac
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class Module implements BootstrapListenerInterface, ConfigProviderInterface
 {

diff --git a/src/ZfcRbac/Mvc/Controller/Plugin/IsGranted.php b/src/ZfcRbac/Mvc/Controller/Plugin/IsGranted.php
@@ -25,7 +25,7 @@
  * Controller plugin that allows to test a permission in a controller
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class IsGranted extends AbstractPlugin
 {

diff --git a/src/ZfcRbac/Options/ModuleOptions.php b/src/ZfcRbac/Options/ModuleOptions.php
@@ -26,7 +26,7 @@
  * Options for ZfcRbac module
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class ModuleOptions extends AbstractOptions
 {

diff --git a/src/ZfcRbac/Options/RedirectStrategyOptions.php b/src/ZfcRbac/Options/RedirectStrategyOptions.php
@@ -24,7 +24,7 @@
  * Redirect strategy options
  *
  * @author  Michaël Gallego <[email protected]>
- * @licence MIT
+ * @license MIT
  */
 class RedirectStrategyOptions extends AbstractOptions
 {