{out}
", - 'item_description' => "\n{out}
", - 'item_head' => "\n{out}
", + 'list' => "{out}
", + 'item_description' => "{out}
", + 'item_head' => "{out}
", 'item_icon' => " ", 'item_toggle' => "", // ALSO: @@ -900,7 +900,7 @@ class InputfieldWrapper extends Inputfield implements \Countable, \IteratorAggre * #pw-internal * * @param bool $clear Set to true in order to clear the delayed children list. - * @return array + * @return array|Inputfield[] * */ public function _getDelayedChildren($clear = false) { diff --git a/wire/core/Pagefile.php b/wire/core/Pagefile.php index 06ef5c2c..186e805c 100644 --- a/wire/core/Pagefile.php +++ b/wire/core/Pagefile.php @@ -19,7 +19,8 @@ * @property-read string $filename full disk path to the file on the server. * @property-read string $name Returns the filename without the path, same as the "basename" property. * @property-read string $hash Get a unique hash (for the page) representing this Pagefile. - * @property-read string $tagsArray Get file tags as an array. #pw-group-tags @since 3.0.17 + * @property-read string $tagsArray Get file tags as an array. #pw-group-tags @since 3.0.17 + * @property-read int $sort Sort order in database. #pw-group-other * @property string $basename Returns the filename without the path. * @property string $description Value of the file’s description field (string), if enabled. Note you can also set this property directly. * @property string $tags Value of the file’s tags field (string), if enabled. #pw-group-tags diff --git a/wire/core/WireData.php b/wire/core/WireData.php index 028c50ec..d754bb50 100644 --- a/wire/core/WireData.php +++ b/wire/core/WireData.php @@ -23,6 +23,8 @@ * * ProcessWire 3.x, Copyright 2016 by Ryan Cramer * https://processwire.com + * + * @method WireArray and($items = null) * */ diff --git a/wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.module b/wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.module index f667e503..d892de1c 100644 --- a/wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.module +++ b/wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.module @@ -498,6 +498,7 @@ class InputfieldRepeater extends Inputfield implements InputfieldItemList { $forIDs = null; if($loading == FieldtypeRepeater::loadingAll && $collapse != FieldtypeRepeater::collapseNone) $forIDs = array(); list($editorUrl, $queryString) = explode('?', $this->page->editUrl()); + if($queryString) {} $this->wire('config')->js('InputfieldRepeater', array( 'editorUrl' => $editorUrl, diff --git a/wire/modules/Inputfield/InputfieldAsmSelect/InputfieldAsmSelect.module b/wire/modules/Inputfield/InputfieldAsmSelect/InputfieldAsmSelect.module index a8c4f4b9..12e2e4ac 100644 --- a/wire/modules/Inputfield/InputfieldAsmSelect/InputfieldAsmSelect.module +++ b/wire/modules/Inputfield/InputfieldAsmSelect/InputfieldAsmSelect.module @@ -2,6 +2,8 @@ /** * A Page List Selector for selecting a single page + * + * @property int|bool $usePageEdit * */ class InputfieldAsmSelect extends InputfieldSelectMultiple implements InputfieldHasArrayValue { @@ -69,7 +71,7 @@ class InputfieldAsmSelect extends InputfieldSelectMultiple implements Inputfield $this->wire('modules')->get('JqueryUI')->use('modal'); } - if($this->hasFieldtype == 'FieldtypePage' && $this->usePageEdit && !$this->editLink) { + if($this->hasFieldtype == 'FieldtypePage' && $this->usePageEdit && empty($this->asmOptions['editLink'])) { $this->setAsmSelectOption('editLink', $this->wire('config')->urls->admin . 'page/edit/?id={value}'); $this->setAsmSelectOption('editLinkOnlySelected', false); $this->setAsmSelectOption('editLinkButtonSelector', ".InputfieldSubmit button.ui-button:visible"); diff --git a/wire/modules/Inputfield/InputfieldButton.module b/wire/modules/Inputfield/InputfieldButton.module index 818b5a72..9f3a5be4 100644 --- a/wire/modules/Inputfield/InputfieldButton.module +++ b/wire/modules/Inputfield/InputfieldButton.module @@ -5,6 +5,7 @@ * * @property string $href URL to link to * @property string $aclass Optional class name(s) for element (if href is used). + * @property string $target Link target * */ class InputfieldButton extends InputfieldSubmit { diff --git a/wire/modules/Inputfield/InputfieldCKEditor/InputfieldCKEditor.module b/wire/modules/Inputfield/InputfieldCKEditor/InputfieldCKEditor.module index aa7249ac..3d46433c 100644 --- a/wire/modules/Inputfield/InputfieldCKEditor/InputfieldCKEditor.module +++ b/wire/modules/Inputfield/InputfieldCKEditor/InputfieldCKEditor.module @@ -167,6 +167,9 @@ class InputfieldCKEditor extends InputfieldTextarea { * Toolbar items split by commas * Groups of toolbar items split by lines * Toolbar lines that starts with '#' are ignored + * + * @param string $str + * @return array * */ protected function toolbarStringToArray($str) { @@ -299,7 +302,7 @@ class InputfieldCKEditor extends InputfieldTextarea { if($this->contentsInlineCss) { $this->config->styles->add($this->pathFromRoot($this->contentsInlineCss, true)); } else { - $this->config->styles->add($this->config->urls->InputfieldCKEditor . "contents-inline.css"); + $this->config->styles->add($this->config->urls('InputfieldCKEditor') . "contents-inline.css"); } } @@ -403,7 +406,7 @@ class InputfieldCKEditor extends InputfieldTextarea { if($this->wire('files')->mkdir($path, true)) { $this->message("Created new CKEditor external plugins directory: $url"); } else { - $this->error("The CKEditor external plugins directory does not exist: $url - Please create it when/if you want to install external plugins.", Notice::warning); + $this->warning("The CKEditor external plugins directory does not exist: $url - Please create it when/if you want to install external plugins."); } } continue; @@ -463,6 +466,9 @@ class InputfieldCKEditor extends InputfieldTextarea { * Clean up a value that will be sent to/from the editor * * This is primarily for HTML Purifier + * + * @param string $value + * @return string * */ protected function purifyValue($value) { @@ -517,6 +523,9 @@ class InputfieldCKEditor extends InputfieldTextarea { * Process data submitted to a CKEditor field * * When inline mode is used, the content is run through HTML Purifier + * + * @param WireInputData $input + * @return $this * */ public function ___processInput(WireInputData $input) { @@ -637,9 +646,11 @@ class InputfieldCKEditor extends InputfieldTextarea { if($f) $inputfields->remove($f); } + /** @var InputfieldFieldset $wrapper */ $wrapper = $this->wire('modules')->get('InputfieldFieldset'); $wrapper->label = $this->_('CKEditor Settings'); + /** @var InputfieldTextarea $f */ $f = $this->wire('modules')->get('InputfieldTextarea'); $f->attr('name', 'toolbar'); $f->attr('value', $this->toolbar); @@ -650,6 +661,7 @@ class InputfieldCKEditor extends InputfieldTextarea { $purifierInstalled = $this->wire('modules')->isInstalled('MarkupHTMLPurifier'); + /** @var InputfieldRadios $f */ $f = $this->wire('modules')->get('InputfieldRadios'); $f->attr('name', 'inlineMode'); $f->label = $this->_('Editor Mode'); @@ -782,11 +794,13 @@ class InputfieldCKEditor extends InputfieldTextarea { $this->_('only for this CKEditor field'); $wrapper->add($f); + /** @var InputfieldFieldset $fieldset */ $fieldset = $this->modules->get('InputfieldFieldset'); $fieldset->attr('name', '_plugins_fieldset'); $fieldset->label = $this->_('Plugins'); $wrapper->add($fieldset); - + + /** @var InputfieldCheckboxes $f */ $f = $this->modules->get('InputfieldCheckboxes'); $f->attr('name', 'extraPlugins'); $f->label = $this->_('Extra Plugins'); diff --git a/wire/modules/Inputfield/InputfieldCheckbox.module b/wire/modules/Inputfield/InputfieldCheckbox.module index 51027a71..d3fd26f5 100644 --- a/wire/modules/Inputfield/InputfieldCheckbox.module +++ b/wire/modules/Inputfield/InputfieldCheckbox.module @@ -106,7 +106,7 @@ class InputfieldCheckbox extends Inputfield { $this->checkedValueIsLabel = false; } // autocheck mode: when non-zero 'value' set, then 'checked=checked' is assumed - if($this->autocheck || $this->formBuilder) $this->attr('checked', 'checked'); + if($this->autocheck || $this->getSetting('formBuilder')) $this->attr('checked', 'checked'); } diff --git a/wire/modules/Inputfield/InputfieldCheckboxes/InputfieldCheckboxes.module b/wire/modules/Inputfield/InputfieldCheckboxes/InputfieldCheckboxes.module index 0dd36bbc..ebcb5a0f 100644 --- a/wire/modules/Inputfield/InputfieldCheckboxes/InputfieldCheckboxes.module +++ b/wire/modules/Inputfield/InputfieldCheckboxes/InputfieldCheckboxes.module @@ -40,6 +40,7 @@ class InputfieldCheckboxes extends InputfieldSelectMultiple implements Inputfiel $entityEncode = $this->getSetting('entityEncodeText') === false ? false : true; if($this->table) { + /** @var MarkupAdminDataTable $table */ $table = $this->modules->get("MarkupAdminDataTable"); $table->setEncodeEntities(false); $table->addClass('pw-no-select'); @@ -62,7 +63,7 @@ class InputfieldCheckboxes extends InputfieldSelectMultiple implements Inputfiel $ulClass = 'InputfieldCheckboxesStacked'; } - if(!$table) $out = "\n{$description}
$out"; + $out = "{$description}
$out"; } else if($textFormat == Inputfield::textFormatMarkdown) { - $out = "\n" . - "\n\t\t" . - "\n\t\t$input" . - "\n\t\t$notes" . - "\n\t
" . - "\n" . + "" . + "$input" . + "$notes" . + "
" . + "" . $this->_('Unable to render this field due to missing parent page in field settings.') . '
'; } - $out = "\n