Moved from spine cased to camel cased

harm-less · harm-less · commit c1c565661693 · 2016-05-08T23:19:27.000+02:00
The nodes, variables and children now use camel cased ids instead of
spinal cased because it's what modern file formats use in general. Even
for XML it's recommended to my surprise.
diff --git a/src/PE/Encoder.php b/src/PE/Encoder.php
@@ -136,15 +136,6 @@ protected function _decodeNode($nodeName, $nodeData, EncoderOptions $options, En
 			$type = $proxyNode->getType($nodeType);
 			$variableCollection = $type->getVariableCollection();
 
-			// make sure the variables are all dashed as this is the default
-			foreach ($nodeDataItem as $nodeDataName => $nodeDataValue) {
-				$nodeDataNameDashed = Inflector::underscore($nodeDataName, '-');
-				if ($nodeDataName !== $nodeDataNameDashed) {
-					$nodeDataItem[$nodeDataNameDashed] = $nodeDataValue;
-					unset($nodeDataItem[$nodeDataName]);
-				}
-			}
-
 			$preNodeStaticOptions = array(
 				NodeAccessor::VARIABLE_NODE => $type,
 				NodeAccessor::VARIABLE_PARENT => $parentObject
@@ -188,23 +179,20 @@ protected function _decodeNode($nodeName, $nodeData, EncoderOptions $options, En
 				$requiredVariableValues = array();
 				foreach ($requiredVariables as $variable) {
 
-					// make sure the variable is underscored
-					$processedVariable = Inflector::underscore($variable, '-');
-
-					if (!array_key_exists($processedVariable, $nodeDataItem)) {
-						throw new EncoderException(sprintf('Variable "%s" for "%s" does not exist but is required to create an object for node "%s" (Node type: "%s") at index "%s"', $processedVariable, $nodeClassName, $nodeName, $type->getNodeName(), $nodeIndex));
+					if (!array_key_exists($variable, $nodeDataItem)) {
+						throw new EncoderException(sprintf('Variable "%s" for "%s" does not exist but is required to create an object for node "%s" (Node type: "%s") at index "%s"', $variable, $nodeClassName, $nodeName, $type->getNodeName(), $nodeIndex));
 					}
-					$requiredValue = $nodeDataItem[$processedVariable];
-					$objectSetterVariable = $variableCollection->getVariableById($processedVariable);
+					$requiredValue = $nodeDataItem[$variable];
+					$objectSetterVariable = $variableCollection->getVariableById($variable);
 					if (!$objectSetterVariable) {
-						throw new EncoderException(sprintf('Variable "%s" for "%s" is required but there is no EncoderNodeVariable available to retrieve the value for node "%s" (Node type: "%s") at index "%s".', $processedVariable, $nodeClassName, $nodeName, $type->getNodeName(), $nodeIndex));
+						throw new EncoderException(sprintf('Variable "%s" for "%s" is required but there is no EncoderNodeVariable available to retrieve the value for node "%s" (Node type: "%s") at index "%s".', $variable, $nodeClassName, $nodeName, $type->getNodeName(), $nodeIndex));
 					}
 
 					$objectSetter = $objectSetterVariable->getObjectSetter();
 					$processedRequiredValue = $objectSetter->processValue($requiredValue);
 
-					$requiredVariableValues[$processedVariable] = $processedRequiredValue;
-					unset($nodeDataItem[$processedVariable]);
+					$requiredVariableValues[$variable] = $processedRequiredValue;
+					unset($nodeDataItem[$variable]);
 				}
 
 				// create a new instance of the class
diff --git a/src/PE/Nodes/EncoderNodeChildren.php b/src/PE/Nodes/EncoderNodeChildren.php
@@ -33,7 +33,6 @@ public function addChild(EncoderNodeChild $child) {
 	 * @return null|EncoderNodeChild Returns the requested child or returns null if it's not found
 	 */
 	public function getChild($childName) {
-		$childName = strtolower($childName);
 		if ($this->childExists($childName)) {
 			return $this->children[$childName];
 		}
@@ -52,21 +51,19 @@ public function getChildren() {
 	 * @return bool Returns true if the child exists based on its name
 	 */
 	public function childExists($childName) {
-		$nodeName = strtolower($childName);
-		return isset($this->children[$nodeName]);
+		return isset($this->children[$childName]);
 	}
 
 	/**
 	 * Adds values to an object based on a single child
 	 *
-	 * @param string $childName Name if the child so it knows what method to use
+	 * @param string $childName Name of the child so it knows what method to use
 	 * @param object $target The target object where the values are supposed to be added to
 	 * @param array $values The values you want to add
 	 * @return bool Returns true if the action succeeded and false when it couldn't find the child
 	 */
 	public function addChildrenToObject($childName, $target, $values) {
-		$child = strtolower($childName);
-		$childNode = $this->getChild($child);
+		$childNode = $this->getChild($childName);
 		if (!$childNode) {
 			throw new EncoderNodeChildException(sprintf('Trying to add children to object, but the child "%s" could not be found', $childName));
 		}
diff --git a/tests/PE/Nodes/Erroneous/EncoderNodeLoaderNode.php b/tests/PE/Nodes/Erroneous/EncoderNodeLoaderNode.php
@@ -9,7 +9,7 @@ class EncoderNodeLoaderNode extends EncoderNode {
 	private $overrideObjectFileName;
 
 	function __construct($overrideObjectFileName = true) {
-		parent::__construct('encoder-node-loaders', 'encoder-node-loader', '\\PE\\Samples\\Erroneous');
+		parent::__construct('encoderNodeLoaders', 'encoderNodeLoader', '\\PE\\Samples\\Erroneous');
 
 		$this->overrideObjectFileName = $overrideObjectFileName;
 	}
diff --git a/tests/PE/Nodes/Erroneous/NoGetterMethodNode.php b/tests/PE/Nodes/Erroneous/NoGetterMethodNode.php
@@ -10,7 +10,7 @@
 class NoGetterMethodNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('no-getter-methods', 'no-getter-method', '\\PE\\Samples\\Erroneous');
+		parent::__construct('noGetterMethods', 'noGetterMethod', '\\PE\\Samples\\Erroneous');
 
 		$this->addChildNode(new EncoderNodeChild('things', new NodeChildSetter('addThing'), new NodeChildGetter('getThings')));
 	}
diff --git a/tests/PE/Nodes/Erroneous/NoVariableGetterMethodNode.php b/tests/PE/Nodes/Erroneous/NoVariableGetterMethodNode.php
@@ -8,7 +8,7 @@
 class NoVariableGetterMethodNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('no-getter-methods', 'no-getter-method', '\\PE\\Samples\\Erroneous');
+		parent::__construct('noGetterMethods', 'noGetterMethod', '\\PE\\Samples\\Erroneous');
 
 		$this->addVariable(new EncoderNodeVariable('nonExistent'));
 	}
diff --git a/tests/PE/Nodes/Erroneous/NonArrayGetterMethodNode.php b/tests/PE/Nodes/Erroneous/NonArrayGetterMethodNode.php
@@ -10,7 +10,7 @@
 class NonArrayGetterMethodNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('non-array-getter-methods', 'non-array-getter-method', '\\PE\\Samples\\Erroneous');
+		parent::__construct('nonArrayGetterMethods', 'nonArrayGetterMethod', '\\PE\\Samples\\Erroneous');
 
 		$this->addChildNode(new EncoderNodeChild('things', new NodeChildSetter('addThing'), new NodeChildGetter('getThings')));
 	}
diff --git a/tests/PE/Nodes/Specials/AccessorMethodActionTypeNodeNode.php b/tests/PE/Nodes/Specials/AccessorMethodActionTypeNodeNode.php
@@ -12,7 +12,7 @@
 class AccessorMethodActionTypeNodeNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('accessor-method-action-type-nodes', 'accessor-method-action-type-node', '\\PE\\Samples\\Specials');
+		parent::__construct('accessorMethodActionTypeNodes', 'accessorMethodActionTypeNode', '\\PE\\Samples\\Specials');
 
 		$this->addVariable(new EncoderNodeVariable('special'));
 
diff --git a/tests/PE/Nodes/Specials/AddAfterDecodeChildNode.php b/tests/PE/Nodes/Specials/AddAfterDecodeChildNode.php
@@ -8,7 +8,7 @@
 class AddAfterDecodeChildNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('add-after-decode-children', 'add-after-decode-child', '\\PE\\Samples\\Specials');
+		parent::__construct('addAfterDecodeChildren', 'addAfterDecodeChild', '\\PE\\Samples\\Specials');
 
 		$this->addVariable(new EncoderNodeVariable('name'));
 	}
diff --git a/tests/PE/Nodes/Specials/AddAfterDecodeChildRequiresNode.php b/tests/PE/Nodes/Specials/AddAfterDecodeChildRequiresNode.php
@@ -13,7 +13,7 @@
 class AddAfterDecodeChildRequiresNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('add-after-decode-children-require', 'add-after-decode-child-require', '\\PE\\Samples\\Specials');
+		parent::__construct('addAfterDecodeChildrenRequire', 'addAfterDecodeChildRequire', '\\PE\\Samples\\Specials');
 
 		$name = $this->addVariable(new EncoderNodeVariable('name'));
 		$name->postNodeSetter(new PostNodeSetter('nodeSetName', array(NodeAccessor::VARIABLE_VALUE, NodeAccessor::VARIABLE_PARENT)));
diff --git a/tests/PE/Nodes/Specials/AddAfterDecodeParentNode.php b/tests/PE/Nodes/Specials/AddAfterDecodeParentNode.php
@@ -11,15 +11,15 @@
 class AddAfterDecodeParentNode extends EncoderNode {
 
 	function __construct($addAfterAttributes = true) {
-		parent::__construct('add-after-decode-parents', 'add-after-decode-parent', '\\PE\\Samples\\Specials');
+		parent::__construct('addAfterDecodeParents', 'addAfterDecodeParent', '\\PE\\Samples\\Specials');
 
 		$this->addVariable(new EncoderNodeVariable('name'));
 
 		$addAfterDecodeChildSetter = new NodeChildSetter('addChild');
 		$addAfterDecodeChildSetter->setAfterChildren(false);
 		$addAfterDecodeChildSetter->setAfterAttributes($addAfterAttributes);
-		$this->addChildNode(new EncoderNodeChild('add-after-decode-child', $addAfterDecodeChildSetter, new NodeChildGetter('getChildren')));
+		$this->addChildNode(new EncoderNodeChild('addAfterDecodeChild', $addAfterDecodeChildSetter, new NodeChildGetter('getChildren')));
 
-		$this->addChildNode(new EncoderNodeChild('add-after-decode-children-require', new NodeChildSetter('addChildRequires'), new NodeChildGetter('getChildrenRequires')));
+		$this->addChildNode(new EncoderNodeChild('addAfterDecodeChildrenRequire', new NodeChildSetter('addChildRequires'), new NodeChildGetter('getChildrenRequires')));
 	}
 }
diff --git a/tests/PE/Nodes/Specials/ClassLoaderNode.php b/tests/PE/Nodes/Specials/ClassLoaderNode.php
@@ -12,7 +12,7 @@ class ClassLoaderNode extends EncoderNode {
 	private $setupLoader;
 
 	function __construct($setupLoader) {
-		parent::__construct('class-loaders', 'class-loader', '\\PE\\Samples\\Loader');
+		parent::__construct('classLoaders', 'classLoader', '\\PE\\Samples\\Loader');
 
 		$this->setupLoader = $setupLoader;
 	}
diff --git a/tests/PE/Nodes/Specials/EncoderNodeVariableApplyToSetterNode.php b/tests/PE/Nodes/Specials/EncoderNodeVariableApplyToSetterNode.php
@@ -14,29 +14,29 @@
 class EncoderNodeVariableApplyToSetterNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('encoder-node-variable-apply-to-setters-node', 'encoder-node-variable-apply-to-setters-node', '\\PE\\Samples\\Specials');
+		parent::__construct('encoderNodeVariableApplyToSettersNode', 'encoderNodeVariableApplyToSetterNode', '\\PE\\Samples\\Specials');
 
-		$nodeSimple = $this->addVariable(new EncoderNodeVariable('node-simple'));
+		$nodeSimple = $this->addVariable(new EncoderNodeVariable('nodeSimple'));
 		$nodeSimple->postNodeSetter(new PostNodeSetter('nodeSimple', array(NodeAccessor::VARIABLE_NAME)));
 
-		$nodeFull = $this->addVariable(new EncoderNodeVariable('node-full'));
+		$nodeFull = $this->addVariable(new EncoderNodeVariable('nodeFull'));
 		$nodeFull->postNodeSetter(new PostNodeSetter('nodeFull', array(
 			NodeAccessor::VARIABLE_NAME,
 			NodeAccessor::VARIABLE_VALUE,
 			NodeAccessor::VARIABLE_OBJECT,
 			NodeAccessor::VARIABLE_PARENT
 		)));
 
-		$nodeWithoutVariables = $this->addVariable(new EncoderNodeVariable('node-without-variables'));
+		$nodeWithoutVariables = $this->addVariable(new EncoderNodeVariable('nodeWithoutVariables'));
 		$nodeWithoutVariables->postNodeSetter(new PostNodeSetter('nodeWithoutVariables'));
 
-		$nodeWithoutVariablesEmpty = $this->addVariable(new EncoderNodeVariable('node-without-variables-empty'));
+		$nodeWithoutVariablesEmpty = $this->addVariable(new EncoderNodeVariable('nodeWithoutVariablesEmpty'));
 		$nodeWithoutVariablesEmpty->postNodeSetter(new PostNodeSetter('nodeWithoutVariables', array()));
 
-		$nodeWithoutVariablesNull = $this->addVariable(new EncoderNodeVariable('node-without-variables-null'));
+		$nodeWithoutVariablesNull = $this->addVariable(new EncoderNodeVariable('nodeWithoutVariablesNull'));
 		$nodeWithoutVariablesNull->postNodeSetter(new PostNodeSetter('nodeWithoutVariables', array()));
 
-		$nodeUnknownVariable = $this->addVariable(new EncoderNodeVariable('node-unknown-variable'));
+		$nodeUnknownVariable = $this->addVariable(new EncoderNodeVariable('nodeUnknownVariable'));
 		$nodeUnknownVariable->postNodeSetter(new PostNodeSetter('nodeSimple', array('unknown_variable')));
 
 		$this->addVariable(new EncoderNodeVariable('var'));
diff --git a/tests/PE/Nodes/Specials/HasDefaultTypeNode.php b/tests/PE/Nodes/Specials/HasDefaultTypeNode.php
@@ -10,7 +10,7 @@ class HasDefaultTypeNode extends EncoderNode {
 	const NEW_DEFAULT_TYPE = 'should-be-the-default-type';
 
 	function __construct($nodeTypeName = null) {
-		parent::__construct('has-default-types', 'has-default-type', '\\PE\\Samples\\Specials', $nodeTypeName);
+		parent::__construct('hasDefaultTypes', 'hasDefaultType', '\\PE\\Samples\\Specials', $nodeTypeName);
 	}
 
 	public function getDefaultType() {
diff --git a/tests/PE/Nodes/Specials/NonArrayGetterMethodOnPurposeNode.php b/tests/PE/Nodes/Specials/NonArrayGetterMethodOnPurposeNode.php
@@ -10,7 +10,7 @@
 class NonArrayGetterMethodOnPurposeNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('non-array-getter-methods-on-purpose', 'non-array-getter-method-on-purpose', '\\PE\\Samples\\Specials');
+		parent::__construct('nonArrayGetterMethodsOnPurpose', 'nonArrayGetterMethodOnPurpose', '\\PE\\Samples\\Specials');
 
 		$things = $this->addChildNode(new EncoderNodeChild('things', new NodeChildSetter('addThing'), new NodeChildGetter('getThing')));
 		$things->isArray(false);
diff --git a/tests/PE/Nodes/Specials/OptionalVariablesNode.php b/tests/PE/Nodes/Specials/OptionalVariablesNode.php
@@ -8,9 +8,9 @@
 class OptionalVariablesNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('optional-variables', 'optional-variables', '\\PE\\Samples\\Specials');
+		parent::__construct('optionalVariables', 'optionalVariables', '\\PE\\Samples\\Specials');
 
 		$this->addVariable(new EncoderNodeVariable('name'));
-		$this->addVariable(new EncoderNodeVariable('other-variable'));
+		$this->addVariable(new EncoderNodeVariable('otherVariable'));
 	}
 }
diff --git a/tests/PE/Nodes/Specials/RequiredConstructorVariablesNode.php b/tests/PE/Nodes/Specials/RequiredConstructorVariablesNode.php
@@ -8,11 +8,11 @@
 class RequiredConstructorVariablesNode extends EncoderNode {
 
 	function __construct($addVariables = true) {
-		parent::__construct('required-constructors-variables', 'required-constructor-variables', '\\PE\\Samples\\Specials');
+		parent::__construct('requiredConstructorsVariables', 'requiredConstructorVariables', '\\PE\\Samples\\Specials');
 
 		if ($addVariables === true) {
 			$this->addVariable(new EncoderNodeVariable('name'));
-			$this->addVariable(new EncoderNodeVariable('variable-category'));
+			$this->addVariable(new EncoderNodeVariable('variableCategory'));
 		}
 	}
 }
diff --git a/tests/PE/Nodes/Specials/RequiredVariableNode.php b/tests/PE/Nodes/Specials/RequiredVariableNode.php
@@ -8,7 +8,7 @@
 class RequiredVariableNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('required-variables', 'required-variable', '\\PE\\Samples\\Specials');
+		parent::__construct('requiredVariables', 'requiredVariable', '\\PE\\Samples\\Specials');
 
 		$thing = $this->addVariable(new EncoderNodeVariable('required'));
 		$thing->getObjectSetter()->required(true);
diff --git a/tests/PE/Nodes/Specials/SingleChildNode.php b/tests/PE/Nodes/Specials/SingleChildNode.php
@@ -10,7 +10,7 @@
 class SingleChildNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('single-children', 'single-child', '\\PE\\Samples\\Specials');
+		parent::__construct('singleChildren', 'singleChild', '\\PE\\Samples\\Specials');
 
 		$thing = $this->addChildNode(new EncoderNodeChild('thing', new NodeChildSetter('setThing'), new NodeChildGetter('getThing')));
 		$thing->isArray(false);
diff --git a/tests/PE/Nodes/Specials/VariableTypesNode.php b/tests/PE/Nodes/Specials/VariableTypesNode.php
@@ -14,7 +14,7 @@
 class VariableTypesNode extends EncoderNode {
 
 	function __construct() {
-		parent::__construct('variable-types', 'variable-type', '\\PE\\Samples\\Specials');
+		parent::__construct('variableTypes', 'variableType', '\\PE\\Samples\\Specials');
 
 		$required = $this->addVariable(new EncoderNodeVariable('required'));
 		$required->setType(EncoderNodeVariable::TYPE_STRING);
diff --git a/tests/PE/Tests/EncoderTest.php b/tests/PE/Tests/EncoderTest.php
diff --git a/tests/PE/Tests/Encoders/JsonEncoderTest.php b/tests/PE/Tests/Encoders/JsonEncoderTest.php
diff --git a/tests/PE/Tests/Encoders/XmlEncoderTest.php b/tests/PE/Tests/Encoders/XmlEncoderTest.php
diff --git a/tests/PE/Tests/Nodes/EncoderNodeChildrenTest.php b/tests/PE/Tests/Nodes/EncoderNodeChildrenTest.php
diff --git a/tests/PE/Tests/Nodes/EncoderNodeTest.php b/tests/PE/Tests/Nodes/EncoderNodeTest.php
diff --git a/tests/PE/Tests/Variables/Types/ObjectGetterTest.php b/tests/PE/Tests/Variables/Types/ObjectGetterTest.php
diff --git a/tests/PE/Tests/Variables/Types/ObjectSetterTest.php b/tests/PE/Tests/Variables/Types/ObjectSetterTest.php
diff --git a/tests/PE/Tests/Variables/Types/PostNodeSetterTest.php b/tests/PE/Tests/Variables/Types/PostNodeSetterTest.php

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class EncoderNodeLoaderNode extends EncoderNode {`
`9`	`9`	`private $overrideObjectFileName;`
`10`	`10`
`11`	`11`	`function __construct($overrideObjectFileName = true) {`
`12`		`- parent::__construct('encoder-node-loaders', 'encoder-node-loader', '\\PE\\Samples\\Erroneous');`
	`12`	`+ parent::__construct('encoderNodeLoaders', 'encoderNodeLoader', '\\PE\\Samples\\Erroneous');`
`13`	`13`
`14`	`14`	`$this->overrideObjectFileName = $overrideObjectFileName;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`class NoGetterMethodNode extends EncoderNode {`
`11`	`11`
`12`	`12`	`function __construct() {`
`13`		`- parent::__construct('no-getter-methods', 'no-getter-method', '\\PE\\Samples\\Erroneous');`
	`13`	`+ parent::__construct('noGetterMethods', 'noGetterMethod', '\\PE\\Samples\\Erroneous');`
`14`	`14`
`15`	`15`	`$this->addChildNode(new EncoderNodeChild('things', new NodeChildSetter('addThing'), new NodeChildGetter('getThings')));`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class NoVariableGetterMethodNode extends EncoderNode {`
`9`	`9`
`10`	`10`	`function __construct() {`
`11`		`- parent::__construct('no-getter-methods', 'no-getter-method', '\\PE\\Samples\\Erroneous');`
	`11`	`+ parent::__construct('noGetterMethods', 'noGetterMethod', '\\PE\\Samples\\Erroneous');`
`12`	`12`
`13`	`13`	`$this->addVariable(new EncoderNodeVariable('nonExistent'));`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class AddAfterDecodeChildNode extends EncoderNode {`
`9`	`9`
`10`	`10`	`function __construct() {`
`11`		`- parent::__construct('add-after-decode-children', 'add-after-decode-child', '\\PE\\Samples\\Specials');`
	`11`	`+ parent::__construct('addAfterDecodeChildren', 'addAfterDecodeChild', '\\PE\\Samples\\Specials');`
`12`	`12`
`13`	`13`	`$this->addVariable(new EncoderNodeVariable('name'));`
`14`	`14`	`}`