Mistralys /
mailcode
@@ -20,18 +20,18 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class Mailcode_Factory_Exception extends Mailcode_Exception |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * @var Mailcode_Commands_Command|NULL |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * @var Mailcode_Commands_Command|NULL |
|
| 25 | + */ |
|
| 26 | 26 | protected $command; |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * @param string $message |
|
| 30 | - * @param string|NULL $details |
|
| 31 | - * @param int|NULL $code |
|
| 32 | - * @param \Exception|NULL $previous |
|
| 33 | - * @param Mailcode_Commands_Command|NULL $command |
|
| 34 | - */ |
|
| 28 | + /** |
|
| 29 | + * @param string $message |
|
| 30 | + * @param string|NULL $details |
|
| 31 | + * @param int|NULL $code |
|
| 32 | + * @param \Exception|NULL $previous |
|
| 33 | + * @param Mailcode_Commands_Command|NULL $command |
|
| 34 | + */ |
|
| 35 | 35 | public function __construct(string $message, $details=null, $code=null, $previous=null, Mailcode_Commands_Command $command=null) |
| 36 | 36 | { |
| 37 | 37 | parent::__construct($message, $details, $code, $previous); |
@@ -39,11 +39,11 @@ discard block |
||
| 39 | 39 | $this->command = $command; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * Retrieves the erroneous command, if any. |
|
| 44 | - * |
|
| 45 | - * @return Mailcode_Commands_Command|NULL |
|
| 46 | - */ |
|
| 42 | + /** |
|
| 43 | + * Retrieves the erroneous command, if any. |
|
| 44 | + * |
|
| 45 | + * @return Mailcode_Commands_Command|NULL |
|
| 46 | + */ |
|
| 47 | 47 | public function getCommand() : ?Mailcode_Commands_Command |
| 48 | 48 | { |
| 49 | 49 | return $this->command; |
@@ -20,7 +20,8 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | abstract class Mailcode_Factory_CommandSets_IfBase extends Mailcode_Factory_CommandSets_Set |
| 22 | 22 | { |
| 23 | - public function else() : Mailcode_Commands_Command_Else |
|
| 23 | + public function else { |
|
| 24 | + () : Mailcode_Commands_Command_Else |
|
| 24 | 25 | { |
| 25 | 26 | $cmd = Mailcode::create()->getCommands()->createCommand( |
| 26 | 27 | 'Else', |
@@ -28,6 +29,7 @@ discard block |
||
| 28 | 29 | '', |
| 29 | 30 | '{else}' |
| 30 | 31 | ); |
| 32 | + } |
|
| 31 | 33 | |
| 32 | 34 | $this->instantiator->checkCommand($cmd); |
| 33 | 35 | |
@@ -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(); |
@@ -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"> |
@@ -65,12 +65,16 @@ |
||
| 65 | 65 | Mailcode_Factory::misc()->comment('Some comments here'), |
| 66 | 66 | Mailcode_Factory::show()->snippet('snippet_name'), |
| 67 | 67 | Mailcode_Factory::show()->date('DATE.VARIABLE'), |
| 68 | - Mailcode_Factory::if()->if('1 + 1 == 2'), |
|
| 68 | + Mailcode_Factory::if() { |
|
| 69 | + ->if('1 + 1 == 2'), |
|
| 69 | 70 | Mailcode_Factory::if()->contains('CUSTOMER.NAME', array('John')), |
| 70 | 71 | Mailcode_Factory::if()->varEquals('NUMBER', '124'), |
| 71 | 72 | ); |
| 73 | + } |
|
| 72 | 74 | |
| 73 | - $and = Mailcode_Factory::elseIf()->varEqualsString('STRINGVAR', 'John'); |
|
| 75 | + $and = Mailcode_Factory::elseIf() { |
|
| 76 | + ->varEqualsString('STRINGVAR', 'John'); |
|
| 77 | + } |
|
| 74 | 78 | $and->getLogicKeywords()->appendOR('$STRINGVAR == "Steve"', "variable"); |
| 75 | 79 | |
| 76 | 80 | $commands[] = $and; |
@@ -20,9 +20,9 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | abstract class Mailcode_Parser_Statement_Validator_Type |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * @var Mailcode_Parser_Statement |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * @var Mailcode_Parser_Statement |
|
| 25 | + */ |
|
| 26 | 26 | protected $statement; |
| 27 | 27 | |
| 28 | 28 | /** |
@@ -30,14 +30,14 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | protected $params; |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * @var boolean |
|
| 35 | - */ |
|
| 33 | + /** |
|
| 34 | + * @var boolean |
|
| 35 | + */ |
|
| 36 | 36 | private $valid = true; |
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @var boolean |
|
| 40 | - */ |
|
| 38 | + /** |
|
| 39 | + * @var boolean |
|
| 40 | + */ |
|
| 41 | 41 | private $validated = false; |
| 42 | 42 | |
| 43 | 43 | public function __construct(Mailcode_Parser_Statement $statement) |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * @return $this |
|
| 58 | - */ |
|
| 56 | + /** |
|
| 57 | + * @return $this |
|
| 58 | + */ |
|
| 59 | 59 | public function validate() : Mailcode_Parser_Statement_Validator_Type |
| 60 | 60 | { |
| 61 | 61 | if(!$this->validated) |
@@ -36,9 +36,9 @@ |
||
| 36 | 36 | ); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @return array<string> |
|
| 41 | - */ |
|
| 39 | + /** |
|
| 40 | + * @return array<string> |
|
| 41 | + */ |
|
| 42 | 42 | protected function getAllowedOperands() : array |
| 43 | 43 | { |
| 44 | 44 | return Mailcode_Parser_Statement_Tokenizer_Token_Operand::getComparisonSigns(); |
@@ -36,8 +36,7 @@ |
||
| 36 | 36 | if($val->isValid()) |
| 37 | 37 | { |
| 38 | 38 | $this->searchTerm = $val->getToken(); |
| 39 | - } |
|
| 40 | - else |
|
| 39 | + } else |
|
| 41 | 40 | { |
| 42 | 41 | $this->validationResult->makeError( |
| 43 | 42 | t('No search term specified.'), |
@@ -24,9 +24,9 @@ discard block |
||
| 24 | 24 | */ |
| 25 | 25 | trait Mailcode_Traits_Commands_Validation_Value |
| 26 | 26 | { |
| 27 | - /** |
|
| 28 | - * @var Mailcode_Parser_Statement_Tokenizer_ValueInterface|NULL |
|
| 29 | - */ |
|
| 27 | + /** |
|
| 28 | + * @var Mailcode_Parser_Statement_Tokenizer_ValueInterface|NULL |
|
| 29 | + */ |
|
| 30 | 30 | protected $valueToken; |
| 31 | 31 | |
| 32 | 32 | protected function validateSyntax_value() : void |
@@ -46,11 +46,11 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * Retrieves the variable being compared. |
|
| 51 | - * |
|
| 52 | - * @return string |
|
| 53 | - */ |
|
| 49 | + /** |
|
| 50 | + * Retrieves the variable being compared. |
|
| 51 | + * |
|
| 52 | + * @return string |
|
| 53 | + */ |
|
| 54 | 54 | public function getValue() : string |
| 55 | 55 | { |
| 56 | 56 | if($this->valueToken instanceof Mailcode_Parser_Statement_Tokenizer_ValueInterface) |
@@ -36,8 +36,7 @@ |
||
| 36 | 36 | if($var->isValid()) |
| 37 | 37 | { |
| 38 | 38 | $this->valueToken = $var->getToken(); |
| 39 | - } |
|
| 40 | - else |
|
| 39 | + } else |
|
| 41 | 40 | { |
| 42 | 41 | $this->validationResult->makeError( |
| 43 | 42 | t('No value has been specified.'), |
@@ -25,14 +25,14 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | trait Mailcode_Traits_Commands_Validation_Operand |
| 27 | 27 | { |
| 28 | - /** |
|
| 29 | - * @var Mailcode_Parser_Statement_Tokenizer_Token_Operand|NULL |
|
| 30 | - */ |
|
| 28 | + /** |
|
| 29 | + * @var Mailcode_Parser_Statement_Tokenizer_Token_Operand|NULL |
|
| 30 | + */ |
|
| 31 | 31 | protected $operandToken; |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * @return string[] |
|
| 35 | - */ |
|
| 33 | + /** |
|
| 34 | + * @return string[] |
|
| 35 | + */ |
|
| 36 | 36 | abstract protected function getAllowedOperands() : array; |
| 37 | 37 | |
| 38 | 38 | protected function validateSyntax_operand() : void |
@@ -78,11 +78,11 @@ discard block |
||
| 78 | 78 | ); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * Retrieves the operand sign. |
|
| 83 | - * |
|
| 84 | - * @return string |
|
| 85 | - */ |
|
| 81 | + /** |
|
| 82 | + * Retrieves the operand sign. |
|
| 83 | + * |
|
| 84 | + * @return string |
|
| 85 | + */ |
|
| 86 | 86 | public function getSign() : string |
| 87 | 87 | { |
| 88 | 88 | return $this->getOperand()->getSign(); |
@@ -44,8 +44,7 @@ discard block |
||
| 44 | 44 | if(in_array($var->getSign(), $this->getAllowedOperands())) |
| 45 | 45 | { |
| 46 | 46 | $this->operandToken = $var->getToken(); |
| 47 | - } |
|
| 48 | - else |
|
| 47 | + } else |
|
| 49 | 48 | { |
| 50 | 49 | $this->validationResult->makeError( |
| 51 | 50 | t('Invalid operand %1$s.', $var->getSign()).' '. |
@@ -54,8 +53,7 @@ discard block |
||
| 54 | 53 | Mailcode_Commands_CommonConstants::VALIDATION_INVALID_OPERAND |
| 55 | 54 | ); |
| 56 | 55 | } |
| 57 | - } |
|
| 58 | - else |
|
| 56 | + } else |
|
| 59 | 57 | { |
| 60 | 58 | $this->validationResult->makeError( |
| 61 | 59 | t('No operand has been specified.'), |
