Passed
Push — master ( ef38a4...07a3b4 )
by Anthony
02:42
created
EventListener/GuidAwareListener.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 	public function prePersist($entity)
21 21
 	{
22 22
 		if ($entity->getGuid() === null) {
23
-			$entity->setGuid((string)Uuid::uuid4());
23
+			$entity->setGuid((string) Uuid::uuid4());
24 24
 		}
25 25
 	}
26 26
 }
Please login to merge, or discard this patch.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@
 block discarded – undo
12 12
 	 */
13 13
 	private $container;
14 14
 
15
-    /**
16
-     * GuidAwareListener constructor.
17
-     * @param ContainerInterface $container
18
-     */
19
-    public function __construct(ContainerInterface $container)
15
+				/**
16
+				 * GuidAwareListener constructor.
17
+				 * @param ContainerInterface $container
18
+				 */
19
+				public function __construct(ContainerInterface $container)
20 20
 	{
21 21
 		$this->container = $container;
22 22
 	}
Please login to merge, or discard this patch.
Entity/UserLogs.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -13,26 +13,26 @@  discard block
 block discarded – undo
13 13
  */
14 14
 class UserLogs
15 15
 {
16
-    /**
17
-     * @var integer
18
-     *
19
-     * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
20
-     * @ORM\Id
21
-     * @ORM\GeneratedValue(strategy="NONE")
22
-     */
23
-    private $id;
16
+				/**
17
+				 * @var integer
18
+				 *
19
+				 * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
20
+				 * @ORM\Id
21
+				 * @ORM\GeneratedValue(strategy="NONE")
22
+				 */
23
+				private $id;
24 24
 
25
-    /**
26
-     * @var \User
27
-     *
28
-     * @ORM\Id
29
-     * @ORM\GeneratedValue(strategy="NONE")
30
-     * @ORM\OneToOne(targetEntity="User")
31
-     * @ORM\JoinColumns({
32
-     *   @ORM\JoinColumn(name="user_id", referencedColumnName="id")
33
-     * })
34
-     */
35
-    private $user;
25
+				/**
26
+				 * @var \User
27
+				 *
28
+				 * @ORM\Id
29
+				 * @ORM\GeneratedValue(strategy="NONE")
30
+				 * @ORM\OneToOne(targetEntity="User")
31
+				 * @ORM\JoinColumns({
32
+				 *   @ORM\JoinColumn(name="user_id", referencedColumnName="id")
33
+				 * })
34
+				 */
35
+				private $user;
36 36
 	
37 37
 	/**
38 38
 	 * @var \DateTime
@@ -50,37 +50,37 @@  discard block
 block discarded – undo
50 50
 	 */
51 51
 	private $updateDate;
52 52
 
53
-    /**
54
-     * @return int
55
-     */
56
-    public function getId()
57
-    {
58
-        return $this->id;
59
-    }
53
+				/**
54
+				 * @return int
55
+				 */
56
+				public function getId()
57
+				{
58
+								return $this->id;
59
+				}
60 60
 
61
-    /**
62
-     * @param int $id
63
-     */
64
-    public function setId($id)
65
-    {
66
-        $this->id = $id;
67
-    }
61
+				/**
62
+				 * @param int $id
63
+				 */
64
+				public function setId($id)
65
+				{
66
+								$this->id = $id;
67
+				}
68 68
 
69
-    /**
70
-     * @return \User
71
-     */
72
-    public function getUser()
73
-    {
74
-        return $this->user;
75
-    }
69
+				/**
70
+				 * @return \User
71
+				 */
72
+				public function getUser()
73
+				{
74
+								return $this->user;
75
+				}
76 76
 
77
-    /**
78
-     * @param \User $user
79
-     */
80
-    public function setUser($user)
81
-    {
82
-        $this->user = $user;
83
-    }
77
+				/**
78
+				 * @param \User $user
79
+				 */
80
+				public function setUser($user)
81
+				{
82
+								$this->user = $user;
83
+				}
84 84
 	
85 85
 	/**
86 86
 	 * @return \DateTime
Please login to merge, or discard this patch.
Entity/Page.php 1 patch
Indentation   +232 added lines, -232 removed lines patch added patch discarded remove patch
@@ -14,49 +14,49 @@  discard block
 block discarded – undo
14 14
  */
15 15
 class Page
16 16
 {
17
-    /**
18
-     * @var integer
19
-     *
20
-     * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
21
-     * @ORM\Id
22
-     * @ORM\GeneratedValue(strategy="IDENTITY")
23
-     */
24
-    private $id;
25
-
26
-    /**
27
-     * @var string
28
-     *
29
-     * @ORM\Column(name="guid", type="string", length=255, nullable=false)
30
-     */
31
-    private $guid;
32
-
33
-    /**
34
-     * @var string
35
-     *
36
-     * @ORM\Column(name="title_tag", type="string", length=70, nullable=true)
37
-     */
38
-    private $titleTag;
39
-
40
-    /**
41
-     * @var string
42
-     *
43
-     * @ORM\Column(name="description_tag", type="string", length=160, nullable=true)
44
-     */
45
-    private $descriptionTag;
46
-
47
-    /**
48
-     * @var string
49
-     *
50
-     * @ORM\Column(name="title", type="string", length=255, nullable=false)
51
-     */
52
-    private $title;
17
+				/**
18
+				 * @var integer
19
+				 *
20
+				 * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
21
+				 * @ORM\Id
22
+				 * @ORM\GeneratedValue(strategy="IDENTITY")
23
+				 */
24
+				private $id;
25
+
26
+				/**
27
+				 * @var string
28
+				 *
29
+				 * @ORM\Column(name="guid", type="string", length=255, nullable=false)
30
+				 */
31
+				private $guid;
32
+
33
+				/**
34
+				 * @var string
35
+				 *
36
+				 * @ORM\Column(name="title_tag", type="string", length=70, nullable=true)
37
+				 */
38
+				private $titleTag;
39
+
40
+				/**
41
+				 * @var string
42
+				 *
43
+				 * @ORM\Column(name="description_tag", type="string", length=160, nullable=true)
44
+				 */
45
+				private $descriptionTag;
46
+
47
+				/**
48
+				 * @var string
49
+				 *
50
+				 * @ORM\Column(name="title", type="string", length=255, nullable=false)
51
+				 */
52
+				private $title;
53 53
 	
54 54
 	/**
55 55
 	 * @var string
56 56
 	 *
57 57
 	 * @ORM\Column(name="template", type="string", length=255, nullable=false)
58 58
 	 */
59
-    private $template;
59
+				private $template;
60 60
 	
61 61
 	/**
62 62
 	 * @var string
@@ -65,43 +65,43 @@  discard block
 block discarded – undo
65 65
 	 */
66 66
 	private $url;
67 67
 
68
-    /**
69
-     * @var string
70
-     *
71
-     * @ORM\Column(name="content", type="text", nullable=true)
72
-     */
73
-    private $content;
74
-
75
-    /**
76
-     * @var integer
77
-     *
78
-     * @ORM\Column(name="active", type="integer", nullable=false)
79
-     */
80
-    private $active;
81
-
82
-    /**
83
-     * @var integer
84
-     *
85
-     * @ORM\Column(name="order", type="integer", nullable=false)
86
-     */
87
-    private $order;
88
-
89
-    /**
90
-     * @var integer
91
-     *
92
-     * @ORM\Column(name="displayed", type="integer", nullable=false)
93
-     */
94
-    private $displayed;
95
-
96
-    /**
97
-     * @var \Page
98
-     *
99
-     * @ORM\ManyToOne(targetEntity="Page")
100
-     * @ORM\JoinColumns({
101
-     *   @ORM\JoinColumn(name="parent", referencedColumnName="id")
102
-     * })
103
-     */
104
-    private $parent;
68
+				/**
69
+				 * @var string
70
+				 *
71
+				 * @ORM\Column(name="content", type="text", nullable=true)
72
+				 */
73
+				private $content;
74
+
75
+				/**
76
+				 * @var integer
77
+				 *
78
+				 * @ORM\Column(name="active", type="integer", nullable=false)
79
+				 */
80
+				private $active;
81
+
82
+				/**
83
+				 * @var integer
84
+				 *
85
+				 * @ORM\Column(name="order", type="integer", nullable=false)
86
+				 */
87
+				private $order;
88
+
89
+				/**
90
+				 * @var integer
91
+				 *
92
+				 * @ORM\Column(name="displayed", type="integer", nullable=false)
93
+				 */
94
+				private $displayed;
95
+
96
+				/**
97
+				 * @var \Page
98
+				 *
99
+				 * @ORM\ManyToOne(targetEntity="Page")
100
+				 * @ORM\JoinColumns({
101
+				 *   @ORM\JoinColumn(name="parent", referencedColumnName="id")
102
+				 * })
103
+				 */
104
+				private $parent;
105 105
 	
106 106
 	/**
107 107
 	 * @var \DateTime
@@ -119,85 +119,85 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	private $updateDate;
121 121
 
122
-    /**
123
-     * @return int
124
-     */
125
-    public function getId()
126
-    {
127
-        return $this->id;
128
-    }
129
-
130
-    /**
131
-     * @param int $id
132
-     */
133
-    public function setId($id)
134
-    {
135
-        $this->id = $id;
136
-    }
137
-
138
-    /**
139
-     * @return string
140
-     */
141
-    public function getGuid()
142
-    {
143
-        return $this->guid;
144
-    }
145
-
146
-    /**
147
-     * @param string $guid
148
-     */
149
-    public function setGuid($guid)
150
-    {
151
-        $this->guid = $guid;
152
-    }
153
-
154
-    /**
155
-     * @return string
156
-     */
157
-    public function getTitleTag()
158
-    {
159
-        return $this->titleTag;
160
-    }
161
-
162
-    /**
163
-     * @param string $titleTag
164
-     */
165
-    public function setTitleTag($titleTag)
166
-    {
167
-        $this->titleTag = $titleTag;
168
-    }
169
-
170
-    /**
171
-     * @return string
172
-     */
173
-    public function getDescriptionTag()
174
-    {
175
-        return $this->descriptionTag;
176
-    }
177
-
178
-    /**
179
-     * @param string $descriptionTag
180
-     */
181
-    public function setDescriptionTag($descriptionTag)
182
-    {
183
-        $this->descriptionTag = $descriptionTag;
184
-    }
185
-
186
-    /**
187
-     * @return string
188
-     */
189
-    public function getTitle()
190
-    {
191
-        return $this->title;
192
-    }
193
-
194
-    /**
195
-     * @param string $title
196
-     */
197
-    public function setTitle($title)
198
-    {
199
-        $this->title = $title;
200
-    }
122
+				/**
123
+				 * @return int
124
+				 */
125
+				public function getId()
126
+				{
127
+								return $this->id;
128
+				}
129
+
130
+				/**
131
+				 * @param int $id
132
+				 */
133
+				public function setId($id)
134
+				{
135
+								$this->id = $id;
136
+				}
137
+
138
+				/**
139
+				 * @return string
140
+				 */
141
+				public function getGuid()
142
+				{
143
+								return $this->guid;
144
+				}
145
+
146
+				/**
147
+				 * @param string $guid
148
+				 */
149
+				public function setGuid($guid)
150
+				{
151
+								$this->guid = $guid;
152
+				}
153
+
154
+				/**
155
+				 * @return string
156
+				 */
157
+				public function getTitleTag()
158
+				{
159
+								return $this->titleTag;
160
+				}
161
+
162
+				/**
163
+				 * @param string $titleTag
164
+				 */
165
+				public function setTitleTag($titleTag)
166
+				{
167
+								$this->titleTag = $titleTag;
168
+				}
169
+
170
+				/**
171
+				 * @return string
172
+				 */
173
+				public function getDescriptionTag()
174
+				{
175
+								return $this->descriptionTag;
176
+				}
177
+
178
+				/**
179
+				 * @param string $descriptionTag
180
+				 */
181
+				public function setDescriptionTag($descriptionTag)
182
+				{
183
+								$this->descriptionTag = $descriptionTag;
184
+				}
185
+
186
+				/**
187
+				 * @return string
188
+				 */
189
+				public function getTitle()
190
+				{
191
+								return $this->title;
192
+				}
193
+
194
+				/**
195
+				 * @param string $title
196
+				 */
197
+				public function setTitle($title)
198
+				{
199
+								$this->title = $title;
200
+				}
201 201
 	
202 202
 	/**
203 203
 	 * @return string
@@ -231,85 +231,85 @@  discard block
 block discarded – undo
231 231
 		$this->url = $url;
232 232
 	}
233 233
 
234
-    /**
235
-     * @return string
236
-     */
237
-    public function getContent()
238
-    {
239
-        return $this->content;
240
-    }
241
-
242
-    /**
243
-     * @param string $content
244
-     */
245
-    public function setContent($content)
246
-    {
247
-        $this->content = $content;
248
-    }
249
-
250
-    /**
251
-     * @return int
252
-     */
253
-    public function getActive()
254
-    {
255
-        return $this->active;
256
-    }
257
-
258
-    /**
259
-     * @param int $active
260
-     */
261
-    public function setActive($active)
262
-    {
263
-        $this->active = $active;
264
-    }
265
-
266
-    /**
267
-     * @return int
268
-     */
269
-    public function getOrder()
270
-    {
271
-        return $this->order;
272
-    }
273
-
274
-    /**
275
-     * @param int $order
276
-     */
277
-    public function setOrder($order)
278
-    {
279
-        $this->order = $order;
280
-    }
281
-
282
-    /**
283
-     * @return int
284
-     */
285
-    public function getDisplayed()
286
-    {
287
-        return $this->displayed;
288
-    }
289
-
290
-    /**
291
-     * @param int $displayed
292
-     */
293
-    public function setDisplayed($displayed)
294
-    {
295
-        $this->displayed = $displayed;
296
-    }
297
-
298
-    /**
299
-     * @return \Page
300
-     */
301
-    public function getParent()
302
-    {
303
-        return $this->parent;
304
-    }
305
-
306
-    /**
307
-     * @param \Page $parent
308
-     */
309
-    public function setParent($parent)
310
-    {
311
-        $this->parent = $parent;
312
-    }
234
+				/**
235
+				 * @return string
236
+				 */
237
+				public function getContent()
238
+				{
239
+								return $this->content;
240
+				}
241
+
242
+				/**
243
+				 * @param string $content
244
+				 */
245
+				public function setContent($content)
246
+				{
247
+								$this->content = $content;
248
+				}
249
+
250
+				/**
251
+				 * @return int
252
+				 */
253
+				public function getActive()
254
+				{
255
+								return $this->active;
256
+				}
257
+
258
+				/**
259
+				 * @param int $active
260
+				 */
261
+				public function setActive($active)
262
+				{
263
+								$this->active = $active;
264
+				}
265
+
266
+				/**
267
+				 * @return int
268
+				 */
269
+				public function getOrder()
270
+				{
271
+								return $this->order;
272
+				}
273
+
274
+				/**
275
+				 * @param int $order
276
+				 */
277
+				public function setOrder($order)
278
+				{
279
+								$this->order = $order;
280
+				}
281
+
282
+				/**
283
+				 * @return int
284
+				 */
285
+				public function getDisplayed()
286
+				{
287
+								return $this->displayed;
288
+				}
289
+
290
+				/**
291
+				 * @param int $displayed
292
+				 */
293
+				public function setDisplayed($displayed)
294
+				{
295
+								$this->displayed = $displayed;
296
+				}
297
+
298
+				/**
299
+				 * @return \Page
300
+				 */
301
+				public function getParent()
302
+				{
303
+								return $this->parent;
304
+				}
305
+
306
+				/**
307
+				 * @param \Page $parent
308
+				 */
309
+				public function setParent($parent)
310
+				{
311
+								$this->parent = $parent;
312
+				}
313 313
 	
314 314
 	/**
315 315
 	 * @return \DateTime
Please login to merge, or discard this patch.
Controller/AccountsController.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -75,14 +75,14 @@
 block discarded – undo
75 75
 				$username = $data->getUser()->getFirstName() . " " . $data->getUser()->getLastName();
76 76
 				
77 77
 				if ($guid === null) {
78
-					$this->addFlash("success-flash", "the account of ". $username . " was created");
78
+					$this->addFlash("success-flash", "the account of " . $username . " was created");
79 79
 				} else {
80
-					$this->addFlash("success-flash", "the account of ". $username . " was edited");
80
+					$this->addFlash("success-flash", "the account of " . $username . " was edited");
81 81
 				}
82 82
 				
83 83
 				return $this->redirectToRoute("ribsadmin_accounts");
84 84
 			} else {
85
-				$this->addFlash("error-flash", "An account with username ". $data->getUsername() . " already exist");
85
+				$this->addFlash("error-flash", "An account with username " . $data->getUsername() . " already exist");
86 86
 				return $this->redirectToRoute($request->get("_route"), ["guid" => $guid]);
87 87
 			}
88 88
 		}
Please login to merge, or discard this patch.
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -33,13 +33,13 @@  discard block
 block discarded – undo
33 33
 		]);
34 34
 	}
35 35
 
36
-    /**
37
-     * @Route("/accounts/create/", name="ribsadmin_accounts_create")
38
-     * @Route("/accounts/edit/{guid}", name="ribsadmin_accounts_edit")
39
-     * @param Request $request
40
-     * @param string|null $guid
41
-     * @return Response
42
-     */
36
+				/**
37
+				 * @Route("/accounts/create/", name="ribsadmin_accounts_create")
38
+				 * @Route("/accounts/edit/{guid}", name="ribsadmin_accounts_edit")
39
+				 * @param Request $request
40
+				 * @param string|null $guid
41
+				 * @return Response
42
+				 */
43 43
 	public function editUserAction(Request $request, string $guid = null): Response
44 44
 	{
45 45
 		$em = $this->getDoctrine()->getManager();
@@ -47,11 +47,11 @@  discard block
 block discarded – undo
47 47
 		if ($guid === null) {
48 48
 			$account = new Account();
49 49
 			$old_password = null;
50
-            $user = null;
50
+												$user = null;
51 51
 		} else {
52 52
 			$user = $em->getRepository(User::class)->findOneBy(["guid" => $guid]);
53 53
 			$account = $em->getRepository(Account::class)->findOneBy(["user" => $user->getId()]);
54
-            $old_password = $account->getPassword();
54
+												$old_password = $account->getPassword();
55 55
 		}
56 56
 		
57 57
 		$form = $this->createForm("PiouPiou\RibsAdminBundle\Form\Account", $account);
@@ -71,15 +71,15 @@  discard block
 block discarded – undo
71 71
 			}
72 72
 			
73 73
 			if (!$account_exist) {
74
-			    if ($guid === null) {
75
-                    $temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData());
76
-                    $data->setPassword($temp_password);
77
-                } else if ($form->get("password")->getData()) {
78
-                    $temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData());
79
-                    $data->setPassword($temp_password);
80
-                } else {
81
-			        $data->setPassword($old_password);
82
-                }
74
+							if ($guid === null) {
75
+																				$temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData());
76
+																				$data->setPassword($temp_password);
77
+																} else if ($form->get("password")->getData()) {
78
+																				$temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData());
79
+																				$data->setPassword($temp_password);
80
+																} else {
81
+											$data->setPassword($old_password);
82
+																}
83 83
 
