From 2a253d24ca9cf21d5d307e0c1f93f6d86bc33ee9 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 28 May 2020 13:53:16 +0200 Subject: [PATCH] Upgrade scheb/two-factor-bundle to fix vulnerability The bundle was locked to a version which contains a security bug. Jumping to the most recent fix the issue. But we'll have the `ListenerInterface` issue, again. So, downgrading sentry-symfony instead. See https://github.com/wallabag/wallabag/pull/4416/commits/0cf743f6fbfbc449c599ee0271e4e62ece0e47ac --- composer.json | 4 +- composer.lock | 563 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 448 insertions(+), 119 deletions(-) diff --git a/composer.json b/composer.json index 6133f5e8..5bc4573a 100644 --- a/composer.json +++ b/composer.json @@ -80,10 +80,10 @@ "php-http/httplug-bundle": "^1.14", "pragmarx/recovery": "^0.1.0", "predis/predis": "v1.1.x-dev", - "scheb/two-factor-bundle": "4.5.0", + "scheb/two-factor-bundle": "^4.11.0", "sensio/distribution-bundle": "^5.0", "sensio/framework-extra-bundle": "^5.2", - "sentry/sentry-symfony": "^3.0", + "sentry/sentry-symfony": "3.2.1", "stof/doctrine-extensions-bundle": "^1.2", "symfony/dom-crawler": "^3.4", "symfony/monolog-bundle": "^3.1", diff --git a/composer.lock b/composer.lock index e6bc6c13..49cc0908 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9460c8c5f1534c0655a9639167c3e1a1", + "content-hash": "684e23e16257042ea975c6797fc40c26", "packages": [ { "name": "bdunogier/guzzle-site-authenticator", @@ -215,6 +215,71 @@ ], "time": "2019-04-09T12:31:48+00:00" }, + { + "name": "composer/package-versions-deprecated", + "version": "1.8.0", + "source": { + "type": "git", + "url": "https://github.com/composer/package-versions-deprecated.git", + "reference": "98df7f1b293c0550bd5b1ce6b60b59bdda23aa47" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/98df7f1b293c0550bd5b1ce6b60b59bdda23aa47", + "reference": "98df7f1b293c0550bd5b1ce6b60b59bdda23aa47", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1.0 || ^2.0", + "php": "^7" + }, + "replace": { + "ocramius/package-versions": "1.2 - 1.8.99" + }, + "require-dev": { + "composer/composer": "^1.9.3 || ^2.0@dev", + "ext-zip": "^1.13", + "phpunit/phpunit": "^6.5 || ^7" + }, + "type": "composer-plugin", + "extra": { + "class": "PackageVersions\\Installer", + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2020-04-23T11:49:37+00:00" + }, { "name": "craue/config-bundle", "version": "2.4.0", @@ -498,6 +563,20 @@ "redis", "xcache" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", + "type": "tidelift" + } + ], "time": "2020-05-27T16:24:54+00:00" }, { @@ -1471,6 +1550,20 @@ "orm", "persistence" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence", + "type": "tidelift" + } + ], "time": "2020-03-21T15:13:52+00:00" }, { @@ -4041,20 +4134,20 @@ }, { "name": "jean85/pretty-package-versions", - "version": "1.2", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "75c7effcf3f77501d0e0caa75111aff4daa0dd48" + "reference": "e3517fb11b67e798239354fe8213927d012ad8f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/75c7effcf3f77501d0e0caa75111aff4daa0dd48", - "reference": "75c7effcf3f77501d0e0caa75111aff4daa0dd48", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/e3517fb11b67e798239354fe8213927d012ad8f9", + "reference": "e3517fb11b67e798239354fe8213927d012ad8f9", "shasum": "" }, "require": { - "ocramius/package-versions": "^1.2.0", + "composer/package-versions-deprecated": "^1.8.0", "php": "^7.0" }, "require-dev": { @@ -4088,7 +4181,7 @@ "release", "versions" ], - "time": "2018-06-13T13:22:40+00:00" + "time": "2020-04-24T14:19:45+00:00" }, { "name": "jms/metadata", @@ -4668,6 +4761,12 @@ "psr", "psr-7" ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], "time": "2020-04-27T17:07:01+00:00" }, { @@ -4778,6 +4877,12 @@ "laminas", "zf" ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], "time": "2020-05-20T16:45:56+00:00" }, { @@ -4833,6 +4938,16 @@ "JWS", "jwt" ], + "funding": [ + { + "url": "https://github.com/lcobucci", + "type": "github" + }, + { + "url": "https://www.patreon.com/lcobucci", + "type": "patreon" + } + ], "time": "2020-05-22T08:21:12+00:00" }, { @@ -5233,6 +5348,16 @@ "logging", "psr-3" ], + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], "time": "2020-05-22T07:31:27+00:00" }, { @@ -5378,56 +5503,6 @@ ], "time": "2019-06-17T08:53:14+00:00" }, - { - "name": "ocramius/package-versions", - "version": "1.4.2", - "source": { - "type": "git", - "url": "https://github.com/Ocramius/PackageVersions.git", - "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/44af6f3a2e2e04f2af46bcb302ad9600cba41c7d", - "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0.0", - "php": "^7.1.0" - }, - "require-dev": { - "composer/composer": "^1.6.3", - "doctrine/coding-standard": "^5.0.1", - "ext-zip": "*", - "infection/infection": "^0.7.1", - "phpunit/phpunit": "^7.5.17" - }, - "type": "composer-plugin", - "extra": { - "class": "PackageVersions\\Installer", - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - } - ], - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "time": "2019-11-15T16:17:10+00:00" - }, { "name": "ocramius/proxy-manager", "version": "2.1.1", @@ -6716,6 +6791,20 @@ "x.509", "x509" ], + "funding": [ + { + "url": "https://github.com/terrafrost", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpseclib", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", + "type": "tidelift" + } + ], "time": "2020-04-04T23:17:33+00:00" }, { @@ -7434,45 +7523,51 @@ }, { "name": "scheb/two-factor-bundle", - "version": "v4.5.0", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/scheb/two-factor-bundle.git", - "reference": "8dd92c33aeff4a5274e782629a0c1df4bbf77db2" + "reference": "44ae7d1394296ed54aa621dd96516786ade2eeed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/8dd92c33aeff4a5274e782629a0c1df4bbf77db2", - "reference": "8dd92c33aeff4a5274e782629a0c1df4bbf77db2", + "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/44ae7d1394296ed54aa621dd96516786ade2eeed", + "reference": "44ae7d1394296ed54aa621dd96516786ade2eeed", "shasum": "" }, "require": { "lcobucci/jwt": "^3.2", "paragonie/constant_time_encoding": "^2.2", "php": "^7.1.3", - "spomky-labs/otphp": "^9.1", - "symfony/config": "^3.4|^4.0", - "symfony/dependency-injection": "^3.4|^4.0", - "symfony/event-dispatcher": "^3.4|^4.0", - "symfony/framework-bundle": "^3.4|^4.0", - "symfony/http-foundation": "^3.4|^4.0", - "symfony/http-kernel": "^3.4|^4.0", - "symfony/property-access": "^3.4|^4.0", - "symfony/security-bundle": "^3.4|^4.0", - "symfony/twig-bundle": "^3.4|^4.0" + "spomky-labs/otphp": "^9.1|^10.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/event-dispatcher": "^3.4|^4.0|^5.0", + "symfony/framework-bundle": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/http-kernel": "^3.4|^4.0|^5.0", + "symfony/property-access": "^3.4|^4.0|^5.0", + "symfony/security-bundle": "^3.4|^4.0|^5.0", + "symfony/twig-bundle": "^3.4|^4.0|^5.0" }, "require-dev": { - "doctrine/lexer": "^1.0.1", - "doctrine/orm": "^2.6", - "phpunit/phpunit": "^7.0|^8.0", + "doctrine/persistence": "^1.3", + "escapestudios/symfony2-coding-standard": "^3.9", + "phpunit/phpunit": "^7.0|^8.0|^9.0", + "squizlabs/php_codesniffer": "^3.5", "swiftmailer/swiftmailer": "^6.0", - "symfony/yaml": "^3.4|^4.0" + "symfony/polyfill-php80": "^1.15", + "symfony/yaml": "^3.4|^4.0|^5.0", + "vimeo/psalm": "^3.11" }, "type": "symfony-bundle", "autoload": { "psr-4": { "Scheb\\TwoFactorBundle\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -7493,7 +7588,7 @@ "two-factor", "two-step" ], - "time": "2019-08-07T18:26:54+00:00" + "time": "2020-05-08T19:32:30+00:00" }, { "name": "sensio/distribution-bundle", @@ -7786,48 +7881,53 @@ "logging", "sentry" ], + "funding": [ + { + "url": "https://sentry.io/", + "type": "custom" + }, + { + "url": "https://sentry.io/pricing/", + "type": "custom" + } + ], "time": "2020-05-20T20:49:38+00:00" }, { "name": "sentry/sentry-symfony", - "version": "3.3.2", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-symfony.git", - "reference": "3a9c2669969604c362cc63ba8fa118d9a00ac711" + "reference": "620b90dc35c12ef96c6460df74e30441e359ce6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-symfony/zipball/3a9c2669969604c362cc63ba8fa118d9a00ac711", - "reference": "3a9c2669969604c362cc63ba8fa118d9a00ac711", + "url": "https://api.github.com/repos/getsentry/sentry-symfony/zipball/620b90dc35c12ef96c6460df74e30441e359ce6d", + "reference": "620b90dc35c12ef96c6460df74e30441e359ce6d", "shasum": "" }, "require": { "jean85/pretty-package-versions": "^1.0", - "ocramius/package-versions": "^1.3.0", "php": "^7.1", "sentry/sdk": "^2.0", - "symfony/config": "^3.4||^4.0||^5.0", - "symfony/console": "^3.4||^4.0||^5.0", - "symfony/dependency-injection": "^3.4||^4.0||^5.0", - "symfony/event-dispatcher": "^3.4||^4.0||^5.0", - "symfony/http-kernel": "^3.4||^4.0||^5.0", - "symfony/security-core": "^3.4||^4.0||^5.0" + "symfony/config": "^2.8||^3.0||^4.0", + "symfony/console": "^2.8||^3.0||^4.0", + "symfony/dependency-injection": "^2.8||^3.0||^4.0", + "symfony/event-dispatcher": "^2.8||^3.0||^4.0", + "symfony/http-kernel": "^2.8||^3.0||^4.0", + "symfony/security-core": "^2.8||^3.0||^4.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.8", "jangregor/phpstan-prophecy": "^0.3.0", "monolog/monolog": "^1.11||^2.0", "php-http/mock-client": "^1.0", + "phpstan/phpstan": "^0.11", "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-shim": "^0.11", - "phpunit/phpunit": "^7.5||^8.5", - "symfony/browser-kit": "^3.4||^4.0||^5.0", - "symfony/expression-language": "^3.4||^4.0||^5.0", - "symfony/framework-bundle": "^3.4||^4.0||^5.0", - "symfony/monolog-bundle": "^3.4", - "symfony/phpunit-bridge": "^5.0", - "symfony/yaml": "^3.4||^4.0||^5.0" + "phpunit/phpunit": "^7.5", + "scrutinizer/ocular": "^1.4", + "symfony/expression-language": "^2.8||^3.0||^4.0" }, "suggest": { "monolog/monolog": "Required to use the Monolog handler" @@ -7868,7 +7968,7 @@ "sentry", "symfony" ], - "time": "2020-01-16T08:45:03+00:00" + "time": "2019-11-29T21:24:37+00:00" }, { "name": "simplepie/simplepie", @@ -8241,6 +8341,20 @@ ], "description": "Symfony HttpClient component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-12T16:14:02+00:00" }, { @@ -8360,6 +8474,20 @@ "mime", "mime-type" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-16T14:49:30+00:00" }, { @@ -8479,6 +8607,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:14:59+00:00" }, { @@ -8537,6 +8679,20 @@ "polyfill", "portable" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:14:59+00:00" }, { @@ -8596,6 +8752,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -8654,6 +8824,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:14:59+00:00" }, { @@ -8716,6 +8900,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -8775,6 +8973,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -8831,6 +9043,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -8890,6 +9116,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -8945,6 +9185,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -9003,6 +9257,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -9055,6 +9323,20 @@ "polyfill", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:14:59+00:00" }, { @@ -9114,6 +9396,20 @@ "portable", "uuid" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -10109,6 +10405,12 @@ "Xdebug", "performance" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + } + ], "time": "2020-03-01T12:26:26+00:00" }, { @@ -10298,6 +10600,20 @@ "Fixture", "persistence" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle", + "type": "tidelift" + } + ], "time": "2020-04-02T16:40:37+00:00" }, { @@ -10389,6 +10705,12 @@ } ], "description": "A tool to automatically fix PHP code style", + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], "time": "2020-04-15T18:51:10+00:00" }, { @@ -10438,16 +10760,16 @@ }, { "name": "nette/bootstrap", - "version": "v3.0.1", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/nette/bootstrap.git", - "reference": "b45a1e33b6a44beb307756522396551e5a9ff249" + "reference": "67830a65b42abfb906f8e371512d336ebfb5da93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/bootstrap/zipball/b45a1e33b6a44beb307756522396551e5a9ff249", - "reference": "b45a1e33b6a44beb307756522396551e5a9ff249", + "url": "https://api.github.com/repos/nette/bootstrap/zipball/67830a65b42abfb906f8e371512d336ebfb5da93", + "reference": "67830a65b42abfb906f8e371512d336ebfb5da93", "shasum": "" }, "require": { @@ -10470,6 +10792,7 @@ "nette/safe-stream": "^2.2", "nette/security": "^3.0", "nette/tester": "^2.0", + "phpstan/phpstan-nette": "^0.12", "tracy/tracy": "^2.6" }, "suggest": { @@ -10490,8 +10813,8 @@ "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "GPL-2.0-only", + "GPL-3.0-only" ], "authors": [ { @@ -10510,7 +10833,7 @@ "configurator", "nette" ], - "time": "2019-09-30T08:19:38+00:00" + "time": "2020-05-26T08:46:23+00:00" }, { "name": "nette/di", @@ -10710,31 +11033,36 @@ }, { "name": "nette/php-generator", - "version": "v3.3.4", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/nette/php-generator.git", - "reference": "8fe7e699dca7db186f56d75800cb1ec32e39c856" + "reference": "ea2c8e8d6439f0a4e3cd3431c572b51a8131539b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/php-generator/zipball/8fe7e699dca7db186f56d75800cb1ec32e39c856", - "reference": "8fe7e699dca7db186f56d75800cb1ec32e39c856", + "url": "https://api.github.com/repos/nette/php-generator/zipball/ea2c8e8d6439f0a4e3cd3431c572b51a8131539b", + "reference": "ea2c8e8d6439f0a4e3cd3431c572b51a8131539b", "shasum": "" }, "require": { + "ext-tokenizer": "*", "nette/utils": "^2.4.2 || ^3.0", "php": ">=7.1" }, "require-dev": { "nette/tester": "^2.0", + "nikic/php-parser": "^4.4", "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.3" }, + "suggest": { + "nikic/php-parser": "to use ClassType::withBodiesFrom() & GlobalFunction::withBodyFrom()" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -10766,7 +11094,7 @@ "php", "scaffolding" ], - "time": "2020-02-09T14:39:09+00:00" + "time": "2020-05-26T16:32:45+00:00" }, { "name": "nette/robot-loader", @@ -10889,16 +11217,16 @@ }, { "name": "nette/utils", - "version": "v3.1.1", + "version": "v3.1.2", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "2c17d16d8887579ae1c0898ff94a3668997fd3eb" + "reference": "488f58378bba71767e7831c83f9e0fa808bf83b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/2c17d16d8887579ae1c0898ff94a3668997fd3eb", - "reference": "2c17d16d8887579ae1c0898ff94a3668997fd3eb", + "url": "https://api.github.com/repos/nette/utils/zipball/488f58378bba71767e7831c83f9e0fa808bf83b9", + "reference": "488f58378bba71767e7831c83f9e0fa808bf83b9", "shasum": "" }, "require": { @@ -10911,7 +11239,7 @@ }, "suggest": { "ext-gd": "to use Image", - "ext-iconv": "to use Strings::webalize() and toAscii()", + "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()", "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", "ext-json": "to use Nette\\Utils\\Json", "ext-mbstring": "to use Strings::lower() etc...", @@ -10963,7 +11291,7 @@ "utility", "validation" ], - "time": "2020-02-09T14:10:55+00:00" + "time": "2020-05-27T09:58:51+00:00" }, { "name": "nikic/php-parser", @@ -11602,5 +11930,6 @@ "platform-dev": [], "platform-overrides": { "php": "7.1.3" - } + }, + "plugin-api-version": "1.1.0" } -- 2.41.0