From d484b2019024a25e09162488d4c999a8e1268a8c Mon Sep 17 00:00:00 2001 From: Tyler Sommer Date: Fri, 29 Jan 2016 15:57:34 -0700 Subject: [PATCH] Prepped release --- .travis.yml | 5 +- composer.json | 2 +- composer.lock | 436 +++++++++++++++++++++--------------------------- src/Version.php | 2 +- 4 files changed, 200 insertions(+), 245 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88c8210..baba49c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,10 @@ language: php php: - 5.4 + - 5.5 + - 5.6 + - 7.0 install: - composer install script: - - php ./vendor/bin/phpunit \ No newline at end of file + - php ./vendor/bin/phpunit diff --git a/composer.json b/composer.json index 2142d9d..732989b 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "nice/twig": "2.0.x-dev", "nice/templating": "1.0.x-dev", "chrisboulton/php-resque": "dev-master", - "doctrine/migrations": "1.0.x-dev", + "doctrine/migrations": "~1.2", "symfony/debug": "~2.7", "symfony/console": "~2.7", "symfony/process": "~2.7", diff --git a/composer.lock b/composer.lock index d2bb80d..42e92c0 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": "0ecf79166b06a2e321a3919c84e37052", - "content-hash": "7db006b26d27afc55fd5b122a41c9636", + "hash": "76ab050aca9fccc42b2af58e9adcb2f8", + "content-hash": "b3111d3f2e63baba5496989de435b84d", "packages": [ { "name": "blackfire/php-sdk", @@ -162,12 +162,12 @@ "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "cd21505c8d58499a9b4d38573881cfec49c51ffd" + "reference": "7c3e621102106fd28af0128fdfd750af926fc569" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/cd21505c8d58499a9b4d38573881cfec49c51ffd", - "reference": "cd21505c8d58499a9b4d38573881cfec49c51ffd", + "url": "https://api.github.com/repos/composer/composer/zipball/7c3e621102106fd28af0128fdfd750af926fc569", + "reference": "7c3e621102106fd28af0128fdfd750af926fc569", "shasum": "" }, "require": { @@ -228,7 +228,7 @@ "dependency", "package" ], - "time": "2016-01-27 13:04:22" + "time": "2016-01-29 12:58:17" }, { "name": "composer/satis", @@ -484,33 +484,33 @@ }, { "name": "doctrine/cache", - "version": "v1.6.0", + "version": "v1.5.4", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6" + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6", - "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6", + "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136", + "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136", "shasum": "" }, "require": { - "php": "~5.5|~7.0" + "php": ">=5.3.2" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0", + "phpunit/phpunit": ">=3.7", "predis/predis": "~1.0", "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -550,7 +550,7 @@ "cache", "caching" ], - "time": "2015-12-31 16:37:02" + "time": "2015-12-19 05:03:47" }, { "name": "doctrine/collections", @@ -620,16 +620,16 @@ }, { "name": "doctrine/common", - "version": "v2.6.1", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "a579557bc689580c19fee4e27487a67fe60defc0" + "reference": "10f1f19651343f87573129ca970aef1a47a6f29e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0", - "reference": "a579557bc689580c19fee4e27487a67fe60defc0", + "url": "https://api.github.com/repos/doctrine/common/zipball/10f1f19651343f87573129ca970aef1a47a6f29e", + "reference": "10f1f19651343f87573129ca970aef1a47a6f29e", "shasum": "" }, "require": { @@ -638,20 +638,20 @@ "doctrine/collections": "1.*", "doctrine/inflector": "1.*", "doctrine/lexer": "1.*", - "php": "~5.5|~7.0" + "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0" + "phpunit/phpunit": "~3.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7.x-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { - "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" + "psr-0": { + "Doctrine\\Common\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -689,7 +689,7 @@ "persistence", "spl" ], - "time": "2015-12-25 13:18:31" + "time": "2015-12-25 13:10:16" }, { "name": "doctrine/dbal", @@ -939,22 +939,21 @@ }, { "name": "doctrine/migrations", - "version": "dev-master", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "4e85ba638acf62e1afe735f94b0c51aa971f8773" + "reference": "6b70c2c4484c02878743929bb3cd3fdbf41193a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/4e85ba638acf62e1afe735f94b0c51aa971f8773", - "reference": "4e85ba638acf62e1afe735f94b0c51aa971f8773", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/6b70c2c4484c02878743929bb3cd3fdbf41193a6", + "reference": "6b70c2c4484c02878743929bb3cd3fdbf41193a6", "shasum": "" }, "require": { "doctrine/dbal": "~2.2", - "ocramius/proxy-manager": "^1.0|^2.0", - "php": "^5.5|^7.0", + "php": ">=5.4.0", "symfony/console": "~2.3|~3.0", "symfony/yaml": "~2.3|~3.0" }, @@ -966,21 +965,18 @@ "phpunit/phpunit": "~4.7", "satooshi/php-coveralls": "0.6.*" }, - "suggest": { - "symfony/console": "to run the migration from the console" - }, "bin": [ "bin/doctrine-migrations" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "v1.0.x-dev" + "dev-master": "v1.1.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\DBAL\\Migrations": "lib" + "psr-4": { + "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations" } }, "notification-url": "https://packagist.org/downloads/", @@ -995,6 +991,10 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com" + }, + { + "name": "Michael Simonson", + "email": "contact@mikesimonson.com" } ], "description": "Database Schema migrations using Doctrine DBAL", @@ -1003,7 +1003,7 @@ "database", "migrations" ], - "time": "2015-08-27 12:05:11" + "time": "2016-01-07 21:28:50" }, { "name": "doctrine/orm", @@ -1083,22 +1083,22 @@ }, { "name": "guzzle/guzzle", - "version": "v3.8.1", + "version": "v3.9.3", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba" + "url": "https://github.com/guzzle/guzzle3.git", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/4de0618a01b34aa1c8c33a3f13f396dcd3882eba", - "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba", + "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" + "symfony/event-dispatcher": "~2.1" }, "replace": { "guzzle/batch": "self.version", @@ -1125,18 +1125,21 @@ "guzzle/stream": "self.version" }, "require-dev": { - "doctrine/cache": "*", - "monolog/monolog": "1.*", + "doctrine/cache": "~1.3", + "monolog/monolog": "~1.0", "phpunit/phpunit": "3.7.*", - "psr/log": "1.0.*", - "symfony/class-loader": "*", - "zendframework/zend-cache": "<2.3", - "zendframework/zend-log": "<2.3" + "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.8-dev" + "dev-master": "3.9-dev" } }, "autoload": { @@ -1160,7 +1163,7 @@ "homepage": "https://github.com/guzzle/guzzle/contributors" } ], - "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients", + "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", "homepage": "http://guzzlephp.org/", "keywords": [ "client", @@ -1171,7 +1174,7 @@ "rest", "web service" ], - "time": "2014-01-28 22:29:15" + "time": "2015-03-18 18:23:50" }, { "name": "ircmaxell/password-compat", @@ -1811,69 +1814,6 @@ ], "time": "2015-09-19 14:15:08" }, - { - "name": "ocramius/proxy-manager", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "57e9272ec0e8deccf09421596e0e2252df440e11" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/57e9272ec0e8deccf09421596e0e2252df440e11", - "reference": "57e9272ec0e8deccf09421596e0e2252df440e11", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "zendframework/zend-code": ">2.2.5,<3.0" - }, - "require-dev": { - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "1.5.*" - }, - "suggest": { - "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", - "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)", - "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)", - "zendframework/zend-stdlib": "To use the hydrator proxy", - "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "ProxyManager\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", - "homepage": "https://github.com/Ocramius/ProxyManager", - "keywords": [ - "aop", - "lazy loading", - "proxy", - "proxy pattern", - "service proxies" - ], - "time": "2015-08-09 04:28:19" - }, { "name": "phpdocumentor/reflection-docblock", "version": "2.0.4", @@ -2435,27 +2375,27 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.0.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d36355e026905fa5229e1ed7b4e9eda2e67adfcf" + "reference": "ee278f7c851533e58ca307f66305ccb9188aceda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d36355e026905fa5229e1ed7b4e9eda2e67adfcf", - "reference": "d36355e026905fa5229e1ed7b4e9eda2e67adfcf", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda", + "reference": "ee278f7c851533e58ca307f66305ccb9188aceda", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.3.9" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.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": "", @@ -2464,7 +2404,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2491,7 +2431,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-10-30 23:35:59" + "time": "2016-01-13 10:28:07" }, { "name": "symfony/filesystem", @@ -2593,28 +2533,30 @@ }, { "name": "symfony/http-foundation", - "version": "v3.0.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "939c8c28a5b1e4ab7317bc30c1f9aa881c4b06b5" + "reference": "9194b33c71da8ef4d05d22964376f2f9c95a1bfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/939c8c28a5b1e4ab7317bc30c1f9aa881c4b06b5", - "reference": "939c8c28a5b1e4ab7317bc30c1f9aa881c4b06b5", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9194b33c71da8ef4d05d22964376f2f9c95a1bfd", + "reference": "9194b33c71da8ef4d05d22964376f2f9c95a1bfd", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.3.9", + "symfony/polyfill-php54": "~1.0", + "symfony/polyfill-php55": "~1.0" }, "require-dev": { - "symfony/expression-language": "~2.8|~3.0" + "symfony/expression-language": "~2.4|~3.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2641,7 +2583,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2015-12-18 15:43:53" + "time": "2016-01-13 10:28:07" }, { "name": "symfony/http-kernel", @@ -2784,6 +2726,120 @@ ], "time": "2016-01-20 09:13:37" }, + { + "name": "symfony/polyfill-php54", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php54.git", + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054", + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php54\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "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 backporting some PHP 5.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" + }, + { + "name": "symfony/polyfill-php55", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php55.git", + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "shasum": "" + }, + "require": { + "ircmaxell/password-compat": "~1.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php55\\": "" + }, + "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 backporting some PHP 5.5+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" + }, { "name": "symfony/process", "version": "v2.8.2", @@ -2997,112 +3053,6 @@ "templating" ], "time": "2016-01-25 21:22:18" - }, - { - "name": "zendframework/zend-code", - "version": "2.6.2", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-code.git", - "reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c4e8f976a772cfb14b47dabd69b5245a423082b4", - "reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "zendframework/zend-eventmanager": "^2.6|^3.0" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "zendframework/zend-stdlib": "~2.7" - }, - "suggest": { - "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", - "zendframework/zend-stdlib": "Zend\\Stdlib component" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Code\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "provides facilities to generate arbitrary code using an object oriented interface", - "homepage": "https://github.com/zendframework/zend-code", - "keywords": [ - "code", - "zf2" - ], - "time": "2016-01-05 05:58:37" - }, - { - "name": "zendframework/zend-eventmanager", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "8c9917f1595ff260f289439bdeb1f46500c65d62" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/8c9917f1595ff260f289439bdeb1f46500c65d62", - "reference": "8c9917f1595ff260f289439bdeb1f46500c65d62", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0" - }, - "require-dev": { - "athletic/athletic": "^0.1", - "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0", - "zendframework/zend-stdlib": "^2.7.3" - }, - "suggest": { - "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", - "zendframework/zend-stdlib": "^2.7.3, to use the FilterChain feature" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\EventManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Trigger and listen to events within a PHP application", - "homepage": "https://github.com/zendframework/zend-eventmanager", - "keywords": [ - "event", - "eventmanager", - "events", - "zf2" - ], - "time": "2016-01-12 23:27:48" } ], "packages-dev": [ @@ -3475,7 +3425,6 @@ "nice/twig": 20, "nice/templating": 20, "chrisboulton/php-resque": 20, - "doctrine/migrations": 20, "composer/satis": 20, "composer/composer": 20, "sami/sami": 20 @@ -3487,5 +3436,8 @@ "ext-pcntl": "*", "ext-posix": "*" }, - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "5.4" + } } diff --git a/src/Version.php b/src/Version.php index 9691f81..b2c2f7f 100644 --- a/src/Version.php +++ b/src/Version.php @@ -11,5 +11,5 @@ class Version { - const VERSION = '3.1.1'; + const VERSION = '3.1.2'; }