84 84
 				$em->persist($data);
85 85
 				$em->flush();
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 		
102 102
 		return $this->render("@RibsAdmin/accounts/edit.html.twig", [
103 103
 			"form" => $form->createView(),
104
-            "form_errors" => $form->getErrors(),
105
-            "user" => $user
104
+												"form_errors" => $form->getErrors(),
105
+												"user" => $user
106 106
 		]);
107 107
 	}
108 108
 	//-------------------------------------------- END DISPLAY VIEWS -----------------------------------------------------------//
Please login to merge, or discard this patch.
Entity/User.php 1 patch
Indentation   +239 added lines, -239 removed lines patch added patch discarded remove patch
@@ -14,21 +14,21 @@  discard block
 block discarded – undo
14 14
  */
15 15
 class User
16 16
 {
17
-    /**
18
-     * @var integer
19
-     *
20
-     * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
21
-     * @ORM\Id
22
-     * @ORM\GeneratedValue(strategy="IDENTITY")
23
-     */
24
-    private $id;
25
-
26
-    /**
27
-     * @var string
28
-     *
29
-     * @ORM\Column(name="guid", type="string", length=255, nullable=false)
30
-     */
31
-    private $guid;
17
+				/**
18
+				 * @var integer
19
+				 *
20
+				 * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
21
+				 * @ORM\Id
22
+				 * @ORM\GeneratedValue(strategy="IDENTITY")
23
+				 */
24
+				private $id;
25
+
26
+				/**
27
+				 * @var string
28
+				 *
29
+				 * @ORM\Column(name="guid", type="string", length=255, nullable=false)
30
+				 */
31
+				private $guid;
32 32
 	
33 33
 	/**
34 34
 	 * @var AccessRight
@@ -36,63 +36,63 @@  discard block
 block discarded – undo
36 36
 	 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\AccessRight", inversedBy="users")
37 37
 	 * @ORM\JoinColumn(name="id_access_right", referencedColumnName="id", nullable=true)
38 38
 	 */
39
-    private $accessRightList;
39
+				private $accessRightList;
40 40
 	
41 41
 	/**
42 42
 	 * @var boolean
43 43
 	 *
44 44
 	 * @ORM\Column(name="admin", type="boolean", nullable=true, options={"default": false})
45 45
 	 */
46
-    private $admin;
47
-
48
-    /**
49
-     * @var string
50
-     *
51
-     * @ORM\Column(name="firstname", type="string", length=255, nullable=false)
52
-     */
53
-    private $firstname;
54
-
55
-    /**
56
-     * @var string
57
-     *
58
-     * @ORM\Column(name="lastname", type="string", length=255, nullable=false)
59
-     */
60
-    private $lastname;
61
-
62
-    /**
63
-     * @var string
64
-     *
65
-     * @ORM\Column(name="adress", type="string", length=255, nullable=true)
66
-     */
67
-    private $adress;
68
-
69
-    /**
70
-     * @var string
71
-     *
72
-     * @ORM\Column(name="postal_code", type="string", length=100, nullable=true)
73
-     */
74
-    private $postalCode;
75
-
76
-    /**
77
-     * @var string
78
-     *
79
-     * @ORM\Column(name="country", type="string", length=100, nullable=true)
80
-     */
81
-    private $country;
82
-
83
-    /**
84
-     * @var string
85
-     *
86
-     * @ORM\Column(name="state", type="string", length=255, nullable=true)
87
-     */
88
-    private $state;
89
-
90
-    /**
91
-     * @var string
92
-     *
93
-     * @ORM\Column(name="access_rights", type="text", nullable=true)
94
-     */
95
-    private $accessRights;
46
+				private $admin;
47
+
48
+				/**
49
+				 * @var string
50
+				 *
51
+				 * @ORM\Column(name="firstname", type="string", length=255, nullable=false)
52
+				 */
53
+				private $firstname;
54
+
55
+				/**
56
+				 * @var string
57
+				 *
58
+				 * @ORM\Column(name="lastname", type="string", length=255, nullable=false)
59
+				 */
60
+				private $lastname;
61
+
62
+				/**
63
+				 * @var string
64
+				 *
65
+				 * @ORM\Column(name="adress", type="string", length=255, nullable=true)
66
+				 */
67
+				private $adress;
68
+
69
+				/**
70
+				 * @var string
71
+				 *
72
+				 * @ORM\Column(name="postal_code", type="string", length=100, nullable=true)
73
+				 */
74
+				private $postalCode;
75
+
76
+				/**
77
+				 * @var string
78
+				 *
79
+				 * @ORM\Column(name="country", type="string", length=100, nullable=true)
80
+				 */
81
+				private $country;
82
+
83
+				/**
84
+				 * @var string
85
+				 *
86
+				 * @ORM\Column(name="state", type="string", length=255, nullable=true)
87
+				 */
88
+				private $state;
89
+
90
+				/**
91
+				 * @var string
92
+				 *
93
+				 * @ORM\Column(name="access_rights", type="text", nullable=true)
94
+				 */
95
+				private $accessRights;
96 96
 	
97 97
 	/**
98 98
 	 * @var boolean
@@ -117,37 +117,37 @@  discard block
 block discarded – undo
117 117
 	 */
118 118
 	private $updateDate;
119 119
 
120
-    /**
121
-     * @return int
122
-     */
123
-    public function getId()
124
-    {
125
-        return $this->id;
126
-    }
127
-
128
-    /**
129
-     * @param int $id
130
-     */
131
-    public function setId($id)
132
-    {
133
-        $this->id = $id;
134
-    }
135
-
136
-    /**
137
-     * @return string
138
-     */
139
-    public function getGuid()
140
-    {
141
-        return $this->guid;
142
-    }
143
-
144
-    /**
145
-     * @param string $guid
146
-     */
147
-    public function setGuid($guid)
148
-    {
149
-        $this->guid = $guid;
150
-    }
120
+				/**
121
+				 * @return int
122
+				 */
123
+				public function getId()
124
+				{
125
+								return $this->id;
126
+				}
127
+
128
+				/**
129
+				 * @param int $id
130
+				 */
131
+				public function setId($id)
132
+				{
133
+								$this->id = $id;
134
+				}
135
+
136
+				/**
137
+				 * @return string
138
+				 */
139
+				public function getGuid()
140
+				{
141
+								return $this->guid;
142
+				}
143
+
144
+				/**
145
+				 * @param string $guid
146
+				 */
147
+				public function setGuid($guid)
148
+				{
149
+								$this->guid = $guid;
150
+				}
151 151
 	
152 152
 	/**
153 153
 	 * @return AccessRight
@@ -181,133 +181,133 @@  discard block
 block discarded – undo
181 181
 		$this->admin = $admin;
182 182
 	}
183 183
 
184
-    /**
185
-     * @return string
186
-     */
187
-    public function getFirstname()
188
-    {
189
-        return $this->firstname;
190
-    }
191
-
192
-    /**
193
-     * @param string $firstname
194
-     */
195
-    public function setFirstname($firstname)
196
-    {
197
-        $this->firstname = $firstname;
198
-    }
199
-
200
-    /**
201
-     * @return string
202
-     */
203
-    public function getLastname()
204
-    {
205
-        return $this->lastname;
206
-    }
207
-
208
-    /**
209
-     * @param string $lastname
210
-     */
211
-    public function setLastname($lastname)
212
-    {
213
-        $this->lastname = $lastname;
214
-    }
215
-
216
-    /**
217
-     * @return string
218
-     */
219
-    public function getAdress()
220
-    {
221
-        return $this->adress;
222
-    }
223
-
224
-    /**
225
-     * @param string $adress
226
-     */
227
-    public function setAdress($adress)
228
-    {
229
-        $this->adress = $adress;
230
-    }
231
-
232
-    /**
233
-     * @return string
234
-     */
235
-    public function getPostalCode()
236
-    {
237
-        return $this->postalCode;
238
-    }
239
-
240
-    /**
241
-     * @param string $postalCode
242
-     */
243
-    public function setPostalCode($postalCode)
244
-    {
245
-        $this->postalCode = $postalCode;
246
-    }
247
-
248
-    /**
249
-     * @return string
250
-     */
251
-    public function getCountry()
252
-    {
253
-        return $this->country;
254
-    }
255
-
256
-    /**
257
-     * @param string $country
258
-     */
259
-    public function setCountry($country)
260
-    {
261
-        $this->country = $country;
262
-    }
263
-
264
-    /**
265
-     * @return string
266
-     */
267
-    public function getState()
268
-    {
269
-        return $this->state;
270
-    }
271
-
272
-    /**
273
-     * @param string $state
274
-     */
275
-    public function setState($state)
276
-    {
277
-        $this->state = $state;
278
-    }
279
-
280
-    /**
281
-     * @return string
282
-     */
283
-    public function getAccessRights()
284
-    {
285
-        return $this->accessRights;
286
-    }
287
-
288
-    /**
289
-     * @param string $accessRights
290
-     */
291
-    public function setAccessRights($accessRights)
292
-    {
293
-        $this->accessRights = $accessRights;
294
-    }
295
-
296
-    /**
297
-     * @return \DateTime
298
-     */
299
-    public function getCreationDate()
300
-    {
301
-        return $this->creationDate;
302
-    }
303
-
304
-    /**
305
-     * @param \DateTime $creationDate
306
-     */
307
-    public function setCreationDate($creationDate)
308
-    {
309
-        $this->creationDate = $creationDate;
310
-    }
184
+				/**
185
+				 * @return string
186
+				 */
187
+				public function getFirstname()
188
+				{
189
+								return $this->firstname;
190
+				}
191
+
192
+				/**
193
+				 * @param string $firstname
194
+				 */
195
+				public function setFirstname($firstname)
196
+				{
197
+								$this->firstname = $firstname;
198
+				}
199
+
200
+				/**
201
+				 * @return string
202
+				 */
203
+				public function getLastname()
204
+				{
205
+								return $this->lastname;
206
+				}
207
+
208
+				/**
209
+				 * @param string $lastname
210
+				 */
211
+				public function setLastname($lastname)
212
+				{
213
+								$this->lastname = $lastname;
214
+				}
215
+
216
+				/**
217
+				 * @return string
218
+				 */
219
+				public function getAdress()
220
+				{
221
+								return $this->adress;
222
+				}
223
+
224
+				/**
225
+				 * @param string $adress
226
+				 */
227
+				public function setAdress($adress)
228
+				{
229
+								$this->adress = $adress;
230
+				}
231
+
232
+				/**
233
+				 * @return string
234
+				 */
235
+				public function getPostalCode()
236
+				{
237
+								return $this->postalCode;
238
+				}
239
+
240
+				/**
241
+				 * @param string $postalCode
242
+				 */
243
+				public function setPostalCode($postalCode)
244
+				{
245
+								$this->postalCode = $postalCode;
246
+				}
247
+
248
+				/**
249
+				 * @return string
250
+				 */
251
+				public function getCountry()
252
+				{
253
+								return $this->country;
254
+				}
255
+
256
+				/**
257
+				 * @param string $country
258
+				 */
259
+				public function setCountry($country)
260
+				{
261
+								$this->country = $country;
262
+				}
263
+
264
+				/**
265
+				 * @return string
266
+				 */
267
+				public function getState()
268
+				{
269
+								return $this->state;
270
+				}
271
+
272
+				/**
273
+				 * @param string $state
274
+				 */
275
+				public function setState($state)
276
+				{
277
+								$this->state = $state;
278
+				}
279
+
280
+				/**
281
+				 * @return string
282
+				 */
283
+				public function getAccessRights()
284
+				{
285
+								return $this->accessRights;
286
+				}
287
+
288
+				/**
289
+				 * @param string $accessRights
290
+				 */
291
+				public function setAccessRights($accessRights)
292
+				{
293
+								$this->accessRights = $accessRights;
294
+				}
295
+
296
+				/**
297
+				 * @return \DateTime
298
+				 */
299
+				public function getCreationDate()
300
+				{
301
+								return $this->creationDate;
302
+				}
303
+
304
+				/**
305
+				 * @param \DateTime $creationDate
306
+				 */
307
+				public function setCreationDate($creationDate)
308
+				{
309
+								$this->creationDate = $creationDate;
310
+				}
311 311
 	
312 312
 	/**
313 313
 	 * @return boolean
@@ -325,21 +325,21 @@  discard block
 block discarded – undo
325 325
 		$this->archived = $archived;
326 326
 	}
327 327
 
328
-    /**
329
-     * @return \DateTime
330
-     */
331
-    public function getUpdateDate()
332
-    {
333
-        return $this->updateDate;
334
-    }
335
-
336
-    /**
337
-     * @param \DateTime $updateDate
338
-     */
339
-    public function setUpdateDate($updateDate)
340
-    {
341
-        $this->updateDate = $updateDate;
342
-    }
328
+				/**
329
+				 * @return \DateTime
330
+				 */
331
+				public function getUpdateDate()
332
+				{
333
+								return $this->updateDate;
334
+				}
335
+
336
+				/**
337
+				 * @param \DateTime $updateDate
338
+				 */
339
+				public function setUpdateDate($updateDate)
340
+				{
341
+								$this->updateDate = $updateDate;
342
+				}
343 343
 
344 344
 
345 345
 }
