Passed
Push — master ( 707ba4...19aa6f )
by Sebastian
02:43
created
src/Mailcode/Collection.php 1 patch
Indentation   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
     const ERROR_CANNOT_RETRIEVE_FIRST_ERROR = 52301;
26 26
     const ERROR_CANNOT_MODIFY_FINALIZED = 52302;
27 27
     
28
-   /**
29
-    * @var Mailcode_Commands_Command[]
30
-    */
28
+    /**
29
+     * @var Mailcode_Commands_Command[]
30
+     */
31 31
     protected $commands = array();
32 32
     
33 33
     /**
@@ -35,9 +35,9 @@  discard block
 block discarded – undo
35 35
      */
36 36
     protected $errors = array();
37 37
     
38
-   /**
39
-    * @var OperationResult|NULL
40
-    */
38
+    /**
39
+     * @var OperationResult|NULL
40
+     */
41 41
     protected $validationResult;
42 42
 
43 43
     /**
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
     private $finalized = false;
47 47
 
48 48
     /**
49
-    * Adds a command to the collection.
50
-    * 
51
-    * @param Mailcode_Commands_Command $command
52
-    * @return Mailcode_Collection
53
-    */
49
+     * Adds a command to the collection.
50
+     * 
51
+     * @param Mailcode_Commands_Command $command
52
+     * @return Mailcode_Collection
53
+     */
54 54
     public function addCommand(Mailcode_Commands_Command $command) : Mailcode_Collection
55 55
     {
56 56
         if($this->finalized)
@@ -71,21 +71,21 @@  discard block
 block discarded – undo
71 71
         return $this;
72 72
     }
73 73
     
74
-   /**
75
-    * Whether there are any commands in the collection.
76
-    * 
77
-    * @return bool
78
-    */
74
+    /**
75
+     * Whether there are any commands in the collection.
76
+     * 
77
+     * @return bool
78
+     */
79 79
     public function hasCommands() : bool
80 80
     {
81 81
         return !empty($this->commands);
82 82
     }
83 83
     
84
-   /**
85
-    * Counts the amount of commands in the collection.
86
-    * 
87
-    * @return int
88
-    */
84
+    /**
85
+     * Counts the amount of commands in the collection.
86
+     * 
87
+     * @return int
88
+     */
89 89
     public function countCommands() : int
90 90
     {
91 91
         return count($this->commands);
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
         $this->commands = $keep;
124 124
     }
125 125
     
126
-   /**
127
-    * @return Mailcode_Collection_Error[]
128
-    */
126
+    /**
127
+     * @return Mailcode_Collection_Error[]
128
+     */
129 129
     public function getErrors()
130 130
     {
131 131
         $result = $this->getValidationResult();
@@ -167,25 +167,25 @@  discard block
 block discarded – undo
167 167
         return empty($errors);
168 168
     }
169 169
     
170
-   /**
171
-    * Retrieves all commands that were detected, in the exact order
172
-    * they were found.
173
-    * 
174
-    * @return \Mailcode\Mailcode_Commands_Command[]
175
-    */
170
+    /**
171
+     * Retrieves all commands that were detected, in the exact order
172
+     * they were found.
173
+     * 
174
+     * @return \Mailcode\Mailcode_Commands_Command[]
175
+     */
176 176
     public function getCommands()
177 177
     {
178
-       return $this->commands;
178
+        return $this->commands;
179 179
     }
180 180
     
181
-   /**
182
-    * Retrieves all unique commands by their matched
183
-    * string hash: this ensures only commands that were
184
-    * written the exact same way (including spacing)
185
-    * are returned.
186
-    * 
187
-    * @return \Mailcode\Mailcode_Commands_Command[]
188
-    */
181
+    /**
182
+     * Retrieves all unique commands by their matched
183
+     * string hash: this ensures only commands that were
184
+     * written the exact same way (including spacing)
185
+     * are returned.
186
+     * 
187
+     * @return \Mailcode\Mailcode_Commands_Command[]
188
+     */
189 189
     public function getGroupedByHash()
190 190
     {
191 191
         $hashes = array();
@@ -203,12 +203,12 @@  discard block
 block discarded – undo
203 203
         return array_values($hashes);
204 204
     }
205 205
 
206
-   /**
207
-    * Adds several commands at once.
208
-    * 
209
-    * @param Mailcode_Commands_Command[] $commands
210
-    * @return Mailcode_Collection
211
-    */
206
+    /**
207
+     * Adds several commands at once.
208
+     * 
209
+     * @param Mailcode_Commands_Command[] $commands
210
+     * @return Mailcode_Collection
211
+     */
212 212
     public function addCommands(array $commands) : Mailcode_Collection
213 213
     {
214 214
         foreach($commands as $command)
@@ -281,10 +281,10 @@  discard block
 block discarded – undo
281 281
     }
282 282
 
283 283
     /**
284
-    * Retrieves only show variable commands in the collection, if any.
285
-    * 
286
-    * @return Mailcode_Commands_Command_ShowVariable[]
287
-    */
284
+     * Retrieves only show variable commands in the collection, if any.
285
+     * 
286
+     * @return Mailcode_Commands_Command_ShowVariable[]
287
+     */
288 288
     public function getShowVariableCommands()
289 289
     {
290 290
         return $this->getCommandsByClass(Mailcode_Commands_Command_ShowVariable::class);
@@ -298,11 +298,11 @@  discard block
 block discarded – undo
298 298
         return $this->getCommandsByClass(Mailcode_Commands_Command_For::class);
299 299
     }
300 300
 
301
-   /**
302
-    * Retrieves only show date commands in the collection, if any.
303
-    *
304
-    * @return Mailcode_Commands_Command_ShowDate[]
305
-    */
301
+    /**
302
+     * Retrieves only show date commands in the collection, if any.
303
+     *
304
+     * @return Mailcode_Commands_Command_ShowDate[]
305
+     */
306 306
     public function getShowDateCommands() : array
