removes internal property name conflicts

Author: henderjon

src/Layout.php

@@ -12,22 +12,22 @@ class Layout extends Widget {
 	/**
 	 * set the view to inject into the layout
 	 */
-	protected $view;
+	protected $__view;
 
 	/**
 	 * assign a widget as the view to be injected
 	 * @param Widget $view The view
 	 */
 	function setView( callable $view ){
-		$this->view = $view;
+		$this->__view = $view;
 	}
 
 	/**
 	 * get the view, mostly for internal use
 	 * @return Widget
 	 */
 	function getView(){
-		return $this->view;
+		return $this->__view;
 	}
 
 	/**

src/Traits/WidgetTrait.php

@@ -7,7 +7,7 @@ trait WidgetTrait {
 	/**
 	 * property to hold the data local to the widget, available via __get()
 	 */
-	private $internalDataMap = array();
+	private $__internalDataMap = array();
 
 	/**
 	 * make your widget callable
@@ -18,14 +18,14 @@ abstract function __invoke();
 	 * for docs, check \Chevron\Widgets\WidgetInterface
 	 */
 	public function get($key){
-		return isset($this->internalDataMap[$key]) ? $this->internalDataMap[$key] : null;
+		return isset($this->__internalDataMap[$key]) ? $this->__internalDataMap[$key] : null;
 	}
 
 	/**
 	 * for docs, check \Chevron\Widgets\WidgetInterface
 	 */
 	public function set($key, $value){
-		$this->internalDataMap[$key] = $value;
+		$this->__internalDataMap[$key] = $value;
 	}
 
 	/**
@@ -43,7 +43,7 @@ public function setMany(array $internalDataMap){
 	 * @return bool
 	 */
 	public function __isset($name){
-		return array_key_exists($name, $this->internalDataMap);
+		return array_key_exists($name, $this->__internalDataMap);
 	}
 
-}
+}

src/Widget.php

@@ -10,7 +10,7 @@ class Widget extends AbstractWidget {
 	/**
 	 * The file that the widget will load
 	 */
-	protected $file;
+	protected $__file;
 
 	/**
 	 * Set the file and data map for the Widget
@@ -40,10 +40,10 @@ function __toString(){
 	 * for docs, check \Chevron\Widgets\WidgetInterface
 	 */
 	function render(){
-		if( !file_exists($this->file) ){
-			throw new \RuntimeException("Not a file: '{$this->file}'");
+		if( !file_exists($this->__file) ){
+			throw new \RuntimeException("Not a file: '{$this->__file}'");
 		}
-		return require($this->file);
+		return require($this->__file);
 	}
 
 	/**
@@ -64,7 +64,7 @@ function __get($key){
 	 * change the base layout
 	 */
 	protected function setFile($file){
-		$this->file = $file;
+		$this->__file = $file;
 	}
 
 }