Please login to merge, or discard this patch.
Service/Api.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,8 +94,8 @@
 block discarded – undo
94 94
 	{
95 95
 		$string = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ23456789";
96 96
 		$token = "";
97
-		srand((double)microtime() * 1000000);
98
-		for ($i = 0 ; $i < $length ; $i++) {
97
+		srand((double) microtime() * 1000000);
98
+		for ($i = 0; $i < $length; $i++) {
99 99
 			$token .= $string[rand() % strlen($string)];
100 100
 		}
101 101
 		
Please login to merge, or discard this patch.
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	}
33 33
 	
34 34
 	/**
35
-     * this method is used to test jwt and if the user is ok else send false
35
+	 * this method is used to test jwt and if the user is ok else send false
36 36
 	 * @param string $infos_jwt
37 37
 	 * @param string $token
38 38
 	 * @return Account|bool
@@ -58,12 +58,12 @@  discard block
 block discarded – undo
58 58
 	}
59 59
 
60 60
 
61
-    /**
62
-     * method that return the token for a user
63
-     * @param Account $account
64
-     * @return string
65
-     * @throws \Exception
66
-     */
61
+				/**
62
+				 * method that return the token for a user
63
+				 * @param Account $account
64
+				 * @return string
65
+				 * @throws \Exception
66
+				 */
67 67
 	public function getToken(Account $account): string
68 68
 	{
69 69
 		$token = $account->getToken();
@@ -76,12 +76,12 @@  discard block
 block discarded – undo
76 76
 		return $token;
77 77
 	}
78 78
 
79
-    /**
80
-     * method that set a toek for the user
81
-     * @param Account $account
82
-     * @return string
83
-     * @throws \Exception
84
-     */
79
+				/**
80
+				 * method that set a toek for the user
81
+				 * @param Account $account
82
+				 * @return string
83
+				 * @throws \Exception
84
+				 */
85 85
 	public function setToken(Account $account): string
86 86
 	{
87 87
 		$token = $this->generateToken();
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	}
99 99
 	
100 100
 	/**
101
-     * generate a token for api
101
+	 * generate a token for api
102 102
 	 * @param int $length
103 103
 	 * @return string
104 104
 	 */
Please login to merge, or discard this patch.
Service/ModuleService.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 	}
23 23
 	
