Completed
Pull Request — development (#720)
by Thomas
06:42
created
htdocs/okapi/meta.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1 1
 <?php return array (
2
-  'version_number' => 1687,
3
-  'git_revision' => 'a18bee1a2c15f4bea9015ee9648ff8e46adff809',
2
+    'version_number' => 1687,
3
+    'git_revision' => 'a18bee1a2c15f4bea9015ee9648ff8e46adff809',
4 4
 );
5 5
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php return array (
1
+<?php return array(
2 2
   'version_number' => 1687,
3 3
   'git_revision' => 'a18bee1a2c15f4bea9015ee9648ff8e46adff809',
4 4
 );
5 5
\ No newline at end of file
Please login to merge, or discard this patch.
htdocs/src/Oc/Page/PageProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
 
76 76
         $sameLocale = $preferredLocale === $defaultLocale;
77 77
 
78
-        if(!$sameLocale && count($pageBlocks) === 0) {
78
+        if (!$sameLocale && count($pageBlocks) === 0) {
79 79
             //Fetch fallback if blocks are empty
80 80
             $pageBlocks = $this->getPageBlocks(
81 81
                 $page,
Please login to merge, or discard this patch.
htdocs/src/Oc/Page/Persistence/PageRepository.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
             $databaseArray
90 90
         );
91 91
 
92
-        $entity->id = (int) $this->connection->lastInsertId();
92
+        $entity->id = (int)$this->connection->lastInsertId();
93 93
 
94 94
         return $entity;
95 95
     }
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             ['id' => $entity->id]
117 117
         );
118 118
 
119
-        $entity->id = (int) $this->connection->lastInsertId();
119
+        $entity->id = (int)$this->connection->lastInsertId();
120 120
 
121 121
         return $entity;
122 122
     }
@@ -175,13 +175,13 @@  discard block
 block discarded – undo
175 175
     public function getEntityFromDatabaseArray(array $data)
176 176
     {
177 177
         $entity = new PageEntity();
178
-        $entity->id = (int) $data['id'];
178
+        $entity->id = (int)$data['id'];
179 179
         $entity->slug = $data['slug'];
180 180
         $entity->metaKeywords = $data['meta_keywords'];
181 181
         $entity->metaDescription = $data['meta_description'];
182 182
         $entity->metaSocial = $data['meta_social'];
183 183
         $entity->updatedAt = new DateTime($data['updated_at']);
184
-        $entity->active = (bool) $data['active'];
184
+        $entity->active = (bool)$data['active'];
185 185
 
186 186
         return $entity;
187 187
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Page/Persistence/BlockRepository.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
             $databaseArray
94 94
         );
95 95
 
96
-        $entity->id = (int) $this->connection->lastInsertId();
96
+        $entity->id = (int)$this->connection->lastInsertId();
97 97
 
98 98
         return $entity;
99 99
     }
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
             ['id' => $entity->id]
121 121
         );
122 122
 
123
-        $entity->id = (int) $this->connection->lastInsertId();
123
+        $entity->id = (int)$this->connection->lastInsertId();
124 124
 
125 125
         return $entity;
126 126
     }
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
             'page_id' => $entity->pageId,
164 164
             'title' => $entity->title,
165 165
             'html' => $entity->html,
166
-            'position' => (int) $entity->position,
166
+            'position' => (int)$entity->position,
167 167
             'updated_at' => $entity->updatedAt->format(DateTime::ATOM),
168 168
             'active' => $entity->active,
169 169
         ];
@@ -179,13 +179,13 @@  discard block
 block discarded – undo
179 179
     public function getEntityFromDatabaseArray(array $data)
180 180
     {
181 181
         $entity = new BlockEntity();
182
-        $entity->id = (int) $data['id'];
183
-        $entity->pageId = (int) $data['page_id'];
182
+        $entity->id = (int)$data['id'];
183
+        $entity->pageId = (int)$data['page_id'];
184 184
         $entity->title = $data['title'];
185 185
         $entity->html = $data['html'];
186
-        $entity->position = (int) $data['position'];
186
+        $entity->position = (int)$data['position'];
187 187
         $entity->updatedAt = new DateTime($data['updated_at']);
188
-        $entity->active = (bool) $data['active'];
188
+        $entity->active = (bool)$data['active'];
189 189
 
190 190
         return $entity;
191 191
     }
Please login to merge, or discard this patch.
local/devel/Repositories/CacheSizeRepository.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
     public function fetchOneBy(array $where = [])
