diff --git a/composer.json b/composer.json index 24a91948a9..94f86c76f0 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "facebook/php-sdk": "~3.0", "firebase/php-jwt": "^3.0.0", "gedmo/doctrine-extensions": "~2.3.0", - "goodby/csv": "dev-master", + "goodby/csv": "^1.3.0", "guzzle/guzzle": "~3.0", "hoa/compiler": "~2.0", "hoa/console": "~2.0", @@ -89,7 +89,7 @@ "sorien/silex-dbal-profiler": "~1.0.0", "sorien/silex-pimple-dumper": "^1.0", "swiftmailer/swiftmailer": "~5.3.0", - "symfony/symfony": "~2.4", + "symfony/symfony": "~2.7.10|~2.8.3", "themattharris/tmhoauth": "~0.7", "twig/extensions": "^1.2.0", "twig/twig": "~1.14, >=1.14.2", @@ -105,7 +105,7 @@ "autoload": { "psr-0": { "Alchemy\\": "lib", - "": "lib/classes" + "": "lib/classes" } }, "include-path": ["vendor/zend/gdata/library"], diff --git a/composer.lock b/composer.lock index 2049afa035..42d9128160 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": "ed45383ccafa1e0c7d586d02a8df2e3f", - "content-hash": "8934531438dc5787ad1ff81ae20efa51", + "hash": "02cbfee2e7384dfed43ce4c8e8a64c5d", + "content-hash": "db0a3515fad6442e50e3a64478365383", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -1926,7 +1926,7 @@ }, { "name": "goodby/csv", - "version": "dev-master", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/goodby/csv.git", @@ -4720,18 +4720,19 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "7de84a436dfddf7d407b9cc6f08afa6fa56ff774" + "reference": "c18abc6df90257ddbbe2654a98cc5cc7be804411" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/c18abc6df90257ddbbe2654a98cc5cc7be804411", - "reference": "7de84a436dfddf7d407b9cc6f08afa6fa56ff774", + "reference": "c18abc6df90257ddbbe2654a98cc5cc7be804411", "shasum": "" }, "conflict": { "aws/aws-sdk-php": ">=3,<3.2.1", "cakephp/cakephp": ">=3,<3.0.15|>=2,<2.4.99|>=2.5,<2.5.90|>=2.6,<2.6.12|>=1.3,<1.3.18|>=2.7,<2.7.6|>=3.1,<3.1.3", "codeigniter/framework": "<3.0.3", + "composer/composer": "<=1.0.0-alpha11", "contao/core": ">=2.11,<3|>=3,<3.1|>=3.1,<3.2|>=3.2,<3.2.19|>=3.3,<3.4|>=3.4,<3.4.4", "doctrine/annotations": ">=1,<1.2.7", "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2", @@ -4742,7 +4743,7 @@ "doctrine/mongodb-odm": ">=1,<1.0.2", "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1", - "dompdf/dompdf": ">=0.6,<0.6.1", + "dompdf/dompdf": ">=0.6,<0.6.2", "firebase/php-jwt": "<2", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/user-bundle": ">=1.2,<1.3|>=1.3,<1.3.5", @@ -4827,7 +4828,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2016-01-25 21:27:29" + "time": "2016-02-14 18:50:07" }, { "name": "seld/jsonlint", @@ -5388,6 +5389,62 @@ ], "time": "2014-12-05 14:17:14" }, + { + "name": "symfony/polyfill-apcu", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-apcu.git", + "reference": "d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c", + "reference": "d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "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 apcu_* functions to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "apcu", + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" + }, { "name": "symfony/polyfill-intl-icu", "version": "v1.1.0", @@ -5846,22 +5903,23 @@ }, { "name": "symfony/symfony", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5" + "reference": "7a9a5fce7ce6e448e527f635463dda00761e12c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/f3e6a82bcbea4db3b56df08e491e20a1faae82b5", - "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5", + "url": "https://api.github.com/repos/symfony/symfony/zipball/7a9a5fce7ce6e448e527f635463dda00761e12c2", + "reference": "7a9a5fce7ce6e448e527f635463dda00761e12c2", "shasum": "" }, "require": { "doctrine/common": "~2.4", "php": ">=5.3.9", "psr/log": "~1.0", + "symfony/polyfill-apcu": "~1.1", "symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php54": "~1.0", @@ -5930,7 +5988,7 @@ "doctrine/orm": "~2.4,>=2.4.5", "egulias/email-validator": "~1.2", "monolog/monolog": "~1.11", - "ocramius/proxy-manager": "~0.4|~1.0", + "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "phpdocumentor/reflection": "^1.0.7" }, "type": "library", @@ -5975,7 +6033,7 @@ "keywords": [ "framework" ], - "time": "2016-01-14 12:01:11" + "time": "2016-02-28 21:06:29" }, { "name": "themattharris/tmhoauth", @@ -7323,7 +7381,6 @@ "stability-flags": { "alchemy/rest-bundle": 20, "alchemy/task-manager": 20, - "goodby/csv": 20, "imagine/imagine": 20, "jms/translation-bundle": 20, "neutron/process-manager": 20,