@@ -26,14 +26,14 @@ |
||
26 | 26 | */ |
27 | 27 | trait Mailcode_Traits_Commands_Validation_Multiline |
28 | 28 | { |
29 | - /** |
|
30 | - * @var boolean |
|
31 | - */ |
|
29 | + /** |
|
30 | + * @var boolean |
|
31 | + */ |
|
32 | 32 | protected $multiline = false; |
33 | 33 | |
34 | - /** |
|
35 | - * @var Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var Mailcode_Parser_Statement_Tokenizer_Token_Keyword|NULL |
|
36 | + */ |
|
37 | 37 | protected $multilineToken; |
38 | 38 | |
39 | 39 | protected function validateSyntax_multiline() : void |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | $this->multiline = $val->isValid(); |
44 | 44 | |
45 | - if($val->isValid()) |
|
45 | + if ($val->isValid()) |
|
46 | 46 | { |
47 | 47 | $this->multilineToken = $val->getToken(); |
48 | 48 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | public function getMultilineToken() : ?Mailcode_Parser_Statement_Tokenizer_Token_Keyword |
57 | 57 | { |
58 | - if($this->multilineToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
58 | + if ($this->multilineToken instanceof Mailcode_Parser_Statement_Tokenizer_Token_Keyword) |
|
59 | 59 | { |
60 | 60 | return $this->multilineToken; |
61 | 61 | } |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $this |
42 | 42 | ); |
43 | 43 | |
44 | - if(!$this->params->isValid() && $this->requiresParameters()) |
|
44 | + if (!$this->params->isValid() && $this->requiresParameters()) |
|
45 | 45 | { |
46 | 46 | $error = $this->params->getValidationResult(); |
47 | 47 |
@@ -40,15 +40,15 @@ |
||
40 | 40 | { |
41 | 41 | $opening = $this->getOpeningCommand(); |
42 | 42 | |
43 | - if($opening === null) { |
|
43 | + if ($opening === null) { |
|
44 | 44 | return array(); |
45 | 45 | } |
46 | 46 | |
47 | 47 | $siblings = $opening->getSiblingCommands(); |
48 | 48 | $result = array(); |
49 | - foreach($siblings as $sibling) |
|
49 | + foreach ($siblings as $sibling) |
|
50 | 50 | { |
51 | - if($sibling !== $this) { |
|
51 | + if ($sibling !== $this) { |
|
52 | 52 | $result[] = $sibling; |
53 | 53 | } |
54 | 54 | } |
@@ -60,11 +60,11 @@ discard block |
||
60 | 60 | |
61 | 61 | $commands = $this->collection->getCommands(); |
62 | 62 | |
63 | - foreach($commands as $command) |
|
63 | + foreach ($commands as $command) |
|
64 | 64 | { |
65 | 65 | $method = 'validate_'.$command->getCommandType(); |
66 | 66 | |
67 | - if(!method_exists($this, $method)) |
|
67 | + if (!method_exists($this, $method)) |
|
68 | 68 | { |
69 | 69 | throw new Mailcode_Exception( |
70 | 70 | 'Unknown command type validation method.', |
@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | |
80 | 80 | $this->$method($command); |
81 | 81 | |
82 | - if(!$this->validationResult->isValid()) |
|
82 | + if (!$this->validationResult->isValid()) |
|
83 | 83 | { |
84 | 84 | break; |
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
88 | - if($this->validationResult->isValid()) |
|
88 | + if ($this->validationResult->isValid()) |
|
89 | 89 | { |
90 | 90 | $this->validate_Unclosed(); |
91 | 91 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | { |
98 | 98 | $leftover = $this->getOpenCommand(); |
99 | 99 | |
100 | - if($leftover === null) |
|
100 | + if ($leftover === null) |
|
101 | 101 | { |
102 | 102 | return; |
103 | 103 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | protected function getOpenCommand() : ?Mailcode_Commands_Command_Type_Opening |
115 | 115 | { |
116 | - if(empty($this->stack)) |
|
116 | + if (empty($this->stack)) |
|
117 | 117 | { |
118 | 118 | return null; |
119 | 119 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | |
125 | 125 | $cmd = $this->stack[$idx]; |
126 | 126 | |
127 | - if($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
127 | + if ($cmd instanceof Mailcode_Commands_Command_Type_Opening) |
|
128 | 128 | { |
129 | 129 | return $cmd; |
130 | 130 | } |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | { |
149 | 149 | $parent = $this->getOpenCommand(); |
150 | 150 | |
151 | - if($parent === null) |
|
151 | + if ($parent === null) |
|
152 | 152 | { |
153 | 153 | $this->validationResult->makeError( |
154 | 154 | t( |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | return; |
163 | 163 | } |
164 | 164 | |
165 | - if($parent->getName() !== $command->getParentName()) |
|
165 | + if ($parent->getName() !== $command->getParentName()) |
|
166 | 166 | { |
167 | 167 | $this->validationResult->makeError( |
168 | 168 | t( |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | protected function validate_Closing(Mailcode_Commands_Command_Type_Closing $command) : void |
186 | 186 | { |
187 | - if(empty($this->stack)) |
|
187 | + if (empty($this->stack)) |
|
188 | 188 | { |
189 | 189 | $this->validationResult->makeError( |
190 | 190 | t('All open commands have already been ended.'), |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | |
197 | 197 | $openingCommand = array_pop($this->stack); |
198 | 198 | |
199 | - if($openingCommand instanceof Mailcode_Commands_Command_Type_Opening) |
|
199 | + if ($openingCommand instanceof Mailcode_Commands_Command_Type_Opening) |
|
200 | 200 | { |
201 | 201 | $this->log(sprintf('Closing command %s', $openingCommand->getName())); |
202 | 202 |
@@ -30,19 +30,19 @@ |
||
30 | 30 | public const VALIDATION_UNCLOSED_COMMAND = 49104; |
31 | 31 | public const VALIDATION_CLOSING_NON_OPENING_COMMAND = 49105; |
32 | 32 | |
33 | - /** |
|
34 | - * @var Mailcode_Collection |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var Mailcode_Collection |
|
35 | + */ |
|
36 | 36 | protected $collection; |
37 | 37 | |
38 | - /** |
|
39 | - * @var OperationResult |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @var OperationResult |
|
40 | + */ |
|
41 | 41 | protected $validationResult; |
42 | 42 | |
43 | - /** |
|
44 | - * @var Mailcode_Commands_Command_Type[] |
|
45 | - */ |
|
43 | + /** |
|
44 | + * @var Mailcode_Commands_Command_Type[] |
|
45 | + */ |
|
46 | 46 | protected $stack = array(); |
47 | 47 | |
48 | 48 | public function __construct(Mailcode_Collection $collection) |
@@ -25,16 +25,16 @@ |
||
25 | 25 | { |
26 | 26 | $command = $location->getPlaceholder()->getCommand(); |
27 | 27 | |
28 | - if($command instanceof Mailcode_Interfaces_Commands_PreProcessing) |
|
28 | + if ($command instanceof Mailcode_Interfaces_Commands_PreProcessing) |
|
29 | 29 | { |
30 | 30 | return $command->preProcessOpening(); |
31 | 31 | } |
32 | 32 | |
33 | - if($command instanceof Mailcode_Commands_Command_Type_Closing) |
|
33 | + if ($command instanceof Mailcode_Commands_Command_Type_Closing) |
|
34 | 34 | { |
35 | 35 | $opening = $command->getOpeningCommand(); |
36 | 36 | |
37 | - if($opening instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
37 | + if ($opening instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
38 | 38 | return $opening->preProcessClosing(); |
39 | 39 | } |
40 | 40 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | // This ending command is tied to a preprocessing command: Since |
26 | 26 | // we do not want to keep these, we return an empty string to strip |
27 | 27 | // it out. |
28 | - if($command->getOpeningCommand() instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
28 | + if ($command->getOpeningCommand() instanceof Mailcode_Interfaces_Commands_PreProcessing) { |
|
29 | 29 | return ''; |
30 | 30 | } |
31 | 31 |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | declare(strict_types=1); |
4 | 4 | |
5 | -if(!file_exists('../vendor/autoload.php')) { |
|
5 | +if (!file_exists('../vendor/autoload.php')) { |
|
6 | 6 | die('Autoloader not present.'); |
7 | 7 | } |
8 | 8 |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $error = null; |
31 | 31 | $activeSyntax = $syntaxes[0]->getTypeID(); |
32 | 32 | |
33 | -if($request->getBool('translate')) |
|
33 | +if ($request->getBool('translate')) |
|
34 | 34 | { |
35 | 35 | $commandsText = $request->getParam('mailcode'); |
36 | 36 | $activeSyntax = (string)$request->registerParam('syntax') |
@@ -47,12 +47,12 @@ discard block |
||
47 | 47 | $error = $e->getMessage(); |
48 | 48 | |
49 | 49 | $collection = $e->getCollection(); |
50 | - if($collection) |
|
50 | + if ($collection) |
|
51 | 51 | { |
52 | 52 | $first = $collection->getFirstError(); |
53 | 53 | $error = $first->getMessage(); |
54 | 54 | $matched = $first->getMatchedText(); |
55 | - if(!empty($matched)) { |
|
55 | + if (!empty($matched)) { |
|
56 | 56 | $error .= '<br>'.t('In command:').' <code>'.$matched.'</code>'; |
57 | 57 | } |
58 | 58 | } |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $selected = ''; |
120 | 120 | $typeID = $syntax->getTypeID(); |
121 | 121 | |
122 | - if($typeID === $activeSyntax) { |
|
122 | + if ($typeID === $activeSyntax) { |
|
123 | 123 | $selected = ' selected'; |
124 | 124 | } |
125 | 125 | |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | <p></p><br> |
140 | 140 | <h2><?php pt('Translated commands') ?></h2> |
141 | 141 | <?php |
142 | - if(empty($commandsText)) |
|
142 | + if (empty($commandsText)) |
|
143 | 143 | { |
144 | 144 | ?> |
145 | 145 | <div class="alert alert-info"> |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | </div> |
148 | 148 | <?php |
149 | 149 | } |
150 | - else if($error) |
|
150 | + else if ($error) |
|
151 | 151 | { |
152 | 152 | ?> |
153 | 153 | <div class="alert alert-danger"> |
@@ -40,8 +40,7 @@ discard block |
||
40 | 40 | try |
41 | 41 | { |
42 | 42 | $translated = translateMailcode($commandsText, $activeSyntax); |
43 | - } |
|
44 | - catch (Mailcode_Exception $e) |
|
43 | + } catch (Mailcode_Exception $e) |
|
45 | 44 | { |
46 | 45 | $translated = ''; |
47 | 46 | $error = $e->getMessage(); |
@@ -146,8 +145,7 @@ discard block |
||
146 | 145 | <?php pt('No commands specified.') ?> |
147 | 146 | </div> |
148 | 147 | <?php |
149 | - } |
|
150 | - else if($error) |
|
148 | + } else if($error) |
|
151 | 149 | { |
152 | 150 | ?> |
153 | 151 | <div class="alert alert-danger"> |
@@ -155,8 +153,7 @@ discard block |
||
155 | 153 | <?php echo $error ?> |
156 | 154 | </div> |
157 | 155 | <?php |
158 | - } |
|
159 | - else |
|
156 | + } else |
|
160 | 157 | { |
161 | 158 | ?> |
162 | 159 | <textarea class="form-control" rows="10"><?php echo htmlspecialchars($translated) ?></textarea> |
@@ -79,7 +79,7 @@ |
||
79 | 79 | { |
80 | 80 | $meta = $phoneNumberUtil->getMetadataForRegion($code); |
81 | 81 | if (!$meta) { |
82 | - die('No metadata for ' . $code); |
|
82 | + die('No metadata for '.$code); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | $exampleNumber = $phoneNumberUtil->getExampleNumber($code); |