24 24
 	/**
25
-     * method that return all infos needed in access right management page
25
+	 * method that return all infos needed in access right management page
26 26
 	 * @return array
27 27
 	 */
28 28
 	public function getAllInfosModules()
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	}
45 45
 	
46 46
 	/**
47
-     * function that return all modules rights
47
+	 * function that return all modules rights
48 48
 	 * @return object
49 49
 	 */
50 50
 	public function getModuleRights()
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		foreach ($modules as $module) {
37 37
 			$modules_data[] = [
38 38
 				"name" => $module->getTitle(),
39
-				"rights" => (array)json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/ribsadmin_rights.json"))
39
+				"rights" => (array) json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/ribsadmin_rights.json"))
40 40
 			];
41 41
 		}
42 42
 		
@@ -59,6 +59,6 @@  discard block
 block discarded – undo
59 59
 			$rights[] = json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/ribsadmin_rights.json"));
60 60
 		}
61 61
 		
62
-		return (object)$rights;
62
+		return (object) $rights;
63 63
 	}
64 64
 }
Please login to merge, or discard this patch.
Service/AccessRights.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 		
80 80
 		$ribs_admin_rights = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json"));
81 81
 		$modules_rights = $this->module->getModuleRights();
82
-		$ribs_admin_rights = (object)array_merge((array)$ribs_admin_rights, (array)$modules_rights);
82
+		$ribs_admin_rights = (object) array_merge((array) $ribs_admin_rights, (array) $modules_rights);
83 83
 		
