OpencachingDeutschland / oc-server3

htdocs/log.php

Unused Use Statements -2 removed lines

@@ -3,11 +3,9 @@
  * for license information see LICENSE.md
  ***************************************************************************/
 
-use Oc\FieldNotes\Entity\FieldNote;
 use Oc\FieldNotes\Enum\LogType as FieldNotesLogType;
 use Oc\FieldNotes\Persistence\FieldNoteEntity;
 use Oc\FieldNotes\Persistence\FieldNoteService;
-use Oc\GeoCache\Entity\GeocacheLog;
 use Oc\GeoCache\Enum\GeoCacheType;
 use Oc\GeoCache\Enum\LogType as GeoCacheLogType;
 use Oc\GeoCache\Enum\NeedMaintenance;

Spacing +4 added lines, -4 removed lines

@@ -49,8 +49,8 @@ 
     $fieldNoteService = AppKernel::Container()->get(FieldNoteService::class);
 
     $fieldNote = $fieldNoteService->fetchOneBy([
-        'id' => (int) $_GET['fieldnoteid'],
-        'user_id' => (int) $user->getUserId()
+        'id' => (int)$_GET['fieldnoteid'],
+        'user_id' => (int)$user->getUserId()
     ]);
 
     if ($fieldNote !== null) {
@@ -171,7 +171,7 @@ 
     // get log text editor mode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = $_POST['descMode'] + 0;  // Ocprop: 2
+        $descMode = $_POST['descMode'] + 0; // Ocprop: 2
         if (($descMode < 1) || ($descMode > 3)) {
             $descMode = 3;
         }
@@ -313,7 +313,7 @@ 
             if (isset($_REQUEST['fieldnoteid']) && $_REQUEST['fieldnoteid']) {
                 sql(
                     'DELETE FROM field_note WHERE `id` = &1 AND `user_id` = &2',
-                    (int) $_REQUEST['fieldnoteid'],
+                    (int)$_REQUEST['fieldnoteid'],
                     $user->getUserId()
                 );
 

htdocs/src/Oc/Page/BlockRepository.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -97,7 +97,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -125,7 +125,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -169,7 +169,7 @@ 
             'page_id' => $entity->pageId,
             'title' => $entity->title,
             'html' => $entity->html,
-            'position' => (int) $entity->position,
+            'position' => (int)$entity->position,
             'updated_at' => $entity->updatedAt->format(DateTime::ATOM),
             'active' => $entity->active
         ];
@@ -185,13 +185,13 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new BlockEntity();
-        $entity->id = (int) $data['id'];
-        $entity->pageId = (int) $data['page_id'];
-        $entity->title = (string) $data['title'];
-        $entity->html = (string) $data['html'];
-        $entity->position = (int) $data['position'];
+        $entity->id = (int)$data['id'];
+        $entity->pageId = (int)$data['page_id'];
+        $entity->title = (string)$data['title'];
+        $entity->html = (string)$data['html'];
+        $entity->position = (int)$data['position'];
         $entity->updatedAt = new DateTime($data['updated_at']);
-        $entity->active = (bool) $data['active'];
+        $entity->active = (bool)$data['active'];
 
         return $entity;
     }

htdocs/src/Oc/Validator/Exception/ValidationException.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         $this->setViolations($violations);
 
