diff --git a/bin/composer.phar b/bin/composer.phar index 5001689d2..041775a12 100755 Binary files a/bin/composer.phar and b/bin/composer.phar differ diff --git a/composer.json b/composer.json index 788cd0175..be8da4094 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "monolog/monolog": "~1.0", "gregwar/image": "2.*", "donatj/phpuseragentparser": "~0.3", - "pimple/pimple": "~3.0", + "pimple/pimple": "~3.2", "rockettheme/toolbox": "~1.3", "maximebf/debugbar": "~1.10", "ext-mbstring": "*", diff --git a/composer.lock b/composer.lock index e13390d56..1ee7732c4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "863f839a5a0e0ebbf94742efc24cb6a4", + "content-hash": "0733f86741987a1c04f95887723ad988", "packages": [ { "name": "antoligy/dom-string-iterators", @@ -1093,18 +1093,19 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "664836e89c7ecad3dbaabc1572ea752c0d532d80" + "reference": "6da6150c9fb568739c8508a9859e9d5d7a5e99e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/664836e89c7ecad3dbaabc1572ea752c0d532d80", - "reference": "664836e89c7ecad3dbaabc1572ea752c0d532d80", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6da6150c9fb568739c8508a9859e9d5d7a5e99e9", + "reference": "6da6150c9fb568739c8508a9859e9d5d7a5e99e9", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", "adodb/adodb-php": "<5.20.6", "amphp/artax": "<1.0.6|>=2,<2.0.6", + "amphp/http": "<1.0.1", "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", "aws/aws-sdk-php": ">=3,<3.2.1", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", @@ -1170,7 +1171,7 @@ "simplesamlphp/simplesamlphp": "<1.15.2", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "socalnick/scn-social-auth": "<1.15.2", - "squizlabs/php_codesniffer": ">=1,<2.8.1", + "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", "stormpath/sdk": ">=0,<9.9.99", "swiftmailer/swiftmailer": ">=4,<5.4.5", "symfony/dependency-injection": ">=2,<2.0.17", @@ -1199,11 +1200,13 @@ "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", "willdurand/js-translation-bundle": "<2.1.1", "yiisoft/yii": ">=1.1.14,<1.1.15", - "yiisoft/yii2": "<2.0.14", + "yiisoft/yii2": "<2.0.15", "yiisoft/yii2-bootstrap": "<2.0.4", - "yiisoft/yii2-dev": "<2.0.14", + "yiisoft/yii2-dev": "<2.0.15", + "yiisoft/yii2-elasticsearch": "<2.0.5", "yiisoft/yii2-gii": "<2.0.4", "yiisoft/yii2-jui": "<2.0.4", + "yiisoft/yii2-redis": "<2.0.8", "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3", "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2", "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2", @@ -1241,7 +1244,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2018-03-07T15:45:44+00:00" + "time": "2018-03-20T15:54:02+00:00" }, { "name": "rockettheme/toolbox", @@ -1754,16 +1757,16 @@ }, { "name": "twig/twig", - "version": "v1.35.2", + "version": "v1.35.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9c24f2cd39dc1906b76879e099970b7e53724601" + "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9c24f2cd39dc1906b76879e099970b7e53724601", - "reference": "9c24f2cd39dc1906b76879e099970b7e53724601", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f", + "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f", "shasum": "" }, "require": { @@ -1771,8 +1774,8 @@ }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~3.3@dev" + "symfony/debug": "^2.7", + "symfony/phpunit-bridge": "^3.3" }, "type": "library", "extra": { @@ -1815,7 +1818,7 @@ "keywords": [ "templating" ], - "time": "2018-03-03T16:21:29+00:00" + "time": "2018-03-20T04:25:58+00:00" } ], "packages-dev": [ @@ -1971,16 +1974,16 @@ }, { "name": "codeception/phpunit-wrapper", - "version": "6.0.5", + "version": "6.0.8", "source": { "type": "git", "url": "https://github.com/Codeception/phpunit-wrapper.git", - "reference": "44e2100c300413a6b40cf8874ad402695010f443" + "reference": "e18f3ea1f841bfd2cecaf6e183e584127b9d467b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/44e2100c300413a6b40cf8874ad402695010f443", - "reference": "44e2100c300413a6b40cf8874ad402695010f443", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/e18f3ea1f841bfd2cecaf6e183e584127b9d467b", + "reference": "e18f3ea1f841bfd2cecaf6e183e584127b9d467b", "shasum": "" }, "require": { @@ -1989,6 +1992,13 @@ "sebastian/comparator": ">1.1 <3.0", "sebastian/diff": ">=1.4 <4.0" }, + "replace": { + "codeception/phpunit-wrapper": "*" + }, + "require-dev": { + "codeception/specify": "*", + "vlucas/phpdotenv": "^2.4" + }, "type": "library", "autoload": { "psr-4": { @@ -2006,7 +2016,7 @@ } ], "description": "PHPUnit classes used by Codeception", - "time": "2018-02-19T13:24:40+00:00" + "time": "2018-03-16T10:17:47+00:00" }, { "name": "codeception/stub",