cleanup (this is only for php 7.0)php70

7 files changed, 71 insertions, 731 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/0001-php-ocramius-proxy-manager-dup-the-spec.patch b/0001-php-ocramius-proxy-manager-dup-the-spec.patch
deleted file mode 100644
index 88ddda6..0000000
--- a/0001-php-ocramius-proxy-manager-dup-the-spec.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From 2083683fe048422ded32f7e176e4a3a5bca6d370 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Wed, 30 Nov 2016 18:04:10 +0100
-Subject: [PATCH] php-ocramius-proxy-manager: dup the spec
-
----
- .../php-ocramius-proxy-manager-dev.spec            |   2 +-
- .../php-ocramius-proxy-manager-php7.spec           | 194 +++++++++++++++++++++
- 2 files changed, 195 insertions(+), 1 deletion(-)
- create mode 100644 php/php-ocramius-proxy-manager/php-ocramius-proxy-manager-php7.spec
-
-diff --git a/php/php-ocramius-proxy-manager/php-ocramius-proxy-manager-dev.spec b/php/php-ocramius-proxy-manager/php-ocramius-proxy-manager-dev.spec
-index 4a04297..409cd03 100644
---- a/php/php-ocramius-proxy-manager/php-ocramius-proxy-manager-dev.spec
-+++ b/php/php-ocramius-proxy-manager/php-ocramius-proxy-manager-dev.spec
-@@ -144,7 +144,7 @@ require_once '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
- EOF
- 
- : Run tests
--%{_bindir}/phpunit --verbose --exclude-group Performance
-+php71 %{_bindir}/phpunit --verbose --exclude-group Performance
- %else
- : Tests skipped
- %endif
-diff --git a/php/php-ocramius-proxy-manager/php-ocramius-proxy-manager-php7.spec b/php/php-ocramius-proxy-manager/php-ocramius-proxy-manager-php7.spec
-new file mode 100644
-index 0000000..409cd03
---- /dev/null
-+++ b/php/php-ocramius-proxy-manager/php-ocramius-proxy-manager-php7.spec
-@@ -0,0 +1,194 @@
-+# remirepo spec file for php-ocramius-proxy-manager from Fedora:
-+#
-+# Fedora spec file for php-ocramius-proxy-manager
-+#
-+# Copyright (c) 2015-2016 Shawn Iwinski <shawn.iwinski@gmail.com>
-+#
-+# License: MIT
-+# http://opensource.org/licenses/MIT
-+#
-+# Please preserve changelog entries
-+#
-+
-+%global github_owner      Ocramius
-+%global github_name       ProxyManager
-+%global github_version    2.0.4
-+%global github_commit     a55d08229f4f614bf335759ed0cf63378feeb2e6
-+%global github_short      %(c=%{github_commit}; echo ${c:0:7})
-+
-+%global composer_vendor   ocramius
-+%global composer_project  proxy-manager
-+
-+# "php": "7.0.0 - 7.0.5 || ^7.0.7"
-+%global php_min_ver 7.0.7
-+# "zendframework/zend-code": "~3.0.0 - 3.0.2 || ^3.0.4"
-+%global zf_min_ver  3.0.4
-+%global zf_max_ver  4
-+
-+# Build using "--without tests" to disable tests
-+%global with_tests 0%{!?_without_tests:1}
-+
-+%{!?phpdir:  %global phpdir  %{_datadir}/php}
-+
-+Name:          php-%{composer_vendor}-%{composer_project}
-+Version:       %{github_version}
-+Release:       1%{?github_release}%{?dist}
-+Summary:       OOP proxy wrappers utilities
-+
-+Group:         Development/Libraries
-+License:       MIT
-+URL:           http://ocramius.github.io/ProxyManager/
-+Source0:       %{name}-%{github_version}-%{github_short}.tgz
-+# git snapshot to retrieve test suite
-+Source1:       makesrc.sh
-+
-+# Hardcode library version
-+# drop dependency on ocramius/package-versions
-+Patch0:        %{name}-rpm.patch
-+
-+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-+BuildArch:     noarch
-+# Autoloader
-+BuildRequires: %{_bindir}/phpab
-+%if %{with_tests}
-+# Tests
-+## composer.json
-+BuildRequires: php(language) >= %{php_min_ver}
-+BuildRequires: php-composer(zendframework/zend-code) >= %{zf_min_ver}
-+BuildRequires: php-composer(zendframework/zend-code) <  %{zf_max_ver}
-+BuildRequires: php-composer(zendframework/zend-loader)
-+BuildRequires: php-composer(ocramius/generated-hydrator) >= 2
-+## phpcompatinfo (computed from version 2.0.0)
-+BuildRequires: php-pcre
-+BuildRequires: php-reflection
-+BuildRequires: php-spl
-+BuildRequires: php-composer(phpunit/phpunit) >= 5.4.6
-+%endif
-+
-+# composer.json
-+Requires:      php(language) >= %{php_min_ver}
-+Requires:      php-composer(zendframework/zend-code) >= %{zf_min_ver}
-+Requires:      php-composer(zendframework/zend-code) <  %{zf_max_ver}
-+# phpcompatinfo (computed from version 2.0.0)
-+Requires:      php-pcre
-+Requires:      php-reflection
-+Requires:      php-spl
-+# Autoloader
-+Requires:      php-composer(zendframework/zend-loader)
-+
-+# Weak dependencies
-+%if 0%{?fedora} >= 21
-+Suggests:      php-composer(ocramius/generated-hydrator)
-+Suggests:      php-composer(zendframework/zend-json)
-+Suggests:      php-composer(zendframework/zend-soap)
-+Suggests:      php-composer(zendframework/zend-stdlib)
-+Suggests:      php-composer(zendframework/zend-xmlrpc)
-+%endif
-+# For autoloader
-+Conflicts:     php-ocramius-generated-hydrator < 2
-+
-+# Composer
-+Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
-+
-+
-+%description
-+This library aims at providing abstraction for generating various kinds
-+of proxy classes.
-+
-+Autoloader: %{phpdir}/ProxyManager/autoload.php
-+
-+
-+%prep
-+%setup -qn %{github_name}-%{github_commit}
-+
-+%patch0 -p0
-+sed -e 's/@VERSION@/%{version}/' \
-+    -e 's/@COMMIT@/%{github_commit}/' \
-+    -i src/ProxyManager/Version.php
-+grep ' return' src/ProxyManager/Version.php
-+
-+
-+%build
-+: Generate autoloader
-+%{_bindir}/phpab --output src/ProxyManager/autoload.php src/ProxyManager
-+
-+cat <<'AUTOLOAD' | tee -a src/ProxyManager/autoload.php
-+
-+// Dependencies (autoloader => required)
-+foreach (array(
-+    // Required
-+    '%{phpdir}/Zend/autoload.php' => true,
-+    // Optional
-+    '%{phpdir}/GeneratedHydrator/autoload.php' => false,
-+) as $dependencyAutoloader => $required) {
-+    if ($required || file_exists($dependencyAutoloader)) {
-+        require_once $dependencyAutoloader;
-+    }
-+}
-+AUTOLOAD
-+
-+
-+%install
-+rm -rf %{buildroot}
-+mkdir -p %{buildroot}%{phpdir}
-+cp -rp src/* %{buildroot}%{phpdir}/
-+
-+
-+%check
-+%if %{with_tests}
-+: Create tests autoload
-+mkdir vendor
-+%{_bindir}/phpab --output vendor/autoload.php tests
-+cat << 'EOF' | tee -a vendor/autoload.php
-+require_once '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
-+EOF
-+
-+: Run tests
-+php71 %{_bindir}/phpunit --verbose --exclude-group Performance
-+%else
-+: Tests skipped
-+%endif
-+
-+
-+%clean
-+rm -rf %{buildroot}
-+
-+
-+%files
-+%defattr(-,root,root,-)
-+%{!?_licensedir:%global license %%doc}
-+%license LICENSE
-+%doc *.md
-+%doc composer.json
-+%{phpdir}/ProxyManager
-+
-+
-+%changelog
-+* Sun Nov  6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
-+- update to 2.0.4
-+
-+* Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-2
-+- Add weak dependencies
-+- Use dependencies' autoloaders
-+
-+* Fri Jul  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-1
-+- update to 2.0.3
-+- raise dependency on zendframework/zend-code 3.0.4
-+
-+* Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
-+- update to 2.0.2
-+- raise dependency on php 7.0.7
-+- raise dependency on zendframework/zend-code 3.0
-+
-+* Mon Aug 10 2015 Remi Collet <remi@remirepo.net> - 1.0.2-1
-+- update to 1.0.2
-+
-+* Fri May 29 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-2
-+- Fix autoloader to load all optional pkgs
-+- Some spec cleanup
-+
-+* Mon May 18 2015 Remi Collet <RPMS@FamilleCollet.com> - 1.0.0-1
-+- add needed backport stuff for remi repository
-+
-+* Sat May 16 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-1
-+- Initial package
--- 
-2.9.3
-
diff --git a/composer-dev.json b/composer-dev.json
deleted file mode 100644
index 0ecb333..0000000
--- a/composer-dev.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "name":              "ocramius/proxy-manager",
-    "description":       "A library providing utilities to generate, instantiate and generally operate with Object Proxies",
-    "type":              "library",
-    "license":           "MIT",
-    "homepage":          "https://github.com/Ocramius/ProxyManager",
-    "keywords":          [
-        "proxy",
-        "proxy pattern",
-        "service proxies",
-        "lazy loading",
-        "aop"
-    ],
-    "authors": [
-        {
-            "name":     "Marco Pivetta",
-            "email":    "ocramius@gmail.com",
-            "homepage": "http://ocramius.github.io/"
-        }
-    ],
-    "require": {
-        "php":                       "^7.1.0",
-        "zendframework/zend-code":   "^3.1.0",
-        "ocramius/package-versions": "^1.1.1"
-    },
-    "require-dev": {
-        "ext-phar":                     "*",
-        "phpunit/phpunit":              "^5.6.4",
-        "phpunit/phpunit-mock-objects": "^3.4.1",
-        "squizlabs/php_codesniffer":    "^2.7.0",
-        "couscous/couscous":            "^1.5.2",
-        "phpbench/phpbench":            "^0.12.2",
-        "humbug/humbug":                "dev-master@DEV"
-    },
-    "suggest": {
-        "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects",
-        "zendframework/zend-xmlrpc":   "To have the XmlRpc adapter (Remote Object feature)",
-        "zendframework/zend-json":     "To have the JsonRpc adapter (Remote Object feature)",
-        "zendframework/zend-soap":     "To have the Soap adapter (Remote Object feature)"
-    },
-    "autoload": {
-        "psr-0": {
-            "ProxyManager\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-0": {
-            "ProxyManagerBench\\": "tests",
-            "ProxyManagerTest\\": "tests",
-            "ProxyManagerTestAsset\\": "tests"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.0.x-dev"
-        }
-    }
-}
diff --git a/composer.json b/composer.json
index 0c5d206..48e7d46 100644
--- a/composer.json
+++ b/composer.json
@@ -15,24 +15,26 @@
         {
             "name":     "Marco Pivetta",
             "email":    "ocramius@gmail.com",
-            "homepage": "http://ocramius.github.com/"
+            "homepage": "http://ocramius.github.io/"
         }
     ],
     "require": {
-        "php":                     ">=5.3.3",
-        "zendframework/zend-code": ">2.2.5,<3.0"
+        "php":                       "7.0.0 - 7.0.5 || ^7.0.7",
+        "zendframework/zend-code":   "3.0.0 - 3.0.2 || ^3.0.4",
+        "ocramius/package-versions": "^1.0"
     },
     "require-dev": {
         "ext-phar":                    "*",
-        "phpunit/phpunit":             "~4.0",
-        "squizlabs/php_codesniffer":   "1.5.*"
+        "phpunit/phpunit":             "^5.4.6",
+        "squizlabs/php_codesniffer":   "^2.6.0",
+        "couscous/couscous":           "^1.4.0",
+        "phpbench/phpbench":            "^0.11.2"
     },
     "suggest": {
-        "zendframework/zend-stdlib":   "To use the hydrator proxy",
         "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects",
-        "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)",
-        "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)",
-        "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)"
+        "zendframework/zend-xmlrpc":   "To have the XmlRpc adapter (Remote Object feature)",
+        "zendframework/zend-json":     "To have the JsonRpc adapter (Remote Object feature)",
+        "zendframework/zend-soap":     "To have the Soap adapter (Remote Object feature)"
     },
     "autoload": {
         "psr-0": {
@@ -41,13 +43,14 @@
     },
     "autoload-dev": {
         "psr-0": {
+            "ProxyManagerBench\\": "tests",
             "ProxyManagerTest\\": "tests",
             "ProxyManagerTestAsset\\": "tests"
         }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }
diff --git a/php-ocramius-proxy-manager-dev.spec b/php-ocramius-proxy-manager-dev.spec
deleted file mode 100644
index 74b559b..0000000
--- a/php-ocramius-proxy-manager-dev.spec
+++ /dev/null
@@ -1,210 +0,0 @@
-# remirepo spec file for php-ocramius-proxy-manager from Fedora:
-#
-# Fedora spec file for php-ocramius-proxy-manager
-#
-# Copyright (c) 2015-2016 Shawn Iwinski <shawn.iwinski@gmail.com>
-#
-# License: MIT
-# http://opensource.org/licenses/MIT
-#
-# Please preserve changelog entries
-#
-
-%global github_owner      Ocramius
-%global github_name       ProxyManager
-%global github_version    2.1.0
-%global github_commit     d9e5a00ca2d87b7e0f1bff36b897e02afd7d5435
-%global github_short      %(c=%{github_commit}; echo ${c:0:7})
-
-%global composer_vendor   ocramius
-%global composer_project  proxy-manager
-
-# "php": "^7.1.0"
-%global php_min_ver 7.1.0
-# "zendframework/zend-code": "^3.1.0"
-%global zf_min_ver  3.1.0
-%global zf_max_ver  4
-
-# Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
-
-%{!?phpdir:  %global phpdir  %{_datadir}/php}
-
-Name:          php-%{composer_vendor}-%{composer_project}
-Version:       %{github_version}
-Release:       1%{?github_release}%{?dist}
-Summary:       OOP proxy wrappers utilities
-
-Group:         Development/Libraries
-License:       MIT
-URL:           http://ocramius.github.io/ProxyManager/
-Source0:       %{name}-%{github_version}-%{github_short}.tgz
-# git snapshot to retrieve test suite
-Source1:       makesrc.sh
-
-# Hardcode library version
-# drop dependency on ocramius/package-versions
-Patch0:        %{name}-rpm.patch
-
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch:     noarch
-# Autoloader
-BuildRequires: %{_bindir}/phpab
-%if %{with_tests}
-# Tests
-## composer.json
-BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(zendframework/zend-code) >= %{zf_min_ver}
-BuildRequires: php-composer(zendframework/zend-code) <  %{zf_max_ver}
-BuildRequires: php-composer(zendframework/zend-loader)
-BuildRequires: php-composer(ocramius/generated-hydrator) >= 2
-## phpcompatinfo (computed from version 2.0.0)
-BuildRequires: php-pcre
-BuildRequires: php-reflection
-BuildRequires: php-spl
-BuildRequires: php-composer(phpunit/phpunit) >= 5.6.4
-%endif
-
-# composer.json
-Requires:      php(language) >= %{php_min_ver}
-Requires:      php-composer(zendframework/zend-code) >= %{zf_min_ver}
-Requires:      php-composer(zendframework/zend-code) <  %{zf_max_ver}
-# phpcompatinfo (computed from version 2.0.0)
-Requires:      php-pcre
-Requires:      php-reflection
-Requires:      php-spl
-# Autoloader
-Requires:      php-composer(zendframework/zend-loader)
-
-# Weak dependencies
-%if 0%{?fedora} >= 21
-Suggests:      php-composer(ocramius/generated-hydrator)
-Suggests:      php-composer(zendframework/zend-json)
-Suggests:      php-composer(zendframework/zend-soap)
-Suggests:      php-composer(zendframework/zend-stdlib)
-Suggests:      php-composer(zendframework/zend-xmlrpc)
-%endif
-# For autoloader
-Conflicts:     php-ocramius-generated-hydrator < 2
-
-# Composer
-Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
-
-
-%description
-This library aims at providing abstraction for generating various kinds
-of proxy classes.
-
-Autoloader: %{phpdir}/ProxyManager/autoload.php
-
-
-%prep
-%setup -qn %{github_name}-%{github_commit}
-
-%patch0 -p0
-sed -e 's/@VERSION@/%{version}/' \
-    -e 's/@COMMIT@/%{github_commit}/' \
-    -i src/ProxyManager/Version.php
-grep ' return' src/ProxyManager/Version.php
-
-
-%build
-: Generate autoloader
-%{_bindir}/phpab --output src/ProxyManager/autoload.php src/ProxyManager
-
-cat <<'AUTOLOAD' | tee -a src/ProxyManager/autoload.php
-
-// Dependencies (autoloader => required)
-foreach (array(
-    // Required
-    '%{phpdir}/Zend/autoload.php' => true,
-    // Optional
-    '%{phpdir}/GeneratedHydrator/autoload.php' => false,
-) as $dependencyAutoloader => $required) {
-    if ($required || file_exists($dependencyAutoloader)) {
-        require_once $dependencyAutoloader;
-    }
-}
-AUTOLOAD
-
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{phpdir}
-cp -rp src/* %{buildroot}%{phpdir}/
-
-
-%check
-%if %{with_tests}
-: Create tests autoload
-mkdir vendor
-%{_bindir}/phpab --output vendor/autoload.php tests
-cat << 'EOF' | tee -a vendor/autoload.php
-require_once '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
-EOF
-
-: Run tests
-# remirepo:7
-run=0
-ret=0
-if which php71; then
-   php71 %{_bindir}/phpunit || ret=1
-   run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --verbose
-# remirepo:2
-fi
-exit $ret
-%else
-: Tests skipped
-%endif
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{!?_licensedir:%global license %%doc}
-%license LICENSE
-%doc *.md
-%doc composer.json
-%{phpdir}/ProxyManager
-
-
-%changelog
-* Wed Nov 30 2016 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
-- update to 2.1.0
-- raise dependency on php 7.1
-- raise dependency on zend-code 3.1
-
-* Sun Nov  6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
-- update to 2.0.4
-
-* Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-2
-- Add weak dependencies
-- Use dependencies' autoloaders
-
-* Fri Jul  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-1
-- update to 2.0.3
-- raise dependency on zendframework/zend-code 3.0.4
-
-* Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
-- update to 2.0.2
-- raise dependency on php 7.0.7
-- raise dependency on zendframework/zend-code 3.0
-
-* Mon Aug 10 2015 Remi Collet <remi@remirepo.net> - 1.0.2-1
-- update to 1.0.2
-
-* Fri May 29 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-2
-- Fix autoloader to load all optional pkgs
-- Some spec cleanup
-
-* Mon May 18 2015 Remi Collet <RPMS@FamilleCollet.com> - 1.0.0-1
-- add needed backport stuff for remi repository
-
-* Sat May 16 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-1
-- Initial package
diff --git a/php-ocramius-proxy-manager-php7.spec b/php-ocramius-proxy-manager-php7.spec
deleted file mode 100644
index 4a04297..0000000
--- a/php-ocramius-proxy-manager-php7.spec
+++ /dev/null
@@ -1,194 +0,0 @@
-# remirepo spec file for php-ocramius-proxy-manager from Fedora:
-#
-# Fedora spec file for php-ocramius-proxy-manager
-#
-# Copyright (c) 2015-2016 Shawn Iwinski <shawn.iwinski@gmail.com>
-#
-# License: MIT
-# http://opensource.org/licenses/MIT
-#
-# Please preserve changelog entries
-#
-
-%global github_owner      Ocramius
-%global github_name       ProxyManager
-%global github_version    2.0.4
-%global github_commit     a55d08229f4f614bf335759ed0cf63378feeb2e6
-%global github_short      %(c=%{github_commit}; echo ${c:0:7})
-
-%global composer_vendor   ocramius
-%global composer_project  proxy-manager
-
-# "php": "7.0.0 - 7.0.5 || ^7.0.7"
-%global php_min_ver 7.0.7
-# "zendframework/zend-code": "~3.0.0 - 3.0.2 || ^3.0.4"
-%global zf_min_ver  3.0.4
-%global zf_max_ver  4
-
-# Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
-
-%{!?phpdir:  %global phpdir  %{_datadir}/php}
-
-Name:          php-%{composer_vendor}-%{composer_project}
-Version:       %{github_version}
-Release:       1%{?github_release}%{?dist}
-Summary:       OOP proxy wrappers utilities
-
-Group:         Development/Libraries
-License:       MIT
-URL:           http://ocramius.github.io/ProxyManager/
-Source0:       %{name}-%{github_version}-%{github_short}.tgz
-# git snapshot to retrieve test suite
-Source1:       makesrc.sh
-
-# Hardcode library version
-# drop dependency on ocramius/package-versions
-Patch0:        %{name}-rpm.patch
-
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch:     noarch
-# Autoloader
-BuildRequires: %{_bindir}/phpab
-%if %{with_tests}
-# Tests
-## composer.json
-BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(zendframework/zend-code) >= %{zf_min_ver}
-BuildRequires: php-composer(zendframework/zend-code) <  %{zf_max_ver}
-BuildRequires: php-composer(zendframework/zend-loader)
-BuildRequires: php-composer(ocramius/generated-hydrator) >= 2
-## phpcompatinfo (computed from version 2.0.0)
-BuildRequires: php-pcre
-BuildRequires: php-reflection
-BuildRequires: php-spl
-BuildRequires: php-composer(phpunit/phpunit) >= 5.4.6
-%endif
-
-# composer.json
-Requires:      php(language) >= %{php_min_ver}
-Requires:      php-composer(zendframework/zend-code) >= %{zf_min_ver}
-Requires:      php-composer(zendframework/zend-code) <  %{zf_max_ver}
-# phpcompatinfo (computed from version 2.0.0)
-Requires:      php-pcre
-Requires:      php-reflection
-Requires:      php-spl
-# Autoloader
-Requires:      php-composer(zendframework/zend-loader)
-
-# Weak dependencies
-%if 0%{?fedora} >= 21
-Suggests:      php-composer(ocramius/generated-hydrator)
-Suggests:      php-composer(zendframework/zend-json)
-Suggests:      php-composer(zendframework/zend-soap)
-Suggests:      php-composer(zendframework/zend-stdlib)
-Suggests:      php-composer(zendframework/zend-xmlrpc)
-%endif
-# For autoloader
-Conflicts:     php-ocramius-generated-hydrator < 2
-
-# Composer
-Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
-
-
-%description
-This library aims at providing abstraction for generating various kinds
-of proxy classes.
-
-Autoloader: %{phpdir}/ProxyManager/autoload.php
-
-
-%prep
-%setup -qn %{github_name}-%{github_commit}
-
-%patch0 -p0
-sed -e 's/@VERSION@/%{version}/' \
-    -e 's/@COMMIT@/%{github_commit}/' \
-    -i src/ProxyManager/Version.php
-grep ' return' src/ProxyManager/Version.php
-
-
-%build
-: Generate autoloader
-%{_bindir}/phpab --output src/ProxyManager/autoload.php src/ProxyManager
-
-cat <<'AUTOLOAD' | tee -a src/ProxyManager/autoload.php
-
-// Dependencies (autoloader => required)
-foreach (array(
-    // Required
-    '%{phpdir}/Zend/autoload.php' => true,
-    // Optional
-    '%{phpdir}/GeneratedHydrator/autoload.php' => false,
-) as $dependencyAutoloader => $required) {
-    if ($required || file_exists($dependencyAutoloader)) {
-        require_once $dependencyAutoloader;
-    }
-}
-AUTOLOAD
-
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{phpdir}
-cp -rp src/* %{buildroot}%{phpdir}/
-
-
-%check
-%if %{with_tests}
-: Create tests autoload
-mkdir vendor
-%{_bindir}/phpab --output vendor/autoload.php tests
-cat << 'EOF' | tee -a vendor/autoload.php
-require_once '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
-EOF
-
-: Run tests
-%{_bindir}/phpunit --verbose --exclude-group Performance
-%else
-: Tests skipped
-%endif
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{!?_licensedir:%global license %%doc}
-%license LICENSE
-%doc *.md
-%doc composer.json
-%{phpdir}/ProxyManager
-
-
-%changelog
-* Sun Nov  6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
-- update to 2.0.4
-
-* Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-2
-- Add weak dependencies
-- Use dependencies' autoloaders
-
-* Fri Jul  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-1
-- update to 2.0.3
-- raise dependency on zendframework/zend-code 3.0.4
-
-* Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
-- update to 2.0.2
-- raise dependency on php 7.0.7
-- raise dependency on zendframework/zend-code 3.0
-
-* Mon Aug 10 2015 Remi Collet <remi@remirepo.net> - 1.0.2-1
-- update to 1.0.2
-
-* Fri May 29 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-2
-- Fix autoloader to load all optional pkgs
-- Some spec cleanup
-
-* Mon May 18 2015 Remi Collet <RPMS@FamilleCollet.com> - 1.0.0-1
-- add needed backport stuff for remi repository
-
-* Sat May 16 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-1
-- Initial package
diff --git a/php-ocramius-proxy-manager.spec b/php-ocramius-proxy-manager.spec
index 4e9bfdd..4a04297 100644
--- a/php-ocramius-proxy-manager.spec
+++ b/php-ocramius-proxy-manager.spec
@@ -12,31 +12,39 @@
 
 %global github_owner      Ocramius
 %global github_name       ProxyManager
-%global github_version    1.0.2
-%global github_commit     57e9272ec0e8deccf09421596e0e2252df440e11
+%global github_version    2.0.4
+%global github_commit     a55d08229f4f614bf335759ed0cf63378feeb2e6
+%global github_short      %(c=%{github_commit}; echo ${c:0:7})
 
 %global composer_vendor   ocramius
 %global composer_project  proxy-manager
 
-# "php": ">=5.3.3"
-%global php_min_ver 5.3.3
-# "zendframework/zend-code": ">2.2.5,<3.0"
-%global zf_min_ver  2.2.5
-%global zf_max_ver  3.0
+# "php": "7.0.0 - 7.0.5 || ^7.0.7"
+%global php_min_ver 7.0.7
+# "zendframework/zend-code": "~3.0.0 - 3.0.2 || ^3.0.4"
+%global zf_min_ver  3.0.4
+%global zf_max_ver  4
 
+# Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       OOP proxy wrappers utilities
 
 Group:         Development/Libraries
 License:       MIT
 URL:           http://ocramius.github.io/ProxyManager/
-Source0:       https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+Source0:       %{name}-%{github_version}-%{github_short}.tgz
+# git snapshot to retrieve test suite
+Source1:       makesrc.sh
+
+# Hardcode library version
+# drop dependency on ocramius/package-versions
+Patch0:        %{name}-rpm.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:     noarch
@@ -45,25 +53,28 @@ BuildRequires: %{_bindir}/phpab
 %if %{with_tests}
 # Tests
 ## composer.json
-BuildRequires: %{_bindir}/phpunit
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(zendframework/zend-code) >= %{zf_min_ver}
 BuildRequires: php-composer(zendframework/zend-code) <  %{zf_max_ver}
-BuildRequires: php-composer(ocramius/generated-hydrator) >= 1.2.0
-## phpcompatinfo (computed from version 1.0.2)
+BuildRequires: php-composer(zendframework/zend-loader)
+BuildRequires: php-composer(ocramius/generated-hydrator) >= 2
+## phpcompatinfo (computed from version 2.0.0)
 BuildRequires: php-pcre
 BuildRequires: php-reflection
 BuildRequires: php-spl
+BuildRequires: php-composer(phpunit/phpunit) >= 5.4.6
 %endif
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
 Requires:      php-composer(zendframework/zend-code) >= %{zf_min_ver}
 Requires:      php-composer(zendframework/zend-code) <  %{zf_max_ver}
-# phpcompatinfo (computed from version 1.0.2)
+# phpcompatinfo (computed from version 2.0.0)
 Requires:      php-pcre
 Requires:      php-reflection
 Requires:      php-spl
+# Autoloader
+Requires:      php-composer(zendframework/zend-loader)
 
 # Weak dependencies
 %if 0%{?fedora} >= 21
@@ -74,15 +85,15 @@ Suggests:      php-composer(zendframework/zend-stdlib)
 Suggests:      php-composer(zendframework/zend-xmlrpc)
 %endif
 # For autoloader
-Conflicts:     php-ocramius-generated-hydrator < 1.2.0
-
+Conflicts:     php-ocramius-generated-hydrator < 2
 
 # Composer
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
+
 %description
-A library providing utilities to generate, instantiate and generally operate
-with Object Proxies.
+This library aims at providing abstraction for generating various kinds
+of proxy classes.
 
 Autoloader: %{phpdir}/ProxyManager/autoload.php
 
@@ -90,6 +101,12 @@ Autoloader: %{phpdir}/ProxyManager/autoload.php
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
+%patch0 -p0
+sed -e 's/@VERSION@/%{version}/' \
+    -e 's/@COMMIT@/%{github_commit}/' \
+    -i src/ProxyManager/Version.php
+grep ' return' src/ProxyManager/Version.php
+
 
 %build
 : Generate autoloader
@@ -120,19 +137,11 @@ cp -rp src/* %{buildroot}%{phpdir}/
 %check
 %if %{with_tests}
 : Create tests autoload
-%{_bindir}/phpab --output tests/autoload.php tests %{phpdir}/PHPUnit
-
-: Create mock Composer "vendor/autoload.php"
 mkdir vendor
-cat <<'AUTOLOAD' | tee vendor/autoload.php
-<?php
-require __DIR__.'/../tests/autoload.php';
-require '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
-AUTOLOAD
-
-: Skip test known to fail
-sed 's/function testCodeGeneration/function SKIP_testCodeGeneration/' \
-    -i tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php
+%{_bindir}/phpab --output vendor/autoload.php tests
+cat << 'EOF' | tee -a vendor/autoload.php
+require_once '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
+EOF
 
 : Run tests
 %{_bindir}/phpunit --verbose --exclude-group Performance
@@ -155,11 +164,21 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Oct 18 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.2-2
-- Update to 1.0.2 (RHBZ #1251784)
+* Sun Nov  6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
+- update to 2.0.4
+
+* Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-2
 - Add weak dependencies
 - Use dependencies' autoloaders
-- Temporarily skip tests on Fedora 25+ (RHBZ #1350615)
+
+* Fri Jul  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-1
+- update to 2.0.3
+- raise dependency on zendframework/zend-code 3.0.4
+
+* Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 2.0.2-1
+- update to 2.0.2
+- raise dependency on php 7.0.7
+- raise dependency on zendframework/zend-code 3.0
 
 * Mon Aug 10 2015 Remi Collet <remi@remirepo.net> - 1.0.2-1
 - update to 1.0.2