Merge branch 'hydrator-removal' into develop

Close #33
zendframework · Oct 15, 2015 · 4df7dfd · 4df7dfd
2 parents 5916d2c + 7cc34f2
commit 4df7dfd
Show file tree

Hide file tree

Showing 112 changed files with 25 additions and 5,912 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.0.0 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#33](https://github.com/zendframework/zend-stdlib/pull/20) - removed
+  deprecated classes
+  - *All Hydrator classes* see #22.
+  - `Zend\Stdlib\CallbackHandler` see #35
+
+### Fixed
+
+- Nothing.
+
 ## 2.8.0 - TBD
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -13,32 +13,24 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-hydrator": "~1.0"
+        "php": ">=5.5"
     },
     "require-dev": {
-        "zendframework/zend-config": "~2.5",
-        "zendframework/zend-eventmanager": "~2.5",
-        "zendframework/zend-inputfilter": "~2.5",
+        "zendframework/zend-config": "dev-develop as 2.6.0",
         "zendframework/zend-serializer": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-filter": "~2.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0",
         "athletic/athletic": "~0.1"
     },
     "suggest": {
-        "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-        "zendframework/zend-serializer": "Zend\\Serializer component",
-        "zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
-        "zendframework/zend-filter": "To support naming strategy hydrator usage"
+        "zendframework/zend-serializer": "Zend\\Serializer component"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
             "dev-master": "2.7-dev",
-            "dev-develop": "2.8-dev"
+            "dev-develop": "3.0-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/CallbackHandler.php b/src/CallbackHandler.php
diff --git a/src/Extractor/ExtractionInterface.php b/src/Extractor/ExtractionInterface.php
diff --git a/src/Hydrator/AbstractHydrator.php b/src/Hydrator/AbstractHydrator.php
diff --git a/src/Hydrator/Aggregate/AggregateHydrator.php b/src/Hydrator/Aggregate/AggregateHydrator.php
diff --git a/src/Hydrator/Aggregate/ExtractEvent.php b/src/Hydrator/Aggregate/ExtractEvent.php
diff --git a/src/Hydrator/Aggregate/HydrateEvent.php b/src/Hydrator/Aggregate/HydrateEvent.php
diff --git a/src/Hydrator/Aggregate/HydratorListener.php b/src/Hydrator/Aggregate/HydratorListener.php