@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | array $arguments, |
70 | 70 | string $source, |
71 | 71 | int $level |
72 | - ) { |
|
72 | + ){ |
|
73 | 73 | $this->filename = $filename; |
74 | 74 | $this->line = $line; |
75 | 75 | $this->class = $class; |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | */ |
180 | 180 | public function getArgument(int $index): ReflectionArgument |
181 | 181 | { |
182 | - if (!isset($this->arguments[$index])) { |
|
182 | + if (!isset($this->arguments[$index])){ |
|
183 | 183 | throw new ReflectionException("No such argument with index '{$index}'"); |
184 | 184 | } |
185 | 185 |
@@ -179,7 +179,8 @@ |
||
179 | 179 | */ |
180 | 180 | public function getArgument(int $index): ReflectionArgument |
181 | 181 | { |
182 | - if (!isset($this->arguments[$index])) { |
|
182 | + if (!isset($this->arguments[$index])) |
|
183 | + { |
|
183 | 184 | throw new ReflectionException("No such argument with index '{$index}'"); |
184 | 185 | } |
185 | 186 |
@@ -21,10 +21,10 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * Argument types. |
23 | 23 | */ |
24 | - public const CONSTANT = 'constant'; //Scalar constant and not variable. |
|
25 | - public const VARIABLE = 'variable'; //PHP variable |
|
24 | + public const CONSTANT = 'constant'; //Scalar constant and not variable. |
|
25 | + public const VARIABLE = 'variable'; //PHP variable |
|
26 | 26 | public const EXPRESSION = 'expression'; //PHP code (expression). |
27 | - public const STRING = 'string'; //Simple scalar string, can be fetched using stringValue(). |
|
27 | + public const STRING = 'string'; //Simple scalar string, can be fetched using stringValue(). |
|
28 | 28 | |
29 | 29 | /** @var string */ |
30 | 30 | private $type; |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function stringValue(): string |
71 | 71 | { |
72 | - if ($this->type != self::STRING) { |
|
72 | + if ($this->type != self::STRING){ |
|
73 | 73 | throw new ReflectionException( |
74 | 74 | "Unable to represent value as string, value type is '{$this->type}'" |
75 | 75 | ); |
@@ -91,19 +91,19 @@ discard block |
||
91 | 91 | $level = 0; |
92 | 92 | |
93 | 93 | $result = []; |
94 | - foreach ($tokens as $token) { |
|
95 | - if ($token[ReflectionFile::TOKEN_TYPE] == T_WHITESPACE) { |
|
94 | + foreach ($tokens as $token){ |
|
95 | + if ($token[ReflectionFile::TOKEN_TYPE] == T_WHITESPACE){ |
|
96 | 96 | continue; |
97 | 97 | } |
98 | 98 | |
99 | - if (empty($definition)) { |
|
99 | + if (empty($definition)){ |
|
100 | 100 | $definition = ['type' => self::EXPRESSION, 'value' => '', 'tokens' => []]; |
101 | 101 | } |
102 | 102 | |
103 | 103 | if ( |
104 | 104 | $token[ReflectionFile::TOKEN_TYPE] == '(' |
105 | 105 | || $token[ReflectionFile::TOKEN_TYPE] == '[' |
106 | - ) { |
|
106 | + ){ |
|
107 | 107 | ++$level; |
108 | 108 | $definition['value'] .= $token[ReflectionFile::TOKEN_CODE]; |
109 | 109 | continue; |
@@ -112,18 +112,18 @@ discard block |
||
112 | 112 | if ( |
113 | 113 | $token[ReflectionFile::TOKEN_TYPE] == ')' |
114 | 114 | || $token[ReflectionFile::TOKEN_TYPE] == ']' |
115 | - ) { |
|
115 | + ){ |
|
116 | 116 | --$level; |
117 | 117 | $definition['value'] .= $token[ReflectionFile::TOKEN_CODE]; |
118 | 118 | continue; |
119 | 119 | } |
120 | 120 | |
121 | - if ($level) { |
|
121 | + if ($level){ |
|
122 | 122 | $definition['value'] .= $token[ReflectionFile::TOKEN_CODE]; |
123 | 123 | continue; |
124 | 124 | } |
125 | 125 | |
126 | - if ($token[ReflectionFile::TOKEN_TYPE] == ',') { |
|
126 | + if ($token[ReflectionFile::TOKEN_TYPE] == ','){ |
|
127 | 127 | $result[] = self::createArgument($definition); |
128 | 128 | $definition = null; |
129 | 129 | continue; |
@@ -134,9 +134,9 @@ discard block |
||
134 | 134 | } |
135 | 135 | |
136 | 136 | //Last argument |
137 | - if (is_array($definition)) { |
|
137 | + if (is_array($definition)){ |
|
138 | 138 | $definition = self::createArgument($definition); |
139 | - if (!empty($definition->getType())) { |
|
139 | + if (!empty($definition->getType())){ |
|
140 | 140 | $result[] = $definition; |
141 | 141 | } |
142 | 142 | } |
@@ -155,9 +155,9 @@ discard block |
||
155 | 155 | { |
156 | 156 | $result = new static(self::EXPRESSION, $definition['value']); |
157 | 157 | |
158 | - if (count($definition['tokens']) == 1) { |
|
158 | + if (count($definition['tokens']) == 1){ |
|
159 | 159 | //If argument represent by one token we can try to resolve it's type more precisely |
160 | - switch ($definition['tokens'][0][0]) { |
|
160 | + switch ($definition['tokens'][0][0]){ |
|
161 | 161 | case T_VARIABLE: |
162 | 162 | $result->type = self::VARIABLE; |
163 | 163 | break; |
@@ -69,7 +69,8 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function stringValue(): string |
71 | 71 | { |
72 | - if ($this->type != self::STRING) { |
|
72 | + if ($this->type != self::STRING) |
|
73 | + { |
|
73 | 74 | throw new ReflectionException( |
74 | 75 | "Unable to represent value as string, value type is '{$this->type}'" |
75 | 76 | ); |
@@ -91,12 +92,15 @@ discard block |
||
91 | 92 | $level = 0; |
92 | 93 | |
93 | 94 | $result = []; |
94 | - foreach ($tokens as $token) { |
|
95 | - if ($token[ReflectionFile::TOKEN_TYPE] == T_WHITESPACE) { |
|
95 | + foreach ($tokens as $token) |
|
96 | + { |
|
97 | + if ($token[ReflectionFile::TOKEN_TYPE] == T_WHITESPACE) |
|
98 | + { |
|
96 | 99 | continue; |
97 | 100 | } |
98 | 101 | |
99 | - if (empty($definition)) { |
|
102 | + if (empty($definition)) |
|
103 | + { |
|
100 | 104 | $definition = ['type' => self::EXPRESSION, 'value' => '', 'tokens' => []]; |
101 | 105 | } |
102 | 106 | |
@@ -118,12 +122,14 @@ discard block |
||
118 | 122 | continue; |
119 | 123 | } |
120 | 124 | |
121 | - if ($level) { |
|
125 | + if ($level) |
|
126 | + { |
|
122 | 127 | $definition['value'] .= $token[ReflectionFile::TOKEN_CODE]; |
123 | 128 | continue; |
124 | 129 | } |
125 | 130 | |
126 | - if ($token[ReflectionFile::TOKEN_TYPE] == ',') { |
|
131 | + if ($token[ReflectionFile::TOKEN_TYPE] == ',') |
|
132 | + { |
|
127 | 133 | $result[] = self::createArgument($definition); |
128 | 134 | $definition = null; |
129 | 135 | continue; |
@@ -134,9 +140,11 @@ discard block |
||
134 | 140 | } |
135 | 141 | |
136 | 142 | //Last argument |
137 | - if (is_array($definition)) { |
|
143 | + if (is_array($definition)) |
|
144 | + { |
|
138 | 145 | $definition = self::createArgument($definition); |
139 | - if (!empty($definition->getType())) { |
|
146 | + if (!empty($definition->getType())) |
|
147 | + { |
|
140 | 148 | $result[] = $definition; |
141 | 149 | } |
142 | 150 | } |
@@ -155,9 +163,11 @@ discard block |
||
155 | 163 | { |
156 | 164 | $result = new static(self::EXPRESSION, $definition['value']); |
157 | 165 | |
158 | - if (count($definition['tokens']) == 1) { |
|
166 | + if (count($definition['tokens']) == 1) |
|
167 | + { |
|
159 | 168 | //If argument represent by one token we can try to resolve it's type more precisely |
160 | - switch ($definition['tokens'][0][0]) { |
|
169 | + switch ($definition['tokens'][0][0]) |
|
170 | + { |
|
161 | 171 | case T_VARIABLE: |
162 | 172 | $result->type = self::VARIABLE; |
163 | 173 | break; |
@@ -19,7 +19,7 @@ |
||
19 | 19 | protected function someFunction() |
20 | 20 | { |
21 | 21 | $result = $this->sampleMethod('hello world'); |
22 | - print_r(self::sampleMethod($result . 'plus')); |
|
22 | + print_r(self::sampleMethod($result.'plus')); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function testInstance() |
@@ -22,17 +22,17 @@ |
||
22 | 22 | $this->assertContains(TestTrait::class, $reflection->getTraits()); |
23 | 23 | $this->assertContains(TestInterface::class, $reflection->getInterfaces()); |
24 | 24 | |
25 | - $this->assertSame([__NAMESPACE__ . '\hello'], $reflection->getFunctions()); |
|
25 | + $this->assertSame([__NAMESPACE__.'\hello'], $reflection->getFunctions()); |
|
26 | 26 | |
27 | 27 | $functionA = null; |
28 | 28 | $functionB = null; |
29 | 29 | |
30 | - foreach ($reflection->getInvocations() as $invocation) { |
|
31 | - if ($invocation->getName() == 'test_function_a') { |
|
30 | + foreach ($reflection->getInvocations() as $invocation){ |
|
31 | + if ($invocation->getName() == 'test_function_a'){ |
|
32 | 32 | $functionA = $invocation; |
33 | 33 | } |
34 | 34 | |
35 | - if ($invocation->getName() == 'test_function_b') { |
|
35 | + if ($invocation->getName() == 'test_function_b'){ |
|
36 | 36 | $functionB = $invocation; |
37 | 37 | } |
38 | 38 | } |
@@ -27,12 +27,15 @@ |
||
27 | 27 | $functionA = null; |
28 | 28 | $functionB = null; |
29 | 29 | |
30 | - foreach ($reflection->getInvocations() as $invocation) { |
|
31 | - if ($invocation->getName() == 'test_function_a') { |
|
30 | + foreach ($reflection->getInvocations() as $invocation) |
|
31 | + { |
|
32 | + if ($invocation->getName() == 'test_function_a') |
|
33 | + { |
|
32 | 34 | $functionA = $invocation; |
33 | 35 | } |
34 | 36 | |
35 | - if ($invocation->getName() == 'test_function_b') { |
|
37 | + if ($invocation->getName() == 'test_function_b') |
|
38 | + { |
|
36 | 39 | $functionB = $invocation; |
37 | 40 | } |
38 | 41 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function has(string $domain, string $id): bool |
59 | 59 | { |
60 | - if (!isset($this->data[$domain])) { |
|
60 | + if (!isset($this->data[$domain])){ |
|
61 | 61 | return false; |
62 | 62 | } |
63 | 63 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function get(string $domain, string $string): string |
71 | 71 | { |
72 | - if (!$this->has($domain, $string)) { |
|
72 | + if (!$this->has($domain, $string)){ |
|
73 | 73 | throw new CatalogueException("Undefined string in domain '{$domain}'"); |
74 | 74 | } |
75 | 75 | |
@@ -99,15 +99,15 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function mergeFrom(MessageCatalogue $catalogue, bool $follow = true): void |
101 | 101 | { |
102 | - foreach ($catalogue->all() as $domain => $messages) { |
|
103 | - if (!isset($this->data[$domain])) { |
|
102 | + foreach ($catalogue->all() as $domain => $messages){ |
|
103 | + if (!isset($this->data[$domain])){ |
|
104 | 104 | $this->data[$domain] = []; |
105 | 105 | } |
106 | 106 | |
107 | - if ($follow) { |
|
107 | + if ($follow){ |
|
108 | 108 | //MessageCatalogue string has higher priority that string stored in memory |
109 | 109 | $this->data[$domain] = array_merge($messages, $this->data[$domain]); |
110 | - } else { |
|
110 | + }else{ |
|
111 | 111 | $this->data[$domain] = array_merge($this->data[$domain], $messages); |
112 | 112 | } |
113 | 113 | } |
@@ -57,7 +57,8 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function has(string $domain, string $id): bool |
59 | 59 | { |
60 | - if (!isset($this->data[$domain])) { |
|
60 | + if (!isset($this->data[$domain])) |
|
61 | + { |
|
61 | 62 | return false; |
62 | 63 | } |
63 | 64 | |
@@ -69,7 +70,8 @@ discard block |
||
69 | 70 | */ |
70 | 71 | public function get(string $domain, string $string): string |
71 | 72 | { |
72 | - if (!$this->has($domain, $string)) { |
|
73 | + if (!$this->has($domain, $string)) |
|
74 | + { |
|
73 | 75 | throw new CatalogueException("Undefined string in domain '{$domain}'"); |
74 | 76 | } |
75 | 77 | |
@@ -99,15 +101,20 @@ discard block |
||
99 | 101 | */ |
100 | 102 | public function mergeFrom(MessageCatalogue $catalogue, bool $follow = true): void |
101 | 103 | { |
102 | - foreach ($catalogue->all() as $domain => $messages) { |
|
103 | - if (!isset($this->data[$domain])) { |
|
104 | + foreach ($catalogue->all() as $domain => $messages) |
|
105 | + { |
|
106 | + if (!isset($this->data[$domain])) |
|
107 | + { |
|
104 | 108 | $this->data[$domain] = []; |
105 | 109 | } |
106 | 110 | |
107 | - if ($follow) { |
|
111 | + if ($follow) |
|
112 | + { |
|
108 | 113 | //MessageCatalogue string has higher priority that string stored in memory |
109 | 114 | $this->data[$domain] = array_merge($messages, $this->data[$domain]); |
110 | - } else { |
|
115 | + } |
|
116 | + else |
|
117 | + { |
|
111 | 118 | $this->data[$domain] = array_merge($this->data[$domain], $messages); |
112 | 119 | } |
113 | 120 | } |
@@ -37,10 +37,10 @@ |
||
37 | 37 | */ |
38 | 38 | public function matches(string $string, string $pattern): bool |
39 | 39 | { |
40 | - if ($string === $pattern) { |
|
40 | + if ($string === $pattern){ |
|
41 | 41 | return true; |
42 | 42 | } |
43 | - if (!$this->isPattern($pattern)) { |
|
43 | + if (!$this->isPattern($pattern)){ |
|
44 | 44 | return false; |
45 | 45 | } |
46 | 46 |
@@ -37,10 +37,12 @@ |
||
37 | 37 | */ |
38 | 38 | public function matches(string $string, string $pattern): bool |
39 | 39 | { |
40 | - if ($string === $pattern) { |
|
40 | + if ($string === $pattern) |
|
41 | + { |
|
41 | 42 | return true; |
42 | 43 | } |
43 | - if (!$this->isPattern($pattern)) { |
|
44 | + if (!$this->isPattern($pattern)) |
|
45 | + { |
|
44 | 46 | return false; |
45 | 47 | } |
46 | 48 |
@@ -41,13 +41,13 @@ discard block |
||
41 | 41 | */ |
42 | 42 | protected function say(string $string, array $options = [], $bundle = null): string |
43 | 43 | { |
44 | - if (Translator::isMessage($string)) { |
|
44 | + if (Translator::isMessage($string)){ |
|
45 | 45 | //Cut [[ and ]] |
46 | 46 | $string = substr($string, 2, -2); |
47 | 47 | } |
48 | 48 | |
49 | 49 | $container = ContainerScope::getContainer(); |
50 | - if (empty($container) || !$container->has(TranslatorInterface::class)) { |
|
50 | + if (empty($container) || !$container->has(TranslatorInterface::class)){ |
|
51 | 51 | return Translator::interpolate($string, $options); |
52 | 52 | } |
53 | 53 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | */ |
57 | 57 | $translator = $container->get(TranslatorInterface::class); |
58 | 58 | |
59 | - if (is_null($bundle)) { |
|
59 | + if (is_null($bundle)){ |
|
60 | 60 | $bundle = $translator->getDomain(static::class); |
61 | 61 | } |
62 | 62 |
@@ -41,13 +41,15 @@ discard block |
||
41 | 41 | */ |
42 | 42 | protected function say(string $string, array $options = [], $bundle = null): string |
43 | 43 | { |
44 | - if (Translator::isMessage($string)) { |
|
44 | + if (Translator::isMessage($string)) |
|
45 | + { |
|
45 | 46 | //Cut [[ and ]] |
46 | 47 | $string = substr($string, 2, -2); |
47 | 48 | } |
48 | 49 | |
49 | 50 | $container = ContainerScope::getContainer(); |
50 | - if (empty($container) || !$container->has(TranslatorInterface::class)) { |
|
51 | + if (empty($container) || !$container->has(TranslatorInterface::class)) |
|
52 | + { |
|
51 | 53 | return Translator::interpolate($string, $options); |
52 | 54 | } |
53 | 55 | |
@@ -56,7 +58,8 @@ discard block |
||
56 | 58 | */ |
57 | 59 | $translator = $container->get(TranslatorInterface::class); |
58 | 60 | |
59 | - if (is_null($bundle)) { |
|
61 | + if (is_null($bundle)) |
|
62 | + { |
|
60 | 63 | $bundle = $translator->getDomain(static::class); |
61 | 64 | } |
62 | 65 |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | */ |
95 | 95 | public function getLocaleDirectory(string $locale): string |
96 | 96 | { |
97 | - return $this->getLocalesDirectory() . $locale . '/'; |
|
97 | + return $this->getLocalesDirectory().$locale.'/'; |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
@@ -107,9 +107,9 @@ discard block |
||
107 | 107 | { |
108 | 108 | $bundle = strtolower(str_replace(['/', '\\'], '-', $bundle)); |
109 | 109 | |
110 | - foreach ($this->config['domains'] as $domain => $patterns) { |
|
111 | - foreach ($patterns as $pattern) { |
|
112 | - if ($this->matcher->matches($bundle, $pattern)) { |
|
110 | + foreach ($this->config['domains'] as $domain => $patterns){ |
|
111 | + foreach ($patterns as $pattern){ |
|
112 | + if ($this->matcher->matches($bundle, $pattern)){ |
|
113 | 113 | return $domain; |
114 | 114 | } |
115 | 115 | } |
@@ -107,9 +107,12 @@ |
||
107 | 107 | { |
108 | 108 | $bundle = strtolower(str_replace(['/', '\\'], '-', $bundle)); |
109 | 109 | |
110 | - foreach ($this->config['domains'] as $domain => $patterns) { |
|
111 | - foreach ($patterns as $pattern) { |
|
112 | - if ($this->matcher->matches($bundle, $pattern)) { |
|
110 | + foreach ($this->config['domains'] as $domain => $patterns) |
|
111 | + { |
|
112 | + foreach ($patterns as $pattern) |
|
113 | + { |
|
114 | + if ($this->matcher->matches($bundle, $pattern)) |
|
115 | + { |
|
113 | 116 | return $domain; |
114 | 117 | } |
115 | 118 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | */ |
51 | 51 | public function loadCatalogue(string $locale): CatalogueInterface |
52 | 52 | { |
53 | - if (!$this->hasLocale($locale)) { |
|
53 | + if (!$this->hasLocale($locale)){ |
|
54 | 54 | throw new LocaleException($locale); |
55 | 55 | } |
56 | 56 |
@@ -50,7 +50,8 @@ |
||
50 | 50 | */ |
51 | 51 | public function loadCatalogue(string $locale): CatalogueInterface |
52 | 52 | { |
53 | - if (!$this->hasLocale($locale)) { |
|
53 | + if (!$this->hasLocale($locale)) |
|
54 | + { |
|
54 | 55 | throw new LocaleException($locale); |
55 | 56 | } |
56 | 57 |