@@ -29,39 +29,39 @@ discard block |
||
29 | 29 | const VALIDATION_NO_COMMAND_CREATED = 61101; |
30 | 30 | const VALIDATION_INVALID_COMMAND_CREATED = 61102; |
31 | 31 | |
32 | - /** |
|
33 | - * @var Mailcode_Commands_LogicKeywords |
|
34 | - */ |
|
32 | + /** |
|
33 | + * @var Mailcode_Commands_LogicKeywords |
|
34 | + */ |
|
35 | 35 | private $keywords; |
36 | 36 | |
37 | - /** |
|
38 | - * @var string |
|
39 | - */ |
|
37 | + /** |
|
38 | + * @var string |
|
39 | + */ |
|
40 | 40 | private $name; |
41 | 41 | |
42 | - /** |
|
43 | - * @var string |
|
44 | - */ |
|
42 | + /** |
|
43 | + * @var string |
|
44 | + */ |
|
45 | 45 | private $keywordType; |
46 | 46 | |
47 | - /** |
|
48 | - * @var string |
|
49 | - */ |
|
47 | + /** |
|
48 | + * @var string |
|
49 | + */ |
|
50 | 50 | private $matchedString; |
51 | 51 | |
52 | - /** |
|
53 | - * @var string |
|
54 | - */ |
|
52 | + /** |
|
53 | + * @var string |
|
54 | + */ |
|
55 | 55 | private $params = ''; |
56 | 56 | |
57 | - /** |
|
58 | - * @var boolean |
|
59 | - */ |
|
57 | + /** |
|
58 | + * @var boolean |
|
59 | + */ |
|
60 | 60 | private $paramsSet = false; |
61 | 61 | |
62 | - /** |
|
63 | - * @var Mailcode_Collection |
|
64 | - */ |
|
62 | + /** |
|
63 | + * @var Mailcode_Collection |
|
64 | + */ |
|
65 | 65 | private $collection; |
66 | 66 | |
67 | 67 | public function __construct(Mailcode_Commands_LogicKeywords $keywords, string $name, string $matchedString, string $type) |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | $this->matchedString = $matchedString; |
73 | 73 | } |
74 | 74 | |
75 | - /** |
|
76 | - * The keyword name, e.g. "and". Always lowercase. |
|
77 | - * @return string |
|
78 | - */ |
|
75 | + /** |
|
76 | + * The keyword name, e.g. "and". Always lowercase. |
|
77 | + * @return string |
|
78 | + */ |
|
79 | 79 | public function getName() : string |
80 | 80 | { |
81 | 81 | return $this->name; |
@@ -98,24 +98,24 @@ discard block |
||
98 | 98 | return $string; |
99 | 99 | } |
100 | 100 | |
101 | - /** |
|
102 | - * The full string that was matched in the command's parameters |
|
103 | - * string. Examples: "and:", "and variable:"... |
|
104 | - * |
|
105 | - * @return string |
|
106 | - */ |
|
101 | + /** |
|
102 | + * The full string that was matched in the command's parameters |
|
103 | + * string. Examples: "and:", "and variable:"... |
|
104 | + * |
|
105 | + * @return string |
|
106 | + */ |
|
107 | 107 | public function getMatchedString() : string |
108 | 108 | { |
109 | 109 | return $this->matchedString; |
110 | 110 | } |
111 | 111 | |
112 | - /** |
|
113 | - * Sets the parameters string matching this logic keyword, |
|
114 | - * which is used to build the actual sub-command. Set by |
|
115 | - * the LogicKeywords class instance. |
|
116 | - * |
|
117 | - * @param string $params |
|
118 | - */ |
|
112 | + /** |
|
113 | + * Sets the parameters string matching this logic keyword, |
|
114 | + * which is used to build the actual sub-command. Set by |
|
115 | + * the LogicKeywords class instance. |
|
116 | + * |
|
117 | + * @param string $params |
|
118 | + */ |
|
119 | 119 | public function setParamsString(string $params) : void |
120 | 120 | { |
121 | 121 | if($this->paramsSet) |
@@ -133,13 +133,13 @@ discard block |
||
133 | 133 | $this->createCommand(); |
134 | 134 | } |
135 | 135 | |
136 | - /** |
|
137 | - * Retrieves the full command string used to create |
|
138 | - * the actual command. For opening commands like IF, |
|
139 | - * this includes the closing {end} command. |
|
140 | - * |
|
141 | - * @return string |
|
142 | - */ |
|
136 | + /** |
|
137 | + * Retrieves the full command string used to create |
|
138 | + * the actual command. For opening commands like IF, |
|
139 | + * this includes the closing {end} command. |
|
140 | + * |
|
141 | + * @return string |
|
142 | + */ |
|
143 | 143 | public function getCommandString() : string |
144 | 144 | { |
145 | 145 | $string = sprintf( |
@@ -182,12 +182,12 @@ discard block |
||
182 | 182 | } |
183 | 183 | } |
184 | 184 | |
185 | - /** |
|
186 | - * Retrieves the command for the keyword. |
|
187 | - * |
|
188 | - * @throws Mailcode_Exception |
|
189 | - * @return Mailcode_Commands_Command |
|
190 | - */ |
|
185 | + /** |
|
186 | + * Retrieves the command for the keyword. |
|
187 | + * |
|
188 | + * @throws Mailcode_Exception |
|
189 | + * @return Mailcode_Commands_Command |
|
190 | + */ |
|
191 | 191 | public function getCommand() : Mailcode_Commands_Command |
192 | 192 | { |
193 | 193 | $command = $this->collection->getFirstCommand(); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | { |
91 | 91 | $string = $this->name; |
92 | 92 | |
93 | - if(!empty($this->keywordType)) |
|
93 | + if (!empty($this->keywordType)) |
|
94 | 94 | { |
95 | 95 | $string .= ' '.$this->keywordType; |
96 | 96 | } |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | public function setParamsString(string $params) : void |
120 | 120 | { |
121 | - if($this->paramsSet) |
|
121 | + if ($this->paramsSet) |
|
122 | 122 | { |
123 | 123 | throw new Mailcode_Exception( |
124 | 124 | 'Cannot set parameters twice', |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | |
161 | 161 | $command = $this->collection->getFirstCommand(); |
162 | 162 | |
163 | - if($command === null) |
|
163 | + if ($command === null) |
|
164 | 164 | { |
165 | 165 | $this->makeError( |
166 | 166 | t('No command could be created using the following string:').' '. |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | return; |
173 | 173 | } |
174 | 174 | |
175 | - if(!$command->isValid()) |
|
175 | + if (!$command->isValid()) |
|
176 | 176 | { |
177 | 177 | $this->makeError( |
178 | 178 | t('Invalid command created:').' '. |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | { |
193 | 193 | $command = $this->collection->getFirstCommand(); |
194 | 194 | |
195 | - if($command !== null && $command->isValid()) |
|
195 | + if ($command !== null && $command->isValid()) |
|
196 | 196 | { |
197 | 197 | return $command; |
198 | 198 | } |
@@ -20,19 +20,19 @@ discard block |
||
20 | 20 | */ |
21 | 21 | class Mailcode_Commands_Highlighter |
22 | 22 | { |
23 | - /** |
|
24 | - * @var Mailcode_Commands_Command |
|
25 | - */ |
|
23 | + /** |
|
24 | + * @var Mailcode_Commands_Command |
|
25 | + */ |
|
26 | 26 | protected $command; |
27 | 27 | |
28 | - /** |
|
29 | - * @var string[] |
|
30 | - */ |
|
28 | + /** |
|
29 | + * @var string[] |
|
30 | + */ |
|
31 | 31 | protected $parts = array(); |
32 | 32 | |
33 | 33 | public function __construct(Mailcode_Commands_Command $command) |
34 | 34 | { |
35 | - $this->command = $command; |
|
35 | + $this->command = $command; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function highlight() : string |
@@ -121,11 +121,11 @@ discard block |
||
121 | 121 | $this->appendParams($keyword->getCommand()); |
122 | 122 | } |
123 | 123 | |
124 | - /** |
|
125 | - * @param string[] $classes |
|
126 | - * @param string $content |
|
127 | - * @return string |
|
128 | - */ |
|
124 | + /** |
|
125 | + * @param string[] $classes |
|
126 | + * @param string $content |
|
127 | + * @return string |
|
128 | + */ |
|
129 | 129 | protected function renderTag(array $classes, string $content) : string |
130 | 130 | { |
131 | 131 | $parts = array(); |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | { |
53 | 53 | $this->parts[] = $this->renderTag(array('command-name'), $this->command->getName()); |
54 | 54 | |
55 | - if($this->command->hasType()) |
|
55 | + if ($this->command->hasType()) |
|
56 | 56 | { |
57 | 57 | $this->parts[] = ' '.$this->renderTag(array('command-type'), $this->command->getType()); |
58 | 58 | } |
59 | 59 | |
60 | - if($this->command->requiresParameters()) |
|
60 | + if ($this->command->requiresParameters()) |
|
61 | 61 | { |
62 | 62 | $this->parts[] = $this->renderTag(array('hyphen'), ':'); |
63 | 63 | $this->parts[] = '<wbr>'; |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | { |
69 | 69 | $params = $command->getParams(); |
70 | 70 | |
71 | - if($params === null) |
|
71 | + if ($params === null) |
|
72 | 72 | { |
73 | 73 | return; |
74 | 74 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | $this->parts[] = '<span class="mailcode-params">'; |
79 | 79 | |
80 | - foreach($tokens as $token) |
|
80 | + foreach ($tokens as $token) |
|
81 | 81 | { |
82 | 82 | $this->appendParamToken($token); |
83 | 83 | } |
@@ -92,14 +92,14 @@ discard block |
||
92 | 92 | |
93 | 93 | protected function appendLogicKeywords() : void |
94 | 94 | { |
95 | - if(!$this->command->supportsLogicKeywords()) |
|
95 | + if (!$this->command->supportsLogicKeywords()) |
|
96 | 96 | { |
97 | 97 | return; |
98 | 98 | } |
99 | 99 | |
100 | 100 | $keywords = $this->command->getLogicKeywords()->getKeywords(); |
101 | 101 | |
102 | - foreach($keywords as $keyword) |
|
102 | + foreach ($keywords as $keyword) |
|
103 | 103 | { |
104 | 104 | $this->appendLogicKeyword($keyword); |
105 | 105 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | |
112 | 112 | $type = $keyword->getType(); |
113 | 113 | |
114 | - if(!empty($type)) |
|
114 | + if (!empty($type)) |
|
115 | 115 | { |
116 | 116 | $this->parts[] = ' '.$this->renderTag(array('command-type'), $type); |
117 | 117 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | { |
131 | 131 | $parts = array(); |
132 | 132 | |
133 | - foreach($classes as $class) |
|
133 | + foreach ($classes as $class) |
|
134 | 134 | { |
135 | 135 | $parts[] = 'mailcode-'.$class; |
136 | 136 | } |
@@ -48,13 +48,13 @@ |
||
48 | 48 | <body> |
49 | 49 | <p> |
50 | 50 | <?php |
51 | - pts('This showcases the command\'s syntax highlighting.'); |
|
52 | - pts( |
|
53 | - 'It is based on the %1$s color scheme%2$s:', |
|
54 | - '<a href="https://ethanschoonover.com/solarized/">"Solarized"', |
|
55 | - '</a>' |
|
56 | - ); |
|
57 | - ?> |
|
51 | + pts('This showcases the command\'s syntax highlighting.'); |
|
52 | + pts( |
|
53 | + 'It is based on the %1$s color scheme%2$s:', |
|
54 | + '<a href="https://ethanschoonover.com/solarized/">"Solarized"', |
|
55 | + '</a>' |
|
56 | + ); |
|
57 | + ?> |
|
58 | 58 | </p> |
59 | 59 | <br> |
60 | 60 | <div class="commands"> |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $autoload = realpath($root.'/../vendor/autoload.php'); |
18 | 18 | |
19 | 19 | // we need the autoloader to be present |
20 | - if($autoload === false) |
|
20 | + if ($autoload === false) |
|
21 | 21 | { |
22 | 22 | die('<b>ERROR:</b> Autoloader not present. Run composer update first.'); |
23 | 23 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | Mailcode_Factory::comment('Some comments here'), |
66 | 66 | Mailcode_Factory::showSnippet('snippet_name'), |
67 | 67 | Mailcode_Factory::showDate('DATE.VARIABLE'), |
68 | - Mailcode_Factory::if('1 + 1 == 2'), |
|
68 | + Mailcode_Factory::if ('1 + 1 == 2'), |
|
69 | 69 | Mailcode_Factory::ifContains('CUSTOMER.NAME', 'John'), |
70 | 70 | Mailcode_Factory::ifVarEquals('NUMBER', 124), |
71 | 71 | ); |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | $commands[] = Mailcode_Factory::end(); |
79 | 79 | |
80 | - foreach($commands as $command) |
|
80 | + foreach ($commands as $command) |
|
81 | 81 | { |
82 | 82 | ?> |
83 | 83 | <p> |
@@ -65,10 +65,12 @@ |
||
65 | 65 | Mailcode_Factory::comment('Some comments here'), |
66 | 66 | Mailcode_Factory::showSnippet('snippet_name'), |
67 | 67 | Mailcode_Factory::showDate('DATE.VARIABLE'), |
68 | - Mailcode_Factory::if('1 + 1 == 2'), |
|
68 | + Mailcode_Factory::if('1 + 1 == 2') { |
|
69 | + , |
|
69 | 70 | Mailcode_Factory::ifContains('CUSTOMER.NAME', 'John'), |
70 | 71 | Mailcode_Factory::ifVarEquals('NUMBER', 124), |
71 | 72 | ); |
73 | + } |
|
72 | 74 | |
73 | 75 | $and = Mailcode_Factory::elseIfVarEqualsString('STRINGVAR', 'John'); |
74 | 76 | $and->getLogicKeywords()->appendOR('$STRINGVAR == "Steve"', "variable"); |