@@ -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,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) |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | |
| 42 | 42 | $this->instantiator->checkCommand($cmd); |
| 43 | 43 | |
| 44 | - if($cmd instanceof Mailcode_Commands_Command_End) |
|
| 44 | + if ($cmd instanceof Mailcode_Commands_Command_End) |
|
| 45 | 45 | { |
| 46 | 46 | return $cmd; |
| 47 | 47 | } |
@@ -20,9 +20,9 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | abstract class Mailcode_Factory_CommandSets_Set |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * @var Mailcode_Factory_Instantiator |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * @var Mailcode_Factory_Instantiator |
|
| 25 | + */ |
|
| 26 | 26 | protected Mailcode_Factory_Instantiator $instantiator; |
| 27 | 27 | |
| 28 | 28 | /** |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | |
| 32 | 32 | $this->instantiator->checkCommand($cmd); |
| 33 | 33 | |
| 34 | - if($cmd instanceof Mailcode_Commands_Command_Else) |
|
| 34 | + if ($cmd instanceof Mailcode_Commands_Command_Else) |
|
| 35 | 35 | { |
| 36 | 36 | return $cmd; |
| 37 | 37 | } |
@@ -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 | |
@@ -40,8 +40,7 @@ |
||
| 40 | 40 | if($keyCommand instanceof Mailcode_Commands_IfBase) |
| 41 | 41 | { |
| 42 | 42 | $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand); |
| 43 | - } |
|
| 44 | - else |
|
| 43 | + } else |
|
| 45 | 44 | { |
| 46 | 45 | throw new Mailcode_Exception( |
| 47 | 46 | 'Keyword command type does not match expected base class.', |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | // IF type. |
| 40 | 40 | $method = 'translate'.$this->getIfType($command); |
| 41 | 41 | |
| 42 | - if(method_exists($this, $method)) |
|
| 42 | + if (method_exists($this, $method)) |
|
| 43 | 43 | { |
| 44 | 44 | return strval($this->$method($command)); |
| 45 | 45 | } |
@@ -53,11 +53,11 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | $keywords = $command->getLogicKeywords()->getKeywords(); |
| 55 | 55 | |
| 56 | - foreach($keywords as $keyword) |
|
| 56 | + foreach ($keywords as $keyword) |
|
| 57 | 57 | { |
| 58 | 58 | $keyCommand = $keyword->getCommand(); |
| 59 | 59 | |
| 60 | - if($keyCommand instanceof Mailcode_Commands_IfBase) |
|
| 60 | + if ($keyCommand instanceof Mailcode_Commands_IfBase) |
|
| 61 | 61 | { |
| 62 | 62 | $body .= ' '.$this->getSign($keyword).' '.$this->translateBody($keyCommand); |
| 63 | 63 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | protected function getSign(Mailcode_Commands_LogicKeywords_Keyword $keyword) : string |
| 82 | 82 | { |
| 83 | - switch($keyword->getName()) |
|
| 83 | + switch ($keyword->getName()) |
|
| 84 | 84 | { |
| 85 | 85 | case 'and': |
| 86 | 86 | return '&&'; |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | { |
| 114 | 114 | $sign = ''; |
| 115 | 115 | |
| 116 | - if($notEmpty) |
|
| 116 | + if ($notEmpty) |
|
| 117 | 117 | { |
| 118 | 118 | $sign = '!'; |
| 119 | 119 | } |
@@ -129,12 +129,12 @@ discard block |
||
| 129 | 129 | { |
| 130 | 130 | $params = $command->getParams(); |
| 131 | 131 | |
| 132 | - if(!$params) |
|
| 132 | + if (!$params) |
|
| 133 | 133 | { |
| 134 | 134 | return ''; |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - if($command->hasFreeformParameters()) |
|
| 137 | + if ($command->hasFreeformParameters()) |
|
| 138 | 138 | { |
| 139 | 139 | return $params->getStatementString(); |
| 140 | 140 | } |
@@ -142,18 +142,18 @@ discard block |
||
| 142 | 142 | return $params->getNormalized(); |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - protected function _translateVariable(Mailcode_Variables_Variable $variable, string $comparator, string $value, bool $insensitive=false) : string |
|
| 145 | + protected function _translateVariable(Mailcode_Variables_Variable $variable, string $comparator, string $value, bool $insensitive = false) : string |
|
| 146 | 146 | { |
| 147 | 147 | $booleanCheck = strtolower(trim($value, '"')); |
| 148 | 148 | $fullName = $variable->getFullName(); |
| 149 | 149 | |
| 150 | - if(in_array($booleanCheck, array('true', 'false'))) |
|
| 150 | + if (in_array($booleanCheck, array('true', 'false'))) |
|
| 151 | 151 | { |
| 152 | 152 | $insensitive = true; |
| 153 | 153 | $value = '"'.$booleanCheck.'"'; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - if($insensitive) |
|
| 156 | + if ($insensitive) |
|
| 157 | 157 | { |
| 158 | 158 | $fullName .= '.toLowerCase()'; |
| 159 | 159 | $value = mb_strtolower($value); |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | protected function _translateSearch(string $mode, Mailcode_Variables_Variable $variable, bool $caseSensitive, string $searchTerm) : string |
| 186 | 186 | { |
| 187 | 187 | $method = $mode.'With'; |
| 188 | - if($caseSensitive) |
|
| 188 | + if ($caseSensitive) |
|
| 189 | 189 | { |
| 190 | 190 | $method = $mode.'WithIgnoreCase'; |
| 191 | 191 | } |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | $folder = sprintf(__DIR__.'/../../css/%s', $this->fileName); |
| 40 | 40 | $path = realpath($folder); |
| 41 | 41 | |
| 42 | - if($path === false) |
|
| 42 | + if ($path === false) |
|
| 43 | 43 | { |
| 44 | 44 | throw new Mailcode_Exception( |
| 45 | 45 | 'Could not find the highlight CSS file', |
@@ -25,14 +25,14 @@ discard block |
||
| 25 | 25 | { |
| 26 | 26 | public const ERROR_CSS_FILE_NOT_FOUND = 60901; |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * @var string |
|
| 30 | - */ |
|
| 28 | + /** |
|
| 29 | + * @var string |
|
| 30 | + */ |
|
| 31 | 31 | private string $path; |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * @var string |
|
| 35 | - */ |
|
| 33 | + /** |
|
| 34 | + * @var string |
|
| 35 | + */ |
|
| 36 | 36 | private string $fileName = 'highlight.css'; |
| 37 | 37 | |
| 38 | 38 | public function __construct() |
@@ -55,22 +55,22 @@ discard block |
||
| 55 | 55 | $this->path = $path; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * Retrieves the raw CSS source for the highlighting. |
|
| 60 | - * |
|
| 61 | - * @return string |
|
| 62 | - */ |
|
| 58 | + /** |
|
| 59 | + * Retrieves the raw CSS source for the highlighting. |
|
| 60 | + * |
|
| 61 | + * @return string |
|
| 62 | + */ |
|
| 63 | 63 | public function getCSS() : string |
| 64 | 64 | { |
| 65 | 65 | return FileHelper::readContents($this->path); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * Retrieves a fully formed `code` tag with the CSS, |
|
| 70 | - * to inject inline into an HTML document. |
|
| 71 | - * |
|
| 72 | - * @return string |
|
| 73 | - */ |
|
| 68 | + /** |
|
| 69 | + * Retrieves a fully formed `code` tag with the CSS, |
|
| 70 | + * to inject inline into an HTML document. |
|
| 71 | + * |
|
| 72 | + * @return string |
|
| 73 | + */ |
|
| 74 | 74 | public function getStyleTag() : string |
| 75 | 75 | { |
| 76 | 76 | return sprintf( |
@@ -79,23 +79,23 @@ discard block |
||
| 79 | 79 | ); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - /** |
|
| 83 | - * Retrieves the path to the stylesheet file. |
|
| 84 | - * |
|
| 85 | - * @return string |
|
| 86 | - */ |
|
| 82 | + /** |
|
| 83 | + * Retrieves the path to the stylesheet file. |
|
| 84 | + * |
|
| 85 | + * @return string |
|
| 86 | + */ |
|
| 87 | 87 | public function getStylesheetPath() : string |
| 88 | 88 | { |
| 89 | 89 | return $this->path; |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - /** |
|
| 93 | - * Retrieves the URL to the stylesheet file, given the |
|
| 94 | - * local URL to the application's vendor folder. |
|
| 95 | - * |
|
| 96 | - * @param string $vendorURL The URL to the vendor folder (must be accessible in the webroot). |
|
| 97 | - * @return string |
|
| 98 | - */ |
|
| 92 | + /** |
|
| 93 | + * Retrieves the URL to the stylesheet file, given the |
|
| 94 | + * local URL to the application's vendor folder. |
|
| 95 | + * |
|
| 96 | + * @param string $vendorURL The URL to the vendor folder (must be accessible in the webroot). |
|
| 97 | + * @return string |
|
| 98 | + */ |
|
| 99 | 99 | public function getStylesheetURL(string $vendorURL) : string |
| 100 | 100 | { |
| 101 | 101 | return sprintf( |