-        parent::__construct((string) $this);
+        parent::__construct((string)$this);
     }
 
     /**

htdocs/src/Oc/GeoCache/Persistence/GeoCacheLog/GeoCacheLogRepository.php

Indentation +5 added lines, -5 removed lines

@@ -79,9 +79,9 @@ 
     public function fetchOneBy(array $where = [])
     {
         $queryBuilder = $this->connection->createQueryBuilder()
-             ->select('*')
-             ->from(self::TABLE)
-             ->setMaxResults(1);
+                ->select('*')
+                ->from(self::TABLE)
+                ->setMaxResults(1);
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
@@ -112,8 +112,8 @@ 
     public function fetchBy(array $where = [])
     {
         $queryBuilder = $this->connection->createQueryBuilder()
-             ->select('*')
-             ->from(self::TABLE);
+                ->select('*')
+                ->from(self::TABLE);
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {

Spacing +17 added lines, -17 removed lines

@@ -85,7 +85,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -117,7 +117,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -292,27 +292,27 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new GeoCacheLogEntity();
-        $entity->id = (int) $data['id'];
-        $entity->uuid = (string) $data['uuid'];
-        $entity->node = (int) $data['node'];
+        $entity->id = (int)$data['id'];
+        $entity->uuid = (string)$data['uuid'];
+        $entity->node = (int)$data['node'];
         $entity->dateCreated = new DateTime($data['date_created']);
         $entity->entryLastModified = new DateTime($data['entry_last_modified']);
         $entity->lastModified = new DateTime($data['last_modified']);
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
         $entity->logLastModified = new DateTime($data['log_last_modified']);
-        $entity->cacheId = (int) $data['cache_id'];
-        $entity->userId = (int) $data['user_id'];
-        $entity->type = (int) $data['type'];
-        $entity->ocTeamComment = (bool) $data['oc_team_comment'];
+        $entity->cacheId = (int)$data['cache_id'];
+        $entity->userId = (int)$data['user_id'];
+        $entity->type = (int)$data['type'];
+        $entity->ocTeamComment = (bool)$data['oc_team_comment'];
         $entity->date = new DateTime($data['date']);
         $entity->orderDate = new DateTime($data['order_date']);
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
-        $entity->text = (string) $data['text'];
-        $entity->textHtml = (bool) $data['text_html'];
-        $entity->textHtmledit = (bool) $data['text_htmledit'];
-        $entity->ownerNotified = (bool) $data['owner_notified'];
-        $entity->picture = (int) $data['picture'];
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
+        $entity->text = (string)$data['text'];
+        $entity->textHtml = (bool)$data['text_html'];
+        $entity->textHtmledit = (bool)$data['text_htmledit'];
+        $entity->ownerNotified = (bool)$data['owner_notified'];
+        $entity->picture = (int)$data['picture'];
 
         return $entity;
     }

htdocs/src/Oc/GeoCache/Persistence/GeoCache/GeoCacheRepository.php

Indentation +5 added lines, -5 removed lines

@@ -80,9 +80,9 @@ 
     public function fetchOneBy(array $where = [])
     {
         $queryBuilder = $this->connection->createQueryBuilder()
-             ->select('*')
-             ->from(self::TABLE)
-             ->setMaxResults(1);
+                ->select('*')
+                ->from(self::TABLE)
+                ->setMaxResults(1);
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
@@ -113,8 +113,8 @@ 
     public function fetchBy(array $where = [])
     {
         $queryBuilder = $this->connection->createQueryBuilder()
-             ->select('*')
-             ->from(self::TABLE);
+                ->select('*')
+                ->from(self::TABLE);
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {

Spacing +30 added lines, -30 removed lines

@@ -86,7 +86,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -118,7 +118,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -310,40 +310,40 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new GeoCacheEntity();
-        $entity->cacheId = (string) $data['cache_id'];
-        $entity->uuid = (string) $data['uuid'];
-        $entity->node = (int) $data['node'];
+        $entity->cacheId = (string)$data['cache_id'];
+        $entity->uuid = (string)$data['uuid'];
+        $entity->node = (int)$data['node'];
         $entity->dateCreated = new DateTime($data['date_created']);
-        $entity->isPublishdate = (bool) $data['is_publishdate'];
+        $entity->isPublishdate = (bool)$data['is_publishdate'];
         $entity->lastModified = new DateTime($data['last_modified']);
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
         $entity->listingLastModified = new DateTime($data['listing_last_modified']);
         $entity->metaLastModified = new DateTime($data['meta_last_modified']);
-        $entity->userId = (int) $data['user_id'];
-        $entity->name = (string) $data['name'];
-        $entity->longitude = (double) $data['longitude'];
-        $entity->latitude = (double) $data['latitude'];
-        $entity->type = (int) $data['type'];
-        $entity->status = (int) $data['status'];
-        $entity->country = (string) $data['country'];
+        $entity->userId = (int)$data['user_id'];
+        $entity->name = (string)$data['name'];
+        $entity->longitude = (double)$data['longitude'];
+        $entity->latitude = (double)$data['latitude'];
+        $entity->type = (int)$data['type'];
+        $entity->status = (int)$data['status'];
+        $entity->country = (string)$data['country'];
         $entity->dateHidden = new DateTime($data['date_hidden']);
-        $entity->size = (int) $data['size'];
-        $entity->difficulty = (int) $data['difficulty'];
-        $entity->terrain = (int) $data['terrain'];
-        $entity->logpw = (string) $data['logpw'];
-        $entity->searchTime = (float) $data['search_time'];
-        $entity->wayLength = (float) $data['way_length'];
-        $entity->wpGc = (string) $data['wp_gc'];
-        $entity->wpGcMaintained = (string) $data['wp_gc_maintained'];
-        $entity->wpOc = (string) $data['wp_oc'];
-        $entity->descLanguages = (string) $data['desc_languages'];
-        $entity->defaultDesclang = (string) $data['default_desclang'];
+        $entity->size = (int)$data['size'];
+        $entity->difficulty = (int)$data['difficulty'];
+        $entity->terrain = (int)$data['terrain'];
+        $entity->logpw = (string)$data['logpw'];
+        $entity->searchTime = (float)$data['search_time'];
+        $entity->wayLength = (float)$data['way_length'];
+        $entity->wpGc = (string)$data['wp_gc'];
+        $entity->wpGcMaintained = (string)$data['wp_gc_maintained'];
+        $entity->wpOc = (string)$data['wp_oc'];
+        $entity->descLanguages = (string)$data['desc_languages'];
+        $entity->defaultDesclang = (string)$data['default_desclang'];
         $entity->dateActivate = new DateTime($data['date_activate']);
-        $entity->needNpaRecalc = (bool) $data['need_npa_recalc'];
-        $entity->showCachelists = (bool) $data['show_cachelists'];
-        $entity->protectOldCoords = (bool) $data['protect_old_coords'];
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
+        $entity->needNpaRecalc = (bool)$data['need_npa_recalc'];
+        $entity->showCachelists = (bool)$data['show_cachelists'];
+        $entity->protectOldCoords = (bool)$data['protect_old_coords'];
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
         $entity->flagsLastModified = new DateTime($data['flags_last_modified']);
 
         return $entity;

htdocs/src/Oc/FieldNotes/Persistence/FieldNoteRepository.php

Spacing +3 added lines, -3 removed lines

@@ -90,7 +90,7 @@ 
             ->from(self::TABLE);
 
         foreach ($where as $column => $value) {
-            $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+            $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
         }
 
         foreach ($order as $field => $direction) {
@@ -132,7 +132,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -286,7 +286,7 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new FieldNoteEntity();
-        $entity->id = (string) $data['id'];
+        $entity->id = (string)$data['id'];
         $entity->userId = $data['user_id'];
         $entity->geocacheId = $data['geocache_id'];
         $entity->type = $data['type'];