Completed
Push — master ( c02965...f19773 )
by Aleksandar
100:21 queued 75:50
created
admin_assets/vendors/jQuery-Smart-Wizard/more_examples/services/service.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
20 20
             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
21 21
             </p>';
22
-   }elseif($step_number == 2){
22
+   } elseif($step_number == 2){
23 23
       $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 
24 24
             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 
25 25
             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
33 33
             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
34 34
             </p>';
35
-   }elseif($step_number == 3){
35
+   } elseif($step_number == 3){
36 36
       $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 
37 37
             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 
38 38
             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
             Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
52 52
             Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
53 53
             </p>';
54
-   }else{
54
+   } else{
55 55
       $html .='<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, 
56 56
             sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 
57 57
             quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
Please login to merge, or discard this patch.
packages/Article/src/Controller/DiscussionController.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -90,11 +90,9 @@  discard block
 block discarded – undo
90 90
             } else {
91 91
                 $this->discussionService->createArticle($user, $data);
92 92
             }
93
-        }
94
-        catch(FilterException $fe) {
93
+        } catch(FilterException $fe) {
95 94
             return $this->edit($fe->getArrayMessages());
96
-        }
97
-        catch(\Exception $e) {
95
+        } catch(\Exception $e) {
98 96
             throw $e;
99 97
         }
100 98
 
@@ -105,8 +103,7 @@  discard block
 block discarded – undo
105 103
     {
106 104
         try {
107 105
             $this->discussionService->deleteArticle($this->request->getAttribute('id'));
108
-        }
109
-        catch(\Exception $e) {
106
+        } catch(\Exception $e) {
110 107
             throw $e;
111 108
         }
112 109
 
Please login to merge, or discard this patch.
packages/Article/src/Controller/EventController.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -72,11 +72,9 @@  discard block
 block discarded – undo
72 72
             } else {
73 73
                 $this->eventService->createArticle($user, $data);
74 74
             }
75
-        }
76
-        catch(FilterException $fe) {
75
+        } catch(FilterException $fe) {
77 76
             return $this->edit($fe->getArrayMessages());
78
-        }
79
-        catch(\Exception $e) {
77
+        } catch(\Exception $e) {
80 78
             throw $e;
81 79
         }
82 80
 
@@ -87,8 +85,7 @@  discard block
 block discarded – undo
87 85
     {
88 86
         try {
89 87
             $this->eventService->deleteArticle($this->request->getAttribute('id'));
90
-        }
91
-        catch(\Exception $e) {
88
+        } catch(\Exception $e) {
92 89
             throw $e;
93 90
         }
94 91
 
Please login to merge, or discard this patch.
packages/Article/src/Controller/VideoController.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -117,11 +117,9 @@  discard block
 block discarded – undo
117 117
             } else {
118 118
                 $this->videoService->createArticle($user, $data);
119 119
             }
120
-        }
121
-        catch(FilterException $fe) {
120
+        } catch(FilterException $fe) {
122 121
             return $this->edit($fe->getArrayMessages());
123
-        }
124
-        catch(\Exception $e) {
122
+        } catch(\Exception $e) {
125 123
             throw $e;
126 124
         }
127 125
 
@@ -138,8 +136,7 @@  discard block
 block discarded – undo
138 136
     {
139 137
         try {
140 138
             $this->videoService->deleteArticle($this->request->getAttribute('id'));
141
-        }
142
-        catch(\Exception $e) {
139
+        } catch(\Exception $e) {
143 140
             throw $e;
144 141
         }
145 142
 
Please login to merge, or discard this patch.
packages/Newsletter/src/Web/Action/HandlePostAction.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,7 @@
 block discarded – undo
25 25
             $this->newsletterService->registerNew($email);
26 26
 
27 27
             return new JsonResponse(['message' => 'Uspešno ste se prijavili.']);
28
-        }
29
-        catch(\Exception $e) {
28
+        } catch(\Exception $e) {
30 29
             return new JsonResponse(['message' => $e->getMessage()], $e->getCode());
31 30
         }
32 31
     }
Please login to merge, or discard this patch.
packages/Menu/src/Service/MenuService.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,8 +121,7 @@
 block discarded – undo