51 51
     {
52 52
         $queryBuilder = $this->connection->createQueryBuilder()
53
-                     ->select('*')
54
-                     ->from(self::TABLE)
55
-                     ->setMaxResults(1);
53
+                        ->select('*')
54
+                        ->from(self::TABLE)
55
+                        ->setMaxResults(1);
56 56
 
57 57
         if (count($where) > 0) {
58 58
             foreach ($where as $column => $value) {
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
     public function fetchBy(array $where = [])
79 79
     {
80 80
         $queryBuilder = $this->connection->createQueryBuilder()
81
-                     ->select('*')
82
-                     ->from(self::TABLE);
81
+                        ->select('*')
82
+                        ->from(self::TABLE);
83 83
 
84 84
         if (count($where) > 0) {
85 85
             foreach ($where as $column => $value) {
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                     $databaseArray
122 122
                 );
123 123
 
124
-        $entity->id = (int) $this->connection->lastInsertId();
124
+        $entity->id = (int)$this->connection->lastInsertId();
125 125
 
126 126
         return $entity;
127 127
     }
@@ -190,12 +190,12 @@  discard block
 block discarded – undo
190 190
     public function getEntityFromDatabaseArray(array $data)
191 191
     {
192 192
         $entity = new GeoCacheSizeEntity();
193
-        $entity->id = (int) $data['id'];
194
-        $entity->name = (string) $data['name'];
195
-        $entity->transId = (int) $data['trans_id'];
196
-        $entity->ordinal = (int) $data['ordinal'];
197
-        $entity->de = (string) $data['de'];
198
-        $entity->en = (string) $data['en'];
193
+        $entity->id = (int)$data['id'];
194
+        $entity->name = (string)$data['name'];
195
+        $entity->transId = (int)$data['trans_id'];
196
+        $entity->ordinal = (int)$data['ordinal'];
197
+        $entity->de = (string)$data['de'];
198
+        $entity->en = (string)$data['en'];
199 199
 
200 200
         return $entity;
201 201
     }
Please login to merge, or discard this patch.
local/devel/Repositories/SearchIndexRepository.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
     public function fetchOneBy(array $where = [])
51 51
     {
52 52
         $queryBuilder = $this->connection->createQueryBuilder()
53
-                     ->select('*')
54
-                     ->from(self::TABLE)
55
-                     ->setMaxResults(1);
53
+                        ->select('*')
54
+                        ->from(self::TABLE)
55
+                        ->setMaxResults(1);
56 56
 
57 57
         if (count($where) > 0) {
58 58
             foreach ($where as $column => $value) {
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
     public function fetchBy(array $where = [])
79 79
     {
80 80
         $queryBuilder = $this->connection->createQueryBuilder()
81
-                     ->select('*')
82
-                     ->from(self::TABLE);
81
+                        ->select('*')
82
+                        ->from(self::TABLE);
83 83
 
84 84
         if (count($where) > 0) {
85 85
             foreach ($where as $column => $value) {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                     $databaseArray
122 122
                 );
123 123
 
124
-        $entity->objectType = (int) $this->connection->lastInsertId();
124
+        $entity->objectType = (int)$this->connection->lastInsertId();
125 125
 
126 126
         return $entity;
127 127
     }
@@ -188,10 +188,10 @@  discard block
 block discarded – undo
188 188
     public function getEntityFromDatabaseArray(array $data)
189 189
     {
190 190
         $entity = new SearchIndexEntity();
191
-        $entity->objectType = (int) $data['object_type'];
192
-        $entity->cacheId = (int) $data['cache_id'];
193
-        $entity->hash = (int) $data['hash'];
194
-        $entity->count = (int) $data['count'];
191
+        $entity->objectType = (int)$data['object_type'];
192
+        $entity->cacheId = (int)$data['cache_id'];
193
+        $entity->hash = (int)$data['hash'];
194
+        $entity->count = (int)$data['count'];
195 195
 
196 196
         return $entity;
197 197
     }
Please login to merge, or discard this patch.
local/devel/Repositories/HelppagesRepository.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
     public function fetchOneBy(array $where = [])
51 51
     {
52 52
         $queryBuilder = $this->connection->createQueryBuilder()
53
-                     ->select('*')
54
-                     ->from(self::TABLE)
55
-                     ->setMaxResults(1);
53
+                        ->select('*')
54
+                        ->from(self::TABLE)
55
+                        ->setMaxResults(1);
56 56
 
57 57
         if (count($where) > 0) {
58 58
             foreach ($where as $column => $value) {
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
     public function fetchBy(array $where = [])
79 79
     {
80 80
         $queryBuilder = $this->connection->createQueryBuilder()
81
-                     ->select('*')
82
-                     ->from(self::TABLE);
81
+                        ->select('*')
82
+                        ->from(self::TABLE);
83 83
 
84 84
         if (count($where) > 0) {
85 85
             foreach ($where as $column => $value) {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                     $databaseArray
122 122
                 );
123 123
 
124
-        $entity->ocpage = (int) $this->connection->lastInsertId();
124
+        $entity->ocpage = (int)$this->connection->lastInsertId();
125 125
 
126 126
         return $entity;
127 127
     }
@@ -187,9 +187,9 @@  discard block
 block discarded – undo
187 187
     public function getEntityFromDatabaseArray(array $data)
188 188
     {
189 189
         $entity = new HelppagesEntity();
190
-        $entity->ocpage = (string) $data['ocpage'];
191
-        $entity->language = (string) $data['language'];
192
-        $entity->helppage = (string) $data['helppage'];
190
+        $entity->ocpage = (string)$data['ocpage'];
191
+        $entity->language = (string)$data['language'];
192
+        $entity->helppage = (string)$data['helppage'];
193 193
 
194 194
         return $entity;
195 195
     }
Please login to merge, or discard this patch.
local/devel/Repositories/CacheStatusModifiedRepository.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
     public function fetchOneBy(array $where = [])
51 51
     {
52 52
         $queryBuilder = $this->connection->createQueryBuilder()
53
-                     ->select('*')
54
-                     ->from(self::TABLE)
55
-                     ->setMaxResults(1);
53
+                        ->select('*')
54
+                        ->from(self::TABLE)
55
+                        ->setMaxResults(1);
56 56
 
57 57
         if (count($where) > 0) {
58 58
             foreach ($where as $column => $value) {
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
     public function fetchBy(array $where = [])
79 79
     {
80 80
         $queryBuilder = $this->connection->createQueryBuilder()
81
-                     ->select('*')
82
-                     ->from(self::TABLE);
81
+                        ->select('*')
82
+                        ->from(self::TABLE);
83 83
 
84 84
         if (count($where) > 0) {
85 85
             foreach ($where as $column => $value) {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                     $databaseArray
122 122
                 );
123 123
 
124
-        $entity->cacheId = (int) $this->connection->lastInsertId();
124
+        $entity->cacheId = (int)$this->connection->lastInsertId();
125 125
 
126 126
         return $entity;
127 127
     }
@@ -189,11 +189,11 @@  discard block
 block discarded – undo
189 189
     public function getEntityFromDatabaseArray(array $data)
190 190
     {
191 191
         $entity = new GeoCacheStatusModifiedEntity();
192
-        $entity->cacheId = (int) $data['cache_id'];
193
-        $entity->dateModified =  new DateTime($data['date_modified']);
194
-        $entity->oldState = (int) $data['old_state'];
195
-        $entity->newState = (int) $data['new_state'];
196
-        $entity->userId = (int) $data['user_id'];
192
+        $entity->cacheId = (int)$data['cache_id'];
193
+        $entity->dateModified = new DateTime($data['date_modified']);
194
+        $entity->oldState = (int)$data['old_state'];
195
+        $entity->newState = (int)$data['new_state'];
196
+        $entity->userId = (int)$data['user_id'];
197 197
 
198 198
         return $entity;
199 199
     }
Please login to merge, or discard this patch.
local/devel/Repositories/OkapiCacheRepository.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
     public function fetchOneBy(array $where = [])
51 51
     {
52 52
         $queryBuilder = $this->connection->createQueryBuilder()
53
-                     ->select('*')
54
-                     ->from(self::TABLE)
55
-                     ->setMaxResults(1);
53
+                        ->select('*')
54
+                        ->from(self::TABLE)
55
+                        ->setMaxResults(1);
56 56
 
57 57
         if (count($where) > 0) {
58 58
             foreach ($where as $column => $value) {
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
     public function fetchBy(array $where = [])
79 79
     {
80 80
         $queryBuilder = $this->connection->createQueryBuilder()
81
-                     ->select('*')
82
-                     ->from(self::TABLE);
81
+                        ->select('*')
82
+                        ->from(self::TABLE);
83 83
 
84 84
         if (count($where) > 0) {
85 85
             foreach ($where as $column => $value) {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                     $databaseArray
122 122
                 );
123 123
 
124
-        $entity->key = (int) $this->connection->lastInsertId();
124
+        $entity->key = (int)$this->connection->lastInsertId();
125 125
 
126 126
         return $entity;
127 127
     }
@@ -188,10 +188,10 @@  discard block
 block discarded – undo
188 188
     public function getEntityFromDatabaseArray(array $data)
189 189
     {
190 190
         $entity = new OkapiCacheEntity();
191
-        $entity->key = (string) $data['key'];
191
+        $entity->key = (string)$data['key'];
192 192
         $entity->score = $data['score'];
193
-        $entity->expires =  new DateTime($data['expires']);
194
-        $entity->value = (string) $data['value'];
193
+        $entity->expires = new DateTime($data['expires']);
194
+        $entity->value = (string)$data['value'];
195 195
 
196 196
         return $entity;
197 197
     }
Please login to merge, or discard this patch.