Merge remote-tracking branch 'origin/BS5' into main (5ee55b27) · Commits · Bertrand Gauthier / parametre

.gitignore

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		.idea
		No newline at end of file

+6 −6

Original line number	Diff line number	Diff line
		@@ -2,11 +2,11 @@

		namespace UnicaenParametre;

		use Zend\Config\Factory as ConfigFactory;
		use Zend\Mvc\ModuleRouteListener;
		use Zend\Mvc\MvcEvent;
		use Zend\Stdlib\ArrayUtils;
		use Zend\Stdlib\Glob;
		use Laminas\Config\Factory as ConfigFactory;
		use Laminas\Mvc\ModuleRouteListener;
		use Laminas\Mvc\MvcEvent;
		use Laminas\Stdlib\ArrayUtils;
		use Laminas\Stdlib\Glob;

		class Module
		{
		@@ -35,7 +35,7 @@ class Module
		public function getAutoloaderConfig()
		{
		return array(
		'Zend\Loader\StandardAutoloader' => array(
		'Laminas\Loader\StandardAutoloader' => array(
		'namespaces' => array(
		__NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
		),

+2 −3

Original line number	Diff line number	Diff line
		{
		"name": "unicaen/parametre",
		"description": "Module de gestion de parametre",
		"description": "Module de gestion de paramètres",
		"repositories": [
		{
		"type": "composer",
		@@ -8,8 +8,7 @@
		}
		],
		"require": {
		"unicaen/app": "^3.0",
		"unicaen/privilege": "dev-master"
		"unicaen/privilege": "^5"
		},
		"autoload": {
		"psr-0": {

+2 −2

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@
		namespace UnicaenParametre;

		use UnicaenPrivilege\Guard\PrivilegeController;
		use Zend\Router\Http\Literal;
		use Zend\Router\Http\Segment;
		use Laminas\Router\Http\Literal;
		use Laminas\Router\Http\Segment;

		return [
		'bjyauthorize' => [

+3 −23

Original line number	Diff line number	Diff line
		@@ -12,8 +12,8 @@ use UnicaenParametre\Provider\Privilege\ParametrecategoriePrivileges;
		use UnicaenParametre\Service\Categorie\CategorieService;
		use UnicaenParametre\Service\Categorie\CategorieServiceFactory;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use Zend\Router\Http\Literal;
		use Zend\Router\Http\Segment;
		use Laminas\Router\Http\Literal;
		use Laminas\Router\Http\Segment;

		return [
		'bjyauthorize' => [
		@@ -51,27 +51,7 @@ return [
		],
		],

		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		'administration' => [
		'pages' => [
		'parametre' => [
		'label' => 'Paramètres',
		'route' => 'parametre/index',
		// 'resource' => PrivilegeController::getResourceId(CategorieController::class, 'index'),
		'resource' => ParametrecategoriePrivileges::getResourceId(ParametrecategoriePrivileges::PARAMETRECATEGORIE_INDEX),
		'order' => 7020,
		'pages' => [],
		'icon' => 'fas fa-angle-right',
		],
		],
		],
		],
		],
		],
		],


		'router' => [
		'routes' => [