84 84
 		if ($admin_page == "ribsadmin" && $api !== "api" && strpos($route, "login") === false && strpos($route, "register") === false) {
85 85
 			//redirection if user not connected
Please login to merge, or discard this patch.
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -50,16 +50,16 @@  discard block
 block discarded – undo
50 50
 	/** @var TokenStorageInterface */
51 51
 	private $token_storage;
52 52
 
53
-    /**
54
-     * AccessRights constructor.
55
-     * @param ContainerInterface $container
56
-     * @param RouterInterface $router
57
-     * @param SessionInterface $session
58
-     * @param RequestStack $request
59
-     * @param TokenStorageInterface $tokenStorage
60
-     * @param Globals $globals
61
-     * @param ModuleService $module
62
-     */
53
+				/**
54
+				 * AccessRights constructor.
55
+				 * @param ContainerInterface $container
56
+				 * @param RouterInterface $router
57
+				 * @param SessionInterface $session
58
+				 * @param RequestStack $request
59
+				 * @param TokenStorageInterface $tokenStorage
60
+				 * @param Globals $globals
61
+				 * @param ModuleService $module
62
+				 */
63 63
 	public function __construct(ContainerInterface $container, RouterInterface $router, SessionInterface $session, RequestStack $request, TokenStorageInterface $tokenStorage, Globals $globals, ModuleService $module)
64 64
 	{
65 65
 		$this->container = $container;
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
70 70
 		$this->module = $module;
71 71
 		$this->token_storage = $tokenStorage;
72 72
 		if ($this->token_storage->getToken() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) {
73
-            $this->user = $this->token_storage->getToken()->getUser()->getUser();
74
-        }
73
+												$this->user = $this->token_storage->getToken()->getUser()->getUser();
74
+								}
75 75
 	}
