@@ -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 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | public function getReplacementText() : string |
| 66 | 66 | { |
| 67 | - if(!empty($this->replacement)) |
|
| 67 | + if (!empty($this->replacement)) |
|
| 68 | 68 | { |
| 69 | 69 | return $this->replacement; |
| 70 | 70 | } |
@@ -82,13 +82,13 @@ discard block |
||
| 82 | 82 | // to total amount of zeroes to pad with to obtain the total length |
| 83 | 83 | $padLength = $this->getLength() - $length; |
| 84 | 84 | |
| 85 | - if($padLength < 0) |
|
| 85 | + if ($padLength < 0) |
|
| 86 | 86 | { |
| 87 | 87 | $padLength = 0; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | // create the zero-padded ID to fill the format string with |
| 91 | - $paddedID = str_pad((string)$this->id, $padLength, '0'); |
|
| 91 | + $paddedID = str_pad((string)$this->id, $padLength, '0'); |
|
| 92 | 92 | |
| 93 | 93 | $this->replacement = sprintf($format, $paddedID); |
| 94 | 94 | |
@@ -25,24 +25,24 @@ discard block |
||
| 25 | 25 | { |
| 26 | 26 | const ERROR_PLACEHOLDER_TOO_LONG = 47901; |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * @var int |
|
| 30 | - */ |
|
| 28 | + /** |
|
| 29 | + * @var int |
|
| 30 | + */ |
|
| 31 | 31 | protected $id; |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * @var Mailcode_Parser_Safeguard |
|
| 35 | - */ |
|
| 33 | + /** |
|
| 34 | + * @var Mailcode_Parser_Safeguard |
|
| 35 | + */ |
|
| 36 | 36 | protected $safeguard; |
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @var Mailcode_Commands_Command |
|
| 40 | - */ |
|
| 38 | + /** |
|
| 39 | + * @var Mailcode_Commands_Command |
|
| 40 | + */ |
|
| 41 | 41 | protected $command; |
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @var string |
|
| 45 | - */ |
|
| 43 | + /** |
|
| 44 | + * @var string |
|
| 45 | + */ |
|
| 46 | 46 | protected $replacement = ''; |
| 47 | 47 | |
| 48 | 48 | public function __construct(int $id, Mailcode_Commands_Command $command, Mailcode_Parser_Safeguard $safeguard) |
@@ -115,18 +115,18 @@ discard block |
||
| 115 | 115 | return $this->command; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - /** |
|
| 119 | - * Serializes the placeholder's information into |
|
| 120 | - * an array with the following keys: |
|
| 121 | - * |
|
| 122 | - * - originalText |
|
| 123 | - * - replacementText |
|
| 124 | - * - normalizedText |
|
| 125 | - * - length |
|
| 126 | - * - id |
|
| 127 | - * |
|
| 128 | - * @return array<string,string|integer> |
|
| 129 | - */ |
|
| 118 | + /** |
|
| 119 | + * Serializes the placeholder's information into |
|
| 120 | + * an array with the following keys: |
|
| 121 | + * |
|
| 122 | + * - originalText |
|
| 123 | + * - replacementText |
|
| 124 | + * - normalizedText |
|
| 125 | + * - length |
|
| 126 | + * - id |
|
| 127 | + * |
|
| 128 | + * @return array<string,string|integer> |
|
| 129 | + */ |
|
| 130 | 130 | public function serialize() : array |
| 131 | 131 | { |
| 132 | 132 | return array( |
@@ -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', |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | public function getFullName() : string |
| 78 | 78 | { |
| 79 | - if(empty($this->path)) |
|
| 79 | + if (empty($this->path)) |
|
| 80 | 80 | { |
| 81 | 81 | return '$'.$this->name; |
| 82 | 82 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | public function getHash() : string |
| 103 | 103 | { |
| 104 | - if(empty($this->hash)) |
|
| 104 | + if (empty($this->hash)) |
|
| 105 | 105 | { |
| 106 | 106 | $this->hash = md5($this->matchedText); |
| 107 | 107 | } |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | public function getValidationResult() : OperationResult |
| 118 | 118 | { |
| 119 | - if(isset($this->validationResult)) |
|
| 119 | + if (isset($this->validationResult)) |
|
| 120 | 120 | { |
| 121 | 121 | return $this->validationResult; |
| 122 | 122 | } |
@@ -130,11 +130,11 @@ discard block |
||
| 130 | 130 | |
| 131 | 131 | protected function validate() : void |
| 132 | 132 | { |
| 133 | - foreach($this->validations as $validation) |
|
| 133 | + foreach ($this->validations as $validation) |
|
| 134 | 134 | { |
| 135 | 135 | $method = 'validate_'.$validation; |
| 136 | 136 | |
| 137 | - if(!method_exists($this, $method)) |
|
| 137 | + if (!method_exists($this, $method)) |
|
| 138 | 138 | { |
| 139 | 139 | throw new Mailcode_Exception( |
| 140 | 140 | 'Unknown validation method', |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | $this->$method(); |
| 151 | 151 | |
| 152 | - if(!$this->validationResult->isValid()) |
|
| 152 | + if (!$this->validationResult->isValid()) |
|
| 153 | 153 | { |
| 154 | 154 | return; |
| 155 | 155 | } |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | |
| 179 | 179 | protected function validateNumber(string $value, int $errorCode) : void |
| 180 | 180 | { |
| 181 | - if(!is_numeric(substr($value, 0, 1))) |
|
| 181 | + if (!is_numeric(substr($value, 0, 1))) |
|
| 182 | 182 | { |
| 183 | 183 | return; |
| 184 | 184 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | protected function validateUnderscore(string $value, int $errorCode) : void |
| 197 | 197 | { |
| 198 | 198 | // allow empty paths |
| 199 | - if(empty($value)) |
|
| 199 | + if (empty($value)) |
|
| 200 | 200 | { |
| 201 | 201 | return; |
| 202 | 202 | } |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | $length = strlen($value); |
| 205 | 205 | |
| 206 | 206 | // trimming underscores does not change the length: no underscores at start or end of string. |
| 207 | - if(strlen(trim($value, '_')) == $length) |
|
| 207 | + if (strlen(trim($value, '_')) == $length) |
|
| 208 | 208 | { |
| 209 | 209 | return; |
| 210 | 210 | } |
@@ -20,9 +20,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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() |
| 124 | 124 | { |
| 125 | 125 | $entries = array(); |
@@ -132,11 +132,11 @@ discard block |
||
| 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() |
| 141 | 141 | { |
| 142 | 142 | $entries = array(); |
@@ -149,19 +149,19 @@ discard block |
||
| 149 | 149 | return $this->sortVariables($entries); |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - /** |
|
| 153 | - * Retrieves all variables, in the order they were addded. |
|
| 154 | - * @return \Mailcode\Mailcode_Variables_Variable[] |
|
| 155 | - */ |
|
| 152 | + /** |
|
| 153 | + * Retrieves all variables, in the order they were addded. |
|
| 154 | + * @return \Mailcode\Mailcode_Variables_Variable[] |
|
| 155 | + */ |
|
| 156 | 156 | public function getAll() |
| 157 | 157 | { |
| 158 | 158 | return $this->variables; |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - /** |
|
| 162 | - * Retrieves the full names of the variables that are present in the collection. |
|
| 163 | - * @return string[] |
|
| 164 | - */ |
|
| 161 | + /** |
|
| 162 | + * Retrieves the full names of the variables that are present in the collection. |
|
| 163 | + * @return string[] |
|
| 164 | + */ |
|
| 165 | 165 | public function getNames() : array |
| 166 | 166 | { |
| 167 | 167 | $result = array(); |
@@ -179,13 +179,13 @@ discard block |
||
| 179 | 179 | return $result; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - /** |
|
| 183 | - * Takes a list of variables and sorts them, throwing away |
|
| 184 | - * the source array's keys. |
|
| 185 | - * |
|
| 186 | - * @param Mailcode_Variables_Variable[] $entries |
|
| 187 | - * @return Mailcode_Variables_Variable[] |
|
| 188 | - */ |
|
| 182 | + /** |
|
| 183 | + * Takes a list of variables and sorts them, throwing away |
|
| 184 | + * the source array's keys. |
|
| 185 | + * |
|
| 186 | + * @param Mailcode_Variables_Variable[] $entries |
|
| 187 | + * @return Mailcode_Variables_Variable[] |
|
| 188 | + */ |
|
| 189 | 189 | protected function sortVariables(array $entries) |
| 190 | 190 | { |
| 191 | 191 | $result = array_values($entries); |
@@ -198,13 +198,13 @@ discard block |
||
| 198 | 198 | return $result; |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | - /** |
|
| 202 | - * Merges the variables collection with the target collection |
|
| 203 | - * by inheriting all that collection's variables. |
|
| 204 | - * |
|
| 205 | - * @param Mailcode_Variables_Collection $collection |
|
| 206 | - * @return Mailcode_Variables_Collection |
|
| 207 | - */ |
|
| 201 | + /** |
|
| 202 | + * Merges the variables collection with the target collection |
|
| 203 | + * by inheriting all that collection's variables. |
|
| 204 | + * |
|
| 205 | + * @param Mailcode_Variables_Collection $collection |
|
| 206 | + * @return Mailcode_Variables_Collection |
|
| 207 | + */ |
|
| 208 | 208 | public function mergeWith(Mailcode_Variables_Collection $collection) : Mailcode_Variables_Collection |
| 209 | 209 | { |
| 210 | 210 | $variables = $collection->getGroupedByHash(); |
@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | { |
| 63 | 63 | $fullName = $this->fixName($fullName); |
| 64 | 64 | |
| 65 | - foreach($this->variables as $variable) |
|
| 65 | + foreach ($this->variables as $variable) |
|
| 66 | 66 | { |
| 67 | - if($variable->getFullName() === $fullName) |
|
| 67 | + if ($variable->getFullName() === $fullName) |
|
| 68 | 68 | { |
| 69 | 69 | return true; |
| 70 | 70 | } |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | $collection = new Mailcode_Variables_Collection_Regular(); |
| 89 | 89 | |
| 90 | - foreach($this->variables as $variable) |
|
| 90 | + foreach ($this->variables as $variable) |
|
| 91 | 91 | { |
| 92 | - if($variable->getFullName() === $fullName) |
|
| 92 | + if ($variable->getFullName() === $fullName) |
|
| 93 | 93 | { |
| 94 | 94 | $collection->add($variable); |
| 95 | 95 | } |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | */ |
| 107 | 107 | protected function fixName(string $fullName) : string |
| 108 | 108 | { |
| 109 | - if(substr($fullName, 0, 1) === '$') |
|
| 109 | + if (substr($fullName, 0, 1) === '$') |
|
| 110 | 110 | { |
| 111 | 111 | return $fullName; |
| 112 | 112 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | { |
| 125 | 125 | $entries = array(); |
| 126 | 126 | |
| 127 | - foreach($this->variables as $variable) |
|
| 127 | + foreach ($this->variables as $variable) |
|
| 128 | 128 | { |
| 129 | 129 | $entries[$variable->getHash()] = $variable; |
| 130 | 130 | } |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | { |
| 142 | 142 | $entries = array(); |
| 143 | 143 | |
| 144 | - foreach($this->variables as $variable) |
|
| 144 | + foreach ($this->variables as $variable) |
|
| 145 | 145 | { |
| 146 | 146 | $entries[$variable->getFullName()] = $variable; |
| 147 | 147 | } |
@@ -166,11 +166,11 @@ discard block |
||
| 166 | 166 | { |
| 167 | 167 | $result = array(); |
| 168 | 168 | |
| 169 | - foreach($this->variables as $variable) |
|
| 169 | + foreach ($this->variables as $variable) |
|
| 170 | 170 | { |
| 171 | 171 | $name = $variable->getFullName(); |
| 172 | 172 | |
| 173 | - if(!in_array($name, $result)) |
|
| 173 | + if (!in_array($name, $result)) |
|
| 174 | 174 | { |
| 175 | 175 | $result[] = $name; |
| 176 | 176 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | { |
| 210 | 210 | $variables = $collection->getGroupedByHash(); |
| 211 | 211 | |
| 212 | - foreach($variables as $variable) |
|
| 212 | + foreach ($variables as $variable) |
|
| 213 | 213 | { |
| 214 | 214 | $this->add($variable); |
| 215 | 215 | } |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | { |
| 222 | 222 | $variables = $this->getAll(); |
| 223 | 223 | |
| 224 | - if(!empty($variables)) |
|
| 224 | + if (!empty($variables)) |
|
| 225 | 225 | { |
| 226 | 226 | return array_shift($variables); |
| 227 | 227 | } |