typehints + cleaning

jcheron · jcheron · commit a98604d1e8df · 2017-03-30T00:02:00.000+02:00
diff --git a/Ajax/JsUtils.php b/Ajax/JsUtils.php
@@ -79,7 +79,7 @@ abstract public function fromDispatcher($dispatcher);
 	 * @param JqueryUI $ui
 	 * @return JqueryUI
 	 */
-	public function ui($ui=NULL) {
+	public function ui(JqueryUI $ui=NULL) {
 		if ($ui!==NULL) {
 			$this->_ui=$ui;
 			$ui->setJs($this);
@@ -94,9 +94,9 @@ public function ui($ui=NULL) {
 	/**
 	 *
 	 * @param Bootstrap $bootstrap
-	 * @return \Ajax\Bootstrap
+	 * @return Bootstrap
 	 */
-	public function bootstrap($bootstrap=NULL) {
+	public function bootstrap(Bootstrap $bootstrap=NULL) {
 		if ($bootstrap!==NULL) {
 			$this->_bootstrap=$bootstrap;
 			$bootstrap->setJs($this);
@@ -111,9 +111,9 @@ public function bootstrap($bootstrap=NULL) {
 	/**
 	 *
 	 * @param Semantic $semantic
-	 * @return \Ajax\Semantic
+	 * @return Semantic
 	 */
-	public function semantic($semantic=NULL) {
+	public function semantic(Semantic $semantic=NULL) {
 		if ($semantic!==NULL) {
 			$this->_semantic=$semantic;
 			$semantic->setJs($this);
diff --git a/Ajax/bootstrap/html/HtmlBreadcrumbs.php b/Ajax/bootstrap/html/HtmlBreadcrumbs.php
@@ -6,6 +6,7 @@
 use Ajax\JsUtils;
 
 use Ajax\bootstrap\html\base\HtmlNavElement;
+use Ajax\common\html\HtmlDoubleElement;
 /**
  * Twitter Bootstrap Breadcrumbs component
  * @see http://getbootstrap.com/components/#breadcrumbs
@@ -48,7 +49,7 @@ public function __construct($identifier,$elements=array(),$autoActive=true,$star
 		$this->content=array();
 		$this->autoActive=$autoActive;
 		$this->absolutePaths;
-		$this->_hrefFunction=function ($e){return $e->getContent();};
+		$this->_hrefFunction=function (HtmlDoubleElement $e){return $e->getContent();};
 		if(isset($hrefFunction)){
 			$this->_hrefFunction=$hrefFunction;
 		}
diff --git a/Ajax/bootstrap/html/HtmlLink.php b/Ajax/bootstrap/html/HtmlLink.php
@@ -24,5 +24,4 @@ public function run(JsUtils $js) {
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
-	// TODO use Class Tag
 }
diff --git a/Ajax/bootstrap/html/content/HtmlCarouselItem.php b/Ajax/bootstrap/html/content/HtmlCarouselItem.php
@@ -47,7 +47,7 @@ public function setCaption($caption) {
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		// TODO: Auto-generated method stub
+
 	}
 
 	public function __toString() {
diff --git a/Ajax/bootstrap/html/content/HtmlNavzone.php b/Ajax/bootstrap/html/content/HtmlNavzone.php
@@ -78,7 +78,6 @@ public function addElements($elements) {
 				} else if (is_string($element)) {
 					$this->addLink($element);
 				}
-				// TODO A vérifier
 			}
 		}
 		return $this;
diff --git a/Ajax/common/html/BaseHtml.php b/Ajax/common/html/BaseHtml.php
@@ -176,7 +176,7 @@ public function wrap($before, $after="") {
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
 	}
 
 	public function getBsComponent() {
diff --git a/Ajax/common/html/html5/HtmlLinkTrait.php b/Ajax/common/html/html5/HtmlLinkTrait.php
@@ -18,5 +18,4 @@ public function getHref() {
 	public function setTarget($value="_self") {
 		return $this->setProperty("target", $value);
 	}
-	// TODO use Class Tag
 }
diff --git a/Ajax/common/html/traits/BaseHtmlPropertiesTrait.php b/Ajax/common/html/traits/BaseHtmlPropertiesTrait.php
@@ -111,6 +111,6 @@ protected function setPropertyCtrl($name, $value, $typeCtrl) {
 	}
 
 	protected function getElementByPropertyValue($propertyName,$value, $elements) {
-		return $this->_self->_getElementBy(function($element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);
+		return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);
 	}
 }
diff --git a/Ajax/common/traits/JsUtilsInternalTrait.php b/Ajax/common/traits/JsUtilsInternalTrait.php
@@ -14,7 +14,7 @@ protected function _addToCompile($jsScript) {
 	 * @param BaseGui $library
 	 * @param mixed $view
 	 */
-	protected function _compileLibrary($library, &$view=NULL){
+	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
 		if ($library!=NULL) {
 			if(isset($view))
 				$library->compileHtml($this, $view);
diff --git a/Ajax/semantic/components/Modal.php b/Ajax/semantic/components/Modal.php
@@ -23,6 +23,4 @@ public function showDimmer(){
 	public function setInverted(){
 		$this->params["inverted"]=true;
 	}
-
-	// TODO other events implementation
 }
diff --git a/Ajax/semantic/components/Progress.php b/Ajax/semantic/components/Progress.php
@@ -19,6 +19,4 @@ public function setOnChange($jsCode) {
 	public function setText($values) {
 		return $this->params["text"]=$values;
 	}
-	
-	// TODO other events implementation
 }
diff --git a/Ajax/semantic/components/Search.php b/Ajax/semantic/components/Search.php
@@ -36,6 +36,4 @@ public function setOnSelect($jsCode) {
 		$this->params["onSelect"]=$jsCode;
 		return $this;
 	}
-
-	// TODO other events implementation
 }
diff --git a/Ajax/semantic/html/base/HtmlSemDoubleElement.php b/Ajax/semantic/html/base/HtmlSemDoubleElement.php
@@ -10,7 +10,6 @@
 use Ajax\semantic\html\elements\HtmlLabel;
 use Ajax\semantic\html\base\constants\Direction;
 use Ajax\JsUtils;
-use Phalcon\Mvc\View;
 use Ajax\semantic\html\base\constants\Side;
 
 /**
diff --git a/Ajax/semantic/html/base/traits/AttachedTrait.php b/Ajax/semantic/html/base/traits/AttachedTrait.php
@@ -10,9 +10,9 @@ abstract public function addToPropertyCtrl($name, $value, $typeCtrl);
 	/**
 	 * @param HtmlSemDoubleElement $toElement
 	 * @param string $side
-	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
+	 * @return HtmlSemDoubleElement
 	 */
-	public function setAttachment($toElement, $side=Side::BOTH) {
+	public function setAttachment(HtmlSemDoubleElement $toElement=NULL, $side=Side::BOTH) {
 		if (isset($toElement)) {
 			$toElement->setAttached(true);
 		}
diff --git a/Ajax/semantic/html/base/traits/BaseTrait.php b/Ajax/semantic/html/base/traits/BaseTrait.php
@@ -34,20 +34,20 @@ abstract public function addContent($content,$before=false);
 	abstract public function onCreate($jsCode);
 
 	public function addVariation($variation) {
-		return $this->_self->addToPropertyCtrlCheck("class", $variation, $this->_self->_variations);
+		return $this->_self->addToPropertyCtrlCheck("class", $variation, $this->_self->getVariations());
 	}
 
 	public function addState($state) {
-		return $this->_self->addToPropertyCtrlCheck("class", $state, $this->_self->_states);
+		return $this->_self->addToPropertyCtrlCheck("class", $state, $this->_self->getStates());
 	}
 
 	public function setVariation($variation) {
-		$this->_self->setPropertyCtrl("class", $variation, $this->_self->_variations);
-		return $this->_self->addToProperty("class", $this->_self->_baseClass);
+		$this->_self->setPropertyCtrl("class", $variation, $this->_self->getVariations());
+		return $this->_self->addToProperty("class", $this->_self->getBaseClass());
 	}
 
 	public function setVariations($variations) {
-		$this->_self->setProperty("class", $this->_self->_baseClass);
+		$this->_self->setProperty("class", $this->_self->getBaseClass());
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
 		foreach ( $variations as $variation ) {
@@ -57,8 +57,8 @@ public function setVariations($variations) {
 	}
 
 	public function setState($state) {
-		$this->_self->setPropertyCtrl("class", $state, $this->_self->_states);
-		return $this->_self->addToProperty("class", $this->_self->_baseClass);
+		$this->_self->setPropertyCtrl("class", $state, $this->_self->getStates());
+		return $this->_self->addToProperty("class", $this->_self->getBaseClass());
 	}
 
 	public function addVariations($variations=array()) {
@@ -80,7 +80,7 @@ public function addStates($states=array()) {
 	}
 
 	public function setStates($states) {
-		$this->_self->setProperty("class", $this->_self->_baseClass);
+		$this->_self->setProperty("class", $this->_self->getBaseClass());
 		if (\is_string($states))
 			$states=\explode(" ", $states);
 		foreach ( $states as $state ) {
@@ -90,11 +90,11 @@ public function setStates($states) {
 	}
 
 	public function addIcon($icon, $before=true) {
-		return $this->_self->addContent(new HtmlIcon("icon-" . $this->_self->identifier, $icon), $before);
+		return $this->_self->addContent(new HtmlIcon("icon-" . $this->_self->getIdentifier(), $icon), $before);
 	}
 
 	public function addSticky($context="body"){
-		$this->_self->onCreate("$('#".$this->_self->identifier."').sticky({ context: '".$context."'});");
+		$this->_self->onCreate("$('#".$this->_self->getIdentifier()."').sticky({ context: '".$context."'});");
 		return $this;
 	}
 
@@ -196,7 +196,7 @@ public function floatLeft() {
 	}
 
 	public function getBaseClass() {
-		return $this->_self->_baseClass;
+		return $this->_baseClass;
 	}
 
 	protected function addBehavior(&$array,$key,$value,$before="",$after=""){
@@ -211,6 +211,15 @@ protected function addBehavior(&$array,$key,$value,$before="",$after=""){
 		}
 		return $this;
 	}
+
+	public function getVariations() {
+	return $this->_variations;
+}
+
+	public function getStates() {
+	return $this->_states;
+}
+
 	/*
 	 protected function addBehavior(&$array,$key,$value,$before="",$after=""){
 	 echo $key.":".$this->_self->identifier."<br>";
diff --git a/Ajax/semantic/html/collections/HtmlBreadcrumb.php b/Ajax/semantic/html/collections/HtmlBreadcrumb.php
@@ -52,7 +52,7 @@ public function __construct($identifier, $items=array(), $autoActive=true, $star
 		$this->startIndex=$startIndex;
 		$this->autoActive=$autoActive;
 		$this->_contentSeparator="<div class='divider'> / </div>";
-		$this->_hrefFunction=function ($e) {
+		$this->_hrefFunction=function (HtmlSemDoubleElement $e) {
 			return $e->getContent();
 		};
 		if (isset($hrefFunction)) {
diff --git a/Ajax/semantic/html/collections/form/traits/FormTrait.php b/Ajax/semantic/html/collections/form/traits/FormTrait.php
@@ -6,6 +6,8 @@
 use Ajax\service\AjaxCall;
 use Ajax\JsUtils;
 use Ajax\common\html\BaseHtml;
+use Ajax\semantic\components\Form;
+use Ajax\semantic\html\collections\form\HtmlFormField;
 
 /**
  * trait used in Widget and HtmlForm
@@ -19,7 +21,7 @@ trait FormTrait{
 	 */
 	abstract protected function getForm();
 
-	protected function addCompoValidation($compo,$field){
+	protected function addCompoValidation(Form $compo,HtmlFormField $field){
 		$validation=$field->getValidation();
 		if(isset($validation)){
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
@@ -28,7 +30,7 @@ protected function addCompoValidation($compo,$field){
 		return $compo;
 	}
 
-	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
 		if(isset($params["_ajaxSubmit"])){
diff --git a/Ajax/semantic/html/content/table/HtmlTR.php b/Ajax/semantic/html/content/table/HtmlTR.php
@@ -68,15 +68,15 @@ public function setContainer($container, $row) {
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function(&$cell,$value){$cell->setValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);});
 	}
 
 	/**
 	 * Adds values to the row cols
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function(&$cell,$value){$cell->addValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);});
 	}
 
 	/**
diff --git a/Ajax/semantic/html/content/table/HtmlTableContent.php b/Ajax/semantic/html/content/table/HtmlTableContent.php
@@ -125,15 +125,15 @@ public function setCellValue($row, $col, $value="") {
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function($row,$_values){$row->setValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->setValues($_values);});
 	}
 
 	/**
 	 * Adds the cells values
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function($row,$_values){$row->addValues($_values);});
+		return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->addValues($_values);});
 	}
 
 	/**
diff --git a/Ajax/semantic/html/elements/html5/HtmlLink.php b/Ajax/semantic/html/elements/html5/HtmlLink.php
@@ -36,5 +36,4 @@ public static function icon($identifier, $icon, $href="#", $label=NULL) {
 		$result=new HtmlLink($identifier, $href, $label);
 		return $result->addIcon($icon);
 	}
-	// TODO use Class Tag
 }
diff --git a/Ajax/semantic/widgets/base/FieldAsTrait.php b/Ajax/semantic/widgets/base/FieldAsTrait.php
@@ -19,6 +19,7 @@
 use Ajax\semantic\html\elements\html5\HtmlLink;
 use Ajax\semantic\html\elements\HtmlFlag;
 use Ajax\common\html\BaseHtml;
+use Ajax\semantic\html\collections\form\HtmlFormField;
 
 /**
  * trait used in Widget
@@ -39,7 +40,7 @@ abstract protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$respo
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes($element,&$attributes,$index){
+	protected function _applyAttributes(BaseHtml $element,&$attributes,$index){
 		if(isset($attributes["jsCallback"])){
 			$callback=$attributes["jsCallback"];
 			if(\is_callable($callback)){
@@ -59,7 +60,7 @@ private function _getLabelField($caption,$icon=NULL){
 	}
 
 
-	protected function _addRules($element,&$attributes){
+	protected function _addRules(HtmlFormField $element,&$attributes){
 		if(isset($attributes["rules"])){
 			$rules=$attributes["rules"];
 			if(\is_array($rules)){
@@ -72,7 +73,7 @@ protected function _addRules($element,&$attributes){
 		}
 	}
 
-	protected function _prepareFormFields(&$field,$name,&$attributes){
+	protected function _prepareFormFields(HtmlFormField &$field,$name,&$attributes){
 		$field->setName($name);
 		$this->_addRules($field, $attributes);
 		return $field;
diff --git a/Ajax/semantic/widgets/datatable/DataTable.php b/Ajax/semantic/widgets/datatable/DataTable.php
@@ -97,23 +97,9 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 			if(isset($this->_compileParts))
 				$table->setCompileParts($this->_compileParts);
 
-			if(isset($this->_searchField) && isset($js)){
-				if(isset($this->_urls["refresh"]))
-					$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
-			}
-
 			$this->_generateContent($table);
 
-			if($this->_hasCheckboxes && $table->hasPart("thead")){
-					$table->getHeader()->getCell(0, 0)->addClass("no-sort");
-			}
-
-			if(isset($this->_toolbar)){
-				$this->_setToolbarPosition($table, $captions);
-			}
-			if(isset($this->_pagination) && $this->_pagination->getVisible()){
-				$this->_generatePagination($table,$js);
-			}
+			$this->compileExtraElements($table, $captions,$js);
 
 			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
@@ -123,6 +109,22 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 		return parent::compile($js,$view);
 	}
 
+	protected function compileExtraElements($table,$captions,JsUtils $js=NULL){
+		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
+				$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+		}
+		if($this->_hasCheckboxes && $table->hasPart("thead")){
+			$table->getHeader()->getCell(0, 0)->addClass("no-sort");
+		}
+
+		if(isset($this->_toolbar)){
+			$this->_setToolbarPosition($table, $captions);
+		}
+		if(isset($this->_pagination) && $this->_pagination->getVisible()){
+			$this->_generatePagination($table,$js);
+		}
+	}
+
 	protected function _applyStyleAttributes($table){
 		if(isset($this->_hiddenColumns))
 			$this->_hideColumns();
diff --git a/Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php b/Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php
diff --git a/Ajax/ui/components/Autocomplete.php b/Ajax/ui/components/Autocomplete.php
diff --git a/Ajax/ui/properties/Animation.php b/Ajax/ui/properties/Animation.php
diff --git a/Ajax/ui/properties/Position.php b/Ajax/ui/properties/Position.php

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,4 @@ public function run(JsUtils $js) {`
`24`	`24`	`$this->addEventsOnRun($js);`
`25`	`25`	`return $this->_bsComponent;`
`26`	`26`	`}`
`27`		`- // TODO use Class Tag`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function setCaption($caption) {`
`47`	`47`	`* @see \Ajax\bootstrap\html\base\BaseHtml::run()`
`48`	`48`	`*/`
`49`	`49`	`public function run(JsUtils $js) {`
`50`		`- // TODO: Auto-generated method stub`
	`50`	`+`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public function __toString() {`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ public function addElements($elements) {`
`78`	`78`	`} else if (is_string($element)) {`
`79`	`79`	`$this->addLink($element);`
`80`	`80`	`}`
`81`		`- // TODO A vérifier`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function wrap($before, $after="") {`
`176`	`176`
`177`	`177`
`178`	`178`	`public function getElementById($identifier, $elements) {`
`179`		`- return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);`
	`179`	`+ return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`public function getBsComponent() {`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,4 @@ public function getHref() {`
`18`	`18`	`public function setTarget($value="_self") {`
`19`	`19`	`return $this->setProperty("target", $value);`
`20`	`20`	`}`
`21`		`- // TODO use Class Tag`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,6 @@ protected function setPropertyCtrl($name, $value, $typeCtrl) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`protected function getElementByPropertyValue($propertyName,$value, $elements) {`
`114`		`- return $this->_self->_getElementBy(function($element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);`
	`114`	`+ return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);`
`115`	`115`	`}`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,4 @@ public function showDimmer(){`
`23`	`23`	`public function setInverted(){`
`24`	`24`	`$this->params["inverted"]=true;`
`25`	`25`	`}`
`26`		`-`
`27`		`- // TODO other events implementation`
`28`	`26`	`}`