v3.3.2

2 files changed, 44 insertions, 28 deletions

diff --git a/composer.json b/composer.json
index ee40642..8b18187 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,24 @@
 {
     "name": "zendframework/zend-servicemanager",
-    "description": " ",
+    "description": "Factory-Driven Dependency Injection Container",
     "license": "BSD-3-Clause",
     "keywords": [
+        "di",
+        "dic",
+        "dependency-injection",
+        "psr-11",
         "zf",
+        "zendframework",
         "servicemanager",
         "service-manager"
     ],
-    "homepage": "https://github.com/zendframework/zend-servicemanager",
-    "autoload": {
-        "psr-4": {
-            "Zend\\ServiceManager\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-servicemanager/",
+        "issues": "https://github.com/zendframework/zend-servicemanager/issues",
+        "source": "https://github.com/zendframework/zend-servicemanager",
+        "rss": "https://github.com/zendframework/zend-servicemanager/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
         "php": "^5.6 || ^7.0",
@@ -20,22 +27,23 @@
         "zendframework/zend-stdlib": "^3.1"
     },
     "require-dev": {
+        "mikey179/vfsStream": "^1.6.5",
         "ocramius/proxy-manager": "^1.0 || ^2.0",
-        "phpbench/phpbench": "^0.10.0",
-        "phpunit/phpunit": "^5.7 || ^6.0.6",
-        "mikey179/vfsStream": "^1.6",
+        "phpbench/phpbench": "^0.13.0",
+        "phpunit/phpunit": "^5.7.25 || ^6.4.4",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
+    "provide": {
+        "container-interop/container-interop-implementation": "^1.2",
+        "psr/container-implementation": "^1.0"
+    },
     "suggest": {
         "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services",
         "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.3-dev",
-            "dev-develop": "4.0-dev"
+    "autoload": {
+        "psr-4": {
+            "Zend\\ServiceManager\\": "src/"
         }
     },
     "autoload-dev": {
@@ -44,9 +52,14 @@
             "ZendBench\\ServiceManager\\": "benchmarks/"
         }
     },
-    "provide": {
-        "container-interop/container-interop-implementation": "^1.2",
-        "psr/container-implementation": "^1.0"
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.3-dev",
+            "dev-develop": "4.0-dev"
+        }
     },
     "bin": [
         "bin/generate-deps-for-config-factory",
diff --git a/php-zendframework-zend-servicemanager.spec b/php-zendframework-zend-servicemanager.spec
index 181c1ca..efb62f3 100644
--- a/php-zendframework-zend-servicemanager.spec
+++ b/php-zendframework-zend-servicemanager.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    0fa3d3cf588dde0850fff1efa60d44a7aa3c3ab7
+%global gh_commit    9f35a104b8d4d3b32da5f4a3b6efc0dd62e5af42
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-servicemanager
@@ -20,8 +20,8 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        3.3.1
-Release:        1%{?dist}
+Version:        3.3.2
+Release:        2%{?dist}
 Summary:        Zend Framework %{library} component
 
 Group:          Development/Libraries
@@ -42,14 +42,14 @@ BuildRequires:  php-date
 BuildRequires:  php-json
 BuildRequires:  php-spl
 # From composer, "require-dev": {
+#        "mikey179/vfsStream": "^1.6.5",
 #        "ocramius/proxy-manager": "^1.0 || ^2.0",
-#        "phpbench/phpbench": "^0.10.0",
-#        "phpunit/phpunit": "^5.7 || ^6.0.6"
-#        "mikey179/vfsStream": "^1.6",
+#        "phpbench/phpbench": "^0.13.0",
+#        "phpunit/phpunit": "^5.7.25 || ^6.4.4"
 #        "zendframework/zend-coding-standard": "~1.0.0"
-BuildRequires:  php-composer(phpunit/phpunit)                   >= 5.7
+BuildRequires:  php-composer(mikey179/vfsStream)                >= 1.6.5
 BuildRequires:  php-composer(ocramius/proxy-manager)            >= 1.0
-BuildRequires:  php-composer(mikey179/vfsStream)                >= 1.6
+BuildRequires:  phpunit6 >= 6.4.4
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
@@ -147,9 +147,9 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php71 php72; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit --verbose || ret=1
+    $cmd %{_bindir}/phpunit6 --verbose || ret=1
   fi
 done
 exit $ret
@@ -168,6 +168,9 @@ exit $ret
 
 
 %changelog
+* Wed Jan 31 2018 Remi Collet <remi@remirepo.net> - 3.3.2-1
+- Update to 3.3.2
+
 * Tue Nov 28 2017 Remi Collet <remi@remirepo.net> - 3.3.1-1
 - Update to 3.3.1