| @@ -12,7 +12,7 @@ | ||
| 12 | 12 | $autoload = realpath($root.'/../vendor/autoload.php'); | 
| 13 | 13 | |
| 14 | 14 | // we need the autoloader to be present | 
| 15 | - if($autoload === false) | |
| 15 | + if ($autoload === false) | |
| 16 | 16 |      { | 
| 17 | 17 |          die('<b>ERROR:</b> Autoloader not present. Run composer update first.'); | 
| 18 | 18 | } | 
| @@ -20,9 +20,9 @@ discard block | ||
| 20 | 20 | */ | 
| 21 | 21 | class Mailcode_Variables_Collection_Regular extends Mailcode_Variables_Collection | 
| 22 | 22 |  { | 
| 23 | - /** | |
| 24 | - * @var Mailcode_Variables_Collection_Invalid | |
| 25 | - */ | |
| 23 | + /** | |
| 24 | + * @var Mailcode_Variables_Collection_Invalid | |
| 25 | + */ | |
| 26 | 26 | protected $invalid; | 
| 27 | 27 | |
| 28 | 28 | protected function init() : void | 
| @@ -47,30 +47,30 @@ discard block | ||
| 47 | 47 | return $this; | 
| 48 | 48 | } | 
| 49 | 49 | |
| 50 | - /** | |
| 51 | - * Whether any of the variables in the collection are invalid. | |
| 52 | - * | |
| 53 | - * @return bool | |
| 54 | - */ | |
| 50 | + /** | |
| 51 | + * Whether any of the variables in the collection are invalid. | |
| 52 | + * | |
| 53 | + * @return bool | |
| 54 | + */ | |
| 55 | 55 | public function hasInvalid() : bool | 
| 56 | 56 |      { | 
| 57 | 57 | return isset($this->invalid) && $this->invalid->hasVariables(); | 
| 58 | 58 | } | 
| 59 | 59 | |
| 60 | - /** | |
| 61 | - * Retrieves the collection of invalid variables, if any. | |
| 62 | - * Behaves like a variables collection. | |
| 63 | - * | |
| 64 | - * @return Mailcode_Variables_Collection_Invalid | |
| 65 | - */ | |
| 60 | + /** | |
| 61 | + * Retrieves the collection of invalid variables, if any. | |
| 62 | + * Behaves like a variables collection. | |
| 63 | + * | |
| 64 | + * @return Mailcode_Variables_Collection_Invalid | |
| 65 | + */ | |
| 66 | 66 | public function getInvalid() : Mailcode_Variables_Collection_Invalid | 
| 67 | 67 |      { | 
| 68 | 68 | return $this->invalid; | 
| 69 | 69 | } | 
| 70 | 70 | |
| 71 | - /** | |
| 72 | - * @return Mailcode_Variables_Collection_Regular | |
| 73 | - */ | |
| 71 | + /** | |
| 72 | + * @return Mailcode_Variables_Collection_Regular | |
| 73 | + */ | |
| 74 | 74 | public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection | 
| 75 | 75 |      { | 
| 76 | 76 | parent::mergeWith($collection); | 
| @@ -32,7 +32,7 @@ discard block | ||
| 32 | 32 | |
| 33 | 33 | public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection | 
| 34 | 34 |      { | 
| 35 | - if(!$variable->isValid()) | |
| 35 | + if (!$variable->isValid()) | |
| 36 | 36 |          { | 
| 37 | 37 | return $this->addInvalid($variable); | 
| 38 | 38 | } | 
| @@ -76,7 +76,7 @@ discard block | ||
| 76 | 76 | parent::mergeWith($collection); | 
| 77 | 77 | |
| 78 | 78 | // also inherit any invalid variables | 
| 79 | - if($collection instanceof Mailcode_Variables_Collection_Regular) | |
| 79 | + if ($collection instanceof Mailcode_Variables_Collection_Regular) | |
| 80 | 80 |          { | 
| 81 | 81 | $invalid = $collection->getInvalid(); | 
| 82 | 82 | |
| @@ -24,7 +24,7 @@ | ||
| 24 | 24 |  { | 
| 25 | 25 | public function add(Mailcode_Variables_Variable $variable) : Mailcode_Variables_Collection | 
| 26 | 26 |      { | 
| 27 | - if($variable->isValid()) | |
| 27 | + if ($variable->isValid()) | |
| 28 | 28 |          { | 
| 29 | 29 | return $this; | 
| 30 | 30 | } | 
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | */ | 
| 24 | 24 | function init() : void | 
| 25 | 25 |  { | 
| 26 | -    if(!class_exists('\AppLocalize\Localization')) { | |
| 26 | +    if (!class_exists('\AppLocalize\Localization')) { | |
| 27 | 27 | return; | 
| 28 | 28 | } | 
| 29 | 29 | |
| @@ -20,19 +20,19 @@ | ||
| 20 | 20 | */ | 
| 21 | 21 | abstract class Mailcode_Collection_Error | 
| 22 | 22 |  { | 
| 23 | - /** | |
| 24 | - * @var integer | |
| 25 | - */ | |
| 23 | + /** | |
| 24 | + * @var integer | |
| 25 | + */ | |
| 26 | 26 | protected $code = 0; | 
| 27 | 27 | |
| 28 | - /** | |
| 29 | - * @var string | |
| 30 | - */ | |
| 28 | + /** | |
| 29 | + * @var string | |
| 30 | + */ | |
| 31 | 31 | protected $matchedText = ''; | 
| 32 | 32 | |
| 33 | - /** | |
| 34 | - * @var string | |
| 35 | - */ | |
| 33 | + /** | |
| 34 | + * @var string | |
| 35 | + */ | |
| 36 | 36 | protected $message = ''; | 
| 37 | 37 | |
| 38 | 38 | public function getCode() : int | 
| @@ -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( | 
| @@ -181,7 +181,7 @@ discard block | ||
| 181 | 181 | |
| 182 | 182 | protected function validate_Closing(Mailcode_Commands_Command_Type_Closing $command) : void | 
| 183 | 183 |      { | 
| 184 | - if(empty($this->stack)) | |
| 184 | + if (empty($this->stack)) | |
| 185 | 185 |          { | 
| 186 | 186 | $this->validationResult->makeError( | 
| 187 | 187 |                  t('All open commands have already been ended.'), | 
| @@ -29,19 +29,19 @@ | ||
| 29 | 29 | const VALIDATION_COMMANDS_ALREADY_CLOSED = 49103; | 
| 30 | 30 | const VALIDATION_UNCLOSED_COMMAND = 49104; | 
| 31 | 31 | |
| 32 | - /** | |
| 33 | - * @var Mailcode_Collection | |
| 34 | - */ | |
| 32 | + /** | |
| 33 | + * @var Mailcode_Collection | |
| 34 | + */ | |
| 35 | 35 | protected $collection; | 
| 36 | 36 | |
| 37 | - /** | |
| 38 | - * @var OperationResult | |
| 39 | - */ | |
| 37 | + /** | |
| 38 | + * @var OperationResult | |
| 39 | + */ | |
| 40 | 40 | protected $validationResult; | 
| 41 | 41 | |
| 42 | - /** | |
| 43 | - * @var Mailcode_Commands_Command_Type[] | |
| 44 | - */ | |
| 42 | + /** | |
| 43 | + * @var Mailcode_Commands_Command_Type[] | |
| 44 | + */ | |
| 45 | 45 | protected $stack = array(); | 
| 46 | 46 | |
| 47 | 47 | public function __construct(Mailcode_Collection $collection) | 
| @@ -32,34 +32,34 @@ | ||
| 32 | 32 | const VALIDATION_ERROR_PATH_UNDERSCORE = 48203; | 
| 33 | 33 | const VALIDATION_ERROR_NAME_UNDERSCORE = 48204; | 
| 34 | 34 | |
| 35 | - /** | |
| 36 | - * @var string | |
| 37 | - */ | |
| 35 | + /** | |
| 36 | + * @var string | |
| 37 | + */ | |
| 38 | 38 | protected $path; | 
| 39 | 39 | |
| 40 | - /** | |
| 41 | - * @var string | |
| 42 | - */ | |
| 40 | + /** | |
| 41 | + * @var string | |
| 42 | + */ | |
| 43 | 43 | protected $name; | 
| 44 | 44 | |
| 45 | - /** | |
| 46 | - * @var string | |
| 47 | - */ | |
| 45 | + /** | |
| 46 | + * @var string | |
| 47 | + */ | |
| 48 | 48 | protected $matchedText; | 
| 49 | 49 | |
| 50 | - /** | |
| 51 | - * @var string | |
| 52 | - */ | |
| 50 | + /** | |
| 51 | + * @var string | |
| 52 | + */ | |
| 53 | 53 | protected $hash = ''; | 
| 54 | 54 | |
| 55 | - /** | |
| 56 | - * @var OperationResult | |
| 57 | - */ | |
| 55 | + /** | |
| 56 | + * @var OperationResult | |
| 57 | + */ | |
| 58 | 58 | protected $validationResult = null; | 
| 59 | 59 | |
| 60 | - /** | |
| 61 | - * @var array<string> | |
| 62 | - */ | |
| 60 | + /** | |
| 61 | + * @var array<string> | |
| 62 | + */ | |
| 63 | 63 | protected $validations = array( | 
| 64 | 64 | 'number_path', | 
| 65 | 65 | 'number_name', | 
| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | */ | 
| 73 | 73 | private $command; | 
| 74 | 74 | |
| 75 | - public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand=null) | |
| 75 | + public function __construct(string $path, string $name, string $matchedText, ?Mailcode_Commands_Command $sourceCommand = null) | |
| 76 | 76 |      { | 
| 77 | 77 | $this->path = $path; | 
| 78 | 78 | $this->name = $name; | 
| @@ -95,7 +95,7 @@ discard block | ||
| 95 | 95 | |
| 96 | 96 | public function getFullName() : string | 
| 97 | 97 |      { | 
| 98 | - if(empty($this->path)) | |
| 98 | + if (empty($this->path)) | |
| 99 | 99 |          { | 
| 100 | 100 | return '$'.$this->name; | 
| 101 | 101 | } | 
| @@ -113,7 +113,7 @@ discard block | ||
| 113 | 113 | */ | 
| 114 | 114 | public function getUniqueName() : string | 
| 115 | 115 |      { | 
| 116 | - if(isset($this->command)) | |
| 116 | + if (isset($this->command)) | |
| 117 | 117 |          { | 
| 118 | 118 | return $this->getFullName().'/'.$this->command->getHash(); | 
| 119 | 119 | } | 
| @@ -138,7 +138,7 @@ discard block | ||
| 138 | 138 | |
| 139 | 139 | public function getHash() : string | 
| 140 | 140 |      { | 
| 141 | - if(empty($this->hash)) | |
| 141 | + if (empty($this->hash)) | |
| 142 | 142 |          { | 
| 143 | 143 | $this->hash = md5($this->matchedText); | 
| 144 | 144 | } | 
| @@ -153,7 +153,7 @@ discard block | ||
| 153 | 153 | |
| 154 | 154 | public function getValidationResult() : OperationResult | 
| 155 | 155 |      { | 
| 156 | - if(isset($this->validationResult)) | |
| 156 | + if (isset($this->validationResult)) | |
| 157 | 157 |          { | 
| 158 | 158 | return $this->validationResult; | 
| 159 | 159 | } | 
| @@ -167,11 +167,11 @@ discard block | ||
| 167 | 167 | |
| 168 | 168 | protected function validate() : void | 
| 169 | 169 |      { | 
| 170 | - foreach($this->validations as $validation) | |
| 170 | + foreach ($this->validations as $validation) | |
| 171 | 171 |          { | 
| 172 | 172 | $method = 'validate_'.$validation; | 
| 173 | 173 | |
| 174 | - if(!method_exists($this, $method)) | |
| 174 | + if (!method_exists($this, $method)) | |
| 175 | 175 |              { | 
| 176 | 176 | throw new Mailcode_Exception( | 
| 177 | 177 | 'Unknown validation method', | 
| @@ -186,7 +186,7 @@ discard block | ||
| 186 | 186 | |
| 187 | 187 | $this->$method(); | 
| 188 | 188 | |
| 189 | - if(!$this->validationResult->isValid()) | |
| 189 | + if (!$this->validationResult->isValid()) | |
| 190 | 190 |              { | 
| 191 | 191 | return; | 
| 192 | 192 | } | 
| @@ -215,7 +215,7 @@ discard block | ||
| 215 | 215 | |
| 216 | 216 | protected function validateNumber(string $value, int $errorCode) : void | 
| 217 | 217 |      { | 
| 218 | - if(!is_numeric(substr($value, 0, 1))) | |
| 218 | + if (!is_numeric(substr($value, 0, 1))) | |
| 219 | 219 |          { | 
| 220 | 220 | return; | 
| 221 | 221 | } | 
| @@ -233,7 +233,7 @@ discard block | ||
| 233 | 233 | protected function validateUnderscore(string $value, int $errorCode) : void | 
| 234 | 234 |      { | 
| 235 | 235 | // allow empty paths | 
| 236 | - if(empty($value)) | |
| 236 | + if (empty($value)) | |
| 237 | 237 |          { | 
| 238 | 238 | return; | 
| 239 | 239 | } | 
| @@ -241,7 +241,7 @@ discard block | ||
| 241 | 241 | $length = strlen($value); | 
| 242 | 242 | |
| 243 | 243 | // trimming underscores does not change the length: no underscores at start or end of string. | 
| 244 | - if(strlen(trim($value, '_')) == $length) | |
| 244 | + if (strlen(trim($value, '_')) == $length) | |
| 245 | 245 |          { | 
| 246 | 246 | return; | 
| 247 | 247 | } | 
| @@ -21,24 +21,24 @@ | ||
| 21 | 21 | */ | 
| 22 | 22 | class Mailcode_Parser_Match | 
| 23 | 23 |  { | 
| 24 | - /** | |
| 25 | - * @var string | |
| 26 | - */ | |
| 24 | + /** | |
| 25 | + * @var string | |
| 26 | + */ | |
| 27 | 27 | protected $name; | 
| 28 | 28 | |
| 29 | - /** | |
| 30 | - * @var string | |
| 31 | - */ | |
| 29 | + /** | |
| 30 | + * @var string | |
| 31 | + */ | |
| 32 | 32 | protected $type; | 
| 33 | 33 | |
| 34 | - /** | |
| 35 | - * @var string | |
| 36 | - */ | |
| 34 | + /** | |
| 35 | + * @var string | |
| 36 | + */ | |
| 37 | 37 | protected $params; | 
| 38 | 38 | |
| 39 | - /** | |
| 40 | - * @var string | |
| 41 | - */ | |
| 39 | + /** | |
| 40 | + * @var string | |
| 41 | + */ | |
| 42 | 42 | protected $matchedString; | 
| 43 | 43 | |
| 44 | 44 | public function __construct(string $name, string $type, string $params, string $matchedString) | 
| @@ -24,7 +24,7 @@ | ||
| 24 | 24 | |
| 25 | 25 | public function getVariable() : Mailcode_Variables_Variable | 
| 26 | 26 |      { | 
| 27 | - if($this->subject instanceof Mailcode_Variables_Variable) | |
| 27 | + if ($this->subject instanceof Mailcode_Variables_Variable) | |
| 28 | 28 |          { | 
| 29 | 29 | return $this->subject; | 
| 30 | 30 | } |