diff options
| -rw-r--r-- | 31.patch | 1247 | ||||
| -rw-r--r-- | composer.json | 16 | ||||
| -rw-r--r-- | php-zendframework-zend-serializer.spec | 19 |
3 files changed, 24 insertions, 1258 deletions
diff --git a/31.patch b/31.patch deleted file mode 100644 index 6b313df..0000000 --- a/31.patch +++ /dev/null @@ -1,1247 +0,0 @@ -From 09332136b282399b6a33c09d6f4b09339e16a6b6 Mon Sep 17 00:00:00 2001 -From: Marc Bennewitz <marc@mabe.berlin> -Date: Sun, 5 Nov 2017 15:36:54 +0100 -Subject: [PATCH] fixed #30 - wrong use of variable variables - ---- - composer.json | 2 +- - composer.lock | 638 +++++++++++++++++++++++++++++++------------ - src/Adapter/PythonPickle.php | 11 +- - 3 files changed, 463 insertions(+), 188 deletions(-) - -diff --git a/composer.json b/composer.json -index 9da0982..70c1a98 100644 ---- a/composer.json -+++ b/composer.json -@@ -21,7 +21,7 @@ - "zendframework/zend-math": "^2.6", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "squizlabs/php_codesniffer": "^2.3.1", -- "phpunit/phpunit": "^4.5" -+ "phpunit/phpunit": "^5.5" - }, - "suggest": { - "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization", -diff --git a/composer.lock b/composer.lock -index f79e1cb..e331e02 100644 ---- a/composer.lock -+++ b/composer.lock -@@ -4,8 +4,8 @@ - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], -- "hash": "6f27a6846cf487fb136e6f34dd53ec81", -- "content-hash": "3a061fde20510fe515dc90291b4b4db6", -+ "hash": "5cf99757a251156c6e7122ddc5e71ea0", -+ "content-hash": "b299f84a2b7ce3339b7931b313a55969", - "packages": [ - { - "name": "zendframework/zend-json", -@@ -59,31 +59,31 @@ - }, - { - "name": "zendframework/zend-stdlib", -- "version": "3.0.1", -+ "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", -- "reference": "8bafa58574204bdff03c275d1d618aaa601588ae" -+ "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8bafa58574204bdff03c275d1d618aaa601588ae", -- "reference": "8bafa58574204bdff03c275d1d618aaa601588ae", -+ "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78", -+ "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78", - "shasum": "" - }, - "require": { -- "php": "^5.5 || ^7.0" -+ "php": "^5.6 || ^7.0" - }, - "require-dev": { - "athletic/athletic": "~0.1", -- "fabpot/php-cs-fixer": "1.7.*", -- "phpunit/phpunit": "~4.0" -+ "phpunit/phpunit": "~4.0", -+ "squizlabs/php_codesniffer": "^2.6.2" - }, - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "3.0-dev", -- "dev-develop": "3.1-dev" -+ "dev-master": "3.1-dev", -+ "dev-develop": "3.2-dev" - } - }, - "autoload": { -@@ -100,24 +100,27 @@ - "stdlib", - "zf2" - ], -- "time": "2016-04-12 21:19:36" -+ "time": "2016-09-13 14:38:50" - } - ], - "packages-dev": [ - { - "name": "container-interop/container-interop", -- "version": "1.1.0", -+ "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/container-interop/container-interop.git", -- "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e" -+ "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e", -- "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e", -+ "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", -+ "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "shasum": "" - }, -+ "require": { -+ "psr/container": "^1.0" -+ }, - "type": "library", - "autoload": { - "psr-4": { -@@ -129,7 +132,8 @@ - "MIT" - ], - "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", -- "time": "2014-12-30 15:22:37" -+ "homepage": "https://github.com/container-interop/container-interop", -+ "time": "2017-02-14 19:40:03" - }, - { - "name": "doctrine/instantiator", -@@ -186,17 +190,62 @@ - "time": "2015-06-14 21:17:01" - }, - { -+ "name": "myclabs/deep-copy", -+ "version": "1.7.0", -+ "source": { -+ "type": "git", -+ "url": "https://github.com/myclabs/DeepCopy.git", -+ "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" -+ }, -+ "dist": { -+ "type": "zip", -+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", -+ "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", -+ "shasum": "" -+ }, -+ "require": { -+ "php": "^5.6 || ^7.0" -+ }, -+ "require-dev": { -+ "doctrine/collections": "^1.0", -+ "doctrine/common": "^2.6", -+ "phpunit/phpunit": "^4.1" -+ }, -+ "type": "library", -+ "autoload": { -+ "psr-4": { -+ "DeepCopy\\": "src/DeepCopy/" -+ }, -+ "files": [ -+ "src/DeepCopy/deep_copy.php" -+ ] -+ }, -+ "notification-url": "https://packagist.org/downloads/", -+ "license": [ -+ "MIT" -+ ], -+ "description": "Create deep copies (clones) of your objects", -+ "keywords": [ -+ "clone", -+ "copy", -+ "duplicate", -+ "object", -+ "object graph" -+ ], -+ "time": "2017-10-19 19:58:43" -+ }, -+ { - "name": "phpdocumentor/reflection-common", -- "version": "1.0", -+ "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", -- "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" -+ "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", -- "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", -+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", -+ "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", - "shasum": "" - }, - "require": { -@@ -237,26 +286,26 @@ - "reflection", - "static analysis" - ], -- "time": "2015-12-27 11:43:31" -+ "time": "2017-09-11 18:02:19" - }, - { - "name": "phpdocumentor/reflection-docblock", -- "version": "3.1.0", -+ "version": "4.1.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", -- "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" -+ "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", -- "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", -+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2", -+ "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2", - "shasum": "" - }, - "require": { -- "php": ">=5.5", -+ "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0@dev", -- "phpdocumentor/type-resolver": "^0.2.0", -+ "phpdocumentor/type-resolver": "^0.4.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { -@@ -282,24 +331,24 @@ - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", -- "time": "2016-06-10 09:48:41" -+ "time": "2017-08-30 18:51:59" - }, - { - "name": "phpdocumentor/type-resolver", -- "version": "0.2", -+ "version": "0.4.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", -- "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" -+ "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443", -- "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", -+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", -+ "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", - "shasum": "" - }, - "require": { -- "php": ">=5.5", -+ "php": "^5.5 || ^7.0", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { -@@ -329,36 +378,37 @@ - "email": "me@mikevanriel.com" - } - ], -- "time": "2016-06-10 07:14:17" -+ "time": "2017-07-14 14:27:02" - }, - { - "name": "phpspec/prophecy", -- "version": "v1.6.1", -+ "version": "v1.7.2", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", -- "reference": "58a8137754bc24b25740d4281399a4a3596058e0" -+ "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0", -- "reference": "58a8137754bc24b25740d4281399a4a3596058e0", -+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", -+ "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", -- "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", -- "sebastian/comparator": "^1.1", -- "sebastian/recursion-context": "^1.0" -+ "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", -+ "sebastian/comparator": "^1.1|^2.0", -+ "sebastian/recursion-context": "^1.0|^2.0|^3.0" - }, - "require-dev": { -- "phpspec/phpspec": "^2.0" -+ "phpspec/phpspec": "^2.5|^3.2", -+ "phpunit/phpunit": "^4.8 || ^5.6.5" - }, - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "1.6.x-dev" -+ "dev-master": "1.7.x-dev" - } - }, - "autoload": { -@@ -391,43 +441,44 @@ - "spy", - "stub" - ], -- "time": "2016-06-07 08:13:47" -+ "time": "2017-09-04 11:05:03" - }, - { - "name": "phpunit/php-code-coverage", -- "version": "2.2.4", -+ "version": "4.0.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", -- "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" -+ "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", -- "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", -+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", -+ "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", - "shasum": "" - }, - "require": { -- "php": ">=5.3.3", -- "phpunit/php-file-iterator": "~1.3", -- "phpunit/php-text-template": "~1.2", -- "phpunit/php-token-stream": "~1.3", -- "sebastian/environment": "^1.3.2", -- "sebastian/version": "~1.0" -+ "ext-dom": "*", -+ "ext-xmlwriter": "*", -+ "php": "^5.6 || ^7.0", -+ "phpunit/php-file-iterator": "^1.3", -+ "phpunit/php-text-template": "^1.2", -+ "phpunit/php-token-stream": "^1.4.2 || ^2.0", -+ "sebastian/code-unit-reverse-lookup": "^1.0", -+ "sebastian/environment": "^1.3.2 || ^2.0", -+ "sebastian/version": "^1.0 || ^2.0" - }, - "require-dev": { -- "ext-xdebug": ">=2.1.4", -- "phpunit/phpunit": "~4" -+ "ext-xdebug": "^2.1.4", -+ "phpunit/phpunit": "^5.7" - }, - "suggest": { -- "ext-dom": "*", -- "ext-xdebug": ">=2.2.1", -- "ext-xmlwriter": "*" -+ "ext-xdebug": "^2.5.1" - }, - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "2.2.x-dev" -+ "dev-master": "4.0.x-dev" - } - }, - "autoload": { -@@ -453,20 +504,20 @@ - "testing", - "xunit" - ], -- "time": "2015-10-06 15:47:00" -+ "time": "2017-04-02 07:44:40" - }, - { - "name": "phpunit/php-file-iterator", -- "version": "1.4.1", -+ "version": "1.4.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", -- "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" -+ "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", -- "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", -+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", -+ "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "shasum": "" - }, - "require": { -@@ -500,7 +551,7 @@ - "filesystem", - "iterator" - ], -- "time": "2015-06-21 13:08:43" -+ "time": "2016-10-03 07:40:28" - }, - { - "name": "phpunit/php-text-template", -@@ -545,25 +596,30 @@ - }, - { - "name": "phpunit/php-timer", -- "version": "1.0.8", -+ "version": "1.0.9", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", -- "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" -+ "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", -- "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", -+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", -+ "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "shasum": "" - }, - "require": { -- "php": ">=5.3.3" -+ "php": "^5.3.3 || ^7.0" - }, - "require-dev": { -- "phpunit/phpunit": "~4|~5" -+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "type": "library", -+ "extra": { -+ "branch-alias": { -+ "dev-master": "1.0-dev" -+ } -+ }, - "autoload": { - "classmap": [ - "src/" -@@ -585,33 +641,33 @@ - "keywords": [ - "timer" - ], -- "time": "2016-05-12 18:03:57" -+ "time": "2017-02-26 11:10:40" - }, - { - "name": "phpunit/php-token-stream", -- "version": "1.4.8", -+ "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", -- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" -+ "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", -- "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", -+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0", -+ "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", -- "php": ">=5.3.3" -+ "php": "^7.0" - }, - "require-dev": { -- "phpunit/phpunit": "~4.2" -+ "phpunit/phpunit": "^6.2.4" - }, - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "1.4-dev" -+ "dev-master": "2.0-dev" - } - }, - "autoload": { -@@ -634,44 +690,54 @@ - "keywords": [ - "tokenizer" - ], -- "time": "2015-09-15 10:49:45" -+ "time": "2017-08-20 05:47:52" - }, - { - "name": "phpunit/phpunit", -- "version": "4.8.26", -+ "version": "5.7.23", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", -- "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74" -+ "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74", -- "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74", -+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/78532d5269d984660080d8e0f4c99c5c2ea65ffe", -+ "reference": "78532d5269d984660080d8e0f4c99c5c2ea65ffe", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-json": "*", -- "ext-pcre": "*", -- "ext-reflection": "*", -- "ext-spl": "*", -- "php": ">=5.3.3", -- "phpspec/prophecy": "^1.3.1", -- "phpunit/php-code-coverage": "~2.1", -+ "ext-libxml": "*", -+ "ext-mbstring": "*", -+ "ext-xml": "*", -+ "myclabs/deep-copy": "~1.3", -+ "php": "^5.6 || ^7.0", -+ "phpspec/prophecy": "^1.6.2", -+ "phpunit/php-code-coverage": "^4.0.4", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", -- "phpunit/phpunit-mock-objects": "~2.3", -- "sebastian/comparator": "~1.1", -- "sebastian/diff": "~1.2", -- "sebastian/environment": "~1.3", -- "sebastian/exporter": "~1.2", -- "sebastian/global-state": "~1.0", -- "sebastian/version": "~1.0", -+ "phpunit/phpunit-mock-objects": "^3.2", -+ "sebastian/comparator": "^1.2.4", -+ "sebastian/diff": "^1.4.3", -+ "sebastian/environment": "^1.3.4 || ^2.0", -+ "sebastian/exporter": "~2.0", -+ "sebastian/global-state": "^1.1", -+ "sebastian/object-enumerator": "~2.0", -+ "sebastian/resource-operations": "~1.0", -+ "sebastian/version": "~1.0.3|~2.0", - "symfony/yaml": "~2.1|~3.0" - }, -+ "conflict": { -+ "phpdocumentor/reflection-docblock": "3.0.2" -+ }, -+ "require-dev": { -+ "ext-pdo": "*" -+ }, - "suggest": { -+ "ext-xdebug": "*", - "phpunit/php-invoker": "~1.1" - }, - "bin": [ -@@ -680,7 +746,7 @@ - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "4.8.x-dev" -+ "dev-master": "5.7.x-dev" - } - }, - "autoload": { -@@ -706,30 +772,33 @@ - "testing", - "xunit" - ], -- "time": "2016-05-17 03:09:28" -+ "time": "2017-10-15 06:13:55" - }, - { - "name": "phpunit/phpunit-mock-objects", -- "version": "2.3.8", -+ "version": "3.4.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", -- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" -+ "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", -- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", -+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", -+ "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", -- "php": ">=5.3.3", -- "phpunit/php-text-template": "~1.2", -- "sebastian/exporter": "~1.2" -+ "php": "^5.6 || ^7.0", -+ "phpunit/php-text-template": "^1.2", -+ "sebastian/exporter": "^1.2 || ^2.0" -+ }, -+ "conflict": { -+ "phpunit/phpunit": "<5.4.0" - }, - "require-dev": { -- "phpunit/phpunit": "~4.4" -+ "phpunit/phpunit": "^5.4" - }, - "suggest": { - "ext-soap": "*" -@@ -737,7 +806,7 @@ - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "2.3.x-dev" -+ "dev-master": "3.2.x-dev" - } - }, - "autoload": { -@@ -762,26 +831,120 @@ - "mock", - "xunit" - ], -- "time": "2015-10-02 06:51:40" -+ "time": "2017-06-30 09:13:00" -+ }, -+ { -+ "name": "psr/container", -+ "version": "1.0.0", -+ "source": { -+ "type": "git", -+ "url": "https://github.com/php-fig/container.git", -+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" -+ }, -+ "dist": { -+ "type": "zip", -+ "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", -+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", -+ "shasum": "" -+ }, -+ "require": { -+ "php": ">=5.3.0" -+ }, -+ "type": "library", -+ "extra": { -+ "branch-alias": { -+ "dev-master": "1.0.x-dev" -+ } -+ }, -+ "autoload": { -+ "psr-4": { -+ "Psr\\Container\\": "src/" -+ } -+ }, -+ "notification-url": "https://packagist.org/downloads/", -+ "license": [ -+ "MIT" -+ ], -+ "authors": [ -+ { -+ "name": "PHP-FIG", -+ "homepage": "http://www.php-fig.org/" -+ } -+ ], -+ "description": "Common Container Interface (PHP FIG PSR-11)", -+ "homepage": "https://github.com/php-fig/container", -+ "keywords": [ -+ "PSR-11", -+ "container", -+ "container-interface", -+ "container-interop", -+ "psr" -+ ], -+ "time": "2017-02-14 16:28:37" -+ }, -+ { -+ "name": "sebastian/code-unit-reverse-lookup", -+ "version": "1.0.1", -+ "source": { -+ "type": "git", -+ "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", -+ "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" -+ }, -+ "dist": { -+ "type": "zip", -+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", -+ "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", -+ "shasum": "" -+ }, -+ "require": { -+ "php": "^5.6 || ^7.0" -+ }, -+ "require-dev": { -+ "phpunit/phpunit": "^5.7 || ^6.0" -+ }, -+ "type": "library", -+ "extra": { -+ "branch-alias": { -+ "dev-master": "1.0.x-dev" -+ } -+ }, -+ "autoload": { -+ "classmap": [ -+ "src/" -+ ] -+ }, -+ "notification-url": "https://packagist.org/downloads/", -+ "license": [ -+ "BSD-3-Clause" -+ ], -+ "authors": [ -+ { -+ "name": "Sebastian Bergmann", -+ "email": "sebastian@phpunit.de" -+ } -+ ], -+ "description": "Looks up which function or method a line of code belongs to", -+ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", -+ "time": "2017-03-04 06:30:41" - }, - { - "name": "sebastian/comparator", -- "version": "1.2.0", -+ "version": "1.2.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", -- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" -+ "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", -- "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", -+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", -+ "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", -- "sebastian/exporter": "~1.2" -+ "sebastian/exporter": "~1.2 || ~2.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" -@@ -826,27 +989,27 @@ - "compare", - "equality" - ], -- "time": "2015-07-26 15:48:44" -+ "time": "2017-01-29 09:50:25" - }, - { - "name": "sebastian/diff", -- "version": "1.4.1", -+ "version": "1.4.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", -- "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" -+ "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", -- "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", -+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", -+ "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", - "shasum": "" - }, - "require": { -- "php": ">=5.3.3" -+ "php": "^5.3.3 || ^7.0" - }, - "require-dev": { -- "phpunit/phpunit": "~4.8" -+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "type": "library", - "extra": { -@@ -878,32 +1041,32 @@ - "keywords": [ - "diff" - ], -- "time": "2015-12-08 07:14:41" -+ "time": "2017-05-22 07:24:03" - }, - { - "name": "sebastian/environment", -- "version": "1.3.7", -+ "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", -- "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" -+ "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", -- "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", -+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", -+ "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "shasum": "" - }, - "require": { -- "php": ">=5.3.3" -+ "php": "^5.6 || ^7.0" - }, - "require-dev": { -- "phpunit/phpunit": "~4.4" -+ "phpunit/phpunit": "^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "1.3.x-dev" -+ "dev-master": "2.0.x-dev" - } - }, - "autoload": { -@@ -928,25 +1091,25 @@ - "environment", - "hhvm" - ], -- "time": "2016-05-17 03:18:57" -+ "time": "2016-11-26 07:53:53" - }, - { - "name": "sebastian/exporter", -- "version": "1.2.2", -+ "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", -- "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" -+ "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", -- "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", -+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", -+ "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", -- "sebastian/recursion-context": "~1.0" -+ "sebastian/recursion-context": "~2.0" - }, - "require-dev": { - "ext-mbstring": "*", -@@ -955,7 +1118,7 @@ - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "1.3.x-dev" -+ "dev-master": "2.0.x-dev" - } - }, - "autoload": { -@@ -995,7 +1158,7 @@ - "export", - "exporter" - ], -- "time": "2016-06-17 09:04:28" -+ "time": "2016-11-19 08:54:04" - }, - { - "name": "sebastian/global-state", -@@ -1049,17 +1212,63 @@ - "time": "2015-10-12 03:26:01" - }, - { -+ "name": "sebastian/object-enumerator", -+ "version": "2.0.1", -+ "source": { -+ "type": "git", -+ "url": "https://github.com/sebastianbergmann/object-enumerator.git", -+ "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" -+ }, -+ "dist": { -+ "type": "zip", -+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", -+ "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", -+ "shasum": "" -+ }, -+ "require": { -+ "php": ">=5.6", -+ "sebastian/recursion-context": "~2.0" -+ }, -+ "require-dev": { -+ "phpunit/phpunit": "~5" -+ }, -+ "type": "library", -+ "extra": { -+ "branch-alias": { -+ "dev-master": "2.0.x-dev" -+ } -+ }, -+ "autoload": { -+ "classmap": [ -+ "src/" -+ ] -+ }, -+ "notification-url": "https://packagist.org/downloads/", -+ "license": [ -+ "BSD-3-Clause" -+ ], -+ "authors": [ -+ { -+ "name": "Sebastian Bergmann", -+ "email": "sebastian@phpunit.de" -+ } -+ ], -+ "description": "Traverses array structures and object graphs to enumerate all referenced objects", -+ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", -+ "time": "2017-02-18 15:18:39" -+ }, -+ { - "name": "sebastian/recursion-context", -- "version": "1.0.2", -+ "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", -- "reference": "913401df809e99e4f47b27cdd781f4a258d58791" -+ "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", -- "reference": "913401df809e99e4f47b27cdd781f4a258d58791", -+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", -+ "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "shasum": "" - }, - "require": { -@@ -1071,7 +1280,7 @@ - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "1.0.x-dev" -+ "dev-master": "2.0.x-dev" - } - }, - "autoload": { -@@ -1099,23 +1308,73 @@ - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", -- "time": "2015-11-11 19:50:13" -+ "time": "2016-11-19 07:33:16" -+ }, -+ { -+ "name": "sebastian/resource-operations", -+ "version": "1.0.0", -+ "source": { -+ "type": "git", -+ "url": "https://github.com/sebastianbergmann/resource-operations.git", -+ "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" -+ }, -+ "dist": { -+ "type": "zip", -+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", -+ "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", -+ "shasum": "" -+ }, -+ "require": { -+ "php": ">=5.6.0" -+ }, -+ "type": "library", -+ "extra": { -+ "branch-alias": { -+ "dev-master": "1.0.x-dev" -+ } -+ }, -+ "autoload": { -+ "classmap": [ -+ "src/" -+ ] -+ }, -+ "notification-url": "https://packagist.org/downloads/", -+ "license": [ -+ "BSD-3-Clause" -+ ], -+ "authors": [ -+ { -+ "name": "Sebastian Bergmann", -+ "email": "sebastian@phpunit.de" -+ } -+ ], -+ "description": "Provides a list of PHP built-in functions that operate on resources", -+ "homepage": "https://www.github.com/sebastianbergmann/resource-operations", -+ "time": "2015-07-28 20:34:47" - }, - { - "name": "sebastian/version", -- "version": "1.0.6", -+ "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", -- "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" -+ "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", -- "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", -+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", -+ "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", - "shasum": "" - }, -+ "require": { -+ "php": ">=5.6" -+ }, - "type": "library", -+ "extra": { -+ "branch-alias": { -+ "dev-master": "2.0.x-dev" -+ } -+ }, - "autoload": { - "classmap": [ - "src/" -@@ -1134,20 +1393,20 @@ - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", -- "time": "2015-06-21 13:59:46" -+ "time": "2016-10-03 07:35:21" - }, - { - "name": "squizlabs/php_codesniffer", -- "version": "2.6.1", -+ "version": "2.9.1", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", -- "reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d" -+ "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/fb72ed32f8418db5e7770be1653e62e0d6f5dd3d", -- "reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d", -+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", -+ "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", - "shasum": "" - }, - "require": { -@@ -1212,29 +1471,35 @@ - "phpcs", - "standards" - ], -- "time": "2016-05-30 22:24:32" -+ "time": "2017-05-22 02:43:20" - }, - { - "name": "symfony/yaml", -- "version": "v3.1.1", -+ "version": "v3.3.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", -- "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623" -+ "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/symfony/yaml/zipball/c5a7e7fc273c758b92b85dcb9c46149ccda89623", -- "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623", -+ "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", -+ "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", - "shasum": "" - }, - "require": { -- "php": ">=5.5.9" -+ "php": "^5.5.9|>=7.0.8" -+ }, -+ "require-dev": { -+ "symfony/console": "~2.8|~3.0" -+ }, -+ "suggest": { -+ "symfony/console": "For validating YAML files using the lint command" - }, - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "3.1-dev" -+ "dev-master": "3.3-dev" - } - }, - "autoload": { -@@ -1261,32 +1526,33 @@ - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", -- "time": "2016-06-14 11:18:07" -+ "time": "2017-10-05 14:43:42" - }, - { - "name": "webmozart/assert", -- "version": "1.0.2", -+ "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", -- "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" -+ "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", -- "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", -+ "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", -+ "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", - "shasum": "" - }, - "require": { -- "php": ">=5.3.3" -+ "php": "^5.3.3 || ^7.0" - }, - "require-dev": { -- "phpunit/phpunit": "^4.6" -+ "phpunit/phpunit": "^4.6", -+ "sebastian/version": "^1.0.1" - }, - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "1.0-dev" -+ "dev-master": "1.3-dev" - } - }, - "autoload": { -@@ -1310,7 +1576,7 @@ - "check", - "validate" - ], -- "time": "2015-08-24 13:29:44" -+ "time": "2016-11-23 20:04:58" - }, - { - "name": "zendframework/zend-math", -@@ -1364,40 +1630,48 @@ - }, - { - "name": "zendframework/zend-servicemanager", -- "version": "3.1.0", -+ "version": "3.3.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-servicemanager.git", -- "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25" -+ "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0" - }, - "dist": { - "type": "zip", -- "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/90b88339a4b937c6bb0055ee04b2567e7e628f25", -- "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25", -+ "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/c3036efb81f71bfa36cc9962ee5d4474f36581d0", -+ "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0", - "shasum": "" - }, - "require": { -- "container-interop/container-interop": "~1.0", -- "php": "^5.5 || ^7.0" -+ "container-interop/container-interop": "^1.2", -+ "php": "^5.6 || ^7.0", -+ "psr/container": "^1.0", -+ "zendframework/zend-stdlib": "^3.1" - }, - "provide": { -- "container-interop/container-interop-implementation": "^1.1" -+ "container-interop/container-interop-implementation": "^1.2", -+ "psr/container-implementation": "^1.0" - }, - "require-dev": { -+ "mikey179/vfsstream": "^1.6", - "ocramius/proxy-manager": "^1.0 || ^2.0", - "phpbench/phpbench": "^0.10.0", -- "phpunit/phpunit": "^4.6 || ^5.2.10", -- "squizlabs/php_codesniffer": "^2.5.1" -+ "phpunit/phpunit": "^5.7 || ^6.0.6", -+ "zendframework/zend-coding-standard": "~1.0.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" - }, -+ "bin": [ -+ "bin/generate-deps-for-config-factory", -+ "bin/generate-factory-for-class" -+ ], - "type": "library", - "extra": { - "branch-alias": { -- "dev-master": "3.0-dev", -- "dev-develop": "3.1-dev" -+ "dev-master": "3.3-dev", -+ "dev-develop": "3.4-dev" - } - }, - "autoload": { -@@ -1415,7 +1689,7 @@ - "servicemanager", - "zf" - ], -- "time": "2016-06-01 16:50:58" -+ "time": "2017-03-01 22:08:02" - } - ], - "aliases": [], -diff --git a/src/Adapter/PythonPickle.php b/src/Adapter/PythonPickle.php -index 75f6cbe..6daa41d 100644 ---- a/src/Adapter/PythonPickle.php -+++ b/src/Adapter/PythonPickle.php -@@ -911,7 +911,7 @@ protected function loadLong4() - { - $nBin = $this->read(4); - if (static::$isLittleEndian === false) { -- $nBin = strrev($$nBin); -+ $nBin = strrev($nBin); - } - list(, $n) = unpack('l', $nBin); - $data = $this->read($n); -@@ -984,7 +984,7 @@ protected function loadBinBytes() - // read byte length - $nBin = $this->read(4); - if (static::$isLittleEndian === false) { -- $nBin = strrev($$nBin); -+ $nBin = strrev($nBin); - } - list(, $n) = unpack('l', $nBin); - $this->stack[] = $this->read($n); -@@ -1337,9 +1337,10 @@ protected function decodeBinLong($data) - if ($this->bigIntegerAdapter === null) { - $this->bigIntegerAdapter = BigInteger\BigInteger::getDefaultAdapter(); - } -- if (static::$isLittleEndian === true) { -- $data = strrev($data); -- } -+ -+ // bigInt expects binary data as BigEndian -+ $data = strrev($data); -+ - $long = $this->bigIntegerAdapter->binToInt($data, true); - } else { - for ($i = 0; $i < $nbytes; $i++) { diff --git a/composer.json b/composer.json index 9da0982..5e36632 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,9 @@ "require-dev": { "zendframework/zend-math": "^2.6", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "squizlabs/php_codesniffer": "^2.3.1", - "phpunit/phpunit": "^4.5" + "phpunit/phpunit": "^5.5", + "zendframework/zend-coding-standard": "~1.0.0", + "doctrine/instantiator": "1.0.*" }, "suggest": { "zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization", @@ -43,5 +44,16 @@ "psr-4": { "ZendTest\\Serializer\\": "test/" } + }, + "scripts": { + "check": [ + "@cs-check", + "@test" + ], + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", + "upload-coverage": "coveralls -v" } } diff --git a/php-zendframework-zend-serializer.spec b/php-zendframework-zend-serializer.spec index d78ed46..b35b5de 100644 --- a/php-zendframework-zend-serializer.spec +++ b/php-zendframework-zend-serializer.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit ff74ea020f5f90866eb28365327e9bc765a61a6e +%global gh_commit 7ac42b9a47e9cb23895173a3096bc3b3fb7ac580 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-serializer @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.0 -Release: 4%{?dist} +Version: 2.8.1 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -30,8 +30,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: https://patch-diff.githubusercontent.com/raw/zendframework/zend-serializer/pull/31.patch - # remirepo:3 # For test build on all available arch #global debug_package %{nil} @@ -50,11 +48,12 @@ BuildRequires: php-composer(%{gh_owner}/zend-json) >= 2.5 # From composer, "require-dev": { # "zendframework/zend-math": "^2.6", # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", -# "squizlabs/php_codesniffer": "^2.3.1", -# "phpunit/PHPUnit": "^4.5" +# "phpunit/phpunit": "^5.5", +# "zendframework/zend-coding-standard": "~1.0.0", +# "doctrine/instantiator": "1.0.*" BuildRequires: php-composer(%{gh_owner}/zend-math) >= 2.6 BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 -BuildRequires: php-composer(phpunit/phpunit) >= 4.5 +BuildRequires: php-composer(phpunit/phpunit) >= 5.5 # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif @@ -101,7 +100,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 mv LICENSE.md LICENSE @@ -151,6 +149,9 @@ exit $ret %changelog +* Tue Nov 21 2017 Remi Collet <remi@remirepo.net> - 2.8.1-1 +- Update to 2.8.1 + * Thu Nov 9 2017 Remi Collet <remi@fedoraproject.org> - 2.8.0-4 - fix FTBFS from Koschei, add patch for bigendian from https://github.com/zendframework/zend-serializer/pull/31 |