From 6d8e17b1145cce3765fe6a326cc9956297271c8a Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sun, 11 Dec 2016 03:20:55 +0300 Subject: [PATCH] composer update. PointParser updated to match new version of markdown library. --- app/SymfonyRequirements.php | 10 +- app/check.php | 6 +- composer.lock | 771 ++++++++++-------- .../Service/Markdown/PointParser.php | 32 +- 4 files changed, 475 insertions(+), 344 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index abaf0c1..28b0dcd 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -446,6 +446,12 @@ class SymfonyRequirements extends RequirementCollection ); } + $this->addRequirement( + function_exists('iconv'), + 'iconv() must be available', + 'Install and enable the iconv extension.' + ); + $this->addRequirement( function_exists('json_encode'), 'json_encode() must be available', @@ -546,10 +552,10 @@ class SymfonyRequirements extends RequirementCollection require_once __DIR__.'/../vendor/autoload.php'; try { - $r = new \ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); + $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); - } catch (\ReflectionException $e) { + } catch (ReflectionException $e) { $contents = ''; } $this->addRecommendation( diff --git a/app/check.php b/app/check.php index 60ae0a8..4283cde 100755 --- a/app/check.php +++ b/app/check.php @@ -6,7 +6,7 @@ $lineSize = 70; $symfonyRequirements = new SymfonyRequirements(); $iniPath = $symfonyRequirements->getPhpIniConfigPath(); -echo_title('Symfony2 Requirements Checker'); +echo_title('Symfony Requirements Checker'); echo '> PHP is using the following php.ini file:'.PHP_EOL; if ($iniPath) { @@ -42,9 +42,9 @@ foreach ($symfonyRequirements->getRecommendations() as $req) { } if ($checkPassed) { - echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects'); + echo_block('success', 'OK', 'Your system is ready to run Symfony projects'); } else { - echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects'); + echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects'); echo_title('Fix the following mandatory requirements', 'red'); diff --git a/composer.lock b/composer.lock index 9afffc3..33f1b09 100644 --- a/composer.lock +++ b/composer.lock @@ -8,35 +8,35 @@ "packages": [ { "name": "doctrine/annotations", - "version": "v1.2.7", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" + "reference": "30e07cf03edc3cd3ef579d0dd4dd8c58250799a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/30e07cf03edc3cd3ef579d0dd4dd8c58250799a5", + "reference": "30e07cf03edc3cd3ef579d0dd4dd8c58250799a5", "shasum": "" }, "require": { "doctrine/lexer": "1.*", - "php": ">=5.3.2" + "php": "^5.6 || ^7.0" }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "^5.6.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Annotations\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" } }, "notification-url": "https://packagist.org/downloads/", @@ -72,20 +72,20 @@ "docblock", "parser" ], - "time": "2015-08-31T12:32:49+00:00" + "time": "2016-10-24T11:45:47+00:00" }, { "name": "doctrine/cache", - "version": "v1.6.0", + "version": "v1.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6" + "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6", - "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6", + "url": "https://api.github.com/repos/doctrine/cache/zipball/b6f544a20f4807e81f7044d31e679ccbb1866dc3", + "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3", "shasum": "" }, "require": { @@ -142,7 +142,7 @@ "cache", "caching" ], - "time": "2015-12-31T16:37:02+00:00" + "time": "2016-10-29T11:16:17+00:00" }, { "name": "doctrine/collections", @@ -212,16 +212,16 @@ }, { "name": "doctrine/common", - "version": "v2.6.1", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "a579557bc689580c19fee4e27487a67fe60defc0" + "reference": "5954c297e9d93ff84554906c2fbbc2a133c43941" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0", - "reference": "a579557bc689580c19fee4e27487a67fe60defc0", + "url": "https://api.github.com/repos/doctrine/common/zipball/5954c297e9d93ff84554906c2fbbc2a133c43941", + "reference": "5954c297e9d93ff84554906c2fbbc2a133c43941", "shasum": "" }, "require": { @@ -230,10 +230,10 @@ "doctrine/collections": "1.*", "doctrine/inflector": "1.*", "doctrine/lexer": "1.*", - "php": "~5.5|~7.0" + "php": "~5.6|~7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0" + "phpunit/phpunit": "^5.4.6" }, "type": "library", "extra": { @@ -281,7 +281,7 @@ "persistence", "spl" ], - "time": "2015-12-25T13:18:31+00:00" + "time": "2016-12-03T08:15:01+00:00" }, { "name": "doctrine/dbal", @@ -348,16 +348,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "1.6.2", + "version": "1.6.4", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9" + "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/e9c2ccf573b59b7cea566390f34254fed3c20ed9", - "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/dd40b0a7fb16658cda9def9786992b8df8a49be7", + "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7", "shasum": "" }, "require": { @@ -366,6 +366,7 @@ "jdorn/sql-formatter": "~1.1", "php": ">=5.3.2", "symfony/console": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", "symfony/doctrine-bridge": "~2.2|~3.0", "symfony/framework-bundle": "~2.3|~3.0" }, @@ -374,13 +375,14 @@ "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/property-info": "~2.8|~3.0", "symfony/validator": "~2.2|~3.0", "symfony/yaml": "~2.2|~3.0", "twig/twig": "~1.10" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", - "symfony/web-profiler-bundle": "to use the data collector" + "symfony/web-profiler-bundle": "To use the data collector." }, "type": "symfony-bundle", "extra": { @@ -423,7 +425,7 @@ "orm", "persistence" ], - "time": "2016-01-10T17:21:44+00:00" + "time": "2016-08-10T15:35:22+00:00" }, { "name": "doctrine/doctrine-cache-bundle", @@ -515,28 +517,31 @@ }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "1.1.1", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "303a576e2124efb07ec215e34ea2480b841cf5e4" + "reference": "6276139e0b913a4e5120fc36bb5b0eae8ac549bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/303a576e2124efb07ec215e34ea2480b841cf5e4", - "reference": "303a576e2124efb07ec215e34ea2480b841cf5e4", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/6276139e0b913a4e5120fc36bb5b0eae8ac549bc", + "reference": "6276139e0b913a4e5120fc36bb5b0eae8ac549bc", "shasum": "" }, "require": { "doctrine/doctrine-bundle": "~1.0", - "doctrine/migrations": "~1.0", - "php": ">=5.3.2", + "doctrine/migrations": "^1.1", + "php": ">=5.4.0", "symfony/framework-bundle": "~2.3|~3.0" }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -569,7 +574,7 @@ "migrations", "schema" ], - "time": "2015-11-04T13:45:30+00:00" + "time": "2016-12-05T18:36:37+00:00" }, { "name": "doctrine/inflector", @@ -990,21 +995,21 @@ }, { "name": "incenteev/composer-parameter-handler", - "version": "v2.1.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "84a205fe80a46101607bafbc423019527893ddd0" + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/84a205fe80a46101607bafbc423019527893ddd0", - "reference": "84a205fe80a46101607bafbc423019527893ddd0", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/yaml": "~2.0" + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { "composer/composer": "1.0.*@dev", @@ -1037,7 +1042,7 @@ "keywords": [ "parameters management" ], - "time": "2015-06-03T08:27:03+00:00" + "time": "2015-11-10T17:04:01+00:00" }, { "name": "jdorn/sql-formatter", @@ -1091,23 +1096,24 @@ }, { "name": "jms/metadata", - "version": "1.5.1", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "22b72455559a25777cfd28c4ffda81ff7639f353" + "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/22b72455559a25777cfd28c4ffda81ff7639f353", - "reference": "22b72455559a25777cfd28c4ffda81ff7639f353", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/6a06970a10e0a532fb52d3959547123b84a3b3ab", + "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab", "shasum": "" }, "require": { "php": ">=5.3.0" }, "require-dev": { - "doctrine/cache": "~1.0" + "doctrine/cache": "~1.0", + "symfony/cache": "~3.1" }, "type": "library", "extra": { @@ -1122,14 +1128,12 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache" + "Apache-2.0" ], "authors": [ { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" } ], "description": "Class/method/property metadata management in PHP", @@ -1139,7 +1143,7 @@ "xml", "yaml" ], - "time": "2014-07-12T07:13:19+00:00" + "time": "2016-12-05T10:18:33+00:00" }, { "name": "jms/parser-lib", @@ -1178,40 +1182,42 @@ }, { "name": "jms/serializer", - "version": "1.1.0", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48" + "reference": "f39d8b4660d5cef43b0c3265ce642173d9b2c58b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/fe13a1f993ea3456e195b7820692f2eb2b6bbb48", - "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/f39d8b4660d5cef43b0c3265ce642173d9b2c58b", + "reference": "f39d8b4660d5cef43b0c3265ce642173d9b2c58b", "shasum": "" }, "require": { - "doctrine/annotations": "1.*", - "doctrine/instantiator": "~1.0.3", + "doctrine/annotations": "^1.0", + "doctrine/instantiator": "^1.0.3", "jms/metadata": "~1.1", "jms/parser-lib": "1.*", - "php": ">=5.4.0", - "phpcollection/phpcollection": "~0.1" + "php": ">=5.5.0", + "phpcollection/phpcollection": "~0.1", + "phpoption/phpoption": "^1.1" }, "conflict": { "twig/twig": "<1.12" }, "require-dev": { "doctrine/orm": "~2.1", - "doctrine/phpcr-odm": "~1.0.1", - "jackalope/jackalope-doctrine-dbal": "1.0.*", - "phpunit/phpunit": "~4.0", + "doctrine/phpcr-odm": "^1.3|^2.0", + "ext-pdo_sqlite": "*", + "jackalope/jackalope-doctrine-dbal": "^1.1.5", + "phpunit/phpunit": "^4.8|^5.0", "propel/propel1": "~1.7", - "symfony/filesystem": "2.*", + "symfony/filesystem": "^2.1", "symfony/form": "~2.1", - "symfony/translation": "~2.0", - "symfony/validator": "~2.0", - "symfony/yaml": "2.*", + "symfony/translation": "^2.1", + "symfony/validator": "^2.2", + "symfony/yaml": "^2.1", "twig/twig": "~1.12|~2.0" }, "suggest": { @@ -1220,7 +1226,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1247,7 +1253,7 @@ "serialization", "xml" ], - "time": "2015-10-27T09:24:41+00:00" + "time": "2016-11-13T10:20:11+00:00" }, { "name": "jms/serializer-bundle", @@ -1392,21 +1398,22 @@ }, { "name": "knplabs/knp-markdown-bundle", - "version": "1.4.2", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMarkdownBundle.git", - "reference": "27d6c8c866a5fef70df3f219e6c2afab25e145ce" + "reference": "3581dabfc5e6627261abb0b6513b73b8e95f2c92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMarkdownBundle/zipball/27d6c8c866a5fef70df3f219e6c2afab25e145ce", - "reference": "27d6c8c866a5fef70df3f219e6c2afab25e145ce", + "url": "https://api.github.com/repos/KnpLabs/KnpMarkdownBundle/zipball/3581dabfc5e6627261abb0b6513b73b8e95f2c92", + "reference": "3581dabfc5e6627261abb0b6513b73b8e95f2c92", "shasum": "" }, "require": { "michelf/php-markdown": "~1.4", "php": ">=5.3.9", + "symfony/dependency-injection": "~2.3|~3.0", "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { @@ -1449,7 +1456,7 @@ "knplabs", "markdown" ], - "time": "2015-12-15T20:41:45+00:00" + "time": "2016-05-04T16:08:55+00:00" }, { "name": "knplabs/knp-paginator-bundle", @@ -1514,39 +1521,38 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31" + "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31", - "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1", + "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1", "shasum": "" }, "require": { "php": ">=5.3.1", - "symfony/process": "~2.1" + "symfony/process": "~2.1|~3.0" }, "conflict": { - "twig/twig": "<1.12" + "twig/twig": "<1.27" }, "require-dev": { - "cssmin/cssmin": "*", - "joliclic/javascript-packer": "*", - "kamicane/packager": "*", "leafo/lessphp": "^0.3.7", - "leafo/scssphp": "*@dev", - "leafo/scssphp-compass": "*@dev", - "mrclay/minify": "*", + "leafo/scssphp": "~0.1", + "meenie/javascript-packer": "^1.1", + "mrclay/minify": "<2.3", + "natxet/cssmin": "3.0.4", "patchwork/jsqueeze": "~1.0|~2.0", - "phpunit/phpunit": "~4.8", + "phpunit/phpunit": "~4.8 || ^5.6", "psr/log": "~1.0", - "ptachoire/cssembed": "*", - "symfony/phpunit-bridge": "~2.7", - "twig/twig": "~1.8|~2.0" + "ptachoire/cssembed": "~1.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "twig/twig": "~1.23|~2.0", + "yfix/packager": "dev-master" }, "suggest": { "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", @@ -1559,7 +1565,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1588,20 +1594,20 @@ "compression", "minification" ], - "time": "2015-08-31T19:07:16+00:00" + "time": "2016-11-11T18:43:20+00:00" }, { "name": "michelf/php-markdown", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "156e56ee036505ec637d761ee62dc425d807183c" + "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c", - "reference": "156e56ee036505ec637d761ee62dc425d807183c", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/1f51cc520948f66cd2af8cbc45a5ee175e774220", + "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220", "shasum": "" }, "require": { @@ -1639,7 +1645,7 @@ "keywords": [ "markdown" ], - "time": "2015-12-24T01:37:31+00:00" + "time": "2016-10-29T18:58:20+00:00" }, { "name": "misd/guzzle-bundle", @@ -1716,16 +1722,16 @@ }, { "name": "monolog/monolog", - "version": "1.17.1", + "version": "1.22.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" + "reference": "bad29cb8d18ab0315e6c477751418a82c850d558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558", + "reference": "bad29cb8d18ab0315e6c477751418a82c850d558", "shasum": "" }, "require": { @@ -1736,16 +1742,17 @@ "psr/log-implementation": "1.0.0" }, "require-dev": { - "aws/aws-sdk-php": "^2.4.9", + "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", + "jakub-onderka/php-parallel-lint": "0.9", + "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "~0.11", "ruflin/elastica": ">=0.90 <3.0", - "swiftmailer/swiftmailer": "~5.3", - "videlalvaro/php-amqplib": "~2.4" + "sentry/sentry": "^0.13", + "swiftmailer/swiftmailer": "~5.3" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", @@ -1753,16 +1760,17 @@ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", - "raven/raven": "Allow sending log messages to a Sentry server", "rollbar/rollbar": "Allow sending log messages to Rollbar", "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib" + "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.16.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1788,37 +1796,36 @@ "logging", "psr-3" ], - "time": "2015-08-31T09:17:37+00:00" + "time": "2016-11-26T00:15:39+00:00" }, { "name": "ob/highcharts-bundle", - "version": "1.2", - "target-dir": "Ob/HighchartsBundle", + "version": "1.5", "source": { "type": "git", "url": "https://github.com/marcaube/ObHighchartsBundle.git", - "reference": "cce67aa209f2a8b14db520c8e50a15cd5f5c23d0" + "reference": "ef6a9aded173127e19d4a098a95573f64e0b3309" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/marcaube/ObHighchartsBundle/zipball/cce67aa209f2a8b14db520c8e50a15cd5f5c23d0", - "reference": "cce67aa209f2a8b14db520c8e50a15cd5f5c23d0", + "url": "https://api.github.com/repos/marcaube/ObHighchartsBundle/zipball/ef6a9aded173127e19d4a098a95573f64e0b3309", + "reference": "ef6a9aded173127e19d4a098a95573f64e0b3309", "shasum": "" }, "require": { - "php": ">=5.3.0", - "symfony/symfony": "~2.3", - "zendframework/zend-json": "2.3.0" + "php": ">=5.3", + "symfony/symfony": "~2.3|~3.0", + "zendframework/zend-json": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { - "psr-0": { - "Ob\\HighchartsBundle": "" + "psr-4": { + "Ob\\HighchartsBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1843,7 +1850,7 @@ "marcaube", "ob" ], - "time": "2014-08-04T23:56:54+00:00" + "time": "2016-07-26T23:46:28+00:00" }, { "name": "ocramius/proxy-manager", @@ -1909,17 +1916,65 @@ "time": "2015-08-09T04:28:19+00:00" }, { - "name": "phpcollection/phpcollection", - "version": "0.4.0", + "name": "paragonie/random_compat", + "version": "v1.4.1", "source": { "type": "git", - "url": "https://github.com/schmittjoh/php-collection.git", - "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83" + "url": "https://github.com/paragonie/random_compat.git", + "reference": "c7e26a21ba357863de030f0b9e701c7d04593774" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/b8bf55a0a929ca43b01232b36719f176f86c7e83", - "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774", + "reference": "c7e26a21ba357863de030f0b9e701c7d04593774", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "autoload": { + "files": [ + "lib/random.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "pseudorandom", + "random" + ], + "time": "2016-03-18T20:34:03+00:00" + }, + { + "name": "phpcollection/phpcollection", + "version": "0.5.0", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-collection.git", + "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6", + "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6", "shasum": "" }, "require": { @@ -1928,7 +1983,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.3-dev" + "dev-master": "0.4-dev" } }, "autoload": { @@ -1942,10 +1997,8 @@ ], "authors": [ { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" } ], "description": "General-Purpose Collection Library for PHP", @@ -1956,7 +2009,7 @@ "sequence", "set" ], - "time": "2014-03-11T13:46:42+00:00" + "time": "2015-05-17T12:39:23+00:00" }, { "name": "phpoption/phpoption", @@ -2010,22 +2063,30 @@ }, { "name": "psr/log", - "version": "1.0.0", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, + "require": { + "php": ">=5.3.0" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { - "psr-0": { - "Psr\\Log\\": "" + "psr-4": { + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2039,26 +2100,27 @@ } ], "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ "log", "psr", "psr-3" ], - "time": "2012-12-21T11:40:51+00:00" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "sensio/distribution-bundle", - "version": "v3.0.31", + "version": "v3.0.36", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "3a900814bd57bf20f9453ae81ff8772bc95d7fff" + "reference": "964a56e855acac38d4a81920b3a86543f7e8492f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/3a900814bd57bf20f9453ae81ff8772bc95d7fff", - "reference": "3a900814bd57bf20f9453ae81ff8772bc95d7fff", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/964a56e855acac38d4a81920b3a86543f7e8492f", + "reference": "964a56e855acac38d4a81920b3a86543f7e8492f", "shasum": "" }, "require": { @@ -2104,29 +2166,36 @@ "configuration", "distribution" ], - "time": "2015-08-03T10:07:12+00:00" + "time": "2016-04-25T20:46:43+00:00" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.10", + "version": "v3.0.16", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c" + "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/18fc2063c4d6569cdca47a39fbac32342eb65f3c", - "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/507a15f56fa7699f6cc8c2c7de4080b19ce22546", + "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546", "shasum": "" }, "require": { "doctrine/common": "~2.2", - "symfony/framework-bundle": "~2.3" + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { - "symfony/expression-language": "~2.4", - "symfony/security-bundle": "~2.4" + "symfony/browser-kit": "~2.3|~3.0", + "symfony/dom-crawler": "~2.3|~3.0", + "symfony/expression-language": "~2.4|~3.0", + "symfony/finder": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/security-bundle": "~2.4|~3.0", + "symfony/twig-bundle": "~2.3|~3.0", + "twig/twig": "~1.11|~2.0" }, "suggest": { "symfony/expression-language": "", @@ -2159,24 +2228,24 @@ "annotations", "controllers" ], - "time": "2015-08-03T11:59:27+00:00" + "time": "2016-03-25T17:08:27+00:00" }, { "name": "sensiolabs/security-checker", - "version": "v3.0.1", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9" + "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/7735fd97ff7303d9df776b8dbc970f949399abc9", - "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/21696b0daa731064c23cfb694c60a2584a7b6e93", + "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93", "shasum": "" }, "require": { - "symfony/console": "~2.0" + "symfony/console": "~2.0|~3.0" }, "bin": [ "security-checker" @@ -2203,27 +2272,27 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-08-11T12:11:25+00:00" + "time": "2015-11-07T08:07:40+00:00" }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.1", + "version": "v5.4.4", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421" + "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421", - "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/545ce9136690cea74f98f86fbb9c92dd9ab1a756", + "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~0.9.1,<0.9.4" + "mockery/mockery": "~0.9.1" }, "type": "library", "extra": { @@ -2256,42 +2325,42 @@ "mail", "mailer" ], - "time": "2015-06-06T14:19:39+00:00" + "time": "2016-11-24T01:01:23+00:00" }, { "name": "symfony/assetic-bundle", - "version": "v2.7.0", + "version": "v2.8.1", "source": { "type": "git", "url": "https://github.com/symfony/assetic-bundle.git", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" + "reference": "0241b135ff64c6031048c6425cd833a8300da46b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/0241b135ff64c6031048c6425cd833a8300da46b", + "reference": "0241b135ff64c6031048c6425cd833a8300da46b", "shasum": "" }, "require": { - "kriswallsmith/assetic": "~1.3", + "kriswallsmith/assetic": "~1.4", "php": ">=5.3.0", - "symfony/console": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/framework-bundle": "~2.3", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "conflict": { "kriswallsmith/spork": "<=0.2", - "twig/twig": "<1.20" + "twig/twig": "<1.27" }, "require-dev": { "kriswallsmith/spork": "~0.3", "patchwork/jsqueeze": "~1.0", - "symfony/class-loader": "~2.3", - "symfony/css-selector": "~2.3", - "symfony/dom-crawler": "~2.3", - "symfony/phpunit-bridge": "~2.7", - "symfony/twig-bundle": "~2.3" + "symfony/class-loader": "~2.3|~3.0", + "symfony/css-selector": "~2.3|~3.0", + "symfony/dom-crawler": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/twig-bundle": "~2.3|~3.0" }, "suggest": { "kriswallsmith/spork": "to be able to dump assets in parallel", @@ -2300,7 +2369,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2326,38 +2395,39 @@ "compression", "minification" ], - "time": "2015-09-01T00:05:29+00:00" + "time": "2016-11-22T11:42:57+00:00" }, { "name": "symfony/monolog-bundle", - "version": "2.8.1", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" + "reference": "6acef3bd201c4f35e42e52dedf1fe088f30e07e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/6acef3bd201c4f35e42e52dedf1fe088f30e07e8", + "reference": "6acef3bd201c4f35e42e52dedf1fe088f30e07e8", "shasum": "" }, "require": { - "monolog/monolog": "~1.8", + "monolog/monolog": "~1.18", "php": ">=5.3.2", - "symfony/config": "~2.3|3.*", - "symfony/dependency-injection": "~2.3|3.*", - "symfony/http-kernel": "~2.3|3.*", - "symfony/monolog-bridge": "~2.3|3.*" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/monolog-bridge": "~2.3|~3.0" }, "require-dev": { - "symfony/console": "~2.3|3.*", - "symfony/yaml": "~2.3" + "phpunit/phpunit": "^4.8", + "symfony/console": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.8.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2385,32 +2455,146 @@ "log", "logging" ], - "time": "2015-10-02T11:51:59+00:00" + "time": "2016-11-06T18:54:50+00:00" }, { - "name": "symfony/swiftmailer-bundle", - "version": "v2.3.8", + "name": "symfony/polyfill-apcu", + "version": "v1.3.0", "source": { "type": "git", - "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797" + "url": "https://github.com/symfony/polyfill-apcu.git", + "reference": "5d4474f447403c3348e37b70acc2b95475b7befa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa", + "reference": "5d4474f447403c3348e37b70acc2b95475b7befa", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "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 apcu_* functions to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "apcu", + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-11-14T01:06:16+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", + "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "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 for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2016-11-14T01:06:16+00:00" + }, + { + "name": "symfony/swiftmailer-bundle", + "version": "v2.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/swiftmailer-bundle.git", + "reference": "d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069", + "reference": "d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069", "shasum": "" }, "require": { "php": ">=5.3.2", "swiftmailer/swiftmailer": ">=4.2.0,~5.0", - "symfony/swiftmailer-bridge": "~2.1" + "symfony/config": "~2.7|~3.0", + "symfony/dependency-injection": "~2.7|~3.0", + "symfony/http-kernel": "~2.7|~3.0" }, "require-dev": { - "symfony/config": "~2.1", - "symfony/dependency-injection": "~2.1", - "symfony/http-kernel": "~2.1", - "symfony/yaml": "~2.1" + "symfony/console": "~2.7|~3.0", + "symfony/framework-bundle": "~2.7|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/yaml": "~2.7|~3.0" }, "suggest": { "psr/log": "Allows logging" @@ -2418,7 +2602,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -2442,27 +2626,30 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2014-12-01T17:44:50+00:00" + "time": "2016-10-27T17:59:30+00:00" }, { "name": "symfony/symfony", - "version": "v2.7.5", + "version": "v2.7.21", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "619528a274647cffc1792063c3ea04c4fa8266a0" + "reference": "cdc25e2d47d2c2f1d968feda5a7895031915043c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/619528a274647cffc1792063c3ea04c4fa8266a0", - "reference": "619528a274647cffc1792063c3ea04c4fa8266a0", + "url": "https://api.github.com/repos/symfony/symfony/zipball/cdc25e2d47d2c2f1d968feda5a7895031915043c", + "reference": "cdc25e2d47d2c2f1d968feda5a7895031915043c", "shasum": "" }, "require": { "doctrine/common": "~2.4", + "paragonie/random_compat": "~1.0", "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.20|~2.0" + "symfony/polyfill-apcu": "~1.1", + "symfony/polyfill-mbstring": "~1.1", + "twig/twig": "~1.28|~2.0" }, "replace": { "symfony/asset": "self.version", @@ -2515,11 +2702,11 @@ "doctrine/dbal": "~2.4", "doctrine/doctrine-bundle": "~1.2", "doctrine/orm": "~2.4,>=2.4.5", - "egulias/email-validator": "~1.2", + "egulias/email-validator": "~1.2,>=1.2.1", "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", - "ocramius/proxy-manager": "~0.4|~1.0", - "symfony/phpunit-bridge": "self.version" + "ocramius/proxy-manager": "~0.4|~1.0|~2.0", + "symfony/phpunit-bridge": "~3.2" }, "type": "library", "extra": { @@ -2543,6 +2730,9 @@ ], "files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" + ], + "exclude-from-classmap": [ + "**/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2564,20 +2754,20 @@ "keywords": [ "framework" ], - "time": "2015-09-25T11:16:52+00:00" + "time": "2016-11-21T01:13:05+00:00" }, { "name": "twig/extensions", - "version": "v1.3.0", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig-extensions.git", - "reference": "449e3c8a9ffad7c2479c7864557275a32b037499" + "reference": "f0bb8431c8691f5a39f1017d9a5967a082bf01ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/449e3c8a9ffad7c2479c7864557275a32b037499", - "reference": "449e3c8a9ffad7c2479c7864557275a32b037499", + "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/f0bb8431c8691f5a39f1017d9a5967a082bf01ff", + "reference": "f0bb8431c8691f5a39f1017d9a5967a082bf01ff", "shasum": "" }, "require": { @@ -2592,7 +2782,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2616,20 +2806,20 @@ "i18n", "text" ], - "time": "2015-08-22T16:38:35+00:00" + "time": "2016-10-25T17:34:14+00:00" }, { "name": "twig/twig", - "version": "v1.22.2", + "version": "v1.28.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a" + "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a", - "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/b22ce0eb070e41f7cba65d78fe216de29726459c", + "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c", "shasum": "" }, "require": { @@ -2637,12 +2827,12 @@ }, "require-dev": { "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "~3.2@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.22-dev" + "dev-master": "1.28-dev" } }, "autoload": { @@ -2677,31 +2867,31 @@ "keywords": [ "templating" ], - "time": "2015-09-22T13:59:32+00:00" + "time": "2016-11-23T18:41:40+00:00" }, { "name": "zendframework/zend-code", - "version": "2.6.2", + "version": "2.6.3", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4" + "reference": "95033f061b083e16cdee60530ec260d7d628b887" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c4e8f976a772cfb14b47dabd69b5245a423082b4", - "reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/95033f061b083e16cdee60530ec260d7d628b887", + "reference": "95033f061b083e16cdee60530ec260d7d628b887", "shasum": "" }, "require": { - "php": ">=5.5", - "zendframework/zend-eventmanager": "^2.6|^3.0" + "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6", + "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" + "phpunit/phpunit": "^4.8.21", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", @@ -2729,7 +2919,7 @@ "code", "zf2" ], - "time": "2016-01-05T05:58:37+00:00" + "time": "2016-04-20T17:26:42+00:00" }, { "name": "zendframework/zend-eventmanager", @@ -2787,39 +2977,35 @@ }, { "name": "zendframework/zend-json", - "version": "2.3.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-json.git", - "reference": "cf8e594a8a6516d06c25a3dc07e3be462fbea84d" + "reference": "f42a1588e75c2a3e338cd94c37906231e616daab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-json/zipball/cf8e594a8a6516d06c25a3dc07e3be462fbea84d", - "reference": "cf8e594a8a6516d06c25a3dc07e3be462fbea84d", + "url": "https://api.github.com/repos/zendframework/zend-json/zipball/f42a1588e75c2a3e338cd94c37906231e616daab", + "reference": "f42a1588e75c2a3e338cd94c37906231e616daab", "shasum": "" }, "require": { - "php": ">=5.3.23", - "zendframework/zend-stdlib": "self.version" + "php": "^5.5 || ^7.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "dev-master", - "zendframework/zend-http": "self.version", - "zendframework/zend-server": "self.version" + "squizlabs/php_codesniffer": "^2.3", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { - "zendframework/zend-http": "Zend\\Http component", - "zendframework/zend-server": "Zend\\Server component", - "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" + "zendframework/zend-json-server": "For implementing JSON-RPC servers", + "zendframework/zend-xml2json": "For converting XML documents to JSON" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev", - "dev-develop": "2.3-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" } }, "autoload": { @@ -2837,88 +3023,35 @@ "json", "zf2" ], - "time": "2014-03-12T16:10:15+00:00" - }, - { - "name": "zendframework/zend-stdlib", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "426b5396e89e7da2db9678bc9a0b57865f84fe0f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/426b5396e89e7da2db9678bc9a0b57865f84fe0f", - "reference": "426b5396e89e7da2db9678bc9a0b57865f84fe0f", - "shasum": "" - }, - "require": { - "php": ">=5.3.23" - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "dev-master", - "zendframework/zend-eventmanager": "self.version", - "zendframework/zend-filter": "self.version", - "zendframework/zend-serializer": "self.version", - "zendframework/zend-servicemanager": "self.version" - }, - "suggest": { - "zendframework/zend-eventmanager": "To support aggregate hydrator usage", - "zendframework/zend-filter": "To support naming strategy hydrator usage", - "zendframework/zend-serializer": "Zend\\Serializer component", - "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev", - "dev-develop": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "Zend\\Stdlib\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "homepage": "https://github.com/zendframework/zend-stdlib", - "keywords": [ - "stdlib", - "zf2" - ], - "time": "2014-03-12T16:10:15+00:00" + "time": "2016-04-01T02:34:00+00:00" } ], "packages-dev": [ { "name": "doctrine/data-fixtures", - "version": "v1.1.1", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "bd44f6b6e40247b6530bc8abe802e4e4d914976a" + "reference": "17fa5bfe6ff52e35cb3d9ec37c934a2f4bd1fa2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/bd44f6b6e40247b6530bc8abe802e4e4d914976a", - "reference": "bd44f6b6e40247b6530bc8abe802e4e4d914976a", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/17fa5bfe6ff52e35cb3d9ec37c934a2f4bd1fa2e", + "reference": "17fa5bfe6ff52e35cb3d9ec37c934a2f4bd1fa2e", "shasum": "" }, "require": { "doctrine/common": "~2.2", - "php": ">=5.3.2" + "php": "^5.6 || ^7.0" }, "conflict": { "doctrine/orm": "< 2.4" }, "require-dev": { - "doctrine/orm": "~2.4" + "doctrine/dbal": "^2.5.4", + "doctrine/orm": "^2.5.4", + "phpunit/phpunit": "^5.4.6" }, "suggest": { "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", @@ -2928,7 +3061,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -2951,7 +3084,7 @@ "keywords": [ "database" ], - "time": "2015-03-30T12:14:13+00:00" + "time": "2016-09-20T10:07:57+00:00" }, { "name": "doctrine/doctrine-fixtures-bundle", diff --git a/src/Skobkin/Bundle/PointToolsBundle/Service/Markdown/PointParser.php b/src/Skobkin/Bundle/PointToolsBundle/Service/Markdown/PointParser.php index 3105512..906d57d 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/Service/Markdown/PointParser.php +++ b/src/Skobkin/Bundle/PointToolsBundle/Service/Markdown/PointParser.php @@ -73,35 +73,27 @@ class PointParser extends MarkdownParser /** * Point.im breaks Markdown double line wrap rule - * - * @param $text - * - * @return mixed + * {@inheritdoc} */ - protected function formParagraphs($text) { - # - # Params: - # $text - string to process with html

tags - # - # Strip leading and trailing lines: + protected function formParagraphs($text, $wrap_in_p = true) { + // Strip leading and trailing lines: $text = preg_replace('/\A\n+|\n+\z/', '', $text); $grafs = preg_split('/\n+/', $text, -1, PREG_SPLIT_NO_EMPTY); - # - # Wrap

tags and unhashify HTML blocks - # + // Wrap

tags and unhashify HTML blocks foreach ($grafs as $key => $value) { if (!preg_match('/^B\x1A[0-9]+B$/', $value)) { - # Is a paragraph. + // Is a paragraph. $value = $this->runSpanGamut($value); - $value = preg_replace('/^([ ]*)/', "

", $value); - $value .= "

"; + if ($wrap_in_p) { + $value = preg_replace('/^([ ]*)/', "

", $value); + $value .= "

"; + } $grafs[$key] = $this->unhash($value); - } - else { - # Is a block. - # Modify elements of @grafs in-place... + } else { + // Is a block. + // Modify elements of @grafs in-place... $graf = $value; $block = $this->html_hashes[$graf]; $graf = $block;