76 76
 	
77 77
 	public function onKernelController()
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	}
116 116
 	
117 117
 	/**
118
-     * function that allow to test a right directly in the view
118
+	 * function that allow to test a right directly in the view
119 119
 	 * @param string $right
120 120
 	 * @return bool
121 121
 	 */
@@ -126,9 +126,9 @@  discard block
 block discarded – undo
126 126
 		
127 127
 		$all_rights = array_merge($user_rights, $list_rights);
128 128
 
129
-        if (in_array("*", $all_rights)) {
130
-            return true;
131
-        }
129
+								if (in_array("*", $all_rights)) {
130
+												return true;
131
+								}
132 132
 
133 133
 		if (in_array($right, $all_rights)) {
134 134
 			return true;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	}
139 139
 	
140 140
 	/**
141
-     * test if route_right is found in users rights
141
+	 * test if route_right is found in users rights
142 142
 	 * @param array $route_right
143 143
 	 * @return bool
144 144
 	 */
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 		$all_rights = array_merge($user_rights, $list_rights);
151 151
 
152 152
 		if (in_array("*", $all_rights)) {
153
-		    return true;
154
-        }
153
+						return true;
154
+								}
155 155
 
156 156
 		foreach ($all_rights as $right) {
157 157
 			if (in_array($right, $route_right)) {
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	}
164 164
 	
165 165
 	/**
166
-     * function that search if the right contain an url or more
166
+	 * function that search if the right contain an url or more
167 167
 	 * @param $needle
168 168
 	 * @param $haystack
169 169
 	 * @return bool|mixed
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 	}
188 188
 	
189 189
 	/**
190
-     * function that retun a array that contain all user rights or empty array if no right found
190
+	 * function that retun a array that contain all user rights or empty array if no right found
191 191
 	 * @return array
192 192
 	 */
193 193
 	private function getUserRights(): array
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 	}
203 203
 	
204 204
 	/**
205
-     * function that retun a array that contain all rights of rattached list right of the current user
205
+	 * function that retun a array that contain all rights of rattached list right of the current user
206 206
 	 * @return array
207 207
 	 */
208 208
 	private function getRightsListOfUser(): array
Please login to merge, or discard this patch.
Service/Jwt.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 class Jwt
8 8
 {
9 9
 	/**
10
-     * encode an array in jwt
10
+	 * encode an array in jwt
11 11
 	 * @param array $values
12 12
 	 * @param string $token
13 13
 	 * @return string
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	}
19 19
 	
20 20
 	/**
21
-     * encode a jwt in array
21
+	 * encode a jwt in array
22 22
 	 * @param string $encoded_json
23 23
 	 * @param string $token
24 24
 	 * @return bool|object
Please login to merge, or discard this patch.