Adding global data mappers does not reserve the '*' key anymore, rais…

…ed composer dev-dependency of tm/tooly-composer-script to ^1.0, Fixed author tags, Added changelog

.gitignore

@@ -6,7 +6,6 @@ vagrant
 
 # composer
 vendor/
-composer.lock
 
 # locally generated docs
 build/api/

CHANGELOG.md

@@ -0,0 +1,21 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com).
+
+## [1.0.1] - 2016-07-06
+
+### Added
+
+- Changelog
+
+### Changed
+
+- Adding global data mappers does not reserve the '*' key anymore
+- raised composer dev-dependency of `tm/tooly-composer-script` to `^1.0`
+- Fixed author tags
+
+## 1.0.0 - 2016-07-05
+
+- First release
+
+[1.0.1]: https://github.com/icehawk/session/compare/v1.0.0...v1.0.1

composer.json

@@ -18,7 +18,7 @@
 		"php": ">=7.0"
 	},
 	"require-dev": {
-		"tm/tooly-composer-script": "^0.1.1"
+		"tm/tooly-composer-script": "^1.0"
 	},
 	"autoload": {
 		"psr-4": {

src/AbstractSession.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author h.woltersdorf
+ * @author hollodotme
  */
 
 namespace IceHawk\Session;
@@ -17,35 +17,54 @@ abstract class AbstractSession
 	private $sessionData;
 
 	/** @var array|MapsSessionData[] */
-	private $dataMappers;
+	private $keyDataMappers;
+
+	/** @var array|MapsSessionData[] */
+	private $globalDataMappers;
 
 	public function __construct( array &$sessionData )
 	{
-		$this->sessionData = &$sessionData;
-		$this->dataMappers = [ ];
+		$this->sessionData       = &$sessionData;
+		$this->keyDataMappers    = [ ];
+		$this->globalDataMappers = [ ];
 	}
 
 	final public function addDataMapper( MapsSessionData $dataMapper, array $keys = [ ] )
 	{
 		if ( empty($keys) )
 		{
-			$keys = [ '*' ];
+			$this->addGlobalDataMapper( $dataMapper );
 		}
-
-		foreach ( array_unique( $keys ) as $key )
+		else
 		{
-			if ( isset($this->dataMappers[ $key ]) )
+			foreach ( array_unique( $keys ) as $key )
 			{
-				if ( !in_array( $dataMapper, $this->dataMappers[ $key ] ) )
-				{
-					$this->dataMappers[ $key ][] = $dataMapper;
-				}
+				$this->addKeyDataMapper( $dataMapper, $key );
 			}
-			else
+		}
+	}
+
+	private function addGlobalDataMapper( MapsSessionData $dataMapper )
+	{
+		if ( !in_array( $dataMapper, $this->globalDataMappers ) )
+		{
+			$this->globalDataMappers[] = $dataMapper;
+		}
+	}
+
+	private function addKeyDataMapper( MapsSessionData $dataMapper, string $key )
+	{
+		if ( isset($this->keyDataMappers[ $key ]) )
+		{
+			if ( !in_array( $dataMapper, $this->keyDataMappers[ $key ] ) )
 			{
-				$this->dataMappers[ $key ] = [ $dataMapper ];
+				$this->keyDataMappers[ $key ][] = $dataMapper;
 			}
 		}
+		else
+		{
+			$this->keyDataMappers[ $key ] = [ $dataMapper ];
+		}
 	}
 
 	final protected function set( string $key, $value )
@@ -55,27 +74,19 @@ final protected function set( string $key, $value )
 
 	private function mapValueToSessionData( string $key, $value )
 	{
-		$mappers = $this->getDataMappersForKey( $key );
+		$keyDataMappers = $this->keyDataMappers[ $key ] ?? [ ];
 
-		foreach ( $mappers as $mapper )
+		foreach ( $keyDataMappers as $keyDataMapper )
 		{
-			$value = $mapper->toSessionData( $value );
+			$value = $keyDataMapper->toSessionData( $value );
 		}
 
-		return $value;
-	}
-
-	/**
-	 * @param string $key
-	 *
-	 * @return array|MapsSessionData[]
-	 */
-	private function getDataMappersForKey( string $key ) : array
-	{
-		$mappers = $this->dataMappers[ $key ] ?? [ ];
-		$mappers = array_merge( $mappers, $this->dataMappers['*'] ?? [ ] );
+		foreach ( $this->globalDataMappers as $globalDataMapper )
+		{
+			$value = $globalDataMapper->toSessionData( $value );
+		}
 
-		return $mappers;
+		return $value;
 	}
 
 	final protected function get( string $key )
@@ -87,13 +98,20 @@ private function mapValueFromSessionData( string $key )
 	{
 		if ( $this->isset( $key ) )
 		{
-			$value   = $this->sessionData[ $key ];
-			$mappers = $this->getDataMappersForKey( $key );
+			$value             = $this->sessionData[ $key ];
+			$globalDataMappers = array_reverse( $this->globalDataMappers );
+			$keyDataMappers    = array_reverse( $this->keyDataMappers[ $key ] ?? [ ] );
+
+			/** @var MapsSessionData $globalDataMapper */
+			foreach ( $globalDataMappers as $globalDataMapper )
+			{
+				$value = $globalDataMapper->fromSessionData( $value );
+			}
 
-			/** @var MapsSessionData $mapper */
-			foreach ( array_reverse( $mappers ) as $mapper )
+			/** @var MapsSessionData $keyDataMapper */
+			foreach ( $keyDataMappers as $keyDataMapper )
 			{
-				$value = $mapper->fromSessionData( $value );
+				$value = $keyDataMapper->fromSessionData( $value );
 			}
 
 			return $value;

src/Exceptions/SessionException.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author h.woltersdorf
+ * @author hollodotme
  */
 
 namespace IceHawk\Session\Exceptions;

src/Interfaces/MapsSessionData.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author h.woltersdorf
+ * @author hollodotme
  */
 
 namespace IceHawk\Session\Interfaces;

tests/Unit/AbstractSessionTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author h.woltersdorf
+ * @author hollodotme
  */
 
 namespace IceHawk\Session\Tests\Unit;

tests/Unit/Fixtures/DataMapper.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author h.woltersdorf
+ * @author hollodotme
  */
 
 namespace IceHawk\Session\Tests\Unit\Fixtures;

tests/Unit/Fixtures/Session.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author h.woltersdorf
+ * @author hollodotme
  */
 
 namespace IceHawk\Session\Tests\Unit\Fixtures;