@@ -42,7 +42,7 @@ |
||
42 | 42 | trait CommonFileHandlingTrait |
43 | 43 | { |
44 | 44 | /** |
45 | - * @param $fileName |
|
45 | + * @param string $fileName |
|
46 | 46 | * @param MediatorInterface $yem |
47 | 47 | * @param string $mode |
48 | 48 | * |
@@ -135,17 +135,17 @@ discard block |
||
135 | 135 | protected function isWritablePath($path, MediatorInterface $yem) |
136 | 136 | { |
137 | 137 | if (!is_readable($path)) { |
138 | - $mess = 'Cache path is NOT readable or does NOT exist, was given ' . $path; |
|
138 | + $mess = 'Cache path is NOT readable or does NOT exist, was given '.$path; |
|
139 | 139 | $yem->triggerLogEvent('Yapeal.Log.log', Logger::NOTICE, $mess); |
140 | 140 | return false; |
141 | 141 | } |
142 | 142 | if (!is_dir($path)) { |
143 | - $mess = 'Cache path is NOT a directory, was given ' . $path; |
|
143 | + $mess = 'Cache path is NOT a directory, was given '.$path; |
|
144 | 144 | $yem->triggerLogEvent('Yapeal.Log.log', Logger::NOTICE, $mess); |
145 | 145 | return false; |
146 | 146 | } |
147 | 147 | if (!is_writable($path)) { |
148 | - $mess = 'Cache path is NOT writable, was given ' . $path; |
|
148 | + $mess = 'Cache path is NOT writable, was given '.$path; |
|
149 | 149 | $yem->triggerLogEvent('Yapeal.Log.log', Logger::NOTICE, $mess); |
150 | 150 | return false; |
151 | 151 | } |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | protected function safeFileRead($fileName, MediatorInterface $yem) |
215 | 215 | { |
216 | 216 | if (!is_readable($fileName) || !is_file($fileName)) { |
217 | - $mess = 'Could NOT find accessible file, was given ' . $fileName; |
|
217 | + $mess = 'Could NOT find accessible file, was given '.$fileName; |
|
218 | 218 | $yem->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $mess); |
219 | 219 | return false; |
220 | 220 | } |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | } |
92 | 92 | $this->sectionName = $data->getEveApiSectionName(); |
93 | 93 | $xml = $data->getEveApiXml(); |
94 | - if (false === $xml) { |
|
95 | - return $event->setHandledSufficiently(); |
|
96 | - } |
|
94 | + if (false === $xml) { |
|
95 | + return $event->setHandledSufficiently(); |
|
96 | + } |
|
97 | 97 | $sxi = new SimpleXMLIterator($xml); |
98 | 98 | $this->tables = []; |
99 | 99 | $this->processValueOnly($sxi, lcfirst($data->getEveApiName())); |
@@ -154,18 +154,18 @@ discard block |
||
154 | 154 | } |
155 | 155 | $name = strtolower($name); |
156 | 156 | foreach ([ |
157 | - 'descr' => 'xs:string', |
|
158 | - 'name' => 'eveNameType', |
|
159 | - 'balance' => 'eveISKType', |
|
160 | - 'isk' => 'eveISKType', |
|
161 | - 'tax' => 'eveISKType', |
|
162 | - 'timeefficiency' => 'xs:unsignedByte', |
|
163 | - 'date' => 'eveNEDTType', |
|
164 | - 'time' => 'eveNEDTType', |
|
165 | - 'until' => 'eveNEDTType', |
|
166 | - 'errorcode' => 'xs:unsignedShort', |
|
167 | - 'level' => 'xs:unsignedShort' |
|
168 | - ] as $search => $replace) { |
|
157 | + 'descr' => 'xs:string', |
|
158 | + 'name' => 'eveNameType', |
|
159 | + 'balance' => 'eveISKType', |
|
160 | + 'isk' => 'eveISKType', |
|
161 | + 'tax' => 'eveISKType', |
|
162 | + 'timeefficiency' => 'xs:unsignedByte', |
|
163 | + 'date' => 'eveNEDTType', |
|
164 | + 'time' => 'eveNEDTType', |
|
165 | + 'until' => 'eveNEDTType', |
|
166 | + 'errorcode' => 'xs:unsignedShort', |
|
167 | + 'level' => 'xs:unsignedShort' |
|
168 | + ] as $search => $replace) { |
|
169 | 169 | if (false !== strpos($name, $search)) { |
170 | 170 | return $replace; |
171 | 171 | } |
@@ -103,7 +103,7 @@ |
||
103 | 103 | 'className' => lcfirst($data->getEveApiName()), |
104 | 104 | 'tables' => $this->tables, |
105 | 105 | 'sectionName' => lcfirst($this->sectionName), |
106 | - 'version' => gmdate('YmdHis', $sec) . sprintf('.%0-3s', floor($mSec * 1000)) |
|
106 | + 'version' => gmdate('YmdHis', $sec).sprintf('.%0-3s', floor($mSec * 1000)) |
|
107 | 107 | ]; |
108 | 108 | try { |
109 | 109 | $contents = $this->getTwig() |
@@ -49,7 +49,7 @@ |
||
49 | 49 | */ |
50 | 50 | protected function createEveApiMessage($messagePrefix, EveApiReadWriteInterface $data) |
51 | 51 | { |
52 | - $mess = $messagePrefix . ' Eve API %1$s/%2$s'; |
|
52 | + $mess = $messagePrefix.' Eve API %1$s/%2$s'; |
|
53 | 53 | $subs = [lcfirst($data->getEveApiSectionName()), $data->getEveApiName()]; |
54 | 54 | if ($data->hasEveApiArgument('keyID')) { |
55 | 55 | $mess .= ' for keyID = %3$s'; |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function __construct($dir = __DIR__) |
59 | 59 | { |
60 | - $this->setRelativeBaseDir($dir . '/'); |
|
60 | + $this->setRelativeBaseDir($dir.'/'); |
|
61 | 61 | } |
62 | 62 | /** |
63 | 63 | * @param EveApiEventInterface $event |
@@ -117,15 +117,15 @@ discard block |
||
117 | 117 | } |
118 | 118 | $arguments = $data->getEveApiArguments(); |
119 | 119 | if (!empty($arguments['vCode'])) { |
120 | - $arguments['vCode'] = substr($arguments['vCode'], 0, 8) . '...'; |
|
120 | + $arguments['vCode'] = substr($arguments['vCode'], 0, 8).'...'; |
|
121 | 121 | } |
122 | 122 | unset($arguments['mask']); |
123 | 123 | $json = json_encode($arguments); |
124 | 124 | $xml = str_replace( |
125 | 125 | ["encoding='UTF-8'?>\r\n<eveapi", "encoding='UTF-8'?>\n<eveapi"], |
126 | 126 | [ |
127 | - "encoding='UTF-8'?>\r\n<?yapeal.parameters.json " . $json . "?>\r\n<eveapi", |
|
128 | - "encoding='UTF-8'?>\n<?yapeal.parameters.json " . $json . "?>\n<eveapi" |
|
127 | + "encoding='UTF-8'?>\r\n<?yapeal.parameters.json ".$json."?>\r\n<eveapi", |
|
128 | + "encoding='UTF-8'?>\n<?yapeal.parameters.json ".$json."?>\n<eveapi" |
|
129 | 129 | ], |
130 | 130 | $xml |
131 | 131 | ); |
@@ -103,10 +103,10 @@ |
||
103 | 103 | public function setCachePath($value = null) |
104 | 104 | { |
105 | 105 | if ($value === null) { |
106 | - $value = dirname(dirname(__DIR__)) . '/cache/'; |
|
106 | + $value = dirname(dirname(__DIR__)).'/cache/'; |
|
107 | 107 | } |
108 | 108 | if (!is_string($value)) { |
109 | - $mess = 'Cache path MUST be string, but was given ' . gettype($value); |
|
109 | + $mess = 'Cache path MUST be string, but was given '.gettype($value); |
|
110 | 110 | throw new InvalidArgumentException($mess); |
111 | 111 | } |
112 | 112 | if ('' === $this->cachePath) { |
@@ -106,10 +106,10 @@ discard block |
||
106 | 106 | public function setCachePath($value = null) |
107 | 107 | { |
108 | 108 | if ($value === null) { |
109 | - $value = dirname(dirname(__DIR__)) . '/cache/'; |
|
109 | + $value = dirname(dirname(__DIR__)).'/cache/'; |
|
110 | 110 | } |
111 | 111 | if (!is_string($value)) { |
112 | - $mess = 'Cache path MUST be string, but given ' . gettype($value); |
|
112 | + $mess = 'Cache path MUST be string, but given '.gettype($value); |
|
113 | 113 | throw new InvalidArgumentException($mess); |
114 | 114 | } |
115 | 115 | $this->cachePath = $this->getFpn() |
@@ -156,9 +156,9 @@ discard block |
||
156 | 156 | } |
157 | 157 | $now = time(); |
158 | 158 | /** @noinspection PhpUndefinedFieldInspection */ |
159 | - $current = strtotime($simple->currentTime[0] . '+00:00'); |
|
159 | + $current = strtotime($simple->currentTime[0].'+00:00'); |
|
160 | 160 | /** @noinspection PhpUndefinedFieldInspection */ |
161 | - $until = strtotime($simple->cachedUntil[0] . '+00:00'); |
|
161 | + $until = strtotime($simple->cachedUntil[0].'+00:00'); |
|
162 | 162 | // At minimum use cached XML for 5 minutes (300 secs). |
163 | 163 | if (($now - $current) <= 300) { |
164 | 164 | return false; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $output->writeln($name); |
80 | 80 | $csq = $this->getCsq(); |
81 | 81 | $this->executeSqlStatements( |
82 | - $csq->getDropAddOrModifyColumnProcedure() . PHP_EOL . $csq->getCreateAddOrModifyColumnProcedure(), |
|
82 | + $csq->getDropAddOrModifyColumnProcedure().PHP_EOL.$csq->getCreateAddOrModifyColumnProcedure(), |
|
83 | 83 | $name, |
84 | 84 | $output |
85 | 85 | ); |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | protected function getUpdateFileList(OutputInterface $output) |
170 | 170 | { |
171 | 171 | $fileNames = []; |
172 | - $path = $this->getDic()['Yapeal.Sql.dir'] . 'updates/'; |
|
172 | + $path = $this->getDic()['Yapeal.Sql.dir'].'updates/'; |
|
173 | 173 | if (!is_readable($path) || !is_dir($path)) { |
174 | 174 | $mess = sprintf( |
175 | 175 | '<info>Could NOT access update directory %1$s</info>', |
@@ -257,8 +257,8 @@ discard block |
||
257 | 257 | $stmt->execute([$updateVersion]); |
258 | 258 | $pdo->commit(); |
259 | 259 | } catch (PDOException $exc) { |
260 | - $mess = $sql . PHP_EOL; |
|
261 | - $mess .= sprintf('Database error message was %s', $exc->getMessage()) . PHP_EOL; |
|
260 | + $mess = $sql.PHP_EOL; |
|
261 | + $mess .= sprintf('Database error message was %s', $exc->getMessage()).PHP_EOL; |
|
262 | 262 | $mess .= sprintf( |
263 | 263 | 'Database "version" update failed for %1$s', |
264 | 264 | $updateVersion |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | { |
113 | 113 | $name = 'DatabaseUpdater::dropDatabaseProcedure'; |
114 | 114 | $this->executeSqlStatements($this->getCsq() |
115 | - ->getDropAddOrModifyColumnProcedure(), $name, $output); |
|
115 | + ->getDropAddOrModifyColumnProcedure(), $name, $output); |
|
116 | 116 | } |
117 | 117 | /** |
118 | 118 | * @param OutputInterface $output |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | ->getUtilLatestDatabaseVersion(); |
128 | 128 | try { |
129 | 129 | $result = $this->getPdo() |
130 | - ->query($sql, \PDO::FETCH_NUM); |
|
130 | + ->query($sql, \PDO::FETCH_NUM); |
|
131 | 131 | $version = sprintf('%018.3F', $result->fetchColumn()); |
132 | 132 | $result->closeCursor(); |
133 | 133 | } catch (\PDOException $exc) { |
@@ -246,10 +246,10 @@ discard block |
||
246 | 246 | $updateVersion |
247 | 247 | ); |
248 | 248 | if ($this->getPdo() |
249 | - ->inTransaction() |
|
249 | + ->inTransaction() |
|
250 | 250 | ) { |
251 | 251 | $this->getPdo() |
252 | - ->rollBack(); |
|
252 | + ->rollBack(); |
|
253 | 253 | } |
254 | 254 | throw new YapealDatabaseException($mess, 2); |
255 | 255 | } |
@@ -52,8 +52,8 @@ |
||
52 | 52 | array $context = [] |
53 | 53 | ) { |
54 | 54 | $this->setLevel($level) |
55 | - ->setMessage($message) |
|
56 | - ->setContext($context); |
|
55 | + ->setMessage($message) |
|
56 | + ->setContext($context); |
|
57 | 57 | } |
58 | 58 | /** |
59 | 59 | * @return array |
@@ -86,8 +86,8 @@ |
||
86 | 86 | $event = new LogEvent(); |
87 | 87 | } |
88 | 88 | $event->setLevel($level) |
89 | - ->setMessage($message) |
|
90 | - ->setContext($context); |
|
89 | + ->setMessage($message) |
|
90 | + ->setContext($context); |
|
91 | 91 | return $this->trigger($eventName, $event); |
92 | 92 | } |
93 | 93 | } |