@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function getPreserveTos() |
50 | 50 | { |
51 | - if (0 === count($this->preserveTos)){ |
|
51 | + if (0 === count($this->preserveTos)) { |
|
52 | 52 | $mess = 'Tried to access preserveTos before it was set'; |
53 | 53 | throw new \LogicException($mess); |
54 | 54 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | ->triggerLogEvent('Yapeal.Log.log', Logger::INFO, $mess); |
106 | 106 | $mess = implode(',', $columns); |
107 | 107 | if (512 < strlen($mess)) { |
108 | - $mess = substr($mess, 0, 512) . '...'; |
|
108 | + $mess = substr($mess, 0, 512).'...'; |
|
109 | 109 | } |
110 | 110 | $this->getYem() |
111 | 111 | ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $mess); |
@@ -106,9 +106,9 @@ |
||
106 | 106 | if ('Database' === $dir && $this->dropDatabase) { |
107 | 107 | // Add drop database file if requested. |
108 | 108 | $fileList[] = $this->getFpn() |
109 | - ->normalizeFile($path . $dir . '/DropDatabase.sql'); |
|
109 | + ->normalizeFile($path.$dir.'/DropDatabase.sql'); |
|
110 | 110 | } |
111 | - foreach (new \DirectoryIterator($path . $dir . '/') as $fileInfo) { |
|
111 | + foreach (new \DirectoryIterator($path.$dir.'/') as $fileInfo) { |
|
112 | 112 | // Add file path if it's a sql create file. |
113 | 113 | if ($fileInfo->isFile() |
114 | 114 | && 'sql' === $fileInfo->getExtension() |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | ->triggerLogEvent('Yapeal.Log.log', Logger::WARNING, $this->createEveApiMessage($mess, $data)); |
168 | 168 | return false; |
169 | 169 | } |
170 | - if (strtotime($expires[0]['expires'] . '+00:00') < time()) { |
|
170 | + if (strtotime($expires[0]['expires'].'+00:00') < time()) { |
|
171 | 171 | $mess = 'Expired UtilCachedUntil record found for'; |
172 | 172 | $this->getYem() |
173 | 173 | ->triggerLogEvent('Yapeal.Log.log', Logger::DEBUG, $this->createEveApiMessage($mess, $data)); |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | } |
268 | 268 | $dateTime = gmdate( |
269 | 269 | 'Y-m-d H:i:s', |
270 | - strtotime($currentTime . '+00:00') + $data->getCacheInterval() |
|
270 | + strtotime($currentTime.'+00:00') + $data->getCacheInterval() |
|
271 | 271 | ); |
272 | 272 | $row = [ |
273 | 273 | $data->getEveApiName(), |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function __construct($dir = __DIR__) |
55 | 55 | { |
56 | - $this->setRelativeBaseDir($dir . '/'); |
|
56 | + $this->setRelativeBaseDir($dir.'/'); |
|
57 | 57 | } |
58 | 58 | /** |
59 | 59 | * @param EveApiEventInterface $event |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | libxml_clear_errors(); |
98 | 98 | libxml_use_internal_errors($oldErrors); |
99 | 99 | $apiName = $data->getEveApiName(); |
100 | - $data->setEveApiName('Invalid_' . $apiName); |
|
100 | + $data->setEveApiName('Invalid_'.$apiName); |
|
101 | 101 | // Cache error XML. |
102 | 102 | $this->emitEvents($data, 'cache'); |
103 | 103 | $data->setEveApiName($apiName); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | return $this; |
58 | 58 | } |
59 | 59 | if (!is_string($name)) { |
60 | - $mess = 'Name MUST be string but was given ' . gettype($name); |
|
60 | + $mess = 'Name MUST be string but was given '.gettype($name); |
|
61 | 61 | throw new InvalidArgumentException($mess); |
62 | 62 | } |
63 | 63 | $this->eveApiArguments[$name] = (string)$value; |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | { |
90 | 90 | $name = (string)$name; |
91 | 91 | if (!array_key_exists($name, $this->eveApiArguments)) { |
92 | - $mess = 'Unknown argument ' . $name; |
|
92 | + $mess = 'Unknown argument '.$name; |
|
93 | 93 | throw new DomainException($mess); |
94 | 94 | } |
95 | 95 | return $this->eveApiArguments[$name]; |
@@ -151,14 +151,14 @@ discard block |
||
151 | 151 | */ |
152 | 152 | public function getHash() |
153 | 153 | { |
154 | - $hash = $this->getEveApiName() . $this->getEveApiSectionName(); |
|
154 | + $hash = $this->getEveApiName().$this->getEveApiSectionName(); |
|
155 | 155 | $arguments = $this->getEveApiArguments(); |
156 | 156 | ksort($arguments); |
157 | 157 | foreach ($arguments as $key => $value) { |
158 | 158 | if ('mask' === $key) { |
159 | 159 | continue; |
160 | 160 | } |
161 | - $hash .= $key . $value; |
|
161 | + $hash .= $key.$value; |
|
162 | 162 | } |
163 | 163 | return hash('md5', $hash); |
164 | 164 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | public function setEveApiName($value) |
229 | 229 | { |
230 | 230 | if (!is_string($value)) { |
231 | - $mess = 'Name MUST be string but was given ' . gettype($value); |
|
231 | + $mess = 'Name MUST be string but was given '.gettype($value); |
|
232 | 232 | throw new InvalidArgumentException($mess); |
233 | 233 | } |
234 | 234 | $this->eveApiName = $value; |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | public function setEveApiSectionName($value) |
246 | 246 | { |
247 | 247 | if (!is_string($value)) { |
248 | - $mess = 'Section name MUST be string but was given ' . gettype($value); |
|
248 | + $mess = 'Section name MUST be string but was given '.gettype($value); |
|
249 | 249 | throw new InvalidArgumentException($mess); |
250 | 250 | } |
251 | 251 | $this->eveApiSectionName = $value; |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | $xml = ''; |
266 | 266 | } |
267 | 267 | if (!is_string($xml)) { |
268 | - $mess = 'Xml MUST be string but was given ' . gettype($xml); |
|
268 | + $mess = 'Xml MUST be string but was given '.gettype($xml); |
|
269 | 269 | throw new InvalidArgumentException($mess); |
270 | 270 | } |
271 | 271 | $this->eveApiXml = $xml; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | ); |
78 | 78 | } catch (ParseException $exc) { |
79 | 79 | $mess = sprintf( |
80 | - 'Unable to parse the YAML configuration file %2$s.' . ' The error message was %1$s', |
|
80 | + 'Unable to parse the YAML configuration file %2$s.'.' The error message was %1$s', |
|
81 | 81 | $exc->getMessage(), |
82 | 82 | $configFile |
83 | 83 | ); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | { |
107 | 107 | $names = ['Config', 'Error', 'Event', 'Log', 'Sql', 'Xml', 'Xsd', 'Xsl', 'Cache', 'Network', 'EveApi']; |
108 | 108 | foreach ($names as $name) { |
109 | - $className = __NAMESPACE__ . '\\' . $name . 'Wiring'; |
|
109 | + $className = __NAMESPACE__.'\\'.$name.'Wiring'; |
|
110 | 110 | if (class_exists($className, true)) { |
111 | 111 | /** |
112 | 112 | * @var WiringInterface $class |
@@ -115,11 +115,11 @@ discard block |
||
115 | 115 | $class->wire($this->dic); |
116 | 116 | continue; |
117 | 117 | } |
118 | - $methodName = 'wire' . $name; |
|
118 | + $methodName = 'wire'.$name; |
|
119 | 119 | if (method_exists($this, $methodName)) { |
120 | 120 | $this->$methodName(); |
121 | 121 | } else { |
122 | - $mess = 'Could NOT find class or method for ' . $name; |
|
122 | + $mess = 'Could NOT find class or method for '.$name; |
|
123 | 123 | throw new \LogicException($mess); |
124 | 124 | } |
125 | 125 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | do { |
144 | 144 | $settings = preg_replace_callback( |
145 | 145 | $regEx, |
146 | - function ($match) use ($settings, $dic) { |
|
146 | + function($match) use ($settings, $dic) { |
|
147 | 147 | if (!empty($settings[$match['name']])) { |
148 | 148 | return $settings[$match['name']]; |
149 | 149 | } |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | if (PREG_NO_ERROR !== $lastError) { |
165 | 165 | $constants = array_flip(get_defined_constants(true)['pcre']); |
166 | 166 | $lastError = $constants[$lastError]; |
167 | - $mess = 'Received preg error ' . $lastError; |
|
167 | + $mess = 'Received preg error '.$lastError; |
|
168 | 168 | throw new \DomainException($mess); |
169 | 169 | } |
170 | 170 | } while ($count > 0); |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $rdi->setFlags($flags); |
184 | 184 | /** @noinspection SpellCheckingInspection */ |
185 | 185 | $rcfi = new \RecursiveCallbackFilterIterator( |
186 | - $rdi, function (\SplFileInfo $current, $key, \RecursiveDirectoryIterator $rdi) { |
|
186 | + $rdi, function(\SplFileInfo $current, $key, \RecursiveDirectoryIterator $rdi) { |
|
187 | 187 | if ($rdi->hasChildren()) { |
188 | 188 | return true; |
189 | 189 | } |
@@ -218,16 +218,16 @@ discard block |
||
218 | 218 | $dic['Yapeal.baseDir'] = $path; |
219 | 219 | } |
220 | 220 | if (empty($dic['Yapeal.libDir'])) { |
221 | - $dic['Yapeal.libDir'] = $path . 'lib/'; |
|
221 | + $dic['Yapeal.libDir'] = $path.'lib/'; |
|
222 | 222 | } |
223 | 223 | $configFiles = [ |
224 | - $fpn->normalizeFile(__DIR__ . '/yapeal_defaults.yaml'), |
|
225 | - $fpn->normalizeFile($dic['Yapeal.baseDir'] . 'config/yapeal.yaml') |
|
224 | + $fpn->normalizeFile(__DIR__.'/yapeal_defaults.yaml'), |
|
225 | + $fpn->normalizeFile($dic['Yapeal.baseDir'].'config/yapeal.yaml') |
|
226 | 226 | ]; |
227 | 227 | $vendorPos = strpos($path, 'vendor/'); |
228 | 228 | if (false !== $vendorPos) { |
229 | 229 | $dic['Yapeal.vendorParentDir'] = substr($path, 0, $vendorPos); |
230 | - $configFiles[] = $fpn->normalizeFile($dic['Yapeal.vendorParentDir'] . 'config/yapeal.yaml'); |
|
230 | + $configFiles[] = $fpn->normalizeFile($dic['Yapeal.vendorParentDir'].'config/yapeal.yaml'); |
|
231 | 231 | } |
232 | 232 | $settings = []; |
233 | 233 | // Process each file in turn so any substitutions are done in a more |
@@ -270,8 +270,8 @@ discard block |
||
270 | 270 | basename($subscriber, '.php') |
271 | 271 | ); |
272 | 272 | if (!isset($dic[$service])) { |
273 | - $dic[$service] = function () use ($dic, $service) { |
|
274 | - $class = '\\' . str_replace('.', '\\', $service); |
|
273 | + $dic[$service] = function() use ($dic, $service) { |
|
274 | + $class = '\\'.str_replace('.', '\\', $service); |
|
275 | 275 | /** |
276 | 276 | * @var \Yapeal\CommonToolsTrait $callable |
277 | 277 | */ |
@@ -280,27 +280,27 @@ discard block |
||
280 | 280 | ->setPdo($dic['Yapeal.Sql.Connection']); |
281 | 281 | }; |
282 | 282 | } |
283 | - $events = [$service . '.start' => ['startEveApi', 'last']]; |
|
283 | + $events = [$service.'.start' => ['startEveApi', 'last']]; |
|
284 | 284 | if (false === strpos($subscriber, 'Section')) { |
285 | - $events[$service . '.preserve'] = ['preserveEveApi', 'last']; |
|
285 | + $events[$service.'.preserve'] = ['preserveEveApi', 'last']; |
|
286 | 286 | } |
287 | 287 | $mediator->addServiceSubscriberByEventList($service, $events); |
288 | 288 | } |
289 | 289 | } |
290 | 290 | if (empty($dic['Yapeal.EveApi.Creator'])) { |
291 | - $dic['Yapeal.EveApi.Creator'] = function () use ($dic) { |
|
291 | + $dic['Yapeal.EveApi.Creator'] = function() use ($dic) { |
|
292 | 292 | $loader = new \Twig_Loader_Filesystem($dic['Yapeal.EveApi.dir']); |
293 | 293 | $twig = new \Twig_Environment( |
294 | 294 | $loader, ['debug' => true, 'strict_variables' => true, 'autoescape' => false] |
295 | 295 | ); |
296 | 296 | $filter = new \Twig_SimpleFilter( |
297 | - 'ucFirst', function ($value) { |
|
297 | + 'ucFirst', function($value) { |
|
298 | 298 | return ucfirst($value); |
299 | 299 | } |
300 | 300 | ); |
301 | 301 | $twig->addFilter($filter); |
302 | 302 | $filter = new \Twig_SimpleFilter( |
303 | - 'lcFirst', function ($value) { |
|
303 | + 'lcFirst', function($value) { |
|
304 | 304 | return lcfirst($value); |
305 | 305 | } |
306 | 306 | ); |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | */ |
124 | 124 | $statements = str_replace(array_keys($replacements), array_values($replacements), explode(';', $sqlStatements)); |
125 | 125 | // 5 is a 'magic' number that I think is shorter than any legal SQL statement. |
126 | - $statements = array_filter($statements, function ($value) { |
|
126 | + $statements = array_filter($statements, function($value) { |
|
127 | 127 | return 5 <= strlen(trim($value)); |
128 | 128 | }); |
129 | 129 | $progress = null; |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | $progress->finish(); |
152 | 152 | $output->writeln(''); |
153 | 153 | } |
154 | - $mess = $sql . PHP_EOL; |
|
154 | + $mess = $sql.PHP_EOL; |
|
155 | 155 | $mess .= sprintf( |
156 | 156 | 'Sql failed in %1$s on statement %2$s with (%3$s) %4$s', |
157 | 157 | $fileName, |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | $dic = $this->getDic(); |
183 | 183 | foreach (['class', 'database', 'hostName', 'password', 'platform', 'tablePrefix', 'userName'] as $option) { |
184 | 184 | if (!empty($options[$option])) { |
185 | - $dic[$base . $option] = $options[$option]; |
|
185 | + $dic[$base.$option] = $options[$option]; |
|
186 | 186 | } |
187 | 187 | } |
188 | 188 | if (!empty($options['configFile'])) { |