121 121
             $orderNo = 1;
122 122
             $this->updateLevel(null, $menuOrder, $orderNo);
123 123
             $this->menuMapper->getAdapter()->getDriver()->getConnection()->commit();
124
-        }
125
-        catch(\Exception $e) {
124
+        } catch(\Exception $e) {
126 125
             $this->menuMapper->getAdapter()->getDriver()->getConnection()->rollback();
127 126
 
128 127
             throw $e;
Please login to merge, or discard this patch.
packages/Page/src/Controller/PageController.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -75,17 +75,14 @@  discard block
 block discarded – undo
75 75
 
76 76
             if($pageId) {
77 77
                 $this->pageService->updatePage($data, $pageId);
78
-            }
79
-            else {
78
+            } else {
80 79
                 $this->pageService->createPage($data);
81 80
             }
82 81
 
83 82
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages'));
84
-        }
85
-        catch(FilterException $fe) {
83
+        } catch(FilterException $fe) {
86 84
             return $this->edit($fe->getArrayMessages());
87
-        }
88
-        catch(\Exception $e) {
85
+        } catch(\Exception $e) {
89 86
             throw $e;
90 87
         }
91 88
     }
@@ -97,8 +94,7 @@  discard block
 block discarded – undo
97 94
             $this->pageService->delete($pageId);
98 95
 
99 96
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages'));
100
-        }
101
-        catch(\Exception $e) {
97
+        } catch(\Exception $e) {
102 98
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin.pages'));
103 99
         }
104 100
     }
Please login to merge, or discard this patch.
packages/Page/templates/partial/pagination.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,13 +17,16 @@  discard block
 block discarded – undo
17 17
                                 <span class="glyphicon glyphicon-chevron-left"></span>
18 18
                             </a>
19 19
                         </li>
20
-                    <?php else: ?>
20
+                    <?php else {
21
+    : ?>
21 22
                         <li class="disabled">
22 23
                             <a href="#">
23 24
                                 <span class="glyphicon glyphicon-chevron-left"></span>
24 25
                             </a>
25 26
                         </li>
26
-                    <?php endif; ?>
27
+                    <?php endif;
28
+}
29
+?>
27 30
 
28 31
                     <!-- Numbered page links -->
29 32
                     <?php foreach($this->pagesInRange as $page): ?>
@@ -33,9 +36,12 @@  discard block
 block discarded – undo
33 36
                                     <?php echo $page; ?>
34 37
                                 </a>
35 38
                             </li>
36
-                        <?php else: ?>
39
+                        <?php else {
40
+    : ?>
37 41
                             <li class="active">
38
-                                <a href="#"><?php echo $page; ?></a>
42
+                                <a href="#"><?php echo $page;
43
+}
44
+?></a>
39 45
                             </li>
40 46
                         <?php endif; ?>
41 47
                     <?php endforeach; ?>
@@ -47,13 +53,16 @@  discard block
 block discarded – undo
47 53
                                 <span class="glyphicon glyphicon-chevron-right"></span>
48 54
                             </a>
49 55
                         </li>
50
-                    <?php else: ?>
56
+                    <?php else {
57
+    : ?>
51 58
                         <li class="disabled">
52 59
                             <a href="#">
53 60
                                 <span class="glyphicon glyphicon-chevron-right"></span>
54 61
                             </a>
55 62
                         </li>
56
-                    <?php endif; ?>
63
+                    <?php endif;
64
+}
65
+?>
57 66
                 </ul>
58 67
             </div>
59 68
         <?php endif; ?>
Please login to merge, or discard this patch.
packages/Admin/src/Controller/AuthController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,8 +86,7 @@
 block discarded – undo
86 86
             $this->session->getStorage()->user = $this->adminUserService->loginUser($email, $password);
87 87
 
88 88
             return $this->response->withStatus(302)->withHeader('Location', $this->router->generateUri('admin'));
89
-        }
90
-        catch(\Exception $e) {
89
+        } catch(\Exception $e) {
91 90
             return $this->login($e->getMessage());
92 91
 
93 92
             //@todo set $e->getMessage() to flash messanger and print messages in next page
Please login to merge, or discard this patch.