307 307
     {
308 308
         return $this->getCommandsByClass(Mailcode_Commands_Command_ShowDate::class);
Please login to merge, or discard this patch.
src/Mailcode/Factory.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
23 23
     const ERROR_INVALID_COMMAND_CREATED = 50001;
24 24
     const ERROR_UNEXPECTED_COMMAND_TYPE = 50002;
25 25
 
26
-   /**
27
-    * @var Mailcode_Factory_CommandSets
28
-    */
26
+    /**
27
+     * @var Mailcode_Factory_CommandSets
28
+     */
29 29
     private static $commandSets;
30 30
 
31 31
     /**
@@ -79,33 +79,33 @@  discard block
 block discarded – undo
79 79
     }
80 80
 
81 81
     /**
82
-    * Creates a renderer instance, which can be used to easily
83
-    * create and convert commands to strings.
84
-    * 
85
-    * @return Mailcode_Renderer
86
-    */
82
+     * Creates a renderer instance, which can be used to easily
83
+     * create and convert commands to strings.
84
+     * 
85
+     * @return Mailcode_Renderer
86
+     */
87 87
     public static function createRenderer() : Mailcode_Renderer
88 88
     {
89 89
         return new Mailcode_Renderer();
90 90
     }
91 91
     
92
-   /**
93
-    * Creates a printer instance, which works like the renderer,
94
-    * but outputs the generated strings to standard output.
95
-    * 
96
-    * @return Mailcode_Printer
97
-    */
92
+    /**
93
+     * Creates a printer instance, which works like the renderer,
94
+     * but outputs the generated strings to standard output.
95
+     * 
96
+     * @return Mailcode_Printer
97
+     */
98 98
     public static function createPrinter() : Mailcode_Printer
99 99
     {
100 100
         return new Mailcode_Printer();
101 101
     }
102 102
     
103
-   /**
104
-    * Gets/creates the global instance of the date format info
105
-    * class, used to handle date formatting aspects.
106
-    * 
107
-    * @return Mailcode_Date_FormatInfo
108
-    */
103
+    /**
104
+     * Gets/creates the global instance of the date format info
105
+     * class, used to handle date formatting aspects.
106
+     * 
107
+     * @return Mailcode_Date_FormatInfo
108
+     */
109 109
     public static function createDateInfo() : Mailcode_Date_FormatInfo
110 110
     {
111 111
         return Mailcode_Date_FormatInfo::getInstance();
Please login to merge, or discard this patch.
src/Mailcode/Renderer.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -21,17 +21,17 @@  discard block
 block discarded – undo
21 21
  */
22 22
 class Mailcode_Renderer
23 23
 {
24
-   /**
25
-    * @var boolean
26
-    */
24
+    /**
25
+     * @var boolean
26
+     */
27 27
     protected $highlighted = false;
28 28
     
29
-   /**
30
-    * Sets whether to output highlighted commands instead of the default plain text.
31
-    * 
32
-    * @param bool $highlighted
33
-    * @return Mailcode_Renderer
34
-    */
29
+    /**
30
+     * Sets whether to output highlighted commands instead of the default plain text.
31
+     * 
32
+     * @param bool $highlighted
33
+     * @return Mailcode_Renderer
34
+     */
35 35
     public function setOutputHighlighted(bool $highlighted=true) : Mailcode_Renderer
36 36
     {
37 37
         $this->highlighted = $highlighted;
@@ -39,12 +39,12 @@  discard block
 block discarded – undo
39 39
         return $this;
40 40
     }
41 41
     
42
-   /**
43
-    * Converts a show variable command to string.
44
-    * 
45
-    * @param string $variableName The variable name, with or without $ sign.
46
-    * @return string
47
-    */
42
+    /**
43
+     * Converts a show variable command to string.
44
+     * 
45
+     * @param string $variableName The variable name, with or without $ sign.
46
+     * @return string
47
+     */
48 48
     public function showVar(string $variableName) : string
49 49
     {
50 50
         return $this->command2string(Mailcode_Factory::show()->var($variableName));
Please login to merge, or discard this patch.
src/Mailcode/Parser/Safeguard.php 1 patch
Indentation   +144 added lines, -144 removed lines patch added patch discarded remove patch
@@ -54,45 +54,45 @@  discard block
 block discarded – undo
54 54
     const ERROR_INVALID_COMMANDS = 47801;
55 55
     const ERROR_PLACEHOLDER_NOT_FOUND = 47804;
56 56
 
57
-   /**
58
-    * @var Mailcode_Parser
59
-    */
57
+    /**
58
+     * @var Mailcode_Parser
59
+     */
60 60
     protected $parser;
61 61
     
62
-   /**
63
-    * @var Mailcode_Collection
64
-    */
62
+    /**
63
+     * @var Mailcode_Collection
64
+     */
65 65
     protected $commands;
66 66
     
67
-   /**
68
-    * @var string
69
-    */
67
+    /**
68
+     * @var string
69
+     */
70 70
     protected $originalString;
71 71
     
72
-   /**
73
-    * @var Mailcode_Collection
74
-    */
72
+    /**
73
+     * @var Mailcode_Collection
74
+     */
75 75
     protected $collection;
76 76
     
77
-   /**
78
-    * Counter for the placeholders, global for all placeholders.
79
-    * @var integer
80
-    */
77
+    /**
78
+     * Counter for the placeholders, global for all placeholders.
79
+     * @var integer
80
+     */
81 81
     private static $counter = 0;
82 82
     
83
-   /**
84
-    * @var Mailcode_Parser_Safeguard_Placeholder[]
85
-    */
83
+    /**
84
+     * @var Mailcode_Parser_Safeguard_Placeholder[]
85
+     */
86 86
     protected $placeholders;
87 87
     
88
-   /**
89
-    * @var string
90
-    */
88
+    /**
89
+     * @var string
90
+     */
91 91
     protected $delimiter = '999';
92 92
     
93
-   /**
94
-    * @var string[]|NULL
95
-    */
93
+    /**
94
+     * @var string[]|NULL
95
+     */
96 96
     protected $placeholderStrings;
97 97
 
98 98
     public function __construct(Mailcode_Parser $parser, string $subject)
@@ -111,28 +111,28 @@  discard block
 block discarded – undo
111 111
         self::$counter = 0;
112 112
     }
113 113
     
114
-   /**
115
-    * Retrieves the string the safeguard was created for.
116
-    * 
117
-    * @return string
118
-    */
114
+    /**
115
+     * Retrieves the string the safeguard was created for.
116
+     * 
117
+     * @return string
118
+     */
119 119
     public function getOriginalString() : string
120 120
     {
121 121
         return $this->originalString;
122 122
     }
123 123
     
124
-   /**
125
-    * Sets the delimiter character sequence used to prepend
126
-    * and append to the placeholders.
127
-    * 
128
-    * The delimiter's default is "999".
129
-    *
130
-    * Minimum characters: 2
131
-    * Invalid characters: Any characters that get URL encoded
132
-    *
133
-    * @param string $delimiter
134
-    * @return Mailcode_Parser_Safeguard
135
-    */
124
+    /**
125
+     * Sets the delimiter character sequence used to prepend
126
+     * and append to the placeholders.
127
+     * 
128
+     * The delimiter's default is "999".
129
+     *
130
+     * Minimum characters: 2
131
+     * Invalid characters: Any characters that get URL encoded
132
+     *
133
+     * @param string $delimiter
134
+     * @return Mailcode_Parser_Safeguard
135
+     */
136 136
     public function setDelimiter(string $delimiter) : Mailcode_Parser_Safeguard
137 137
     {
138 138
         $validator = new Mailcode_Parser_Safeguard_DelimiterValidator($delimiter);
@@ -148,15 +148,15 @@  discard block
 block discarded – undo
148 148
         return $this->delimiter;
149 149
     }
150 150
     
151
-   /**
152
-    * Retrieves the safe string in which all commands have been replaced
153
-    * by placeholder strings.
154
-    *
155
-    * @return string
156
-    * @throws Mailcode_Exception 
157
-    *
158
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
159
-    */
151
+    /**
152
+     * Retrieves the safe string in which all commands have been replaced
153
+     * by placeholder strings.
154
+     *
155
+     * @return string
156
+     * @throws Mailcode_Exception 
157
+     *
158
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
159
+     */
160 160
     public function makeSafe() : string
161 161
     {
162 162
         $this->requireValidCollection();
@@ -164,16 +164,16 @@  discard block
 block discarded – undo
164 164
         return $this->makeSafePartial();
165 165
     }
166 166
     
167
-   /**
168
-    * Like makeSafe(), but allows partial (invalid) commands: use this
169
-    * if the subject string may contain only part of the whole set of
170
-    * commands. 
171
-    * 
172
-    * Example: parsing a text with an opening if statement, without the 
173
-    * matching end statement.
174
-    * 
175
-    * @return string
176
-    */
167
+    /**
168
+     * Like makeSafe(), but allows partial (invalid) commands: use this
169
+     * if the subject string may contain only part of the whole set of
170
+     * commands. 
171
+     * 
172
+     * Example: parsing a text with an opening if statement, without the 
173
+     * matching end statement.
174
+     * 
175
+     * @return string
176
+     */
177 177
     public function makeSafePartial() : string
178 178
     {
179 179
         $placeholders = $this->getPlaceholders();
@@ -257,13 +257,13 @@  discard block
 block discarded – undo
257 257
         $analyzer->analyze();
258 258
     }
259 259
     
260
-   /**
261
-    * Creates a formatting handler, which can be used to specify
262
-    * which formattings to use for the commands in the subject string.
263
-    * 
264
-    * @param Mailcode_StringContainer|string $subject
265
-    * @return Mailcode_Parser_Safeguard_Formatting
266
-    */
260
+    /**
261
+     * Creates a formatting handler, which can be used to specify
262
+     * which formattings to use for the commands in the subject string.
263
+     * 
264
+     * @param Mailcode_StringContainer|string $subject
265
+     * @return Mailcode_Parser_Safeguard_Formatting
266
+     */
267 267
     public function createFormatting($subject) : Mailcode_Parser_Safeguard_Formatting
268 268
     {
269 269
         if(is_string($subject))
@@ -274,12 +274,12 @@  discard block
 block discarded – undo
274 274
         return new Mailcode_Parser_Safeguard_Formatting($this, $subject);
275 275
     }
276 276
     
277
-   /**
278
-    * Retrieves all placeholders that have to be added to
279
-    * the subject text.
280
-    * 
281
-    * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
282
-    */
277
+    /**
278
+     * Retrieves all placeholders that have to be added to
279
+     * the subject text.
280
+     * 
281
+     * @return \Mailcode\Mailcode_Parser_Safeguard_Placeholder[]
282
+     */
283 283
     public function getPlaceholders()
284 284
     {
285 285
         if(isset($this->placeholders))
@@ -355,16 +355,16 @@  discard block
 block discarded – undo
355 355
         return $string;
356 356
     }
357 357
     
358
-   /**
359
-    * Makes the string whole again after transforming or filtering it,
360
-    * by replacing the command placeholders with the original commands.
361
-    *
362
-    * @param string $string
363
-    * @return string
364
-    * @throws Mailcode_Exception
365
-    *
366
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
367
-    */
358
+    /**
359
+     * Makes the string whole again after transforming or filtering it,
360
+     * by replacing the command placeholders with the original commands.
361
+     *
362
+     * @param string $string
363
+     * @return string
364
+     * @throws Mailcode_Exception
365
+     *
366
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
367
+     */
368 368
     public function makeWhole(string $string) : string
369 369
     {
370 370
         return $this->restore(
@@ -374,15 +374,15 @@  discard block
 block discarded – undo
374 374
         );
375 375
     }
376 376
     
377
-   /**
378
-    * Like `makeWhole()`, but ignores missing command placeholders.
379
-    *
380
-    * @param string $string
381
-    * @return string
382
-    * @throws Mailcode_Exception
383
-    *
384
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
385
-    */
377
+    /**
378
+     * Like `makeWhole()`, but ignores missing command placeholders.
379
+     *
380
+     * @param string $string
381
+     * @return string
382
+     * @throws Mailcode_Exception
383
+     *
384
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
385
+     */
386 386
     public function makeWholePartial(string $string) : string
387 387
     {
388 388
         return $this->restore(
@@ -392,19 +392,19 @@  discard block
 block discarded – undo
392 392
         );
393 393
     }
394 394
 
395
-   /**
396
-    * Like `makeWhole()`, but replaces the commands with a syntax
397
-    * highlighted version, meant for human readable texts only.
398
-    * 
399
-    * Note: the commands lose their functionality (They cannot be 
400
-    * parsed from that string again).
401
-    *
402
-    * @param string $string
403
-    * @return string
404
-    * @throws Mailcode_Exception
405
-    *
406
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
407
-    */
395
+    /**
396
+     * Like `makeWhole()`, but replaces the commands with a syntax
397
+     * highlighted version, meant for human readable texts only.
398
+     * 
399
+     * Note: the commands lose their functionality (They cannot be 
400
+     * parsed from that string again).
401
+     *
402
+     * @param string $string
403
+     * @return string
404
+     * @throws Mailcode_Exception
405
+     *
406
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
407
+     */
408 408
     public function makeHighlighted(string $string) : string
409 409
     {
410 410
         return $this->restore(
@@ -414,15 +414,15 @@  discard block
 block discarded – undo
414 414
         );
415 415
     }
416 416
     
417
-   /**
418
-    * Like `makeHighlighted()`, but ignores missing command placeholders.
419
-    * 
420
-    * @param string $string
421
-    * @return string
422
-    * @throws Mailcode_Exception
423
-    *
424
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
425
-    */
417
+    /**
418
+     * Like `makeHighlighted()`, but ignores missing command placeholders.
419
+     * 
420
+     * @param string $string
421
+     * @return string
422
+     * @throws Mailcode_Exception
423
+     *
424
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
425
+     */
426 426
     public function makeHighlightedPartial(string $string) : string
427 427
     {
428 428
         return $this->restore(
@@ -432,11 +432,11 @@  discard block
 block discarded – undo
432 432
         );
433 433
     }
434 434
     
435
-   /**
436
-    * Retrieves the commands collection contained in the string.
437
-    * 
438
-    * @return Mailcode_Collection
439
-    */
435
+    /**
436
+     * Retrieves the commands collection contained in the string.
437
+     * 
438
+     * @return Mailcode_Collection
439
+     */
440 440
     public function getCollection() : Mailcode_Collection
441 441
     {
442 442
         if(isset($this->collection))
@@ -454,11 +454,11 @@  discard block
 block discarded – undo
454 454
         return $this->getCollection()->isValid();
455 455
     }
456 456
     
457
-   /**
458
-    * @throws Mailcode_Exception
459
-    * 
460
-    * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
461
-    */
457
+    /**
458
+     * @throws Mailcode_Exception
459
+     * 
460
+     * @see Mailcode_Parser_Safeguard::ERROR_INVALID_COMMANDS
461
+     */
462 462
     protected function requireValidCollection() : void
463 463
     {
464 464
         if($this->getCollection()->isValid())
@@ -477,11 +477,11 @@  discard block
 block discarded – undo
477 477
         );
478 478
     }
479 479
     
480
-   /**
481
-    * Retrieves a list of all placeholder IDs used in the text.
482
-    * 
483
-    * @return string[]
484
-    */
480
+    /**
481
+     * Retrieves a list of all placeholder IDs used in the text.
482
+     * 
483
+     * @return string[]
484
+     */
485 485
     public function getPlaceholderStrings() : array
486 486
     {
487 487
         if(is_array($this->placeholderStrings))
@@ -508,13 +508,13 @@  discard block
 block discarded – undo
508 508
         return in_array($subject, $ids, true);
509 509
     }
510 510
     
511
-   /**
512
-    * Retrieves a placeholder instance by its ID.
513
-    * 
514
-    * @param int $id
515
-    * @throws Mailcode_Exception If the placeholder was not found.
516
-    * @return Mailcode_Parser_Safeguard_Placeholder
517
-    */
511
+    /**
512
+     * Retrieves a placeholder instance by its ID.
513
+     * 
514
+     * @param int $id
515
+     * @throws Mailcode_Exception If the placeholder was not found.
516
+     * @return Mailcode_Parser_Safeguard_Placeholder
517
+     */
518 518
     public function getPlaceholderByID(int $id) : Mailcode_Parser_Safeguard_Placeholder
519 519
     {
520 520
         $placeholders = $this->getPlaceholders();
@@ -537,13 +537,13 @@  discard block
 block discarded – undo
537 537
         );
538 538
     }
539 539
     
540
-   /**
541
-    * Retrieves a placeholder instance by its replacement text.
542
-    * 
543
-    * @param string $string
544
-    * @throws Mailcode_Exception
545
-    * @return Mailcode_Parser_Safeguard_Placeholder
546
-    */
540
+    /**
541
+     * Retrieves a placeholder instance by its replacement text.
542
+     * 
543
+     * @param string $string
544
+     * @throws Mailcode_Exception
545
+     * @return Mailcode_Parser_Safeguard_Placeholder
546
+     */
547 547
     public function getPlaceholderByString(string $string) : Mailcode_Parser_Safeguard_Placeholder
548 548
     {
549 549
         $placeholders = $this->getPlaceholders();
Please login to merge, or discard this patch.
src/Mailcode/Translator/Syntax/ApacheVelocity/Contains/StatementBuilder.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -176,27 +176,27 @@
 block discarded – undo
176 176
      * @return array<string,string>
177 177
      * @throws Mailcode_Exception
178 178
      */
179
-     private function parseVarName() : array
180
-     {
181
-         $tokens = explode('.', ltrim($this->variable->getFullName(), '$'));
182
-
183
-         if(count($tokens) === 2)
184
-         {
185
-             return array(
186
-                 'path' => $tokens[0],
187
-                 'name' => $tokens[1]
188
-             );
189
-         }
190
-
191
-         throw new Mailcode_Exception(
192
-             'Invalid variable name for a list property.',
193
-             sprintf(
194
-                 'Exactly 2 parts are required, variable [%s] has [%s].',
195
-                 $this->variable->getFullName(),
196
-                 count($tokens)
197
-             ),
198
-             self::ERROR_INVALID_LIST_VARIABLE_NAME
199
-         );
200
-     }
179
+        private function parseVarName() : array
180
+        {
181
+            $tokens = explode('.', ltrim($this->variable->getFullName(), '$'));
182
+
183
+            if(count($tokens) === 2)
184
+            {
185
+                return array(
186
+                    'path' => $tokens[0],
187
+                    'name' => $tokens[1]
188
+                );
189
+            }
190
+
191
+            throw new Mailcode_Exception(
192
+                'Invalid variable name for a list property.',
193
+                sprintf(
194
+                    'Exactly 2 parts are required, variable [%s] has [%s].',
195
+                    $this->variable->getFullName(),
196
+                    count($tokens)
197
+                ),
198
+                self::ERROR_INVALID_LIST_VARIABLE_NAME
199
+            );
200
+        }
201 201
 }
202 202
 
Please login to merge, or discard this patch.
src/Mailcode/Translator/Syntax/ApacheVelocity.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
20 20
  */
21 21
 abstract class Mailcode_Translator_Syntax_ApacheVelocity extends Mailcode_Translator_Command
22 22
 {
23
-   /**
24
-    * @var string[]
25
-    */
23
+    /**
24
+     * @var string[]
25
+     */
26 26
     private $regexSpecialChars = array(
27 27
         '?',
28 28
         '.',
@@ -47,15 +47,15 @@  discard block
 block discarded – undo
47 47
     }
48 48
 
49 49
     /**
50
-    * Filters the string for use in an Apache Velocity (Java)
51
-    * regex string: escapes all special characters.
52
-    *
53
-    * Velocity does its own escaping, so no need to escape special
54
-    * characters as if they were a javascript string.
55
-    * 
56
-    * @param string $string
57
-    * @return string
58
-    */
50
+     * Filters the string for use in an Apache Velocity (Java)
51
+     * regex string: escapes all special characters.
52
+     *
53
+     * Velocity does its own escaping, so no need to escape special
54
+     * characters as if they were a javascript string.
55
+     * 
56
+     * @param string $string
57
+     * @return string
58
+     */
59 59
     public function filterRegexString(string $string) : string
60 60
     {
61 61
         // Special case: previously escaped quotes. 
Please login to merge, or discard this patch.
src/Mailcode.php 1 patch
Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -26,51 +26,51 @@  discard block
 block discarded – undo
26 26
  */
27 27
 class Mailcode
28 28
 {
29
-   /**
30
-    * @var Mailcode_Parser|NULL
31
-    */
29
+    /**
30
+     * @var Mailcode_Parser|NULL
31
+     */
32 32
     protected $parser = null;
33 33
     
34
-   /**
35
-    * @var Mailcode_Commands|NULL
36
-    */
34
+    /**
35
+     * @var Mailcode_Commands|NULL
36
+     */
37 37
     protected $commands = null;
38 38
     
39
-   /**
40
-    * @var Mailcode_Variables|NULL
41
-    */
39
+    /**
40
+     * @var Mailcode_Variables|NULL
41
+     */
42 42
     protected $variables = null;
43 43
     
44
-   /**
45
-    * @var Mailcode_Translator|NULL
46
-    */
44
+    /**
45
+     * @var Mailcode_Translator|NULL
46
+     */
47 47
     protected $translator = null;
48 48
     
49
-   /**
50
-    * Creates a new mailcode instance.
51
-    * @return Mailcode
52
-    */
49
+    /**
50
+     * Creates a new mailcode instance.
51
+     * @return Mailcode
52
+     */
53 53
     public static function create() : Mailcode
54 54
     {
55 55
         return new Mailcode();
56 56
     }
57 57
     
58
-   /**
59
-    * Parses the string to detect all commands contained within.
60
-    * 
61
-    * @param string $string
62
-    * @return Mailcode_Collection
63
-    */
58
+    /**
59
+     * Parses the string to detect all commands contained within.
60
+     * 
61
+     * @param string $string
62
+     * @return Mailcode_Collection
63
+     */
64 64
     public function parseString(string $string) : Mailcode_Collection
65 65
     {
66 66
         return $this->getParser()->parseString($string);
67 67
     }
68 68
     
69
-   /**
70
-    * Retrieves the string parser instance used to detect commands.
71
-    * 
72
-    * @return Mailcode_Parser
73
-    */
69
+    /**
70
+     * Retrieves the string parser instance used to detect commands.
71
+     * 
72
+     * @return Mailcode_Parser
73
+     */
74 74
     public function getParser() : Mailcode_Parser
75 75
     {
76 76
         if(!isset($this->parser)) 
@@ -81,12 +81,12 @@  discard block
 block discarded – undo
81 81
         return $this->parser;
82 82
     }
83 83
     
84
-   /**
85
-    * Retrieves the commands collection, which is used to
86
-    * access information on the available commands.
87
-    * 
88
-    * @return Mailcode_Commands
89
-    */
84
+    /**
85
+     * Retrieves the commands collection, which is used to
86
+     * access information on the available commands.
87
+     * 
88
+     * @return Mailcode_Commands
89
+     */
90 90
     public function getCommands() : Mailcode_Commands
91 91
     {
92 92
         if(!isset($this->commands)) 
@@ -129,12 +129,12 @@  discard block
 block discarded – undo
129 129
         return $this->variables;
130 130
     }
131 131
     
132
-   /**
133
-    * Creates the translator, which can be used to convert commands
134
-    * to another supported syntax.
135
-    * 
136
-    * @return Mailcode_Translator
137
-    */
132
+    /**
133
+     * Creates the translator, which can be used to convert commands
134
+     * to another supported syntax.
135
+     * 
136
+     * @return Mailcode_Translator
137
+     */
138 138
     public function createTranslator() : Mailcode_Translator
139 139
     {
140 140
         if(!isset($this->translator))
@@ -145,12 +145,12 @@  discard block
 block discarded – undo
145 145
         return $this->translator;
146 146
     }
147 147
     
148
-   /**
149
-    * Creates the styler, which can be used to retrieve the 
150
-    * CSS required to style the highlighted commands in HTML.
151
-    * 
152
-    * @return Mailcode_Styler
153
-    */
148
+    /**
149
+     * Creates the styler, which can be used to retrieve the 
150
+     * CSS required to style the highlighted commands in HTML.
151
+     * 
152
+     * @return Mailcode_Styler
153
+     */
154 154
     public function createStyler() : Mailcode_Styler
155 155
     {
156 156
         return new Mailcode_Styler();
Please login to merge, or discard this patch.
src/Mailcode/Variables/Collection.php 1 patch
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
20 20
  */
21 21
 abstract class Mailcode_Variables_Collection
22 22
 {
23
-   /**
24
-    * @var Mailcode_Variables_Variable[]
25
-    */
23
+    /**
24
+     * @var Mailcode_Variables_Variable[]
25
+     */
26 26
     protected $variables = array();
27 27
     
28 28
     public function __construct()
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
         return count($this->variables);
53 53
     }
54 54
     
55
-   /**
56
-    * Checks whether the collection contains a variable with the specified name.
57
-    * 
58
-    * @param string $fullName The variable name, with or without $ sign.
59
-    * @return bool
60
-    */
55
+    /**
56
+     * Checks whether the collection contains a variable with the specified name.
57
+     * 
58
+     * @param string $fullName The variable name, with or without $ sign.
59
+     * @return bool
60
+     */
61 61
     public function hasVariableName(string $fullName) : bool
62 62
     {
63 63
         $fullName = $this->fixName($fullName);
@@ -73,14 +73,14 @@  discard block
 block discarded – undo
73 73
         return false;
74 74
     }
75 75
     
76
-   /**
77
-    * Retrieves a collection of all variable instances for
78
-    * the specified name (there can be several with differing
79
-    * matched texts because of spacing).
80
-    * 
81
-    * @param string $fullName
82
-    * @return Mailcode_Variables_Collection
83
-    */
76
+    /**
77
+     * Retrieves a collection of all variable instances for
78
+     * the specified name (there can be several with differing
79
+     * matched texts because of spacing).
80
+     * 
81
+     * @param string $fullName
82
+     * @return Mailcode_Variables_Collection
83
+     */
84 84
     public function getByFullName(string $fullName) : Mailcode_Variables_Collection
85 85
     {
86 86
         $fullName = $this->fixName($fullName);
@@ -98,12 +98,12 @@  discard block
 block discarded – undo
98 98
         return $collection;
99 99
     }
100 100
     
101
-   /**
102
-    * Prepends the $ sign to a variable name if it does not have it.
103
-    * 
104
-    * @param string $fullName
105
-    * @return string
106
-    */
101
+    /**
102
+     * Prepends the $ sign to a variable name if it does not have it.
103
+     * 
104
+     * @param string $fullName
105
+     * @return string
106
+     */
107 107
     protected function fixName(string $fullName) : string
108 108
     {
109 109
         if(substr($fullName, 0, 1) === '$')
@@ -114,12 +114,12 @@  discard block
 block discarded – undo
114 114
         return '$'.$fullName;
115 115
     }
116 116
     
117
-   /**
118
-    * Retrieves all variables, grouped by their hash - meaning
119
-    * unique matched strings.
120
-    * 
121
-    * @return Mailcode_Variables_Variable[]
122
-    */
117
+    /**
118
+     * Retrieves all variables, grouped by their hash - meaning
119
+     * unique matched strings.
120
+     * 
121
+     * @return Mailcode_Variables_Variable[]
122
+     */
123 123
     public function getGroupedByHash() : array
124 124
     {
125 125
         $entries = array();
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
         return $this->sortVariables($entries);
133 133
     }
134 134
     
135
-   /**
136
-    * Retrieves all variables, grouped by their name. 
137
-    * 
138
-    * @return Mailcode_Variables_Variable[]
139
-    */
135
+    /**
136
+     * Retrieves all variables, grouped by their name. 
137
+     * 
138
+     * @return Mailcode_Variables_Variable[]
139
+     */
140 140
     public function getGroupedByName() : array
141 141
     {
142 142
         $entries = array();
@@ -168,19 +168,19 @@  discard block
 block discarded – undo
168 168
         return $this->sortVariables($entries);
169 169
     }
170 170
     
171
-   /**
172
-    * Retrieves all variables, in the order they were addded.
173
-    * @return Mailcode_Variables_Variable[]
174
-    */
171
+    /**
172
+     * Retrieves all variables, in the order they were addded.
173
+     * @return Mailcode_Variables_Variable[]
174
+     */
175 175
     public function getAll()
176 176
     {
177 177
         return $this->variables;
178 178
     }
179 179
     
180
-   /**
181
-    * Retrieves the full names of the variables that are present in the collection.
182
-    * @return string[]
183
-    */
180
+    /**
181
+     * Retrieves the full names of the variables that are present in the collection.
182
+     * @return string[]
183
+     */
184 184
     public function getNames() : array
185 185
     {
186 186
         $result = array();
@@ -198,13 +198,13 @@  discard block
 block discarded – undo
198 198
         return $result;
199 199
     }
200 200
     
201
-   /**
202
-    * Takes a list of variables and sorts them, throwing away
203
-    * the source array's keys.
204
-    * 
205
-    * @param Mailcode_Variables_Variable[] $entries
206
-    * @return Mailcode_Variables_Variable[]
207
-    */
201
+    /**
202
+     * Takes a list of variables and sorts them, throwing away
203
+     * the source array's keys.
204
+     * 
205
+     * @param Mailcode_Variables_Variable[] $entries
206
+     * @return Mailcode_Variables_Variable[]
207
+     */
208 208
     protected function sortVariables(array $entries)
209 209
     {
210 210
         $result = array_values($entries);
@@ -217,13 +217,13 @@  discard block
 block discarded – undo
217 217
         return $result;
218 218
     }
219 219
 
220
-   /**
221
-    *  Merges the variables collection with the target collection
222
-    *  by inheriting all that collection's variables.
223
-    *  
224
-    * @param Mailcode_Variables_Collection $collection
225
-    * @return Mailcode_Variables_Collection
226
-    */
220
+    /**
221
+     *  Merges the variables collection with the target collection
222
+     *  by inheriting all that collection's variables.
223
+     *  
224
+     * @param Mailcode_Variables_Collection $collection
225
+     * @return Mailcode_Variables_Collection
226
+     */
227 227
     public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection
228 228
     {
229 229
         $variables = $collection->getGroupedByHash();
Please login to merge, or discard this patch.
src/Mailcode/Commands/Command.php 1 patch
Indentation   +100 added lines, -100 removed lines patch added patch discarded remove patch
@@ -43,44 +43,44 @@  discard block
 block discarded – undo
43 43
 
44 44
     const META_URL_ENCODING = 'url_encoding';
45 45
 
46
-   /**
47
-    * @var string
48
-    */
46
+    /**
47
+     * @var string
48
+     */
49 49
     protected $type = '';
50 50
 
51
-   /**
52
-    * @var string
53
-    */
51
+    /**
52
+     * @var string
53
+     */
54 54
     protected $paramsString = '';
55 55
     
56
-   /**
57
-    * @var string
58
-    */
56
+    /**
57
+     * @var string
58
+     */
59 59
     protected $matchedText = '';
60 60
 
61
-   /**
62
-    * @var string
63
-    */
61
+    /**
62
+     * @var string
63
+     */
64 64
     protected $hash = '';
65 65
     
66
-   /**
67
-    * @var OperationResult
68
-    */
66
+    /**
67
+     * @var OperationResult
68
+     */
69 69
     protected $validationResult = null;
70 70
     
71
-   /**
72
-    * @var \Mailcode\Mailcode
73
-    */
71
+    /**
72
+     * @var \Mailcode\Mailcode
73
+     */
74 74
     protected $mailcode;
75 75
     
76
-   /**
77
-    * @var \Mailcode\Mailcode_Parser_Statement
78
-    */
76
+    /**
77
+     * @var \Mailcode\Mailcode_Parser_Statement
78
+     */
79 79
     protected $params;
80 80
 
81
-   /**
82
-    * @var string[] 
83
-    */
81
+    /**
82
+     * @var string[] 
83
+     */
84 84
     protected $validations = array(
85 85
         'params_empty',
86 86
         'params_keywords',
@@ -89,24 +89,24 @@  discard block
 block discarded – undo
89 89
         'type_unsupported'
90 90
     );
91 91
     
92
-   /**
93
-    * @var string
94
-    */
92
+    /**
93
+     * @var string
94
+     */
95 95
     protected $comment = '';
96 96
     
97
-   /**
98
-    * @var Mailcode_Commands_LogicKeywords|NULL
99
-    */
97
+    /**
98
+     * @var Mailcode_Commands_LogicKeywords|NULL
99
+     */
100 100
     protected $logicKeywords;
101 101
     
102
-   /**
103
-    * @var Mailcode_Parser_Statement_Validator
104
-    */
102
+    /**
103
+     * @var Mailcode_Parser_Statement_Validator
104
+     */
105 105
     protected $validator;
106 106
     
107
-   /**
108
-    * @var boolean
109
-    */
107
+    /**
108
+     * @var boolean
109
+     */
110 110
     private $validated = false;
111 111
 
112 112
     /**
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
         
142 142
     }
143 143
 
144
-   /**
145
-    * Sets the command's parent opening command, if any.
146
-    * NOTE: This is set automatically by the parser, and
147
-    * should not be called manually.
148
-    *
149
-    * @param Mailcode_Commands_Command $command
150
-    */
144
+    /**
145
+     * Sets the command's parent opening command, if any.
146
+     * NOTE: This is set automatically by the parser, and
147
+     * should not be called manually.
148
+     *
149
+     * @param Mailcode_Commands_Command $command
150
+     */
151 151
     public function setParent(Mailcode_Commands_Command $command) : void
152 152
     {
153 153
         $this->parent = $command;
@@ -163,9 +163,9 @@  discard block
 block discarded – undo
163 163
         return $this->parent;
164 164
     }
165 165
     
166
-   /**
167
-    * @return string The ID of the command = the name of the command class file.
168
-    */
166
+    /**
167
+     * @return string The ID of the command = the name of the command class file.
168
+     */
169 169
     public function getID() : string
170 170
     {
171 171
         // account for commands with types: If_Variable should still return If.
@@ -174,14 +174,14 @@  discard block
 block discarded – undo
174 174
         return array_shift($tokens);
175 175
     }
176 176
     
177
-   /**
178
-    * Sets an optional comment that is not used anywhere, but
179
-    * can be used by the application to track why a command is
180
-    * used somewhere. 
181
-    * 
182
-    * @param string $comment
183
-    * @return Mailcode_Commands_Command
184
-    */
177
+    /**
178
+     * Sets an optional comment that is not used anywhere, but
179
+     * can be used by the application to track why a command is
180
+     * used somewhere. 
181
+     * 
182
+     * @param string $comment
183
+     * @return Mailcode_Commands_Command
184
+     */
185 185
     public function setComment(string $comment) : Mailcode_Commands_Command
186 186
     {
187 187
         $this->comment = $comment;
@@ -189,23 +189,23 @@  discard block
 block discarded – undo
189 189
         return $this;
190 190
     }
191 191
     
192
-   /**
193
-    * Retrieves the previously set comment, if any.
194
-    * 
195
-    * @return string
196
-    */
192
+    /**
193
+     * Retrieves the previously set comment, if any.
194
+     * 
195
+     * @return string
196
+     */
197 197
     public function getComment() : string
198 198
     {
199 199
         return $this->comment;
200 200
     }
201 201
     
202
-   /**
203
-    * Checks whether this is a dummy command, which is only
204
-    * used to access information on the command type. It cannot
205
-    * be used as an actual live command.
206
-    * 
207
-    * @return bool
208
-    */
202
+    /**
203
+     * Checks whether this is a dummy command, which is only
204
+     * used to access information on the command type. It cannot
205
+     * be used as an actual live command.
206
+     * 
207
+     * @return bool
208
+     */
209 209
     public function isDummy() : bool
210 210
     {
211 211
         return $this->type === '__dummy';
@@ -319,9 +319,9 @@  discard block
 block discarded – undo
319 319
         return $this->validationResult->isValid();
320 320
     }
321 321
     
322
-   /**
323
-    * @return string[]
324
-    */
322
+    /**
323
+     * @return string[]
324
+     */
325 325
     abstract protected function getValidations() : array;
326 326
 
327 327
     protected function _validateNesting() : void
@@ -409,12 +409,12 @@  discard block
 block discarded – undo
409 409
 
410 410
     abstract public function supportsURLEncoding() : bool;
411 411
     
412
-   /**
413
-    * Whether the command allows using logic keywords like "and:" or "or:"
414
-    * in the command parameters.
415
-    * 
416
-    * @return bool
417
-    */
412
+    /**
413
+     * Whether the command allows using logic keywords like "and:" or "or:"
414
+     * in the command parameters.
415
+     * 
416
+     * @return bool
417
+     */
418 418
     abstract public function supportsLogicKeywords() : bool;
419 419
     
420 420
     abstract public function generatesContent() : bool;
@@ -460,22 +460,22 @@  discard block
 block discarded – undo
460 460
         return $normalizer->normalize();
461 461
     }
462 462
     
463
-   /**
464
-    * Retrieves the names of all the command's supported types: the part
465
-    * between the command name and the colon. Example: {command type: params}.
466
-    * 
467
-    * @return string[]
468
-    */
463
+    /**
464
+     * Retrieves the names of all the command's supported types: the part
465
+     * between the command name and the colon. Example: {command type: params}.
466
+     * 
467
+     * @return string[]
468
+     */
469 469
     public function getSupportedTypes() : array
470 470
     {
471 471
         return array();
472 472
     }
473 473
     
474
-   /**
475
-    * Retrieves all variable names used in the command.
476
-    * 
477
-    * @return Mailcode_Variables_Collection_Regular
478
-    */
474
+    /**
475
+     * Retrieves all variable names used in the command.
476
+     * 
477
+     * @return Mailcode_Variables_Collection_Regular
478
+     */
479 479
     public function getVariables() : Mailcode_Variables_Collection_Regular
480 480
     {
481 481
         return Mailcode::create()->findVariables($this->paramsString, $this);
@@ -500,26 +500,26 @@  discard block
 block discarded – undo
500 500
         );
501 501
     }
502 502
 
503
-   /**
504
-    * Sets a parameter for the translation backend. The backend can use
505
-    * these to allow command-specific configurations.
506
-    *
507
-    * @param string $name
508
-    * @param mixed $value
509
-    * @return $this
510
-    */
503
+    /**
504
+     * Sets a parameter for the translation backend. The backend can use
505
+     * these to allow command-specific configurations.
506
+     *
507
+     * @param string $name
508
+     * @param mixed $value
509
+     * @return $this
510
+     */
511 511
     public function setTranslationParam(string $name, $value)
512 512
     {
513 513
         $this->translationParams[$name] = $value;
514 514
         return $this;
515 515
     }
516 516
 
517
-   /**
518
-    * Retrieves a previously set translation parameter.
519
-    *
520
-    * @param string $name
521
-    * @return mixed
522
-    */
517
+    /**
518
+     * Retrieves a previously set translation parameter.
519
+     *
520
+     * @param string $name
521
+     * @return mixed
522
+     */
523 523
     public function getTranslationParam(string $name)
524 524
     {
525 525
         if(isset($this->translationParams[$name]))
Please login to merge, or discard this patch.