Completed
Pull Request — development (#546)
by Nick
06:41
created
htdocs/lib2/edithelper.inc.php 1 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
             // mode switch from plain text to HTML editor => convert HTML special chars
37 37
             $text = nl2br(htmlspecialchars($text));
38 38
             // .. and smilies
39
-            $text = ' ' . $text . ' ';   // see Redmine #1103
39
+            $text = ' ' . $text . ' '; // see Redmine #1103
40 40
             $text = str_replace($smiley['text'], $smiley['spaced_image'], $text);
41 41
             if (substr($text, 0, 1) == ' ') {
42 42
                 $text = substr($text, 1);
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
             // convert to HTML for storing to database
60 60
             // also implemented in okapi/services/logs/submit.php
61 61
             $text = nl2br(htmlspecialchars($text, ENT_COMPAT, 'UTF-8'));
62
-            $text = str_replace('  ', '  ', $text);   // can produce new '  ' ('  ' + ' ')
62
+            $text = str_replace('  ', '  ', $text); // can produce new '  ' ('  ' + ' ')
63 63
             $text = str_replace('  ', '  ', $text);
64 64
         } else {
65 65
             // mode switch from HTML editor to plain text, or decode HTML-encoded plain text
Please login to merge, or discard this patch.
htdocs/src/Oc/User/UserEntity.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -105,16 +105,16 @@
 block discarded – undo
105 105
      */
106 106
     public function fromDatabaseArray(array $data)
107 107
     {
108
-        $this->id = (int) $data['user_id'];
109
-        $this->username = (string) $data['username'];
110
-        $this->password = (string) $data['password'];
111
-        $this->email = (string) $data['email'];
112
-        $this->latitude = (double) $data['latitude'];
113
-        $this->longitude = (double) $data['longitude'];
114
-        $this->isActive = (bool) $data['is_active_flag'];
115
-        $this->firstname = (string) $data['first_name'];
116
-        $this->lastname = (string) $data['last_name'];
117
-        $this->country = (string) $data['country'];
108
+        $this->id = (int)$data['user_id'];
109
+        $this->username = (string)$data['username'];
110
+        $this->password = (string)$data['password'];
111
+        $this->email = (string)$data['email'];
112
+        $this->latitude = (double)$data['latitude'];
113
+        $this->longitude = (double)$data['longitude'];
114
+        $this->isActive = (bool)$data['is_active_flag'];
115
+        $this->firstname = (string)$data['first_name'];
116
+        $this->lastname = (string)$data['last_name'];
117
+        $this->country = (string)$data['country'];
118 118
         $this->language = strtolower($data['language']);
119 119
 
120 120
         return $this;
Please login to merge, or discard this patch.
htdocs/src/Oc/User/UserRepository.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             $entity->toDatabaseArray()
82 82
         );
83 83
 
84
-        $entity->id = (int) $this->connection->lastInsertId();
84
+        $entity->id = (int)$this->connection->lastInsertId();
85 85
 
86 86
         return $entity;
87 87
     }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
             ['id' => $entity->id]
106 106
         );
107 107
 
108
-        $entity->id = (int) $this->connection->lastInsertId();
108
+        $entity->id = (int)$this->connection->lastInsertId();
109 109
 
110 110
         return $entity;
111 111
     }
Please login to merge, or discard this patch.
htdocs/myhome.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
     $allpics = 'ownlogs';
139 139
 }
140 140
 if ($allpics == 'ownlogs' || $allpics == 'owncaches') {
141
-    $gallery =  ($allpics == 'ownlogs' ? LogPics::FOR_OWNLOGS_GALLERY : LogPics::FOR_OWNCACHES_GALLERY);
141
+    $gallery = ($allpics == 'ownlogs' ? LogPics::FOR_OWNLOGS_GALLERY : LogPics::FOR_OWNCACHES_GALLERY);
142 142
     $all_pictures = LogPics::get($gallery);
143 143
     LogPics::setPaging($gallery, 0, 0, "myhome.php?allpics=" . $allpics);
144 144
 } else {
Please login to merge, or discard this patch.
htdocs/src/Oc/Translation/CrowdinImport.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
     }
42 42
 
43 43
     /**
44
-     * @param $path
44
+     * @param string $path
45 45
      * @return TranslationStruct[]
46 46
      */
47 47
     private function readCrowdinCsv($path)
Please login to merge, or discard this patch.
htdocs/src/AppBundle/Command/OkapiCronjobsCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 
26 26
     protected function execute(InputInterface $input, OutputInterface $output)
27 27
     {
28
-        require_once __DIR__.'/../../../okapi/autoload.php';
28
+        require_once __DIR__ . '/../../../okapi/autoload.php';
29 29
         Okapi::execute_prerequest_cronjobs();
30 30
         Okapi::execute_cron5_cronjobs();
31 31
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Postfix/JournalLogs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
                     $cursor[$key] = $value;
72 72
                 }
73 73
 
74
-                $logEntry->id = (int) hexdec($cursor['i']);
74
+                $logEntry->id = (int)hexdec($cursor['i']);
75 75
 
76 76
                 $timeStamp = $entry['__REALTIME_TIMESTAMP'];
77 77
                 $logEntry->created = \DateTimeImmutable::createFromFormat(
Please login to merge, or discard this patch.
htdocs/src/Oc/Postfix/LogEntity.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     public function toDatabaseArray()
31 31
     {
32 32
         return [
33
-            'id' => (int) $this->id,
33
+            'id' => (int)$this->id,
34 34
             'email' => $this->email,
35 35
             'status' => $this->status,
36 36
             'created' => $this->created,
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      */
44 44
     public function fromDatabaseArray(array $data)
45 45
     {
46
-        $this->id = (int) $data['id'];
46
+        $this->id = (int)$data['id'];
47 47
         $this->email = $data['email'];
48 48
         $this->status = $data['status'];
49 49
         $this->created = $data['created'];
Please login to merge, or discard this patch.
htdocs/src/Oc/Translation/TranslationStruct.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
 
57 57
     public function fromCsvArray(array $data)
58 58
     {
59
-        $this->identifier = (int) $data['Identifier'];
59
+        $this->identifier = (int)$data['Identifier'];
60 60
         $this->sourceString = $data['SourceString'];
61 61
         $this->comment = $data['Comment'];
62 62
         $this->de = $data['DE'];
Please login to merge, or discard this patch.