@@ -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 | } |
@@ -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'; |
@@ -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 |
@@ -380,11 +380,11 @@ |
||
380 | 380 | public function getUpsert($tableName, array $columnNameList, $rowCount) |
381 | 381 | { |
382 | 382 | $columns = implode('","', $columnNameList); |
383 | - $rowPrototype = '(' . implode(',', array_fill(0, count($columnNameList), '?')) . ')'; |
|
383 | + $rowPrototype = '('.implode(',', array_fill(0, count($columnNameList), '?')).')'; |
|
384 | 384 | $rows = implode(',', array_fill(0, $rowCount, $rowPrototype)); |
385 | 385 | $updates = []; |
386 | 386 | foreach ($columnNameList as $column) { |
387 | - $updates[] = '"' . $column . '"=VALUES("' . $column . '")'; |
|
387 | + $updates[] = '"'.$column.'"=VALUES("'.$column.'")'; |
|
388 | 388 | } |
389 | 389 | $updates = implode(',', $updates); |
390 | 390 | $sql = sprintf( |
@@ -372,7 +372,7 @@ |
||
372 | 372 | } |
373 | 373 | /** |
374 | 374 | * @param string $tableName |
375 | - * @param array $columnNameList |
|
375 | + * @param string[] $columnNameList |
|
376 | 376 | * @param string $rowCount |
377 | 377 | * |
378 | 378 | * @return string |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | } |
81 | 81 | if ($code < 200) { |
82 | 82 | if (false !== strpos($mess, 'retry after')) { |
83 | - $data->setCacheInterval(strtotime(substr($mess, -19) . '+00:00') - time()); |
|
83 | + $data->setCacheInterval(strtotime(substr($mess, -19).'+00:00') - time()); |
|
84 | 84 | } |
85 | 85 | $yem->triggerLogEvent('Yapeal.Log.log', Logger::WARNING, |
86 | 86 | $this->createEventMessage($mess, $data, $eventName)); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $data->setCacheInterval(300); |
98 | 98 | } |
99 | 99 | $apiName = $data->getEveApiName(); |
100 | - $data->setEveApiName('Error_' . $apiName); |
|
100 | + $data->setEveApiName('Error_'.$apiName); |
|
101 | 101 | // Cache error XML. |
102 | 102 | $this->emitEvents($data, 'cache'); |
103 | 103 | $data->setEveApiName($apiName); |
@@ -50,20 +50,20 @@ |
||
50 | 50 | { |
51 | 51 | if (empty($dic['Yapeal.Event.EveApiEvent'])) { |
52 | 52 | $dic['Yapeal.Event.EveApi'] = $dic->factory( |
53 | - function ($dic) { |
|
53 | + function($dic) { |
|
54 | 54 | return new $dic['Yapeal.Event.Factories.eveApi'](); |
55 | 55 | } |
56 | 56 | ); |
57 | 57 | } |
58 | 58 | if (empty($dic['Yapeal.Event.LogEvent'])) { |
59 | 59 | $dic['Yapeal.Event.LogEvent'] = $dic->factory( |
60 | - function ($dic) { |
|
60 | + function($dic) { |
|
61 | 61 | return new $dic['Yapeal.Event.Factories.log']; |
62 | 62 | } |
63 | 63 | ); |
64 | 64 | } |
65 | 65 | if (empty($dic['Yapeal.Event.Mediator'])) { |
66 | - $dic['Yapeal.Event.Mediator'] = function ($dic) { |
|
66 | + $dic['Yapeal.Event.Mediator'] = function($dic) { |
|
67 | 67 | return new $dic['Yapeal.Event.mediator']($dic); |
68 | 68 | }; |
69 | 69 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | public function wire(ContainerInterface $dic) |
51 | 51 | { |
52 | 52 | if (empty($dic['Yapeal.Network.Client'])) { |
53 | - $dic['Yapeal.Network.Client'] = function ($dic) { |
|
53 | + $dic['Yapeal.Network.Client'] = function($dic) { |
|
54 | 54 | $appComment = $dic['Yapeal.Network.appComment']; |
55 | 55 | $appName = $dic['Yapeal.Network.appName']; |
56 | 56 | $appVersion = $dic['Yapeal.Network.appVersion']; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | 'Keep-Alive' => $dic['Yapeal.Network.Headers.Keep-Alive'] |
87 | 87 | ]; |
88 | 88 | // Clean up any extra spaces and EOL chars from Yaml. |
89 | - array_walk($headers, function (&$value) { |
|
89 | + array_walk($headers, function(&$value) { |
|
90 | 90 | /** @noinspection ReferenceMismatchInspection */ |
91 | 91 | return trim(str_replace(' ', '', $value)); |
92 | 92 | }); |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | }; |
105 | 105 | } |
106 | 106 | if (empty($dic['Yapeal.Network.Retriever'])) { |
107 | - $dic['Yapeal.Network.Retriever'] = function ($dic) { |
|
107 | + $dic['Yapeal.Network.Retriever'] = function($dic) { |
|
108 | 108 | return new GuzzleNetworkRetriever($dic['Yapeal.Network.Client']); |
109 | 109 | }; |
110 | 110 | } |