Merge branch 'hotfix/31'

Close #32
Fixes #31

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.2 - TBD
+## 2.6.2 - 2016-02-25
 
 ### Added
 
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#32](https://github.com/zendframework/zend-session/pull/32) provides a better
+  polfill for the `ValidatorChain` to ensure it can be represented in
+  auto-generated classmaps (e.g., via `composer dump-autoload --optimize` and/or
+  `composer dump-autoload --classmap-authoritative`).
 
 ## 2.6.1 - 2016-02-23
 

src/Validator/ValidatorChainEM2.php → src/Validator/AbstractValidatorChainEM2.php

@@ -12,9 +12,9 @@
 use Zend\Session\Storage\StorageInterface;
 
 /**
- * Validator chain for validating sessions (for use with zend-eventmanager v2)
+ * Abstract validator chain for validating sessions (for use with zend-eventmanager v2).
  */
-class ValidatorChainEM2 extends EventManager
+abstract class AbstractValidatorChainEM2 extends EventManager
 {
     use ValidatorChainTrait;
 

src/Validator/ValidatorChainEM3.php → src/Validator/AbstractValidatorChainEM3.php

@@ -12,9 +12,9 @@
 use Zend\Session\Storage\StorageInterface;
 
 /**
- * Validator chain for validating sessions (for use with zend-eventmanager v3)
+ * Abstract validator chain for validating sessions (for use with zend-eventmanager v3)
  */
-class ValidatorChainEM3 extends EventManager
+abstract class AbstractValidatorChainEM3 extends EventManager
 {
     use ValidatorChainTrait;
 

src/ValidatorChain.php

@@ -12,19 +12,32 @@
 use Zend\EventManager\GlobalEventManager;
 
 /**
- * Polyfill for ValidatorChain
+ * Polyfill for AbstractValidatorChain.
  *
  * The definitions for EventManagerInterface::attach differ between versions 2
  * and 3 of zend-eventmanager, which makes it impossible to override the method
- * in a way that is compatible with both. To get around that, we define 2
- * classes, one targeting each major version of zend-eventmanager, each
- * sharing the same trait, and each defining attach() per the EM version they
- * target. This file then aliases the appropriate one to `ValidatorChain`,
+ * in a way that is compatible with both.
+ *
+ * To get around that, we define 2 abstract classes, one targeting each major
+ * version of zend-eventmanager, and each defining attach() per the EM version
+ * they target.
+ *
+ * This conditional below then aliases the appropriate one to `AbstractValidatorChain`,
  * based on which version of the EM is present. Since the `GlobalEventManager`
  * is only present in v2, we can use that as our test.
  */
 if (class_exists(GlobalEventManager::class)) {
-    class_alias(Validator\ValidatorChainEM2::class, ValidatorChain::class);
+    class_alias(Validator\AbstractValidatorChainEM2::class, AbstractValidatorChain::class);
 } else {
-    class_alias(Validator\ValidatorChainEM3::class, ValidatorChain::class);
+    class_alias(Validator\AbstractValidatorChainEM3::class, AbstractValidatorChain::class);
+}
+
+/**
+ * Validator chain implementation.
+ *
+ * Extends the zend-eventmanager-version-specific base class implementation
+ * as polyfilled above.
+ */
+class ValidatorChain extends AbstractValidatorChain
+{
 }