Deprecated ordered parameters.
Ordered list of parameters is no longer allowed, use the “pass-by-name” style.
//Old style
-'.$caller.'($'.implode(', $', $params->compliance).');
+'.$caller.'($'.implode(
+ ', $',
+ $params->compliance
+).');
//Pass-by-name
'.$caller.'([
- '.implode(','.PHP_EOL."\t", $message).'
+ '.implode(
+ ','.PHP_EOL."\t",
+ $message
+).'
]);
Strings separated by “::” && “||” in parameters are deprecated. Use JSON or Query string instead.
' - ]); + '=' + ) !== false){ + parse_str( + $inputString, + $result + ); + //The old deprecated format where string is separated by '||' and '::' + }else{ + $result = self::explodeAssoc($inputString); + + self::logEvent([ + 'message' => 'Strings separated by “::” && “||” in parameters are deprecated. Use JSON or Query string instead.
' + ]); + } } } @@ -757,13 +771,14 @@ public static function logEvent($params){ /** * parseText - * @version 1.4.1 (2017-12-09) + * @version 1.5.1 (2018-06-26) * - * @desc Like $modx->parseChunk, but takes a text. + * @desc Similar to $modx->parseChunk, but takes a text. * * @param $params {array_associative|stdClass} — The object of params. @required * @param $params['text'] {string} — String to parse. @required - * @param $params['data'] {array_associative} — Array of values. Key — placeholder name, value — value. Nested arrays are supported too: “['stringPlaceholder' = > 'one', 'arrayPlaceholder' => ['a' => 'one', 'b' => 'two']]” => “[+stringPlaceholder+]”, “[+arrayPlaceholder.a+]”, “[+arrayPlaceholder.b+]”. + * @param $params['data'] {array_associative|stdClass} — Array of values. Nested arrays are supported too: “['stringPlaceholder' = > 'one', 'arrayPlaceholder' => ['a' => 'one', 'b' => 'two']]” => “[+stringPlaceholder+]”, “[+arrayPlaceholder.a+]”, “[+arrayPlaceholder.b+]”. Default: []. + * @param $params['data'][key] {string|array_associative|stdClass} — Key — placeholder name, value — value. * @param $params['placeholderPrefix'] {string} — Placeholders prefix. Default: '[+'. * @param $params['placeholderSuffix'] {string} — Placeholders suffix. Default: '+]'. * @param $params['removeEmptyPlaceholders'] {boolean} — Do you need to remove empty placeholders? Default: false. @@ -784,6 +799,7 @@ public static function parseText($params = []){ //Defaults $params = (object) array_merge([ 'text' => '', + 'data' => [], 'placeholderPrefix' => '[+', 'placeholderSuffix' => '+]', 'removeEmptyPlaceholders' => false, @@ -792,15 +808,20 @@ public static function parseText($params = []){ $result = $params->text; + //Convert stdClass to array + if (!is_array($params->data)){ + $params->data = (array) $params->data; + } + //Если значения для парсинга переданы - if ( - isset($params->data) && - is_array($params->data) - ){ + if (!empty($params->data)){ //Unfold for arrays support (e. g. “some[a]=one&some[b]=two” => “[+some.a+]”, “[+some.b+]”; “some[]=one&some[]=two” => “[+some.0+]”, “[some.1]”) $params->data = self::unfoldArray($params->data); - foreach ($params->data as $key => $value){ + foreach ( + $params->data as + $key => $value + ){ $result = str_replace( $params->placeholderPrefix.$key.$params->placeholderSuffix, $value, @@ -876,7 +897,10 @@ public static function explodeFieldsArr($fields = []){ //Save fields $result[0] = $docData->fieldsData; //And TVs - foreach ($docData->tvsData as $tvName => $tvValue){ + foreach ( + $docData->tvsData as + $tvName => $tvValue + ){ $result[1][$tvName] = ['val' => $tvValue]; if (isset($docData->tvsAdditionalData[$tvName])){ @@ -889,7 +913,7 @@ public static function explodeFieldsArr($fields = []){ /** * prepareDocData - * @version 2.0 (2018-06-17) + * @version 2.0.1 (2018-06-26) * * @desc Prepare document data from single array of fields and TVs: separate them and get TV IDs if needed. * @@ -921,7 +945,10 @@ public static function prepareDocData($params){ ]; //Перебираем поля, раскидываем на поля документа и TV - foreach ($params->data as $data_itemFieldName => $data_itemFieldValue){ + foreach ( + $params->data as + $data_itemFieldName => $data_itemFieldValue + ){ //Если это не поле документа if (!in_array( $data_itemFieldName, @@ -973,7 +1000,7 @@ public static function prepareDocData($params){ /** * createDocument - * @version 1.2 (2018-06-17) + * @version 1.2.1 (2018-06-26) * * @desc Create a new document. * @@ -1021,7 +1048,10 @@ public static function createDocument( //Если есть хоть одна существующая TV if (count($docData->tvsAdditionalData) > 0){ //Перебираем массив TV с ID - foreach ($docData->tvsAdditionalData as $tvName => $tvData){ + foreach ( + $docData->tvsAdditionalData as + $tvName => $tvData + ){ if ( //Если это дата $tvData['type'] == 'date' && @@ -1104,7 +1134,7 @@ public static function createDocument( /** * updateDocument - * @version 1.3 (2018-06-17) + * @version 1.3.1 (2018-06-26) * * @desc Update a document. * @@ -1184,7 +1214,10 @@ public static function updateDocument( //Обновляем TV всех найденых документов while ($doc = self::$modx->db->getRow($docIdsToUpdate_dbRes)){ //Перебираем массив существующих TV - foreach ($docData->tvsAdditionalData as $tvName => $tvData){ + foreach ( + $docData->tvsAdditionalData as + $tvName => $tvData + ){ if ( //Если это дата $tvData['type'] == 'date' && @@ -1423,7 +1456,7 @@ public static function getDocument( /** * getTemplateVars - * @version 1.3.6 (2018-06-17) + * @version 1.3.7 (2018-06-26) * * @desc Returns the TV and fields array of a document. * @@ -1531,7 +1564,10 @@ public static function getTemplateVars( // get default/built-in template variables ksort($docRow); - foreach ($docRow as $key => $value){ + foreach ( + $docRow as + $key => $value + ){ if ( $idnames == '*' || in_array( @@ -2020,7 +2056,7 @@ public static function getDocumentIdByUrl($url){ /** * verifyRenamedParams - * @version 1.1.6 (2018-06-17) + * @version 1.1.7 (2018-06-26) * * @desc The method checks an array for deprecated parameters and writes warning messages into the MODX event log. It returns an associative array, in which the correct parameter names are the keys and the parameter values are the values. You can use the “exctract” function to turn the array into variables of the current symbol table. * @@ -2055,7 +2091,10 @@ public static function verifyRenamedParams( $params_names = array_keys($params); //Перебираем таблицу соответствия - foreach ($compliance as $newName => $oldNames){ + foreach ( + $compliance as + $newName => $oldNames + ){ //Если параметр с новым именем не задан if (!isset($params[$newName])){ //Если старое имя только одно, всё равно приведём к массиву для удобства @@ -2093,7 +2132,7 @@ public static function verifyRenamedParams( /** * sendMail - * @version 3.0.1 (2018-06-17) + * @version 3.0.2 (2018-06-26) * * @desc Method for sending e-mails. * @@ -2140,7 +2179,10 @@ public static function sendMail($params){ if(!$_FILES[$value]['tmp_name'][0]){break;} //Перебираем пост - foreach($_FILES[$value]['name'] as $key => $name){ + foreach( + $_FILES[$value]['name'] as + $key => $name + ){ //Если нет ошибок if ($_FILES[$value]['error'][$key] == 0){ //Добавляем в массив файлы @@ -2206,7 +2248,7 @@ public static function sendMail($params){ /** * getResponse - * @version 1.0.4 (2017-05-25) + * @version 1.0.5 (2018-06-26) * * @desc Returns a proper instance of the “Response” class recommended to be used as response to an HTTP request. * @@ -2217,9 +2259,9 @@ public static function sendMail($params){ public static function getResponse($version = '0.2'){ $responseClass = \DDTools\Response::includeResponseByVersion($version); - $output = new $responseClass; + $result = new $responseClass; - return $output; + return $result; } } @@ -2227,7 +2269,10 @@ public static function getResponse($version = '0.2'){ ddTools::$modx = $modx; //Решение спорное, но делать Синглтон очень не хотелось - foreach (ddTools::$tables as $key => $val){ + foreach ( + ddTools::$tables as + $key => $val + ){ ddTools::$tables[$key] = $modx->getFullTableName($key); }