From 04788761a349bd3de583cf08675a3aa81fcc50ed Mon Sep 17 00:00:00 2001 From: Kevin Millar Date: Fri, 12 Dec 2014 14:59:27 +1000 Subject: [PATCH 1/3] Removed redis SET lastTTL from redis-extend.lua --- src/Driver/Redis/redis-extend.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Driver/Redis/redis-extend.lua b/src/Driver/Redis/redis-extend.lua index 2c76709..d12e5f4 100644 --- a/src/Driver/Redis/redis-extend.lua +++ b/src/Driver/Redis/redis-extend.lua @@ -9,6 +9,4 @@ end ttl = ttl + redis.call('PTTL', key) redis.call('PEXPIRE', key, ttl) -redis.call('SET', 'lastTTL', ttl) - return ttl From 764b602d5405686803d19882858da192a4c84eaa Mon Sep 17 00:00:00 2001 From: James Harris Date: Mon, 15 Dec 2014 10:57:32 +1000 Subject: [PATCH 2/3] Updated dependencies. --- .php_cs | 1 + composer.json | 2 +- composer.lock | 133 +++++++++++++++++++++++++------------------------- 3 files changed, 69 insertions(+), 67 deletions(-) diff --git a/.php_cs b/.php_cs index 27b65a5..fe026e5 100644 --- a/.php_cs +++ b/.php_cs @@ -6,6 +6,7 @@ $finder = Symfony\CS\Finder\DefaultFinder::create() return Symfony\CS\Config\Config::create() ->fixers(array( '-concat_without_spaces', + '-empty_return', '-new_with_braces', 'align_double_arrow', 'align_equals', diff --git a/composer.json b/composer.json index 69443fb..a6d05fa 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ }, "require-dev": { "eloquent/asplode": "~2", - "eloquent/phony": "~0.1.0@dev", + "eloquent/phony": "~0.2.0", "icecave/archer": "~1", "predis/predis": "~1" }, diff --git a/composer.lock b/composer.lock index a9cb990..5ea3629 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "7548b8a035ade5615e5e799a5bb465ba", + "hash": "a9a2eae4581411ccdcc5c84eb8e11e78", "packages": [ { "name": "icecave/druid", @@ -333,16 +333,16 @@ }, { "name": "eloquent/phony", - "version": "dev-develop", + "version": "0.2.0", "source": { "type": "git", "url": "https://github.com/eloquent/phony.git", - "reference": "c47746b9edd269ce69c1dbd9faf23e04f21c1f4e" + "reference": "a050203d19cb10932a28220cc5b9207bbfa4245c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/eloquent/phony/zipball/c47746b9edd269ce69c1dbd9faf23e04f21c1f4e", - "reference": "c47746b9edd269ce69c1dbd9faf23e04f21c1f4e", + "url": "https://api.github.com/repos/eloquent/phony/zipball/a050203d19cb10932a28220cc5b9207bbfa4245c", + "reference": "a050203d19cb10932a28220cc5b9207bbfa4245c", "shasum": "" }, "require": { @@ -405,7 +405,7 @@ "stubbing", "test" ], - "time": "2014-11-13 03:15:09" + "time": "2014-11-18 01:43:22" }, { "name": "guzzle/guzzle", @@ -904,16 +904,16 @@ }, { "name": "sebastian/comparator", - "version": "1.0.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef" + "reference": "c484a80f97573ab934e37826dba0135a3301b26a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e54a01c0da1b87db3c5a3c4c5277ddf331da4aef", - "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a", + "reference": "c484a80f97573ab934e37826dba0135a3301b26a", "shasum": "" }, "require": { @@ -927,7 +927,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -964,7 +964,7 @@ "compare", "equality" ], - "time": "2014-05-11 23:00:21" + "time": "2014-11-16 21:32:38" }, { "name": "sebastian/diff", @@ -1085,17 +1085,17 @@ }, { "name": "symfony/config", - "version": "v2.5.6", + "version": "v2.6.1", "target-dir": "Symfony/Component/Config", "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "0316364bfebc8b080077c731a99f189341476bd7" + "reference": "84c0c150c1520995f09ea9e47e817068b353cb0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/0316364bfebc8b080077c731a99f189341476bd7", - "reference": "0316364bfebc8b080077c731a99f189341476bd7", + "url": "https://api.github.com/repos/symfony/Config/zipball/84c0c150c1520995f09ea9e47e817068b353cb0f", + "reference": "84c0c150c1520995f09ea9e47e817068b353cb0f", "shasum": "" }, "require": { @@ -1105,7 +1105,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -1129,21 +1129,21 @@ ], "description": "Symfony Config Component", "homepage": "http://symfony.com", - "time": "2014-09-23 05:25:11" + "time": "2014-12-02 20:19:20" }, { "name": "symfony/console", - "version": "v2.5.6", + "version": "v2.6.1", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0" + "reference": "ef825fd9f809d275926547c9e57cbf14968793e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/6f177fca24200a5b97aef5ce7a5c98124a0f0db0", - "reference": "6f177fca24200a5b97aef5ce7a5c98124a0f0db0", + "url": "https://api.github.com/repos/symfony/Console/zipball/ef825fd9f809d275926547c9e57cbf14968793e8", + "reference": "ef825fd9f809d275926547c9e57cbf14968793e8", "shasum": "" }, "require": { @@ -1151,16 +1151,18 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1" + "symfony/event-dispatcher": "~2.1", + "symfony/process": "~2.1" }, "suggest": { "psr/log": "For using the console logger", - "symfony/event-dispatcher": "" + "symfony/event-dispatcher": "", + "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -1184,21 +1186,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2014-10-05 13:57:04" + "time": "2014-12-02 20:19:20" }, { "name": "symfony/event-dispatcher", - "version": "v2.5.6", + "version": "v2.6.1", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212" + "reference": "720fe9bca893df7ad1b4546649473b5afddf0216" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/804eb28dbbfba9ffdab21fe2066744906cea2212", - "reference": "804eb28dbbfba9ffdab21fe2066744906cea2212", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216", + "reference": "720fe9bca893df7ad1b4546649473b5afddf0216", "shasum": "" }, "require": { @@ -1207,7 +1209,8 @@ "require-dev": { "psr/log": "~1.0", "symfony/config": "~2.0", - "symfony/dependency-injection": "~2.0,<2.6.0", + "symfony/dependency-injection": "~2.6", + "symfony/expression-language": "~2.6", "symfony/stopwatch": "~2.2" }, "suggest": { @@ -1217,7 +1220,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -1241,21 +1244,21 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2014-10-01 15:43:05" + "time": "2014-12-02 20:19:20" }, { "name": "symfony/filesystem", - "version": "v2.5.6", + "version": "v2.6.1", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "4e62fab0060a826561c78b665925b37c870c45f5" + "reference": "ff6efc95256cb33031933729e68b01d720b5436b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/4e62fab0060a826561c78b665925b37c870c45f5", - "reference": "4e62fab0060a826561c78b665925b37c870c45f5", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/ff6efc95256cb33031933729e68b01d720b5436b", + "reference": "ff6efc95256cb33031933729e68b01d720b5436b", "shasum": "" }, "require": { @@ -1264,7 +1267,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -1288,21 +1291,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2014-09-22 09:14:18" + "time": "2014-12-02 20:19:20" }, { "name": "symfony/finder", - "version": "v2.5.6", + "version": "v2.6.1", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "cf66df4e783e6aade319b273c9bcf9e42aa9b10f" + "reference": "0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/cf66df4e783e6aade319b273c9bcf9e42aa9b10f", - "reference": "cf66df4e783e6aade319b273c9bcf9e42aa9b10f", + "url": "https://api.github.com/repos/symfony/Finder/zipball/0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721", + "reference": "0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721", "shasum": "" }, "require": { @@ -1311,7 +1314,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -1335,21 +1338,21 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2014-10-01 05:50:18" + "time": "2014-12-02 20:19:20" }, { "name": "symfony/process", - "version": "v2.5.6", + "version": "v2.6.1", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "9bbacbb3a7a27b17c0d51e2f126f59e0e588ad3a" + "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/9bbacbb3a7a27b17c0d51e2f126f59e0e588ad3a", - "reference": "9bbacbb3a7a27b17c0d51e2f126f59e0e588ad3a", + "url": "https://api.github.com/repos/symfony/Process/zipball/bf0c9bd625f13b0b0bbe39919225cf145dfb935a", + "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a", "shasum": "" }, "require": { @@ -1358,7 +1361,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -1382,21 +1385,21 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2014-10-01 05:50:18" + "time": "2014-12-02 20:19:20" }, { "name": "symfony/stopwatch", - "version": "v2.5.6", + "version": "v2.6.1", "target-dir": "Symfony/Component/Stopwatch", "source": { "type": "git", "url": "https://github.com/symfony/Stopwatch.git", - "reference": "9f8a33a24f2378c0ec5f372a8d50b2d43069c050" + "reference": "261abd360cfb6ac65ea93ffd82073e2011d034fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/9f8a33a24f2378c0ec5f372a8d50b2d43069c050", - "reference": "9f8a33a24f2378c0ec5f372a8d50b2d43069c050", + "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/261abd360cfb6ac65ea93ffd82073e2011d034fc", + "reference": "261abd360cfb6ac65ea93ffd82073e2011d034fc", "shasum": "" }, "require": { @@ -1405,7 +1408,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -1429,21 +1432,21 @@ ], "description": "Symfony Stopwatch Component", "homepage": "http://symfony.com", - "time": "2014-09-22 09:14:18" + "time": "2014-12-02 20:19:20" }, { "name": "symfony/yaml", - "version": "v2.5.6", + "version": "v2.6.1", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726" + "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/2d9f527449cabfa8543dd7fa3a466d6ae83d6726", - "reference": "2d9f527449cabfa8543dd7fa3a466d6ae83d6726", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20", + "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20", "shasum": "" }, "require": { @@ -1452,7 +1455,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -1476,7 +1479,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2014-10-01 05:50:18" + "time": "2014-12-02 20:19:20" }, { "name": "twig/twig", @@ -1538,9 +1541,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "eloquent/phony": 20 - }, + "stability-flags": [], "prefer-stable": false, "platform": { "php": ">=5.5" From 90a1ddd985d024750e61ab52dd6494fd3a072644 Mon Sep 17 00:00:00 2001 From: James Harris Date: Mon, 15 Dec 2014 10:58:41 +1000 Subject: [PATCH 3/3] Bumped version and updated changelog. --- CHANGELOG.md | 4 ++++ README.md | 2 +- src/PackageInfo.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a30cf1..1e9a607 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Chastity Changelog +### 0.1.1 (2014-12-15) + +* **[FIXED]** Removed unnecessary SET operation from redis-extend.lua + ### 0.1.0 (2014-11-17) * Initial release diff --git a/README.md b/README.md index 5e41757..4278160 100644 --- a/README.md +++ b/README.md @@ -31,4 +31,4 @@ in a distributed environment. [Build Status]: http://img.shields.io/travis/IcecaveStudios/chastity/develop.svg?style=flat-square [Test Coverage]: http://img.shields.io/coveralls/IcecaveStudios/chastity/develop.svg?style=flat-square -[SemVer]: http://img.shields.io/:semver-0.1.0-yellow.svg?style=flat-square +[SemVer]: http://img.shields.io/:semver-0.1.1-yellow.svg?style=flat-square diff --git a/src/PackageInfo.php b/src/PackageInfo.php index 26f3546..d5fffed 100644 --- a/src/PackageInfo.php +++ b/src/PackageInfo.php @@ -4,5 +4,5 @@ class PackageInfo { const NAME = 'Chastity'; - const VERSION = '0.1.0'; + const VERSION = '0.1.1'; }