From a67d640942b60c023abdd0e3e57fc851f134cb54 Mon Sep 17 00:00:00 2001 From: mikey179 Date: Thu, 14 Aug 2014 17:00:58 +0200 Subject: [PATCH] upgrade stubbles/date to 5.0.0 --- CHANGELOG.md | 6 ++++ composer.json | 4 +-- composer.lock | 44 ++++++++++++++--------------- src/main/php/filter/DateFilter.php | 2 ++ src/main/php/filter/DayFilter.php | 2 ++ src/main/php/filter/MonthFilter.php | 2 ++ 6 files changed, 36 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7f08d5..3f7b409 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +3.2.0 (2014-08-14) +------------------ + + * upgraded stubbles/date to 5.0.0 + + 3.1.1 (2014-08-10) ------------------ diff --git a/composer.json b/composer.json index 6a0b213..700c6b2 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "require-dev": { "mikey179/vfsStream": "~1.3", "phpunit/phpunit": "~4.1", - "stubbles/date": "~4.0" + "stubbles/date": "~5.0" }, "suggest": { "stubbles/date": "~4.0" @@ -23,7 +23,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "3.2.x-dev" } }, "minimum-stability": "dev", diff --git a/composer.lock b/composer.lock index c659f72..64b7264 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "fcd8a1283a293cc623e5208d25ebea23", + "hash": "578d180f2fa38f7d0c5a59b3d43170fe", "packages": [ { "name": "stubbles/core", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/stubbles/stubbles-core.git", - "reference": "b4e4398dac224d174d3129ab2b1c95930e4e95ae" + "reference": "fdf325a192f4b348229df83f5dbe250aa3dd3159" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stubbles/stubbles-core/zipball/b4e4398dac224d174d3129ab2b1c95930e4e95ae", - "reference": "b4e4398dac224d174d3129ab2b1c95930e4e95ae", + "url": "https://api.github.com/repos/stubbles/stubbles-core/zipball/fdf325a192f4b348229df83f5dbe250aa3dd3159", + "reference": "fdf325a192f4b348229df83f5dbe250aa3dd3159", "shasum": "" }, "require": { @@ -49,7 +49,7 @@ ], "description": "Provides base classes for Stubbles packages.", "homepage": "http://stubbles.net/", - "time": "2014-08-10 09:11:04" + "time": "2014-08-11 20:07:38" } ], "packages-dev": [ @@ -93,16 +93,16 @@ }, { "name": "ocramius/instantiator", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/Ocramius/Instantiator.git", - "reference": "cc754c2289ffd4483c319f6ed6ee88ce21676f64" + "reference": "8aa99efa86c51319afc26d23254fe6a8b5a5144a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/Instantiator/zipball/cc754c2289ffd4483c319f6ed6ee88ce21676f64", - "reference": "cc754c2289ffd4483c319f6ed6ee88ce21676f64", + "url": "https://api.github.com/repos/Ocramius/Instantiator/zipball/8aa99efa86c51319afc26d23254fe6a8b5a5144a", + "reference": "8aa99efa86c51319afc26d23254fe6a8b5a5144a", "shasum": "" }, "require": { @@ -111,6 +111,7 @@ }, "require-dev": { "athletic/athletic": "~0.1.8", + "ext-pdo": "*", "ext-phar": "*", "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "2.0.*@ALPHA" @@ -134,8 +135,7 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/", - "role": "Developer" + "homepage": "http://ocramius.github.com/" } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", @@ -144,7 +144,7 @@ "constructor", "instantiate" ], - "time": "2014-06-15 11:44:46" + "time": "2014-08-11 23:48:35" }, { "name": "ocramius/lazy-map", @@ -854,29 +854,29 @@ }, { "name": "stubbles/date", - "version": "v4.0.0", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/stubbles/stubbles-date.git", - "reference": "604fd1e3b4147b4317fdda80471ec9d9589d396a" + "reference": "d6f549fec1a695f0b6e852e85df8ebe3e30cb02a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stubbles/stubbles-date/zipball/604fd1e3b4147b4317fdda80471ec9d9589d396a", - "reference": "604fd1e3b4147b4317fdda80471ec9d9589d396a", + "url": "https://api.github.com/repos/stubbles/stubbles-date/zipball/d6f549fec1a695f0b6e852e85df8ebe3e30cb02a", + "reference": "d6f549fec1a695f0b6e852e85df8ebe3e30cb02a", "shasum": "" }, "require": { - "php": ">=5.4.0", - "stubbles/core": "~4.0" + "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.1" + "phpunit/phpunit": "~4.1", + "stubbles/core": "~5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { @@ -890,7 +890,7 @@ ], "description": "Simplified handling of dates and datespans.", "homepage": "http://stubbles.net/", - "time": "2014-07-31 12:14:28" + "time": "2014-08-14 12:05:32" }, { "name": "symfony/yaml", diff --git a/src/main/php/filter/DateFilter.php b/src/main/php/filter/DateFilter.php index 9719b6c..15454a9 100644 --- a/src/main/php/filter/DateFilter.php +++ b/src/main/php/filter/DateFilter.php @@ -47,6 +47,8 @@ public function apply(Param $param) return new Date($param->value()); } catch (IllegalArgumentException $iae) { $param->addError('DATE_INVALID'); + } catch (\InvalidArgumentException $iae) { + $param->addError('DATE_INVALID'); } return null; diff --git a/src/main/php/filter/DayFilter.php b/src/main/php/filter/DayFilter.php index 82af32a..89eff93 100644 --- a/src/main/php/filter/DayFilter.php +++ b/src/main/php/filter/DayFilter.php @@ -47,6 +47,8 @@ public function apply(Param $param) return new Day($param->value()); } catch (IllegalArgumentException $iae) { $param->addError('DATE_INVALID'); + } catch (\InvalidArgumentException $iae) { + $param->addError('DATE_INVALID'); } return null; diff --git a/src/main/php/filter/MonthFilter.php b/src/main/php/filter/MonthFilter.php index ce6d5bc..2a70c15 100644 --- a/src/main/php/filter/MonthFilter.php +++ b/src/main/php/filter/MonthFilter.php @@ -47,6 +47,8 @@ public function apply(Param $param) return Month::fromString($param->value()); } catch (IllegalArgumentException $iae) { $param->addError('MONTH_INVALID'); + } catch (\InvalidArgumentException $iae) { + $param->addError('MONTH_INVALID'); } return null;