Completed
Push — master ( 4bb011...4b99be )
by Guillaume
13:23
created
src/Starkerxp/LeadBundle/Controller/LeadController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
             return new JsonResponse([]);
28 28
         }
29 29
         $retour = array_map(
30
-            function ($element) use ($manager, $options) {
30
+            function($element) use ($manager, $options) {
31 31
                 return $manager->toArray($element, $this->getFields($options['fields']));
32 32
             },
33 33
             $resultSets
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 
15 15
 class LeadController extends StructureController
16 16
 {
17
-	/**
17
+    /**
18 18
      * @ApiDoc(
19 19
      *      resource=true,
20 20
      *      description="Liste les leads.",
@@ -76,12 +76,12 @@  discard block
 block discarded – undo
76 76
     }
77 77
 
78 78
 	
79
-	/**
79
+    /**
80 80
      * @ApiDoc(
81 81
      *      resource=true,
82 82
      *      description="Affiche un lead.",
83 83
      *      section="starkerxp_lead.lead",
84
-	 *      requirements={
84
+     *      requirements={
85 85
      *          {
86 86
      *              "name"="lead_id",
87 87
      *              "dataType"="integer",
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
         $manager = $this->get("starkerxp_lead.manager.lead");
107 107
         try {
108 108
             $options = $this->resolveParams()->resolve($request->query->all());
109
-			if (!$entite = $manager->findOneBy(['id' => $request->get('lead_id')])) {
109
+            if (!$entite = $manager->findOneBy(['id' => $request->get('lead_id')])) {
110 110
                 return new JsonResponse(["payload" => $this->translate("entity.not_found", "lead")], 404);
111 111
             }
112 112
         } catch (\Exception $e) {
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
         return new JsonResponse($retour);
119 119
     }
120 120
 
121
-	/**
121
+    /**
122 122
      * @ApiDoc(
123 123
      *      resource=true,
124 124
      *      description="Ajoute un lead.",
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
             if ($form->isValid()) {
137 137
                 $lead = $form->getData();
138 138
                 $manager->insert($lead);
139
-				$this->dispatch(Events::LEAD_CREATED, new GenericEvent($entite));
139
+                $this->dispatch(Events::LEAD_CREATED, new GenericEvent($entite));
140 140
                 return new JsonResponse(["payload" => $this->translate("lead.entity.created", "lead")], 201);
141 141
             }
142 142
         } catch (\Exception $e) {
Please login to merge, or discard this patch.
src/Starkerxp/LeadBundle/Tests/Manager/LeadManagerTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
      */
25 25
     public function testFindAll()
26 26
     {
27
-        $this->loadFixtureFiles(['@StarkerxpLeadBundle/Tests/DataFixtures/LeadManager/LeadManager.yml',]);
27
+        $this->loadFixtureFiles(['@StarkerxpLeadBundle/Tests/DataFixtures/LeadManager/LeadManager.yml', ]);
28 28
         $this->assertCount(10, $this->manager->findAll());
29 29
     }
30 30
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      */
35 35
     public function testInsertNewLead()
36 36
     {
37
-        $this->loadFixtureFiles(['@StarkerxpLeadBundle/Tests/DataFixtures/LeadManager/DefaultLead.yml',]);
37
+        $this->loadFixtureFiles(['@StarkerxpLeadBundle/Tests/DataFixtures/LeadManager/DefaultLead.yml', ]);
38 38
         $lead = new Lead();
39 39
         $this->manager->insert($lead);
40 40
         $this->assertCount(2, $this->manager->findAll());
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
      */
47 47
     public function testUpdateLead()
48 48
     {
49
-        $this->loadFixtureFiles(['@StarkerxpLeadBundle/Tests/DataFixtures/LeadManager/DefaultLead.yml',]);
49
+        $this->loadFixtureFiles(['@StarkerxpLeadBundle/Tests/DataFixtures/LeadManager/DefaultLead.yml', ]);
50 50
         $criteria = ['createdAt' => new \DateTime("2016-08-05 12:12:12")];
51 51
         $lead = $this->manager->findOneBy($criteria);
52 52
         $this->manager->update($lead);
Please login to merge, or discard this patch.
src/Starkerxp/LeadBundle/Tests/Controller/LeadControllerTest.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $manager = $this->getContainer()->get('starkerxp_lead.manager.leadaction');
71 71
         $listeLeads = $manager->getRepository()->findAll();
72 72
         $this->assertCount(1, $listeLeads);
73
-        $LeadActionDepart = $manager->toArray($listeLeads[0], [/*'nom'*/]);// Exemple
73
+        $LeadActionDepart = $manager->toArray($listeLeads[0], [/*'nom'*/]); // Exemple
74 74
         $data = [
75 75
             //'nom'     => "Mon nom", //exemple
76 76
         ];
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
         $manager->clear();
88 88
         $LeadActions = $manager->findAll();
89 89
         $this->assertCount(1, $LeadActions);
90
-        $LeadActionFinal = $manager->toArray($LeadActions[0], [/*'nom'*/]);// Exemple
90
+        $LeadActionFinal = $manager->toArray($LeadActions[0], [/*'nom'*/]); // Exemple
91 91
         $this->assertNotEquals($LeadActionDepart, $LeadActionFinal);
92 92
         $this->assertEquals($data, $LeadActionFinal);
93 93
     }
Please login to merge, or discard this patch.
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
         $data = [
21 21
             //'nom'     => "Mon nom", //exemple
22 22
         ];
23
-		$url = $this->generateUrl(
23
+        $url = $this->generateUrl(
24 24
             'starkerxp_lead.lead.post',
25 25
             []
26 26
         );
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         $this->loadFixtureFiles([
44 44
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
45 45
         ]);
46
-		$url = $this->generateUrl(
46
+        $url = $this->generateUrl(
47 47
             'starkerxp_lead.lead.post',
48 48
             []
49 49
         );
@@ -63,10 +63,10 @@  discard block
 block discarded – undo
63 63
      */
64 64
     public function testPutValide()
65 65
     {
66
-		$this->loadFixtureFiles([
66
+        $this->loadFixtureFiles([
67 67
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
68
-			'@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/DefaultLeadAction.yml',
69
-		]);
68
+            '@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/DefaultLeadAction.yml',
69
+        ]);
70 70
         $manager = $this->getContainer()->get('starkerxp_lead.manager.leadaction');
71 71
         $listeLeads = $manager->getRepository()->findAll();
72 72
         $this->assertCount(1, $listeLeads);
@@ -74,11 +74,11 @@  discard block
 block discarded – undo
74 74
         $data = [
75 75
             //'nom'     => "Mon nom", //exemple
76 76
         ];
77
-		$url = $this->generateUrl(
77
+        $url = $this->generateUrl(
78 78
             'starkerxp_lead.lead.put',
79 79
             [
80
-				"id"    => $listeLeads[0]->getId(),
81
-			]
80
+                "id"    => $listeLeads[0]->getId(),
81
+            ]
82 82
         );
83 83
         $client = $this->getAuthClient();
84 84
         $client->request('PUT', $url, $data);
@@ -99,18 +99,18 @@  discard block
 block discarded – undo
99 99
      */
100 100
     public function testPutInvalide()
101 101
     {
102
-		$this->loadFixtureFiles([
102
+        $this->loadFixtureFiles([
103 103
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
104
-			'@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/DefaultLeadAction.yml',
105
-		]);
104
+            '@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/DefaultLeadAction.yml',
105
+        ]);
106 106
         $manager = $this->getContainer()->get('starkerxp_lead.manager.leadaction');
107 107
         $listeLeads = $manager->getRepository()->findAll();
108 108
         $this->assertCount(1, $listeLeads);
109
-		$url = $this->generateUrl(
109
+        $url = $this->generateUrl(
110 110
             'starkerxp_lead.lead.put',
111 111
             [
112
-				"id"    => $listeLeads[0]->getId(),
113
-			]
112
+                "id"    => $listeLeads[0]->getId(),
113
+            ]
114 114
         );
115 115
         $client = $this->getAuthClient();
116 116
         $client->request('PUT', $url, []);
@@ -128,17 +128,17 @@  discard block
 block discarded – undo
128 128
      */
129 129
     public function testPutSansResultat()
130 130
     {
131
-		$this->loadFixtureFiles([
131
+        $this->loadFixtureFiles([
132 132
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
133
-		]);
133
+        ]);
134 134
         $data = [
135 135
             //'nom'     => "Mon nom", //exemple
136 136
         ];
137
-		$url = $this->generateUrl(
137
+        $url = $this->generateUrl(
138 138
             'starkerxp_lead.lead.put',
139 139
             [
140
-				"id"    => 404,
141
-			]
140
+                "id"    => 404,
141
+            ]
142 142
         );
143 143
         $client = $this->getAuthClient();
144 144
         $client->request('PUT', $url, $data);
@@ -156,15 +156,15 @@  discard block
 block discarded – undo
156 156
      */
157 157
     public function testCGetValideAvecResultats()
158 158
     {
159
-		$this->loadFixtureFiles([
159
+        $this->loadFixtureFiles([
160 160
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
161
-			'@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/LeadManager.yml',
162
-		]);
163
-		$url = $this->generateUrl(
161
+            '@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/LeadManager.yml',
162
+        ]);
163
+        $url = $this->generateUrl(
164 164
             'starkerxp_lead.lead.cget',
165 165
             [
166 166
 				
167
-			]
167
+            ]
168 168
         );
169 169
         $client = $this->getAuthClient();
170 170
         $client->request('GET', $url, []);
@@ -184,14 +184,14 @@  discard block
 block discarded – undo
184 184
      */
185 185
     public function testCGetValideSansResultat()
186 186
     {
187
-		$this->loadFixtureFiles([
187
+        $this->loadFixtureFiles([
188 188
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
189
-		]);
190
-		$url = $this->generateUrl(
189
+        ]);
190
+        $url = $this->generateUrl(
191 191
             'starkerxp_lead.lead.cget',
192 192
             [
193 193
 				
194
-			]
194
+            ]
195 195
         );
196 196
         $client = $this->getAuthClient();
197 197
         $client->request('GET', $url, []);
@@ -208,14 +208,14 @@  discard block
 block discarded – undo
208 208
      */
209 209
     public function testCGetInvalide()
210 210
     {
211
-		$this->loadFixtureFiles([
211
+        $this->loadFixtureFiles([
212 212
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
213
-		]);
214
-		$url = $this->generateUrl(
213
+        ]);
214
+        $url = $this->generateUrl(
215 215
             'starkerxp_lead.lead.cget',
216 216
             [
217 217
 				
218
-			]
218
+            ]
219 219
         );
220 220
         $client = $this->getAuthClient();
221 221
         $client->request('GET', $url, ["filter_erreur" => "+h"]);
@@ -230,18 +230,18 @@  discard block
 block discarded – undo
230 230
      */
231 231
     public function testGetValideAvecResultats()
232 232
     {
233
-		$this->loadFixtureFiles([
233
+        $this->loadFixtureFiles([
234 234
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
235
-			'@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/LeadManager.yml',
236
-		]);
235
+            '@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/LeadManager.yml',
236
+        ]);
237 237
         $manager = $this->getContainer()->get('starkerxp_lead.manager.leadaction');
238 238
         $listeLeads = $manager->getRepository()->findAll();
239 239
         $this->assertCount(10, $listeLeads);
240
-		$url = $this->generateUrl(
240
+        $url = $this->generateUrl(
241 241
             'starkerxp_lead.lead.get',
242 242
             [
243
-				"id" => $listeLeads[0]->getId(),
244
-			]
243
+                "id" => $listeLeads[0]->getId(),
244
+            ]
245 245
         );
246 246
         $client = $this->getAuthClient();
247 247
         $client->request('GET', $url, []);
@@ -259,14 +259,14 @@  discard block
 block discarded – undo
259 259
      */
260 260
     public function testGetValideSansResultat()
261 261
     {
262
-		$this->loadFixtureFiles([
262
+        $this->loadFixtureFiles([
263 263
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
264
-		]);
265
-		$url = $this->generateUrl(
264
+        ]);
265
+        $url = $this->generateUrl(
266 266
             'starkerxp_lead.lead.get',
267 267
             [
268
-				"id" => 404,
269
-			]
268
+                "id" => 404,
269
+            ]
270 270
         );
271 271
         $client = $this->getAuthClient();
272 272
         $client->request('GET', $url, []);
@@ -283,14 +283,14 @@  discard block
 block discarded – undo
283 283
      */
284 284
     public function testGetInvalide()
285 285
     {
286
-		$this->loadFixtureFiles([
286
+        $this->loadFixtureFiles([
287 287
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
288
-		]);
289
-		$url = $this->generateUrl(
288
+        ]);
289
+        $url = $this->generateUrl(
290 290
             'starkerxp_lead.lead.get',
291 291
             [
292
-				"id" => 500,
293
-			]
292
+                "id" => 500,
293
+            ]
294 294
         );
295 295
         $client = $this->getAuthClient();
296 296
         $client->request('GET', $url, ["filter_erreur" => "+h"]);
@@ -305,18 +305,18 @@  discard block
 block discarded – undo
305 305
      */
306 306
     public function testDeleteValide()
307 307
     {
308
-		$this->loadFixtureFiles([
308
+        $this->loadFixtureFiles([
309 309
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
310
-			'@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/DefaultLeadAction.yml',
311
-		]);
310
+            '@StarkerxpLeadBundle/Tests/DataFixtures/LeadActionManager/DefaultLeadAction.yml',
311
+        ]);
312 312
         $manager = $this->getContainer()->get('starkerxp_lead.manager.leadaction');
313 313
         $listeLeads = $manager->getRepository()->findAll();
314 314
         $this->assertCount(1, $listeLeads);
315
-		$url = $this->generateUrl(
315
+        $url = $this->generateUrl(
316 316
             'starkerxp_lead.lead.delete',
317 317
             [
318
-				"id" => $listeLeads[0]->getId(),
319
-			]
318
+                "id" => $listeLeads[0]->getId(),
319
+            ]
320 320
         );
321 321
         $client = $this->getAuthClient();
322 322
         $client->request('DELETE', $url);
@@ -334,14 +334,14 @@  discard block
 block discarded – undo
334 334
      */
335 335
     public function testDeleteSansResultat()
336 336
     {
337
-		$this->loadFixtureFiles([
337
+        $this->loadFixtureFiles([
338 338
             '@StarkerxpUserBundle/Tests/DataFixtures/UserManager/DefaultUser.yml',
339
-		]);
340
-		$url = $this->generateUrl(
339
+        ]);
340
+        $url = $this->generateUrl(
341 341
             'starkerxp_lead.lead.get',
342 342
             [
343
-				"id" => 404,
344
-			]
343
+                "id" => 404,
344
+            ]
345 345
         );
346 346
         $client = $this->getAuthClient();
347 347
         $client->request('DELETE', $url, []);
Please login to merge, or discard this patch.
src/Starkerxp/CampaignBundle/Render/BuzzExpertRender.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -11,6 +11,9 @@
 block discarded – undo
11 11
         return $contenu;
12 12
     }
13 13
 
14
+    /**
15
+     * @param string $contenu
16
+     */
14 17
     public function remplacerLesCaracteresSpeciaux($contenu)
15 18
     {
16 19
         // Gestion des accents.
Please login to merge, or discard this patch.
src/Starkerxp/CampaignBundle/Render/OctosendHtmlRender.php 2 patches
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -33,6 +33,9 @@  discard block
 block discarded – undo
33 33
         return $contenuReplace;
34 34
     }
35 35
 
36
+    /**
37
+     * @param string $type
38
+     */
36 39
     private function renderLien($type, $contenu)
37 40
     {
38 41
         $arrayContenu = [];
@@ -49,6 +52,11 @@  discard block
 block discarded – undo
49 52
 
50 53
     }
51 54
 
55
+    /**
56
+     * @param string $lien
57
+     * @param string $texte
58
+     * @param string $style
59
+     */
52 60
     protected function retournerLaChaine($type, $lien, $texte, $style = null)
53 61
     {
54 62
         if ($type == "unsub") {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
             return "<a href='{{unsubscribe:".$lien."}}' style='".$style."' title='Désinscription'>".$texte.'</a>';
59 59
         }
60 60
 
61
-        return "<a href='{{click:".$lien."}}' style='".$style."'>".$texte.'</a>';;
61
+        return "<a href='{{click:".$lien."}}' style='".$style."'>".$texte.'</a>'; ;
62 62
     }
63 63
 
64 64
     public function getSupport($api, $version)
Please login to merge, or discard this patch.
src/Starkerxp/StructureBundle/Listener/EntitySubscriber.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -64,6 +64,9 @@
 block discarded – undo
64 64
         return true;
65 65
     }
66 66
 
67
+    /**
68
+     * @return \Starkerxp\StructureBundle\Entity\UserInterface
69
+     */
67 70
     protected function getUser()
68 71
     {
69 72
         if (!$token = $this->user->getToken()) {
Please login to merge, or discard this patch.
src/Starkerxp/UserBundle/Entity/User.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
     }
132 132
 
133 133
     /**
134
-     * @return mixed
134
+     * @return string
135 135
      */
136 136
     public function getPlainPassword()
137 137
     {
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
     }
140 140
 
141 141
     /**
142
-     * @param mixed $plainPassword
142
+     * @param string $plainPassword
143 143
      */
144 144
     public function setPlainPassword($plainPassword)
145 145
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
      */
89 89
     public function setRoles($roles)
90 90
     {
91
-        if($roles instanceof RoleUser || empty($this->roles) ){
91
+        if ($roles instanceof RoleUser || empty($this->roles)) {
92 92
             $this->roles = new RoleUser($roles);
93 93
             return true;
94 94
         }
Please login to merge, or discard this patch.
src/Starkerxp/UserBundle/Controller/UserController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
             return new JsonResponse([]);
65 65
         }
66 66
         $retour = array_map(
67
-            function ($element) use ($manager, $options) {
67
+            function($element) use ($manager, $options) {
68 68
                 return $manager->toArray($element, $this->getFields($options['fields']));
69 69
             },
70 70
             $resultSets
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
             return new JsonResponse(["payload" => $this->translate("user.entity.not_found", "user")], 404);
185 185
         }
186 186
         // Un user ne peut modifier un autre user sauf si ce dernier est un super admin.
187
-        if($this->getUser()->getId() !=  $user->getId() && !$this->isGranted("ROLE_SUPER_ADMIN")){
187
+        if ($this->getUser()->getId() != $user->getId() && !$this->isGranted("ROLE_SUPER_ADMIN")) {
188 188
             return new JsonResponse(["payload" => $this->translate("user.entity.not_updated_is_not_admin", "user")], 400);
189 189
         }
190 190
         $manager->beginTransaction();
Please login to merge, or discard this patch.
src/Starkerxp/UserBundle/DependencyInjection/StarkerxpUserExtension.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
     public function load(array $configs, ContainerBuilder $container)
21 21
     {
22 22
         $configuration = new Configuration();
23
-         $this->processConfiguration($configuration, $configs);
23
+            $this->processConfiguration($configuration, $configs);
24 24
 
25 25
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
26 26
         $loader->load('services.yml');
Please login to merge, or discard this patch.