Merge branch 'master' into v0.0.12 (55eb84c0) · Commits · lib / unicaen / signature

config/merged/signature.config.php

+0 −1

Changes for config/merged/signature.config.php: 0 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		<?php

		use Laminas\Router\Http\Literal;
		use Laminas\Router\Http\Regex;
		use Laminas\Router\Http\Segment;

+5 −10

Changes for config/module.config.php: 5 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		<?php

		use Doctrine\ORM\Mapping\Driver\XmlDriver;
		use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
		use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;

		return [
		@@ -13,22 +13,17 @@ return [
		'orm_default' => [
		'class' => MappingDriverChain::class,
		'drivers' => [
		'UnicaenSignature\Entity\Db' => 'orm_default_xml_driver',
		'UnicaenSignature\Entity\Db' => 'orm_default_annotation_driver',
		],
		],
		'orm_default_xml_driver' => [
		'class' => XmlDriver::class,
		'cache' => 'apc',
		'orm_default_annotation_driver' => [
		'class' => AnnotationDriver::class,
		'paths' => [
		__DIR__ . '/../src/Entity/Db/',
		],
		],
		],
		'cache' => [
		'apc' => [
		'namespace' => 'UNICAEN-SIGNATURE__' . __NAMESPACE__,
		],
		],

		],

		'view_manager' => [

+2 −1

Changes for src/Entity/Db/Process.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -16,7 +16,8 @@ class Process
		{
		/**
		* @ORM\Id
		* @ORM\GeneratedValue(strategy="AUTO")
		* @ORM\GeneratedValue(strategy="SEQUENCE")
		* @ORM\SequenceGenerator(sequenceName="unicaen_signature_process_id_seq",allocationSize=1, initialValue=1)
		* @ORM\Column(type="integer")
		*/
		private $id;

+2 −1

Changes for src/Entity/Db/ProcessStep.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -14,7 +14,8 @@ class ProcessStep
		{
		/**
		* @ORM\Id
		* @ORM\GeneratedValue(strategy="AUTO")
		* @ORM\GeneratedValue(strategy="SEQUENCE")
		* @ORM\SequenceGenerator(sequenceName="unicaen_signature_process_step_id_seq",allocationSize=1, initialValue=1)
		* @ORM\Column(type="integer")
		*/
		private int $id;

+2 −1

Changes for src/Entity/Db/Signature.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -70,7 +70,8 @@ class Signature

		/**
		* @ORM\Id
		* @ORM\GeneratedValue(strategy="AUTO")
		* @ORM\GeneratedValue(strategy="SEQUENCE")
		* @ORM\SequenceGenerator(sequenceName="unicaen_signature_signature_id_seq",allocationSize=1, initialValue=1)
		* @ORM\Column(type="integer")
		*/
		private $id;