From 3e2b806163f72f161cd9dcc1afa96680eb1941d0 Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 14:09:13 +0900 Subject: [PATCH 01/10] Updated library --- .gitignore | 1 - .travis.yml | 1 + README.md | 6 +- composer.json | 2 +- composer.lock | 1150 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1157 insertions(+), 3 deletions(-) create mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index 1c2b7d3..ff3edf1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ vendor -composer.lock composer.phar clover.xml build diff --git a/.travis.yml b/.travis.yml index 2bba505..60efb80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: php php: + - 7.0 - 5.6 - 5.5 - 5.4 diff --git a/README.md b/README.md index 9b6621d..6f00e38 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Requirements - PhpRedis extension - https://github.com/nicolasff/phpredis - PHP - - >=5.3 + - >=5.3, >=5.4, >=5.5 >=5.6, >=7.0 - Composer @@ -73,6 +73,10 @@ TODO History ---------------------------- +- Next Release + - Refactoring + - Support PHP 7.0 + - Library update - 1.0.1 - bugfix: correct variable name. - supports travis CI and passed test. diff --git a/composer.json b/composer.json index 98a8d7a..af2e187 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require-dev": { - "devster/ubench": "1.1.*-dev", + "devster/ubench": "dev-master", "phpunit/phpunit": "3.7.*@stable", "satooshi/php-coveralls": "dev-master", "fabpot/php-cs-fixer": "0.3.*@dev", diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..3aa6537 --- /dev/null +++ b/composer.lock @@ -0,0 +1,1150 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "640c59f32b3d0d9e40804c5ac4ebcf9f", + "content-hash": "1eda4b7efa9898d12c3b8c61b3e71392", + "packages": [], + "packages-dev": [ + { + "name": "devster/ubench", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/devster/ubench.git", + "reference": "4b5c8217b6067b0156fef2cf268523ed0720be95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/devster/ubench/zipball/4b5c8217b6067b0156fef2cf268523ed0720be95", + "reference": "4b5c8217b6067b0156fef2cf268523ed0720be95", + "shasum": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-0": { + "Ubench": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeremy Perret", + "email": "jeremy@devster.org" + } + ], + "description": "Micro PHP library for benchmarking", + "homepage": "https://github.com/devster/ubench", + "keywords": [ + "bench", + "benchmark", + "library", + "micro" + ], + "time": "2015-06-02 08:26:32" + }, + { + "name": "fabpot/php-cs-fixer", + "version": "v0.3.0", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "f6c4f78b3e34c1c67c8ae4543f5d4b7232e23011" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/f6c4f78b3e34c1c67c8ae4543f5d4b7232e23011", + "reference": "f6c4f78b3e34c1c67c8ae4543f5d4b7232e23011", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "1.0.*@dev", + "symfony/console": "~2.1", + "symfony/filesystem": "~2.1", + "symfony/finder": "~2.1" + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "extra": { + "branch-alias": { + "dev-master": "0.3.x-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\CS": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "A script to automatically fix Symfony Coding Standard", + "time": "2013-09-23 10:31:06" + }, + { + "name": "guzzle/guzzle", + "version": "v3.9.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle3.git", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.3.3", + "symfony/event-dispatcher": "~2.1" + }, + "replace": { + "guzzle/batch": "self.version", + "guzzle/cache": "self.version", + "guzzle/common": "self.version", + "guzzle/http": "self.version", + "guzzle/inflection": "self.version", + "guzzle/iterator": "self.version", + "guzzle/log": "self.version", + "guzzle/parser": "self.version", + "guzzle/plugin": "self.version", + "guzzle/plugin-async": "self.version", + "guzzle/plugin-backoff": "self.version", + "guzzle/plugin-cache": "self.version", + "guzzle/plugin-cookie": "self.version", + "guzzle/plugin-curlauth": "self.version", + "guzzle/plugin-error-response": "self.version", + "guzzle/plugin-history": "self.version", + "guzzle/plugin-log": "self.version", + "guzzle/plugin-md5": "self.version", + "guzzle/plugin-mock": "self.version", + "guzzle/plugin-oauth": "self.version", + "guzzle/service": "self.version", + "guzzle/stream": "self.version" + }, + "require-dev": { + "doctrine/cache": "~1.3", + "monolog/monolog": "~1.0", + "phpunit/phpunit": "3.7.*", + "psr/log": "~1.0", + "symfony/class-loader": "~2.1", + "zendframework/zend-cache": "2.*,<2.3", + "zendframework/zend-log": "2.*,<2.3" + }, + "suggest": { + "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.9-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Guzzle Community", + "homepage": "https://github.com/guzzle/guzzle/contributors" + } + ], + "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2015-03-18 18:23:50" + }, + { + "name": "phpunit/php-code-coverage", + "version": "1.2.18", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b", + "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-file-iterator": ">=1.3.0@stable", + "phpunit/php-text-template": ">=1.2.0@stable", + "phpunit/php-token-stream": ">=1.1.3,<1.3.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*@dev" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.0.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2014-09-02 10:13:14" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2015-06-21 13:08:43" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21 13:50:34" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.7", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2015-06-21 08:01:12" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32", + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2014-03-03 05:10:30" + }, + { + "name": "phpunit/phpunit", + "version": "3.7.38", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/38709dc22d519a3d1be46849868aa2ddf822bcf6", + "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpunit/php-code-coverage": "~1.2", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.1", + "phpunit/php-timer": "~1.0", + "phpunit/phpunit-mock-objects": "~1.2", + "symfony/yaml": "~2.0" + }, + "require-dev": { + "pear-pear.php.net/pear": "1.9.4" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "composer/bin/phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.7.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "", + "../../symfony/yaml/" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "http://www.phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2014-10-17 09:04:17" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "1.2.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875", + "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-text-template": ">=1.1.1@stable" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2013-01-13 10:24:48" + }, + { + "name": "psr/log", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-0": { + "Psr\\Log\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2012-12-21 11:40:51" + }, + { + "name": "satooshi/php-coveralls", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/satooshi/php-coveralls.git", + "reference": "73d05ac4f4a66aaecf4c5c7cd2441868e7197fe5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/73d05ac4f4a66aaecf4c5c7cd2441868e7197fe5", + "reference": "73d05ac4f4a66aaecf4c5c7cd2441868e7197fe5", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-simplexml": "*", + "guzzle/guzzle": "^2.8|^3.0", + "php": ">=5.3.3", + "psr/log": "^1.0", + "symfony/config": "^2.4|^3.0", + "symfony/console": "^2.1|^3.0", + "symfony/stopwatch": "^2.2|^3.0", + "symfony/yaml": "^2.1|^3.0" + }, + "suggest": { + "symfony/http-kernel": "Allows Symfony integration" + }, + "bin": [ + "bin/coveralls" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.8-dev" + } + }, + "autoload": { + "psr-4": { + "Satooshi\\": "src/Satooshi/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kitamura Satoshi", + "email": "with.no.parachute@gmail.com", + "homepage": "https://www.facebook.com/satooshi.jp" + } + ], + "description": "PHP client library for Coveralls API", + "homepage": "https://github.com/satooshi/php-coveralls", + "keywords": [ + "ci", + "coverage", + "github", + "test" + ], + "time": "2015-12-25 20:09:02" + }, + { + "name": "sebastian/diff", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "6affc0bf53304452d7f296588f6d5837070b4789" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/6affc0bf53304452d7f296588f6d5837070b4789", + "reference": "6affc0bf53304452d7f296588f6d5837070b4789", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "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", + "role": "lead" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "http://www.github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2013-07-09 05:45:26" + }, + { + "name": "symfony/config", + "version": "v3.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "40bae8658dbbb500ebc19aa9fde22dc4295fc290" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/40bae8658dbbb500ebc19aa9fde22dc4295fc290", + "reference": "40bae8658dbbb500ebc19aa9fde22dc4295fc290", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/filesystem": "~2.8|~3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "https://symfony.com", + "time": "2015-11-02 20:34:04" + }, + { + "name": "symfony/console", + "version": "v2.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/d232bfc100dfd32b18ccbcab4bcc8f28697b7e41", + "reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41", + "shasum": "" + }, + "require": { + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/process": "~2.1|~3.0.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com", + "time": "2015-11-30 12:35:10" + }, + { + "name": "symfony/event-dispatcher", + "version": "v2.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc", + "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2015-10-30 20:15:42" + }, + { + "name": "symfony/filesystem", + "version": "v2.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "3e661a0d521ac67496515fa6e6704bd61bcfff60" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/3e661a0d521ac67496515fa6e6704bd61bcfff60", + "reference": "3e661a0d521ac67496515fa6e6704bd61bcfff60", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "https://symfony.com", + "time": "2015-11-23 10:19:46" + }, + { + "name": "symfony/finder", + "version": "v2.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "ead9b07af4ba77b6507bee697396a5c79e633f08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/ead9b07af4ba77b6507bee697396a5c79e633f08", + "reference": "ead9b07af4ba77b6507bee697396a5c79e633f08", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "https://symfony.com", + "time": "2015-10-30 20:15:42" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, + { + "name": "symfony/stopwatch", + "version": "v3.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6aeac8907e3e1340a0033b0a9ec075f8e6524800", + "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "time": "2015-10-30 23:35:59" + }, + { + "name": "symfony/yaml", + "version": "v2.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "f79824187de95064a2f5038904c4d7f0227fedb5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/f79824187de95064a2f5038904c4d7f0227fedb5", + "reference": "f79824187de95064a2f5038904c4d7f0227fedb5", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2015-11-30 12:35:10" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": { + "devster/ubench": 20, + "phpunit/phpunit": 0, + "satooshi/php-coveralls": 20, + "fabpot/php-cs-fixer": 20, + "sebastian/diff": 20 + }, + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.3.0" + }, + "platform-dev": [] +} From b17aea63f6df12bb791cc0929ddacecd4c1b2902 Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 14:15:26 +0900 Subject: [PATCH 02/10] set to install phpredis --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60efb80..123d209 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,8 @@ services: - redis-server before_install: # install phpredis extension. - - wget -O phpredis.tar.gz --no-check-certificate https://github.com/nicolasff/phpredis/tarball/master - - tar -xzf phpredis.tar.gz - - sh -c "cd nicolasff-phpredis-* && phpize && ./configure && make && sudo make install" + - git clone --depth=50 https://github.com/nicolasff/phpredis + - sh -c "cd phpredis && phpize && ./configure && make && sudo make install" - echo "extension=redis.so" > redis.ini && phpenv config-add redis.ini before_script: - wget http://getcomposer.org/composer.phar From 8158156cb3e174155d838d573994c54704b63b89 Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 16:33:02 +0900 Subject: [PATCH 03/10] added php redis install script --- .travis.yml | 5 +---- .travis_redis.sh | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100755 .travis_redis.sh diff --git a/.travis.yml b/.travis.yml index 123d209..3014c08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,7 @@ php: services: - redis-server before_install: - # install phpredis extension. - - git clone --depth=50 https://github.com/nicolasff/phpredis - - sh -c "cd phpredis && phpize && ./configure && make && sudo make install" - - echo "extension=redis.so" > redis.ini && phpenv config-add redis.ini + - ./.travis_redis.sh before_script: - wget http://getcomposer.org/composer.phar - php composer.phar install --dev --no-interaction diff --git a/.travis_redis.sh b/.travis_redis.sh new file mode 100755 index 0000000..184d213 --- /dev/null +++ b/.travis_redis.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# install phpredis extension. + +set -e + + +git clone --depth=50 https://github.com/nicolasff/phpredis +cd phpredis + +major_version=`php -v | head -n 1 | cut -c 5` +if [ $major_version == "7" ] +then + git checkout php7 +fi + +exit; +phpize +./configure +make +sudo make install + +echo "extension=redis.so" > redis.ini +phpenv config-add redis.ini + From 97d6070b831c29ff6af165a827f920d76051398a Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 16:40:43 +0900 Subject: [PATCH 04/10] fix redis install script --- .travis_redis.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis_redis.sh b/.travis_redis.sh index 184d213..a03e633 100755 --- a/.travis_redis.sh +++ b/.travis_redis.sh @@ -4,7 +4,7 @@ set -e -git clone --depth=50 https://github.com/nicolasff/phpredis +git clone --depth=50 https://github.com/phpredis/phpredis cd phpredis major_version=`php -v | head -n 1 | cut -c 5` @@ -13,7 +13,6 @@ then git checkout php7 fi -exit; phpize ./configure make From 02e8840b585b8de54c2edcf9725f26558dedbdde Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 16:46:22 +0900 Subject: [PATCH 05/10] fix redis install script --- .travis_redis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis_redis.sh b/.travis_redis.sh index a03e633..0cd9446 100755 --- a/.travis_redis.sh +++ b/.travis_redis.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # install phpredis extension. set -e From 4e3110d49d6fa93b83aa37ca64bb3861de90b138 Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 16:49:31 +0900 Subject: [PATCH 06/10] fix redis install script --- .travis_redis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis_redis.sh b/.travis_redis.sh index 0cd9446..3a72832 100755 --- a/.travis_redis.sh +++ b/.travis_redis.sh @@ -10,7 +10,7 @@ cd phpredis major_version=`php -v | head -n 1 | cut -c 5` if [ $major_version == "7" ] then - git checkout php7 + git checkout remotes/origin/php7 fi phpize From 9a5e3b45c6e98fbe3d56701c1ba5ff629ec826f2 Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 16:54:19 +0900 Subject: [PATCH 07/10] fix redis install script --- .travis.yml | 1 - .travis_redis.sh | 4 ++-- README.md | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3014c08..dbc004c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ php: - 5.6 - 5.5 - 5.4 - - 5.3 services: - redis-server before_install: diff --git a/.travis_redis.sh b/.travis_redis.sh index 3a72832..95d650d 100755 --- a/.travis_redis.sh +++ b/.travis_redis.sh @@ -4,8 +4,8 @@ set -e -git clone --depth=50 https://github.com/phpredis/phpredis -cd phpredis +git clone https://github.com/phpredis/phpredis +cd phpredis major_version=`php -v | head -n 1 | cut -c 5` if [ $major_version == "7" ] diff --git a/README.md b/README.md index 6f00e38..5bd53e4 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Requirements - PhpRedis extension - https://github.com/nicolasff/phpredis - PHP - - >=5.3, >=5.4, >=5.5 >=5.6, >=7.0 + - >=5.4, >=5.5 >=5.6, >=7.0 - Composer @@ -61,7 +61,7 @@ Run with default setting. % vendor/bin/phpunit -c phpunit.xml.dist ``` -Currently tested with PHP 5.3.15 + Redis 2.6.12. +Currently tested with PHP 7.0.0 + Redis 2.6.12. TODO @@ -77,6 +77,7 @@ History - Refactoring - Support PHP 7.0 - Library update + - Removed PHP5.3 compatibility - 1.0.1 - bugfix: correct variable name. - supports travis CI and passed test. From 5afebcc7c0cafcdf398d6d93c4bb08a88c55f0de Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 16:54:29 +0900 Subject: [PATCH 08/10] fix redis install script --- .travis_redis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis_redis.sh b/.travis_redis.sh index 95d650d..38f7349 100755 --- a/.travis_redis.sh +++ b/.travis_redis.sh @@ -10,7 +10,7 @@ cd phpredis major_version=`php -v | head -n 1 | cut -c 5` if [ $major_version == "7" ] then - git checkout remotes/origin/php7 + git checkout origin/php7 fi phpize From 927e55edfcec157f67aeead679a93a83234f56a3 Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 16:57:47 +0900 Subject: [PATCH 09/10] Updated readme to drop php 5.4 support --- .travis_redis.sh | 7 ++++--- README.md | 2 +- composer.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis_redis.sh b/.travis_redis.sh index 38f7349..0cb60e5 100755 --- a/.travis_redis.sh +++ b/.travis_redis.sh @@ -4,15 +4,16 @@ set -e -git clone https://github.com/phpredis/phpredis -cd phpredis major_version=`php -v | head -n 1 | cut -c 5` if [ $major_version == "7" ] then - git checkout origin/php7 + git clone --branch=php7 https://github.com/phpredis/phpredis +else + git clone https://github.com/phpredis/phpredis fi +cd phpredis phpize ./configure make diff --git a/README.md b/README.md index 5bd53e4..98c2060 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ History - Refactoring - Support PHP 7.0 - Library update - - Removed PHP5.3 compatibility + - Removed PHP5.3 and PHP5.4 compatibility - 1.0.1 - bugfix: correct variable name. - supports travis CI and passed test. diff --git a/composer.json b/composer.json index af2e187..590871a 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "type": "library", "license": "PHP3", "require" : { - "php": ">=5.3.0" + "php": ">=5.5.0" }, "authors": [ { From 6fb8c79f48cdfcaafee119149e882d296d815c4a Mon Sep 17 00:00:00 2001 From: Yuki Matsukura Date: Sat, 26 Dec 2015 17:00:28 +0900 Subject: [PATCH 10/10] Updated readme to drop php 5.4 support --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dbc004c..5dcc271 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ php: - 7.0 - 5.6 - 5.5 - - 5.4 services: - redis-server before_install: