@@ -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 | } |
@@ -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 |
@@ -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 Mailcode_Variables_Collection_Invalid $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 $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); |
@@ -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 |
@@ -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 | } |
@@ -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; |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * @param \Exception|NULL $previous |
33 | 33 | * @param Mailcode_Commands_Command|NULL $command |
34 | 34 | */ |
35 | - public function __construct(string $message, $details=null, $code=null, $previous=null, Mailcode_Commands_Command $command=null) |
|
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); |
38 | 38 |
@@ -87,7 +87,7 @@ |
||
87 | 87 | */ |
88 | 88 | public function getTypeLabel() : string |
89 | 89 | { |
90 | - switch($this->type) |
|
90 | + switch ($this->type) |
|
91 | 91 | { |
92 | 92 | case Mailcode_Date_FormatInfo::CHARTYPE_DATE: |
93 | 93 | return t('Date'); |
@@ -23,19 +23,19 @@ discard block |
||
23 | 23 | { |
24 | 24 | public const ERROR_UNHANDLED_CHARTYPE = 55601; |
25 | 25 | |
26 | - /** |
|
27 | - * @var string |
|
28 | - */ |
|
26 | + /** |
|
27 | + * @var string |
|
28 | + */ |
|
29 | 29 | private $type; |
30 | 30 | |
31 | - /** |
|
32 | - * @var string |
|
33 | - */ |
|
31 | + /** |
|
32 | + * @var string |
|
33 | + */ |
|
34 | 34 | private $char; |
35 | 35 | |
36 | - /** |
|
37 | - * @var string |
|
38 | - */ |
|
36 | + /** |
|
37 | + * @var string |
|
38 | + */ |
|
39 | 39 | private $description; |
40 | 40 | |
41 | 41 | public function __construct(string $type, string $char, string $description) |
@@ -45,46 +45,46 @@ discard block |
||
45 | 45 | $this->description = $description; |
46 | 46 | } |
47 | 47 | |
48 | - /** |
|
49 | - * Retrieves the format character (PHP date format). |
|
50 | - * |
|
51 | - * @return string |
|
52 | - */ |
|
48 | + /** |
|
49 | + * Retrieves the format character (PHP date format). |
|
50 | + * |
|
51 | + * @return string |
|
52 | + */ |
|
53 | 53 | public function getChar() : string |
54 | 54 | { |
55 | 55 | return $this->char; |
56 | 56 | } |
57 | 57 | |
58 | - /** |
|
59 | - * Retrieves a human readable description of the character's role. |
|
60 | - * |
|
61 | - * @return string |
|
62 | - */ |
|
58 | + /** |
|
59 | + * Retrieves a human readable description of the character's role. |
|
60 | + * |
|
61 | + * @return string |
|
62 | + */ |
|
63 | 63 | public function getDescription() : string |
64 | 64 | { |
65 | 65 | return $this->description; |
66 | 66 | } |
67 | 67 | |
68 | - /** |
|
69 | - * Retrieves the character type ID. |
|
70 | - * |
|
71 | - * @return string |
|
72 | - * |
|
73 | - * @see Mailcode_Date_FormatInfo::CHARTYPE_DATE |
|
74 | - * @see Mailcode_Date_FormatInfo::CHARTYPE_TIME |
|
75 | - * @see Mailcode_Date_FormatInfo::CHARTYPE_PUNCTUATION |
|
76 | - */ |
|
68 | + /** |
|
69 | + * Retrieves the character type ID. |
|
70 | + * |
|
71 | + * @return string |
|
72 | + * |
|
73 | + * @see Mailcode_Date_FormatInfo::CHARTYPE_DATE |
|
74 | + * @see Mailcode_Date_FormatInfo::CHARTYPE_TIME |
|
75 | + * @see Mailcode_Date_FormatInfo::CHARTYPE_PUNCTUATION |
|
76 | + */ |
|
77 | 77 | public function getTypeID() : string |
78 | 78 | { |
79 | 79 | return $this->type; |
80 | 80 | } |
81 | 81 | |
82 | - /** |
|
83 | - * Retrieves a human readable label for the character's type, e.g. "Date", "Time", "Punctuation". |
|
84 | - * |
|
85 | - * @throws Mailcode_Exception If the character type is unknown. |
|
86 | - * @return string |
|
87 | - */ |
|
82 | + /** |
|
83 | + * Retrieves a human readable label for the character's type, e.g. "Date", "Time", "Punctuation". |
|
84 | + * |
|
85 | + * @throws Mailcode_Exception If the character type is unknown. |
|
86 | + * @return string |
|
87 | + */ |
|
88 | 88 | public function getTypeLabel() : string |
89 | 89 | { |
90 | 90 | switch($this->type) |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | |
59 | 59 | public static function getInstance() : Mailcode_Date_FormatInfo |
60 | 60 | { |
61 | - if(!isset(self::$instance)) |
|
61 | + if (!isset(self::$instance)) |
|
62 | 62 | { |
63 | 63 | self::$instance = new Mailcode_Date_FormatInfo(); |
64 | 64 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | array(self::CHARTYPE_PUNCTUATION, ' ', t('Space')) |
91 | 91 | ); |
92 | 92 | |
93 | - foreach($chars as $def) |
|
93 | + foreach ($chars as $def) |
|
94 | 94 | { |
95 | 95 | $char = new Mailcode_Date_FormatInfo_Character( |
96 | 96 | $def[0], |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | |
130 | 130 | $trimmed = trim($formatString); |
131 | 131 | |
132 | - if(empty($trimmed)) |
|
132 | + if (empty($trimmed)) |
|
133 | 133 | { |
134 | 134 | $result->makeError( |
135 | 135 | t('Empty date format.'), |
@@ -142,15 +142,15 @@ discard block |
||
142 | 142 | $chars = ConvertHelper::string2array($formatString); |
143 | 143 | $total = count($chars); |
144 | 144 | |
145 | - for($i=0; $i < $total; $i++) |
|
145 | + for ($i = 0; $i < $total; $i++) |
|
146 | 146 | { |
147 | 147 | $char = $chars[$i]; |
148 | 148 | |
149 | - if(!in_array($char, $this->allowedChars)) |
|
149 | + if (!in_array($char, $this->allowedChars)) |
|
150 | 150 | { |
151 | 151 | $result->makeError( |
152 | 152 | t('Invalid character in date format:').' '. |
153 | - t('%1$s at position %2$s.', '<code>'.$char.'</code>', $i+1), |
|
153 | + t('%1$s at position %2$s.', '<code>'.$char.'</code>', $i + 1), |
|
154 | 154 | self::VALIDATION_INVALID_FORMAT_CHARACTER |
155 | 155 | ); |
156 | 156 | |
@@ -182,11 +182,11 @@ discard block |
||
182 | 182 | { |
183 | 183 | $grouped = array(); |
184 | 184 | |
185 | - foreach($this->formatChars as $char) |
|
185 | + foreach ($this->formatChars as $char) |
|
186 | 186 | { |
187 | 187 | $type = $char->getTypeLabel(); |
188 | 188 | |
189 | - if(!isset($grouped[$type])) |
|
189 | + if (!isset($grouped[$type])) |
|
190 | 190 | { |
191 | 191 | $grouped[$type] = array(); |
192 | 192 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | |
197 | 197 | $groups = array_keys($grouped); |
198 | 198 | |
199 | - foreach($groups as $group) |
|
199 | + foreach ($groups as $group) |
|
200 | 200 | { |
201 | 201 | usort($grouped[$group], function(Mailcode_Date_FormatInfo_Character $a, Mailcode_Date_FormatInfo_Character $b) |
202 | 202 | { |
@@ -31,24 +31,24 @@ discard block |
||
31 | 31 | public const CHARTYPE_TIME = 'time'; |
32 | 32 | public const CHARTYPE_PUNCTUATION = 'punctuation'; |
33 | 33 | |
34 | - /** |
|
35 | - * @var string |
|
36 | - */ |
|
34 | + /** |
|
35 | + * @var string |
|
36 | + */ |
|
37 | 37 | private $defaultFormat = "Y/m/d"; |
38 | 38 | |
39 | - /** |
|
40 | - * @var Mailcode_Date_FormatInfo_Character[] |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var Mailcode_Date_FormatInfo_Character[] |
|
41 | + */ |
|
42 | 42 | private $formatChars = array(); |
43 | 43 | |
44 | - /** |
|
45 | - * @var string[] |
|
46 | - */ |
|
44 | + /** |
|
45 | + * @var string[] |
|
46 | + */ |
|
47 | 47 | private $allowedChars = array(); |
48 | 48 | |
49 | - /** |
|
50 | - * @var Mailcode_Date_FormatInfo|NULL |
|
51 | - */ |
|
49 | + /** |
|
50 | + * @var Mailcode_Date_FormatInfo|NULL |
|
51 | + */ |
|
52 | 52 | private static $instance; |
53 | 53 | |
54 | 54 | private function __construct() |
@@ -66,11 +66,11 @@ discard block |
||
66 | 66 | return self::$instance; |
67 | 67 | } |
68 | 68 | |
69 | - /** |
|
70 | - * Initialized the list of allowed date formatting |
|
71 | - * characters. This is done only once per request |
|
72 | - * by storing them statically for performance reasons. |
|
73 | - */ |
|
69 | + /** |
|
70 | + * Initialized the list of allowed date formatting |
|
71 | + * characters. This is done only once per request |
|
72 | + * by storing them statically for performance reasons. |
|
73 | + */ |
|
74 | 74 | private function initCharacters() : void |
75 | 75 | { |
76 | 76 | $chars = array( |
@@ -115,16 +115,16 @@ discard block |
||
115 | 115 | $this->defaultFormat = $formatString; |
116 | 116 | } |
117 | 117 | |
118 | - /** |
|
119 | - * Validates the date format string, by ensuring that |
|
120 | - * all the characters it is composed of are known. |
|
121 | - * |
|
122 | - * @param string $formatString |
|
123 | - * @return OperationResult |
|
124 | - * |
|
125 | - * @see Mailcode_Commands_Command_ShowDate::VALIDATION_EMPTY_FORMAT_STRING |
|
126 | - * @see Mailcode_Commands_Command_ShowDate::VALIDATION_INVALID_FORMAT_CHARACTER |
|
127 | - */ |
|
118 | + /** |
|
119 | + * Validates the date format string, by ensuring that |
|
120 | + * all the characters it is composed of are known. |
|
121 | + * |
|
122 | + * @param string $formatString |
|
123 | + * @return OperationResult |
|
124 | + * |
|
125 | + * @see Mailcode_Commands_Command_ShowDate::VALIDATION_EMPTY_FORMAT_STRING |
|
126 | + * @see Mailcode_Commands_Command_ShowDate::VALIDATION_INVALID_FORMAT_CHARACTER |
|
127 | + */ |
|
128 | 128 | public function validateFormat(string $formatString) : OperationResult |
129 | 129 | { |
130 | 130 | $result = new OperationResult($this); |
@@ -163,23 +163,23 @@ discard block |
||
163 | 163 | return $result; |
164 | 164 | } |
165 | 165 | |
166 | - /** |
|
167 | - * Retrieves all characters that are allowed to |
|
168 | - * be used in a date format string, with information |
|
169 | - * on each. |
|
170 | - * |
|
171 | - * @return Mailcode_Date_FormatInfo_Character[] |
|
172 | - */ |
|
166 | + /** |
|
167 | + * Retrieves all characters that are allowed to |
|
168 | + * be used in a date format string, with information |
|
169 | + * on each. |
|
170 | + * |
|
171 | + * @return Mailcode_Date_FormatInfo_Character[] |
|
172 | + */ |
|
173 | 173 | public function getCharactersList() : array |
174 | 174 | { |
175 | 175 | return $this->formatChars; |
176 | 176 | } |
177 | 177 | |
178 | - /** |
|
179 | - * Retrieves the characters list, grouped by type label. |
|
180 | - * |
|
181 | - * @return array<string,array<int,Mailcode_Date_FormatInfo_Character>> |
|
182 | - */ |
|
178 | + /** |
|
179 | + * Retrieves the characters list, grouped by type label. |
|
180 | + * |
|
181 | + * @return array<string,array<int,Mailcode_Date_FormatInfo_Character>> |
|
182 | + */ |
|
183 | 183 | public function getCharactersGrouped() : array |
184 | 184 | { |
185 | 185 | $grouped = array(); |