Fix scrut bugs

jcheron · jcheron · commit 92726bbbcead · 2018-04-03T20:05:08.000+02:00
diff --git a/Ajax/bootstrap/html/HtmlBreadcrumbs.php b/Ajax/bootstrap/html/HtmlBreadcrumbs.php
@@ -30,7 +30,7 @@ class HtmlBreadcrumbs extends HtmlNavElement {
 	protected $absolutePaths;
 
 	/**
-	 * @var object<Closure> the function who generates the href elements. default : function($e){return $e->getContent()}
+	 * @var callable the function who generates the href elements. default : function($e){return $e->getContent()}
 	 */
 	protected $_hrefFunction;
 
diff --git a/Ajax/bootstrap/html/HtmlButtongroups.php b/Ajax/bootstrap/html/HtmlButtongroups.php
@@ -14,7 +14,7 @@
 class HtmlButtongroups extends HtmlBsDoubleElement {
 
 	/**
-	 * @var array[HtmlButton]
+	 * @var array
 	 */
 	protected $elements;
 
@@ -128,7 +128,7 @@ public function setAlignment($value) {
 
 	/**
 	 * Return the element at index
-	 * @param int $index
+	 * @param int $index|string
 	 * @return HtmlButton
 	 */
 	public function getElement($index) {
diff --git a/Ajax/common/html/BaseHtml.php b/Ajax/common/html/BaseHtml.php
@@ -66,9 +66,8 @@ protected function ctrl($name, $value, $typeCtrl) {
 
 
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
-			return $name=$value;
-		}
+		$this->ctrl($name, $value, $typeCtrl);
+		$name=$value;
 		return $this;
 	}
 
@@ -83,12 +82,11 @@ protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ")
 
 
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
-			if (\is_array($typeCtrl)) {
-				$this->removeOldValues($name, $typeCtrl);
-			}
-			$name.=$separator . $value;
+		$this->ctrl($name, $value, $typeCtrl);
+		if (\is_array($typeCtrl)) {
+			$this->removeOldValues($name, $typeCtrl);
 		}
+		$name.=$separator . $value;
 		return $this;
 	}
 
diff --git a/Ajax/common/html/HtmlCollection.php b/Ajax/common/html/HtmlCollection.php
@@ -155,8 +155,8 @@ public function setProperties($properties){
 	/**
 	 * Sets the values of a property for each item in the collection
 	 * @param string $property
-	 * @param array $values
-	 * @return HtmlCollection
+	 * @param array|mixed $values
+	 * @return $this
 	 */
 	public function setPropertyValues($property,$values){
 		$i=0;
@@ -178,8 +178,8 @@ public function setPropertyValues($property,$values){
 	/**
 	 * Adds the values of a property for each item in the collection
 	 * @param string $property
-	 * @param array $values
-	 * @return HtmlCollection
+	 * @param array|mixed $values
+	 * @return $this
 	 */
 	public function addPropertyValues($property,$values){
 		$i=0;
diff --git a/Ajax/common/traits/JsUtilsActionsTrait.php b/Ajax/common/traits/JsUtilsActionsTrait.php
@@ -365,7 +365,7 @@ public function show($element='this', $speed='', $callback='', $immediatly=false
 	 *
 	 * @param string $element
 	 * @param array $options
-	 * @return void
+	 * @return string
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
diff --git a/Ajax/semantic/components/validation/FieldValidation.php b/Ajax/semantic/components/validation/FieldValidation.php
@@ -43,7 +43,7 @@ public function getRules() {
 	}
 
 	/**
-	 * @param string $type
+	 * @param string $type|Rule|array
 	 * @param string $prompt
 	 * @param string $value
 	 * @return Rule
diff --git a/Ajax/semantic/html/collections/HtmlGrid.php b/Ajax/semantic/html/collections/HtmlGrid.php
@@ -2,7 +2,6 @@
 
 namespace Ajax\semantic\html\collections;
 
-use Ajax\common\html\HtmlCollection;
 use Ajax\semantic\html\content\HtmlGridRow;
 use Ajax\semantic\html\base\constants\Wide;
 use Ajax\semantic\html\base\constants\VerticalAlignment;
@@ -27,9 +26,7 @@ public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=
 		$this->_implicitRows=$implicitRows;
 		$this->_createCols=$createCols;
 		if (isset($numCols)) {
-			// if($this->_createCols){
 			$this->_colSizing=false;
-			// }
 			$this->setWide($numCols);
 		}
 		if($createCols)
@@ -167,6 +164,13 @@ public function setColsCount($numCols, $toCreate=true, $width=NULL) {
 	public function getRow($index) {
 		return $this->getItem($index);
 	}
+	
+	/**
+	 * @return HtmlGridRow
+	 */
+	public function getItem($index){
+		return parent::getItem($index);
+	}
 
 	/**
 	 * Returns the row count
diff --git a/Ajax/semantic/html/collections/form/HtmlFormFields.php b/Ajax/semantic/html/collections/form/HtmlFormFields.php
@@ -61,6 +61,13 @@ public function addItem($item) {
 			$item->setContainer($this);
 		return $item;
 	}
+	
+	/**
+	 * @return HtmlFormField
+	 */
+	public function getItem($index){
+		return parent::getItem($index);
+	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		if ($this->_equalWidth) {
diff --git a/Ajax/semantic/html/collections/form/traits/CheckboxTrait.php b/Ajax/semantic/html/collections/form/traits/CheckboxTrait.php
@@ -61,7 +61,7 @@ public function getDataField(){
 	/**
 	 * Check the checkbox
 	 * @param boolean $value
-	 * @return HtmlFormField
+	 * @return $this
 	 */
 	public function setChecked($value=true){
 		if($value===true){
diff --git a/Ajax/semantic/html/collections/form/traits/FieldTrait.php b/Ajax/semantic/html/collections/form/traits/FieldTrait.php
@@ -68,10 +68,10 @@ public function labeledToCorner($icon, $direction=Direction::LEFT) {
 	}
 
 	/**
-	 * @param string $action
+	 * @param mixed $action
 	 * @param string $direction
 	 * @param string $icon
-	 * @param string $labeled
+	 * @param boolean $labeled
 	 * @return mixed|HtmlButton
 	 */
 	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
diff --git a/Ajax/semantic/html/collections/form/traits/FieldsTrait.php b/Ajax/semantic/html/collections/form/traits/FieldsTrait.php
@@ -10,7 +10,6 @@
 use Ajax\semantic\html\collections\form\HtmlFormRadio;
 use Ajax\semantic\html\collections\form\HtmlFormField;
 use Ajax\common\html\html5\HtmlTextarea;
-use Ajax\common\html\HtmlDoubleElement;
 use Ajax\semantic\html\collections\form\HtmlFormTextarea;
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 use Ajax\semantic\html\elements\HtmlButtonGroups;
@@ -23,6 +22,7 @@
 trait FieldsTrait {
 	abstract public function addFields($fields=NULL,$label=NULL);
 	abstract public function addItem($item);
+	abstract public function getItem($index);
 
 	protected function createItem($value){
 		if(\is_array($value)){
@@ -53,7 +53,7 @@ public function addInputs($inputs,$fieldslabel=null){
 	/**
 	 * Sets the values of a property for each Field of each item in the collection
 	 * @param string $property
-	 * @param array $values
+	 * @param array|mixed $values
 	 * @return HtmlFormFields
 	 */
 	public function setFieldsPropertyValues($property,$values){
diff --git a/Ajax/semantic/html/content/HtmlDropdownItem.php b/Ajax/semantic/html/content/HtmlDropdownItem.php
@@ -45,7 +45,7 @@ public function asOption(){
 
 	/**
 	 * @param string $image the image src
-	 * @return HtmlImg
+	 * @return $this
 	 */
 	public function asMiniAvatar($image){
 		$this->tagName="div";
@@ -140,6 +140,8 @@ public static function icon($caption,$icon){
 	 * @return HtmlDropdownItem
 	 */
 	public static function avatar($caption,$image){
-		return (new HtmlDropdownItem("",$caption))->asMiniAvatar($image);
+		$dd=new HtmlDropdownItem("",$caption);
+		$dd->asMiniAvatar($image);
+		return $dd;
 	}
 }
diff --git a/Ajax/semantic/html/content/HtmlMenuItem.php b/Ajax/semantic/html/content/HtmlMenuItem.php
@@ -27,18 +27,10 @@ protected function initContent($content){
 				$this->addIcon($icon);
 			}
 			if(isset($title)){
-				$this->setTitle($title,$desc);
+				$this->setTitle($title);
 			}
 		}else{
 			$this->setContent($content);
 		}
 	}
-
-/*	public function addIcon($icon, $before=true) {
-		$content=$this->content;
-		$this->content=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content");
-		$this->content->setContent($content);
-		$this->content->addContent(new HtmlIcon("icon" . $this->identifier, $icon), $before);
-		return $this;
-	}*/
 }
diff --git a/Ajax/semantic/html/content/view/HtmlViewItem.php b/Ajax/semantic/html/content/view/HtmlViewItem.php
@@ -11,7 +11,6 @@
 use Ajax\semantic\html\elements\HtmlReveal;
 use Ajax\semantic\html\base\constants\RevealType;
 use Ajax\semantic\html\elements\HtmlButtonGroups;
-use Ajax\semantic\html\content\view\HtmlViewContent;
 use Ajax\semantic\html\elements\HtmlIcon;
 
 abstract class HtmlViewItem extends HtmlSemDoubleElement {
@@ -97,14 +96,6 @@ public function addExtraContent($content=array()) {
 		return $this->content["extra-content"]= $this->createContent($content, "extra content");
 	}
 
-	/*public function addContent($content=array(), $before=false) {
-		if (!$content instanceof HtmlViewContent) {
-			$content=$this->createContent($content);
-		}
-		$this->content["content"]->addElement($content);
-		return $content;
-	}*/
-
 	/**
 	 * @param array $elements
 	 * @param boolean $asIcons
diff --git a/Ajax/semantic/html/elements/HtmlButtonGroups.php b/Ajax/semantic/html/elements/HtmlButtonGroups.php
@@ -46,7 +46,7 @@ public function addDropdown($items,$asCombo=false){
 	/**
 	 * @param mixed $element
 	 * @param boolean $asIcon
-	 * @return HtmlButton
+	 * @return HtmlButton|HtmlDropdown
 	 */
 	public function addElement($element, $asIcon=false) {
 		$item=$this->addItem($element);
diff --git a/Ajax/semantic/html/elements/HtmlList.php b/Ajax/semantic/html/elements/HtmlList.php
@@ -49,6 +49,13 @@ public function addList($items=array()) {
 		$list->setClass("list");
 		return $this->addItem($list);
 	}
+	
+	/**
+	 * @return HtmlListItem
+	 */
+	public function getItem($index){
+		return parent::getItem($index);
+	}
 
 	protected function getItemToAdd($item){
 		$itemO=parent::getItemToAdd($item);
@@ -111,7 +118,7 @@ public function setHorizontal() {
 	 * Adds a grouped checked box to the list
 	 * @param array $items
 	 * @param string|array|null $masterItem
-	 * @param array|null $values
+	 * @param array $values
 	 * @param string $notAllChecked
 	 * @return HtmlList
 	 */
diff --git a/Ajax/semantic/html/modules/HtmlDropdown.php b/Ajax/semantic/html/modules/HtmlDropdown.php
@@ -193,8 +193,8 @@ public function addItems($items){
 	/**
 	 * Sets the values of a property for each item in the collection
 	 * @param string $property
-	 * @param array $values
-	 * @return HtmlCollection
+	 * @param array|mixed $values
+	 * @return $this
 	 */
 	public function setPropertyValues($property,$values){
 		$i=0;
diff --git a/Ajax/semantic/widgets/base/InstanceViewer.php b/Ajax/semantic/widgets/base/InstanceViewer.php
@@ -88,7 +88,7 @@ protected function _getDefaultValue($name,$value,$index){
 		return $func($name,$value,$index,$this->instance);
 	}
 
-	protected function _getPropertyValue(\ReflectionProperty $property,$index){
+	protected function _getPropertyValue(\ReflectionProperty $property){
 		$property->setAccessible(true);
 		return $property->getValue($this->instance);
 	}
@@ -97,7 +97,7 @@ protected function _getValue($property,$index){
 		$value=null;
 		$propertyName=$property;
 		if($property instanceof \ReflectionProperty){
-			$value=$this->_getPropertyValue($property, $index);
+			$value=$this->_getPropertyValue($property);
 			$propertyName=$property->getName();
 		}elseif(\is_callable($property))
 			$value=$property($this->instance);
@@ -119,7 +119,7 @@ protected function _postGetValue($index,$propertyName,$value){
 		if(isset($this->values[$index])){
 			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
 		}else{
-			$value=$this->_getDefaultValue($propertyName,$value, $index,self::$index);
+			$value=$this->_getDefaultValue($propertyName,$value, $index);
 		}
 		if(isset($this->afterCompile[$index])){
 			if(\is_callable($this->afterCompile[$index])){
diff --git a/Ajax/semantic/widgets/dataform/DataForm.php b/Ajax/semantic/widgets/dataform/DataForm.php
@@ -113,7 +113,7 @@ public function setSeparators($separators) {
 	}
 
 	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
+		return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){
 			$button=new HtmlButton($id,$value,$cssStyle);
 			$button->setProperty("type", "reset");
 			return $button;
@@ -149,6 +149,6 @@ public function addWrapper($index,$contentBefore,$contentAfter=null){
 	}
 
 	public function run(JsUtils $js){
-		return parent::run($js);
+		parent::run($js);
 	}
 }
diff --git a/Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php b/Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php
@@ -1,7 +1,6 @@
 <?php
 namespace Ajax\semantic\widgets\datatable;
 use Ajax\semantic\html\elements\HtmlButton;
-use Ajax\semantic\widgets\base\InstanceViewer;
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 use Ajax\common\html\BaseHtml;
 use Ajax\semantic\html\elements\HtmlButtonGroups;
@@ -19,6 +18,8 @@ abstract public function addField($field);
 	abstract public function insertField($index,$field);
 	abstract public function insertInField($index,$field);
 	abstract public function fieldAs($index,$type,$attributes=NULL);
+	abstract protected function cleanIdentifier($id);
+	abstract protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
@@ -84,7 +85,7 @@ private function getFieldButtons($buttons,$visibleHover=true){
 	 * @return DataTable
 	 */
 	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
+		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
 			$button=new HtmlButton($id,$value,$cssStyle);
 			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
 			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
@@ -178,7 +179,7 @@ public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=
 
 	/**
 	 * Adds an edit button
-	 * @param string $visibleHover
+	 * @param boolean $visibleHover
 	 * @param array $editBehavior default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"data-ajax","params"=>"{}","method"=>"get")
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ public function show($element='this', $speed='', $callback='', $immediatly=false`
`365`	`365`	`*`
`366`	`366`	`* @param string $element`
`367`	`367`	`* @param array $options`
`368`		`- * @return void`
	`368`	`+ * @return string`
`369`	`369`	`*/`
`370`	`370`	`public function sortable($element, $options=array()) {`
`371`	`371`	`if (count($options)>0) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function getRules() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`46`		`- * @param string $type`
	`46`	`+ * @param string $type\|Rule\|array`
`47`	`47`	`* @param string $prompt`
`48`	`48`	`* @param string $value`
`49`	`49`	`* @return Rule`