Fixed the "variablesAreValidWithData" method

Author: harm-less

src/PE/Encoder.php

@@ -97,11 +97,9 @@ protected function decodeChildNames($structure) {
 	 * @param array $nodeData
 	 * @param EncoderOptions $options
 	 * @param EncoderNode|null $parentNode
-	 * @param array $parentObject
+	 * @param object $parentObject
 	 * @param array $parentNodeData
 	 * @return array[]
-	 *
-	 * @todo setAfterChildren doesn't work when it has the wrong order, so perhaps I need to build a sorting mechanism. Perhaps in "decodeRawToArray"?
 	 */
 	protected function _decodeNode($nodeName, $nodeData, EncoderOptions $options, EncoderNode $parentNode = null, $parentObject = null, $parentNodeData = null) {
 
@@ -234,8 +232,7 @@ protected function _decodeNode($nodeName, $nodeData, EncoderOptions $options, En
 
 			$nodeIndex++;
 		}
-		// @todo this broke, perhaps this can be fixed some time
-		//$proxyNode->variablesAreValid($decodedChildren);
+		$proxyNode->variablesAreValid($decodedChildren, true);
 
 		if ($isSingleNode) {
 			return $objects[0];

src/PE/nodes/EncoderNode.php

@@ -549,12 +549,13 @@ public function variableExists($id) {
 
 	/**
 	 * @param array $nodeDataArray
-	 * @return bool
+	 * @param bool $throwErrorIfFails Set to true if you want it to throw an error if it fails
+	 * @return bool Returns true if all requirements are met
 	 *
 	 * @see EncoderNodeVariable::variablesAreValidWithData()
 	 */
-	public function variablesAreValid($nodeDataArray) {
-		return $this->variables->variablesAreValidWithData($nodeDataArray);
+	public function variablesAreValid($nodeDataArray, $throwErrorIfFails = false) {
+		return $this->variables->variablesAreValidWithData($nodeDataArray, $throwErrorIfFails);
 	}
 
 	/**
@@ -622,7 +623,7 @@ public function loadObject($object = null) {
 				throw new EncoderNodeException('Object for loading cannot be null');
 			}
 		}
-		return $this->_loadObject($object);
+		$this->_loadObject($object);
 	}
 
 	/**

src/PE/nodes/EncoderNodeVariableCollection.php

@@ -55,9 +55,10 @@ public function addVariable(Variable $variable) {
 
 	/**
 	 * @param $dataArray
+	 * @param bool $throwErrorIfFails Set to true if you want it to throw an error if it fails
 	 * @return bool Returns true if all requirements are met
 	 */
-	public function variablesAreValidWithData($dataArray) {
+	public function variablesAreValidWithData($dataArray, $throwErrorIfFails = false) {
 		$variables = $this->getVariables();
 		$unique = array();
 		foreach ($dataArray as $data) {
@@ -70,7 +71,12 @@ public function variablesAreValidWithData($dataArray) {
 						}
 						$variableValue = $data[$variableId];
 						if (array_search($variableValue, $unique[$variableId]) !== false) {
-							throw new EncoderNodeVariableException(sprintf('Variable "%s" must be unique but value "%s" is given at least twice', $variableId, $variableValue));
+							if ($throwErrorIfFails) {
+								throw new EncoderNodeVariableException(sprintf('Variable "%s" must be unique but value "%s" is given at least twice', $variableId, $variableValue));
+							}
+							else {
+								return false;
+							}
 						}
 						$unique[$variableId][] = $variableValue;
 					}

tests/PE/Tests/nodes/EncoderNodeVariableCollectionTest.php

@@ -71,6 +71,7 @@ public function testVariablesAreValidWithData() {
 		$variable->mustBeUnique(true);
 
 		$this->assertTrue($collection->variablesAreValidWithData(array(array('var' => 'Test'))));
+		$this->assertFalse($collection->variablesAreValidWithData(array(array('var' => 'Test'), array('var' => 'Test'))));
 	}
 
 	public function testVariablesAreNotValidWithData() {
@@ -80,7 +81,7 @@ public function testVariablesAreNotValidWithData() {
 		$variable = $this->collectionAddVariable(new EncoderNodeVariable('var'));
 		$variable->mustBeUnique(true);
 
-		$collection->variablesAreValidWithData(array(array('var' => 'Test'), array('var' => 'Test')));
+		$collection->variablesAreValidWithData(array(array('var' => 'Test'), array('var' => 'Test')), true);
 	}
 
 	public function testGetAlwaysExecutedVariables() {