From 8405a08922cf736c0c707ad64fd4db9d67eed33d Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 19:46:46 +0300 Subject: [PATCH 01/17] composer remove symfony/swiftmailer-bundle. --- app/AppKernel.php | 1 - app/config/config.yml | 7 -- app/config/parameters.yml.dist | 5 - composer.json | 1 - composer.lock | 220 ++++++++------------------------- 5 files changed, 54 insertions(+), 180 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 77d68f0..1550814 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -12,7 +12,6 @@ class AppKernel extends Kernel new Symfony\Bundle\SecurityBundle\SecurityBundle(), new Symfony\Bundle\TwigBundle\TwigBundle(), new Symfony\Bundle\MonologBundle\MonologBundle(), - new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(), diff --git a/app/config/config.yml b/app/config/config.yml index 2bf0721..b405ade 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -60,10 +60,3 @@ doctrine_migrations: table_name: migration_versions name: Application Migrations -# Swiftmailer Configuration -swiftmailer: - transport: "%mailer_transport%" - host: "%mailer_host%" - username: "%mailer_user%" - password: "%mailer_password%" - spool: { type: memory } diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 4207d8d..05ad8a9 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -9,11 +9,6 @@ parameters: # You should uncomment this if you want use pdo_sqlite # database_path: "%kernel.root_dir%/data.db3" - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: ~ - mailer_password: ~ - locale: en # A secret key that's used to generate certain security-related tokens diff --git a/composer.json b/composer.json index 35c811a..6ee7fd0 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,6 @@ "symfony/symfony": "3.2.*", "doctrine/orm": "^2.5", "doctrine/doctrine-bundle": "^1.4", - "symfony/swiftmailer-bundle": "^2.3", "symfony/monolog-bundle": "~2.11.3", "symfony/polyfill-apcu": "^1.0", "sensio/distribution-bundle": "^5.0", diff --git a/composer.lock b/composer.lock index 80215cf..c248427 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d3a808fc52e8817d6331dec648d836d7", + "content-hash": "1580820dd9c3f41a83c6d9d803f138a5", "packages": [ { "name": "doctrine/annotations", @@ -72,7 +72,7 @@ "docblock", "parser" ], - "time": "2016-11-05 13:23:40" + "time": "2016-11-05T13:23:40+00:00" }, { "name": "doctrine/cache", @@ -141,7 +141,7 @@ "cache", "caching" ], - "time": "2016-12-17 21:41:50" + "time": "2016-12-17T21:41:50+00:00" }, { "name": "doctrine/collections", @@ -208,7 +208,7 @@ "collections", "iterator" ], - "time": "2016-12-17 22:35:33" + "time": "2016-12-17T22:35:33+00:00" }, { "name": "doctrine/common", @@ -281,7 +281,7 @@ "persistence", "spl" ], - "time": "2016-12-03 08:10:21" + "time": "2016-12-03T08:10:21+00:00" }, { "name": "doctrine/data-fixtures", @@ -340,7 +340,7 @@ "keywords": [ "database" ], - "time": "2016-09-20 10:07:57" + "time": "2016-09-20T10:07:57+00:00" }, { "name": "doctrine/dbal", @@ -412,7 +412,7 @@ "persistence", "queryobject" ], - "time": "2016-12-04 05:57:28" + "time": "2016-12-04T05:57:28+00:00" }, { "name": "doctrine/doctrine-bundle", @@ -493,7 +493,7 @@ "orm", "persistence" ], - "time": "2016-12-16 16:21:00" + "time": "2016-12-16T16:21:00+00:00" }, { "name": "doctrine/doctrine-cache-bundle", @@ -699,7 +699,7 @@ "migrations", "schema" ], - "time": "2016-12-05 18:36:37" + "time": "2016-12-05T18:36:37+00:00" }, { "name": "doctrine/inflector", @@ -766,7 +766,7 @@ "singularize", "string" ], - "time": "2016-05-12 17:23:41" + "time": "2016-05-12T17:23:41+00:00" }, { "name": "doctrine/instantiator", @@ -820,7 +820,7 @@ "constructor", "instantiate" ], - "time": "2016-03-31 10:24:22" + "time": "2016-03-31T10:24:22+00:00" }, { "name": "doctrine/lexer", @@ -874,7 +874,7 @@ "lexer", "parser" ], - "time": "2014-09-09 13:34:57" + "time": "2014-09-09T13:34:57+00:00" }, { "name": "doctrine/migrations", @@ -948,7 +948,7 @@ "database", "migrations" ], - "time": "2016-12-12 04:34:06" + "time": "2016-12-12T04:34:06+00:00" }, { "name": "doctrine/orm", @@ -1027,7 +1027,7 @@ "database", "orm" ], - "time": "2016-12-18 15:42:44" + "time": "2016-12-18T15:42:44+00:00" }, { "name": "incenteev/composer-parameter-handler", @@ -1078,7 +1078,7 @@ "keywords": [ "parameters management" ], - "time": "2015-11-10 17:04:01" + "time": "2015-11-10T17:04:01+00:00" }, { "name": "jdorn/sql-formatter", @@ -1131,7 +1131,7 @@ "highlight", "sql" ], - "time": "2015-08-30 16:36:01" + "time": "2015-08-30T16:36:01+00:00" }, { "name": "monolog/monolog", @@ -1209,7 +1209,7 @@ "logging", "psr-3" ], - "time": "2016-12-13 14:25:55" + "time": "2016-12-13T14:25:55+00:00" }, { "name": "ocramius/proxy-manager", @@ -1272,7 +1272,7 @@ "proxy pattern", "service proxies" ], - "time": "2015-08-09 04:28:19" + "time": "2015-08-09T04:28:19+00:00" }, { "name": "paragonie/random_compat", @@ -1366,7 +1366,7 @@ "psr", "psr-6" ], - "time": "2016-10-13 14:48:10" + "time": "2016-10-13T14:48:10+00:00" }, { "name": "psr/log", @@ -1413,7 +1413,7 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "sensio/distribution-bundle", @@ -1465,7 +1465,7 @@ "configuration", "distribution" ], - "time": "2016-12-06 07:29:27" + "time": "2016-12-06T07:29:27+00:00" }, { "name": "sensio/framework-extra-bundle", @@ -1533,7 +1533,7 @@ "annotations", "controllers" ], - "time": "2016-12-14 08:30:06" + "time": "2016-12-14T08:30:06+00:00" }, { "name": "sensiolabs/security-checker", @@ -1577,60 +1577,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2016-10-24 14:47:53" - }, - { - "name": "swiftmailer/swiftmailer", - "version": "5.x-dev", - "source": { - "type": "git", - "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "968cd5302dba8d60ddb64489069953fae2ff1a92" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/968cd5302dba8d60ddb64489069953fae2ff1a92", - "reference": "968cd5302dba8d60ddb64489069953fae2ff1a92", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "mockery/mockery": "~0.9.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.4-dev" - } - }, - "autoload": { - "files": [ - "lib/swift_required.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Chris Corbyn" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Swiftmailer, free feature-rich PHP mailer", - "homepage": "http://swiftmailer.org", - "keywords": [ - "email", - "mail", - "mailer" - ], - "time": "2016-12-06 13:58:36" + "time": "2016-10-24T14:47:53+00:00" }, { "name": "symfony/monolog-bundle", @@ -1743,7 +1690,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/polyfill-intl-icu", @@ -1801,7 +1748,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1860,7 +1807,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/polyfill-php56", @@ -1916,7 +1863,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/polyfill-php70", @@ -1975,7 +1922,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/polyfill-util", @@ -2027,66 +1974,7 @@ "polyfill", "shim" ], - "time": "2016-11-14 01:06:16" - }, - { - "name": "symfony/swiftmailer-bundle", - "version": "dev-master", - "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/config": "~2.7|~3.0", - "symfony/dependency-injection": "~2.7|~3.0", - "symfony/http-kernel": "~2.7|~3.0" - }, - "require-dev": { - "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" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Bundle\\SwiftmailerBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony SwiftmailerBundle", - "homepage": "http://symfony.com", - "time": "2016-10-27 17:59:30" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/symfony", @@ -2228,7 +2116,7 @@ "keywords": [ "framework" ], - "time": "2016-12-18 21:40:57" + "time": "2016-12-18T21:40:57+00:00" }, { "name": "theodordiaconu/geshi", @@ -2264,7 +2152,7 @@ "geshi", "highlighter" ], - "time": "2013-03-19 00:39:21" + "time": "2013-03-19T00:39:21+00:00" }, { "name": "theodordiaconu/geshi-bundle", @@ -2308,7 +2196,7 @@ "highlighter", "syntax highlight" ], - "time": "2013-03-29 12:54:06" + "time": "2013-03-29T12:54:06+00:00" }, { "name": "twig/twig", @@ -2370,7 +2258,7 @@ "keywords": [ "templating" ], - "time": "2016-12-13 17:10:29" + "time": "2016-12-13T17:10:29+00:00" }, { "name": "zendframework/zend-code", @@ -2476,7 +2364,7 @@ "events", "zf2" ], - "time": "2016-11-06 22:02:11" + "time": "2016-11-06T22:02:11+00:00" } ], "packages-dev": [ @@ -2574,7 +2462,7 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-27T11:43:31+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -2729,7 +2617,7 @@ "spy", "stub" ], - "time": "2016-11-21 14:58:47" + "time": "2016-11-21T14:58:47+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2792,7 +2680,7 @@ "testing", "xunit" ], - "time": "2016-12-05 07:01:14" + "time": "2016-12-05T07:01:14+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2839,7 +2727,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03 07:40:28" + "time": "2016-10-03T07:40:28+00:00" }, { "name": "phpunit/php-text-template", @@ -2973,7 +2861,7 @@ "keywords": [ "tokenizer" ], - "time": "2016-11-15 14:06:22" + "time": "2016-11-15T14:06:22+00:00" }, { "name": "phpunit/phpunit", @@ -3055,7 +2943,7 @@ "testing", "xunit" ], - "time": "2016-12-13 21:21:43" + "time": "2016-12-13T21:21:43+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -3159,7 +3047,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2016-12-06 20:00:09" + "time": "2016-12-06T20:00:09+00:00" }, { "name": "sebastian/comparator", @@ -3223,7 +3111,7 @@ "compare", "equality" ], - "time": "2016-12-10 08:07:52" + "time": "2016-12-10T08:07:52+00:00" }, { "name": "sebastian/diff", @@ -3275,7 +3163,7 @@ "keywords": [ "diff" ], - "time": "2016-10-03 07:45:03" + "time": "2016-10-03T07:45:03+00:00" }, { "name": "sebastian/environment", @@ -3325,7 +3213,7 @@ "environment", "hhvm" ], - "time": "2016-11-26 07:53:53" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", @@ -3392,7 +3280,7 @@ "export", "exporter" ], - "time": "2016-11-19 08:54:04" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -3443,7 +3331,7 @@ "keywords": [ "global state" ], - "time": "2016-10-03 07:46:22" + "time": "2016-10-03T07:46:22+00:00" }, { "name": "sebastian/object-enumerator", @@ -3489,7 +3377,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2016-11-19 07:35:10" + "time": "2016-11-19T07:35:10+00:00" }, { "name": "sebastian/recursion-context", @@ -3542,7 +3430,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19 07:33:16" + "time": "2016-11-19T07:33:16+00:00" }, { "name": "sebastian/resource-operations", @@ -3584,7 +3472,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2016-10-03 07:43:09" + "time": "2016-10-03T07:43:09+00:00" }, { "name": "sebastian/version", @@ -3627,7 +3515,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "sensio/generator-bundle", @@ -3679,7 +3567,7 @@ } ], "description": "This bundle generates code for you", - "time": "2016-12-05 16:01:19" + "time": "2016-12-05T16:01:19+00:00" }, { "name": "symfony/phpunit-bridge", @@ -3737,7 +3625,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2016-12-13 09:39:51" + "time": "2016-12-13T09:39:51+00:00" }, { "name": "webmozart/assert", @@ -3787,7 +3675,7 @@ "check", "validate" ], - "time": "2016-11-23 20:04:41" + "time": "2016-11-23T20:04:41+00:00" } ], "aliases": [], From 3341f4fcaba1f75eec85ebc6dc4f572cc21ff582 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 19:48:18 +0300 Subject: [PATCH 02/17] composer remove symfony/polyfill-apcu. --- composer.json | 1 - composer.lock | 55 +-------------------------------------------------- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/composer.json b/composer.json index 6ee7fd0..23d920c 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,6 @@ "doctrine/orm": "^2.5", "doctrine/doctrine-bundle": "^1.4", "symfony/monolog-bundle": "~2.11.3", - "symfony/polyfill-apcu": "^1.0", "sensio/distribution-bundle": "^5.0", "sensio/framework-extra-bundle": "^3.0.2", "incenteev/composer-parameter-handler": "~2.0", diff --git a/composer.lock b/composer.lock index c248427..e3d5100 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": "1580820dd9c3f41a83c6d9d803f138a5", + "content-hash": "c1438425a97016ba74d9890c92bc03d4", "packages": [ { "name": "doctrine/annotations", @@ -1639,59 +1639,6 @@ ], "time": "2016-10-19T07:54:05+00:00" }, - { - "name": "symfony/polyfill-apcu", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "5d4474f447403c3348e37b70acc2b95475b7befa" - }, - "dist": { - "type": "zip", - "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-intl-icu", "version": "dev-master", From fddc706755225b32e0c78e66167362690742385e Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 20:23:33 +0300 Subject: [PATCH 03/17] composer remove sensio/generator-bundle --- app/AppKernel.php | 1 - composer.json | 1 - composer.lock | 151 +++++++++++++++++++++++++--------------------- 3 files changed, 81 insertions(+), 72 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 1550814..e87f6cb 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -24,7 +24,6 @@ class AppKernel extends Kernel $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); - $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); } return $bundles; diff --git a/composer.json b/composer.json index 23d920c..522c540 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,6 @@ "doctrine/annotations": "^1.3" }, "require-dev": { - "sensio/generator-bundle": "^3.0", "symfony/phpunit-bridge": "^3.0", "phpunit/phpunit": "^5.7" }, diff --git a/composer.lock b/composer.lock index e3d5100..bac1537 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": "c1438425a97016ba74d9890c92bc03d4", + "content-hash": "48dbc523737d70c9ffd577f0b868cf5b", "packages": [ { "name": "doctrine/annotations", @@ -1639,6 +1639,64 @@ ], "time": "2016-10-19T07:54:05+00:00" }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.10.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", + "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "backendtea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-08-06T14:22:27+00:00" + }, { "name": "symfony/polyfill-intl-icu", "version": "dev-master", @@ -1699,16 +1757,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "dev-master", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", "shasum": "" }, "require": { @@ -1720,7 +1778,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -1754,7 +1812,7 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/polyfill-php56", @@ -2151,31 +2209,36 @@ "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "5c0aabb0eebd5db07f96a9d0f5bc0a5914b807f5" + "reference": "237c326c78c3bc0dda0639ebc9deab34539b7bf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/5c0aabb0eebd5db07f96a9d0f5bc0a5914b807f5", - "reference": "5c0aabb0eebd5db07f96a9d0f5bc0a5914b807f5", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/237c326c78c3bc0dda0639ebc9deab34539b7bf3", + "reference": "237c326c78c3bc0dda0639ebc9deab34539b7bf3", "shasum": "" }, "require": { - "php": "^5.6|^7.0", - "symfony/polyfill-mbstring": "~1.0" + "php": "^7.0", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { - "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~3.2@dev" + "psr/container": "^1.0", + "symfony/debug": "^2.7", + "symfony/phpunit-bridge": "^3.4.19|^4.1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.6-dev" } }, "autoload": { "psr-0": { "Twig_": "lib/" + }, + "psr-4": { + "Twig\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2196,16 +2259,16 @@ }, { "name": "Twig Team", - "homepage": "http://twig.sensiolabs.org/contributors", + "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", + "homepage": "https://twig.symfony.com", "keywords": [ "templating" ], - "time": "2016-12-13T17:10:29+00:00" + "time": "2019-01-14T15:01:20+00:00" }, { "name": "zendframework/zend-code", @@ -3464,58 +3527,6 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" }, - { - "name": "sensio/generator-bundle", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "ec278c0bd530edf155c4a00900577b5cb80f559e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/ec278c0bd530edf155c4a00900577b5cb80f559e", - "reference": "ec278c0bd530edf155c4a00900577b5cb80f559e", - "shasum": "" - }, - "require": { - "symfony/console": "~2.7|~3.0", - "symfony/framework-bundle": "~2.7|~3.0", - "symfony/process": "~2.7|~3.0", - "symfony/yaml": "~2.7|~3.0", - "twig/twig": "^1.28.2|^2.0" - }, - "require-dev": { - "doctrine/orm": "~2.4", - "symfony/doctrine-bridge": "~2.7|~3.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Sensio\\Bundle\\GeneratorBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "This bundle generates code for you", - "time": "2016-12-05T16:01:19+00:00" - }, { "name": "symfony/phpunit-bridge", "version": "dev-master", From 5a819777c335b6a2b8bc933522075f8d5ffa3c26 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 20:24:49 +0300 Subject: [PATCH 04/17] composer remove symfony/phpunit-bridge phpunit/phpunit --- composer.json | 2 - composer.lock | 1283 +------------------------------------------------ 2 files changed, 13 insertions(+), 1272 deletions(-) diff --git a/composer.json b/composer.json index 522c540..644c859 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,6 @@ "doctrine/annotations": "^1.3" }, "require-dev": { - "symfony/phpunit-bridge": "^3.0", - "phpunit/phpunit": "^5.7" }, "scripts": { "symfony-scripts": [ diff --git a/composer.lock b/composer.lock index bac1537..b7c8e83 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": "48dbc523737d70c9ffd577f0b868cf5b", + "content-hash": "27e6b76e0107f06ca5e0b3d1ae34e8a5", "packages": [ { "name": "doctrine/annotations", @@ -774,28 +774,29 @@ "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "416fb8ad1d095a87f1d21bc40711843cd122fd4a" + "reference": "8c8c1afee0f929f17528fe1721de5d58e15f71c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/416fb8ad1d095a87f1d21bc40711843cd122fd4a", - "reference": "416fb8ad1d095a87f1d21bc40711843cd122fd4a", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8c8c1afee0f929f17528fe1721de5d58e15f71c7", + "reference": "8c8c1afee0f929f17528fe1721de5d58e15f71c7", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { - "athletic/athletic": "~0.1.8", + "doctrine/coding-standard": "^5.0", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpbench/phpbench": "^0.13", + "phpstan/phpstan-shim": "^0.9.2", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -815,12 +816,12 @@ } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ "constructor", "instantiate" ], - "time": "2016-03-31T10:24:22+00:00" + "time": "2018-10-15T11:30:00+00:00" }, { "name": "doctrine/lexer", @@ -2377,1265 +2378,7 @@ "time": "2016-11-06T22:02:11+00:00" } ], - "packages-dev": [ - { - "name": "myclabs/deep-copy", - "version": "1.5.5", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/399c1f9781e222f6eb6cc238796f5200d1b7f108", - "reference": "399c1f9781e222f6eb6cc238796f5200d1b7f108", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "doctrine/collections": "1.*", - "phpunit/phpunit": "~4.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Create deep copies (clones) of your objects", - "homepage": "https://github.com/myclabs/DeepCopy", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ], - "time": "2016-10-31T17:19:45+00:00" - }, - { - "name": "phpdocumentor/reflection-common", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2015-12-27T11:43:31+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30T07:12:33+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.2.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "time": "2016-11-25T06:54:22+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "6c52c2722f8460122f96f86346600e1077ce22cb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb", - "reference": "6c52c2722f8460122f96f86346600e1077ce22cb", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "sebastian/comparator": "^1.1", - "sebastian/recursion-context": "^1.0|^2.0" - }, - "require-dev": { - "phpspec/phpspec": "^2.0", - "phpunit/phpunit": "^4.8 || ^5.6.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, - "autoload": { - "psr-0": { - "Prophecy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "time": "2016-11-21T14:58:47+00:00" - }, - { - "name": "phpunit/php-code-coverage", - "version": "4.0.x-dev", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "31fbb24b4a5e7070a1e626318fabfe0fa1c1a18e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/31fbb24b4a5e7070a1e626318fabfe0fa1c1a18e", - "reference": "31fbb24b4a5e7070a1e626318fabfe0fa1c1a18e", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "^1.4.2", - "sebastian/code-unit-reverse-lookup": "~1.0", - "sebastian/environment": "^1.3.2 || ^2.0", - "sebastian/version": "~1.0|~2.0" - }, - "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "^5.4" - }, - "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.4.0", - "ext-xmlwriter": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ], - "time": "2016-12-05T07:01:14+00:00" - }, - { - "name": "phpunit/php-file-iterator", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ], - "time": "2016-10-03T07:40:28+00:00" - }, - { - "name": "phpunit/php-text-template", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "time": "2015-06-21T13:50:34+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "1.0.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4|~5" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "time": "2016-05-12T18:03:57+00:00" - }, - { - "name": "phpunit/php-token-stream", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b", - "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ], - "time": "2016-11-15T14:06:22+00:00" - }, - { - "name": "phpunit/phpunit", - "version": "5.7.x-dev", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "94cec036f7cc3b7bab26cc1aaeb78e99bdb6f579" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/94cec036f7cc3b7bab26cc1aaeb78e99bdb6f579", - "reference": "94cec036f7cc3b7bab26cc1aaeb78e99bdb6f579", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "myclabs/deep-copy": "~1.3", - "php": "^5.6 || ^7.0", - "phpspec/prophecy": "^1.6.2", - "phpunit/php-code-coverage": "^4.0.3", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "~1.2.2", - "sebastian/diff": "~1.2", - "sebastian/environment": "^1.3.4 || ^2.0", - "sebastian/exporter": "~2.0", - "sebastian/global-state": "^1.0 || ^2.0", - "sebastian/object-enumerator": "~2.0", - "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0|~2.0", - "symfony/yaml": "~2.1|~3.0" - }, - "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" - }, - "require-dev": { - "ext-pdo": "*" - }, - "suggest": { - "ext-xdebug": "*", - "phpunit/php-invoker": "~1.1" - }, - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.7.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "time": "2016-12-13T21:21:43+00:00" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "3.4.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", - "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" - }, - "conflict": { - "phpunit/phpunit": "<5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.4" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "time": "2016-12-08T20:27:08+00:00" - }, - { - "name": "sebastian/code-unit-reverse-lookup", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "99805768a703b1b8200354f6cfe4269f4c5372b8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/99805768a703b1b8200354f6cfe4269f4c5372b8", - "reference": "99805768a703b1b8200354f6cfe4269f4c5372b8", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "~5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2016-12-06T20:00:09+00:00" - }, - { - "name": "sebastian/comparator", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2f09d5a251c4a92d1a80518c2166b5d0d742bc63" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2f09d5a251c4a92d1a80518c2166b5d0d742bc63", - "reference": "2f09d5a251c4a92d1a80518c2166b5d0d742bc63", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0", - "sebastian/diff": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ], - "time": "2016-12-10T08:07:52+00:00" - }, - { - "name": "sebastian/diff", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "d0814318784b7756fb932116acd19ee3b0cbe67a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/d0814318784b7756fb932116acd19ee3b0cbe67a", - "reference": "d0814318784b7756fb932116acd19ee3b0cbe67a", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff" - ], - "time": "2016-10-03T07:45:03+00:00" - }, - { - "name": "sebastian/environment", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" - ], - "time": "2016-11-26T07:53:53+00:00" - }, - { - "name": "sebastian/exporter", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~2.0" - }, - "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ], - "time": "2016-11-19T08:54:04+00:00" - }, - { - "name": "sebastian/global-state", - "version": "1.1.x-dev", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "5a2b9ba59e8cf82fd1fdd7efb7d7846fd69ac36d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/5a2b9ba59e8cf82fd1fdd7efb7d7846fd69ac36d", - "reference": "5a2b9ba59e8cf82fd1fdd7efb7d7846fd69ac36d", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.2|~5.0" - }, - "suggest": { - "ext-uopz": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], - "time": "2016-10-03T07:46:22+00:00" - }, - { - "name": "sebastian/object-enumerator", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35", - "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35", - "shasum": "" - }, - "require": { - "php": ">=5.6", - "sebastian/recursion-context": "~2.0" - }, - "require-dev": { - "phpunit/phpunit": "~5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2016-11-19T07:35:10+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19T07:33:16+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "fadc83f7c41fb2924e542635fea47ae546816ece" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/fadc83f7c41fb2924e542635fea47ae546816ece", - "reference": "fadc83f7c41fb2924e542635fea47ae546816ece", - "shasum": "" - }, - "require": { - "php": ">=5.6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2016-10-03T07:43:09+00:00" - }, - { - "name": "sebastian/version", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" - }, - { - "name": "symfony/phpunit-bridge", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "acd56b8bd397537177a37f2c52efb74df52d844d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/acd56b8bd397537177a37f2c52efb74df52d844d", - "reference": "acd56b8bd397537177a37f2c52efb74df52d844d", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" - }, - "bin": [ - "bin/simple-phpunit" - ], - "type": "symfony-bridge", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Bridge\\PhpUnit\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "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 PHPUnit Bridge", - "homepage": "https://symfony.com", - "time": "2016-12-13T09:39:51+00:00" - }, - { - "name": "webmozart/assert", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "4a8bf11547e139e77b651365113fc12850c43d9a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/4a8bf11547e139e77b651365113fc12850c43d9a", - "reference": "4a8bf11547e139e77b651365113fc12850c43d9a", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2016-11-23T20:04:41+00:00" - } - ], + "packages-dev": [], "aliases": [], "minimum-stability": "dev", "stability-flags": { From ca40acee8bb7bf865e83ea893a5b1ffb04017d9e Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 20:25:17 +0300 Subject: [PATCH 05/17] require-dev section removed from composer.json. --- composer.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/composer.json b/composer.json index 644c859..772b8a0 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,6 @@ "doctrine/doctrine-migrations-bundle": "^1.0", "doctrine/annotations": "^1.3" }, - "require-dev": { - }, "scripts": { "symfony-scripts": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", From 2d763df6856a30eadf7b961cbdd7be31eb95141a Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 20:34:48 +0300 Subject: [PATCH 06/17] composer update doctrine/orm (also stabilizing package versions and sorting them alphabetically) --- app/SymfonyRequirements.php | 25 +- composer.json | 5 +- composer.lock | 843 +++++++++++++++++++++++++----------- 3 files changed, 593 insertions(+), 280 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 7e7723a..4a1fcc6 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -389,7 +389,7 @@ class SymfonyRequirements extends RequirementCollection { /* mandatory requirements follow */ - $installedPhpVersion = phpversion(); + $installedPhpVersion = PHP_VERSION; $requiredPhpVersion = $this->getPhpRequiredVersion(); $this->addRecommendation( @@ -448,15 +448,8 @@ class SymfonyRequirements extends RequirementCollection } if (false !== $requiredPhpVersion && version_compare($installedPhpVersion, $requiredPhpVersion, '>=')) { - $timezones = array(); - foreach (DateTimeZone::listAbbreviations() as $abbreviations) { - foreach ($abbreviations as $abbreviation) { - $timezones[$abbreviation['timezone_id']] = true; - } - } - $this->addRequirement( - isset($timezones[@date_default_timezone_get()]), + in_array(@date_default_timezone_get(), DateTimeZone::listIdentifiers(), true), sprintf('Configured default timezone "%s" must be supported by your installation of PHP', @date_default_timezone_get()), 'Your default timezone is not supported by PHP. Check for typos in your php.ini file and have a look at the list of deprecated timezones at http://php.net/manual/en/timezones.others.php.' ); @@ -633,12 +626,6 @@ class SymfonyRequirements extends RequirementCollection 'Install and enable the mbstring extension.' ); - $this->addRecommendation( - function_exists('iconv'), - 'iconv() should be available', - 'Install and enable the iconv extension.' - ); - $this->addRecommendation( function_exists('utf8_decode'), 'utf8_decode() should be available', @@ -737,7 +724,7 @@ class SymfonyRequirements extends RequirementCollection 'Install and/or enable a PHP accelerator (highly recommended).' ); - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + if ('WIN' === strtoupper(substr(PHP_OS, 0, 3))) { $this->addRecommendation( $this->getRealpathCacheSize() >= 5 * 1024 * 1024, 'realpath_cache_size should be at least 5M in php.ini', @@ -780,7 +767,11 @@ class SymfonyRequirements extends RequirementCollection { $size = ini_get('realpath_cache_size'); $size = trim($size); - $unit = strtolower(substr($size, -1, 1)); + $unit = ''; + if (!ctype_digit($size)) { + $unit = strtolower(substr($size, -1, 1)); + $size = (int) substr($size, 0, -1); + } switch ($unit) { case 'g': return $size * 1024 * 1024 * 1024; diff --git a/composer.json b/composer.json index 772b8a0..ebfb320 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "psr-4": { "": "src/" }, "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, - "minimum-stability": "dev", + "minimum-stability": "stable", "require": { "php": ">=5.5.9", "symfony/symfony": "3.2.*", @@ -40,7 +40,8 @@ ] }, "config": { - "bin-dir": "bin" + "bin-dir": "bin", + "sort-packages": true }, "extra": { "symfony-app-dir": "app", diff --git a/composer.lock b/composer.lock index b7c8e83..0e04b72 100644 --- a/composer.lock +++ b/composer.lock @@ -4,34 +4,90 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "27e6b76e0107f06ca5e0b3d1ae34e8a5", + "content-hash": "75fb34a8c718eb17bd81a5d635065533", "packages": [ { - "name": "doctrine/annotations", - "version": "dev-master", + "name": "composer/ca-bundle", + "version": "1.1.3", "source": { "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "a0adee8297c90980c3d3ffe25e5a6c6f52fa73fa" + "url": "https://github.com/composer/ca-bundle.git", + "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/a0adee8297c90980c3d3ffe25e5a6c6f52fa73fa", - "reference": "a0adee8297c90980c3d3ffe25e5a6c6f52fa73fa", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660", + "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660", "shasum": "" }, "require": { - "doctrine/lexer": "1.*", - "php": "^5.6 || ^7.0" + "ext-openssl": "*", + "ext-pcre": "*", + "php": "^5.3.2 || ^7.0" }, "require-dev": { - "doctrine/cache": "1.*", - "phpunit/phpunit": "^5.6.1" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", + "psr/log": "^1.0", + "symfony/process": "^2.5 || ^3.0 || ^4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\CaBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", + "keywords": [ + "cabundle", + "cacert", + "certificate", + "ssl", + "tls" + ], + "time": "2018-10-18T06:09:13+00:00" + }, + { + "name": "doctrine/annotations", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "php": "^7.1" + }, + "require-dev": { + "doctrine/cache": "1.*", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -72,36 +128,42 @@ "docblock", "parser" ], - "time": "2016-11-05T13:23:40+00:00" + "time": "2017-12-06T07:11:42+00:00" }, { "name": "doctrine/cache", - "version": "dev-master", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "e14f7e04cf7106fed6061b42aeeb56df556db49d" + "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/e14f7e04cf7106fed6061b42aeeb56df556db49d", - "reference": "e14f7e04cf7106fed6061b42aeeb56df556db49d", + "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57", + "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57", "shasum": "" }, "require": { - "php": "~5.6|~7.0" + "php": "~7.1" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "phpunit/phpunit": "^5.6.2", + "alcaeus/mongo-php-adapter": "^1.1", + "doctrine/coding-standard": "^4.0", + "mongodb/mongodb": "^1.1", + "phpunit/phpunit": "^7.0", "predis/predis": "~1.0" }, + "suggest": { + "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { @@ -136,33 +198,33 @@ } ], "description": "Caching library offering an object-oriented API for many cache backends", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "cache", "caching" ], - "time": "2016-12-17T21:41:50+00:00" + "time": "2018-08-21T18:01:43+00:00" }, { "name": "doctrine/collections", - "version": "dev-master", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "d7414669e9e3f6d467eaef88893e4deec7e4a0b8" + "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/d7414669e9e3f6d467eaef88893e4deec7e4a0b8", - "reference": "d7414669e9e3f6d467eaef88893e4deec7e4a0b8", + "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf", + "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0" + "php": "^7.1" }, "require-dev": { "doctrine/coding-standard": "~0.1@dev", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^5.7" }, "type": "library", "extra": { @@ -208,37 +270,43 @@ "collections", "iterator" ], - "time": "2016-12-17T22:35:33+00:00" + "time": "2017-07-22T10:37:32+00:00" }, { "name": "doctrine/common", - "version": "dev-master", + "version": "v2.10.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "c10aa59433689cf803dc669c8512cc1a3612233c" + "reference": "30e33f60f64deec87df728c02b107f82cdafad9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/c10aa59433689cf803dc669c8512cc1a3612233c", - "reference": "c10aa59433689cf803dc669c8512cc1a3612233c", + "url": "https://api.github.com/repos/doctrine/common/zipball/30e33f60f64deec87df728c02b107f82cdafad9d", + "reference": "30e33f60f64deec87df728c02b107f82cdafad9d", "shasum": "" }, "require": { - "doctrine/annotations": "1.*", - "doctrine/cache": "1.*", - "doctrine/collections": "1.*", - "doctrine/inflector": "1.*", - "doctrine/lexer": "1.*", - "php": "~5.6|~7.0" + "doctrine/annotations": "^1.0", + "doctrine/cache": "^1.0", + "doctrine/collections": "^1.0", + "doctrine/event-manager": "^1.0", + "doctrine/inflector": "^1.0", + "doctrine/lexer": "^1.0", + "doctrine/persistence": "^1.1", + "doctrine/reflection": "^1.0", + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^5.4.6" + "doctrine/coding-standard": "^1.0", + "phpunit/phpunit": "^6.3", + "squizlabs/php_codesniffer": "^3.0", + "symfony/phpunit-bridge": "^4.0.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7.x-dev" + "dev-master": "2.10.x-dev" } }, "autoload": { @@ -270,46 +338,49 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" } ], - "description": "Common Library for Doctrine projects", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, persistence interfaces, proxies, event system and much more.", + "homepage": "https://www.doctrine-project.org/projects/common.html", "keywords": [ - "annotations", - "collections", - "eventmanager", - "persistence", - "spl" + "common", + "doctrine", + "php" ], - "time": "2016-12-03T08:10:21+00:00" + "time": "2018-11-21T01:24:55+00:00" }, { "name": "doctrine/data-fixtures", - "version": "dev-master", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "17fa5bfe6ff52e35cb3d9ec37c934a2f4bd1fa2e" + "reference": "3a1e2c3c600e615a2dffe56d4ca0875cc5233e0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/17fa5bfe6ff52e35cb3d9ec37c934a2f4bd1fa2e", - "reference": "17fa5bfe6ff52e35cb3d9ec37c934a2f4bd1fa2e", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/3a1e2c3c600e615a2dffe56d4ca0875cc5233e0a", + "reference": "3a1e2c3c600e615a2dffe56d4ca0875cc5233e0a", "shasum": "" }, "require": { "doctrine/common": "~2.2", - "php": "^5.6 || ^7.0" + "php": "^7.1" }, "conflict": { - "doctrine/orm": "< 2.4" + "doctrine/phpcr-odm": "<1.3.0" }, "require-dev": { "doctrine/dbal": "^2.5.4", "doctrine/orm": "^2.5.4", - "phpunit/phpunit": "^5.4.6" + "phpunit/phpunit": "^7.0" }, "suggest": { + "alcaeus/mongo-php-adapter": "For using MongoDB ODM with PHP 7", "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", "doctrine/orm": "For loading ORM fixtures", "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" @@ -321,8 +392,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\DataFixtures": "lib/" + "psr-4": { + "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" } }, "notification-url": "https://packagist.org/downloads/", @@ -340,30 +411,35 @@ "keywords": [ "database" ], - "time": "2016-09-20T10:07:57+00:00" + "time": "2018-03-20T09:06:36+00:00" }, { "name": "doctrine/dbal", - "version": "dev-master", + "version": "v2.9.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "b551fcb26a81e230085c0dca88174573b6c36609" + "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/b551fcb26a81e230085c0dca88174573b6c36609", - "reference": "b551fcb26a81e230085c0dca88174573b6c36609", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9", + "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9", "shasum": "" }, "require": { - "doctrine/common": "^2.7.1", - "php": "^5.6 || ^7.0" + "doctrine/cache": "^1.0", + "doctrine/event-manager": "^1.0", + "ext-pdo": "*", + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^5.4.6", - "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5", - "symfony/console": "2.*||^3.0" + "doctrine/coding-standard": "^5.0", + "jetbrains/phpstorm-stubs": "^2018.1.2", + "phpstan/phpstan": "^0.10.1", + "phpunit/phpunit": "^7.4", + "symfony/console": "^2.0.5|^3.0|^4.0", + "symfony/phpunit-bridge": "^3.4.5|^4.0.5" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -374,12 +450,13 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6.x-dev" + "dev-master": "2.9.x-dev", + "dev-develop": "3.0.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\DBAL\\": "lib/" + "psr-4": { + "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" } }, "notification-url": "https://packagist.org/downloads/", @@ -404,49 +481,57 @@ "email": "jonwage@gmail.com" } ], - "description": "Database Abstraction Layer", - "homepage": "http://www.doctrine-project.org", + "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.", + "homepage": "https://www.doctrine-project.org/projects/dbal.html", "keywords": [ + "abstraction", "database", "dbal", + "mysql", "persistence", + "pgsql", + "php", "queryobject" ], - "time": "2016-12-04T05:57:28+00:00" + "time": "2018-12-31T03:27:51+00:00" }, { "name": "doctrine/doctrine-bundle", - "version": "dev-master", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "554408b70b9802f05d9dc086016fc048fbc79908" + "reference": "98551d71f515692c2278073e0d483763ac70b341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/554408b70b9802f05d9dc086016fc048fbc79908", - "reference": "554408b70b9802f05d9dc086016fc048fbc79908", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/98551d71f515692c2278073e0d483763ac70b341", + "reference": "98551d71f515692c2278073e0d483763ac70b341", "shasum": "" }, "require": { - "doctrine/dbal": "~2.3", - "doctrine/doctrine-cache-bundle": "~1.0", - "jdorn/sql-formatter": "~1.1", - "php": ">=5.5.9", - "symfony/console": "~2.7|~3.0", - "symfony/dependency-injection": "~2.7|~3.0", - "symfony/doctrine-bridge": "~2.7|~3.0", - "symfony/framework-bundle": "~2.7|~3.0" + "doctrine/dbal": "^2.5.12", + "doctrine/doctrine-cache-bundle": "~1.2", + "jdorn/sql-formatter": "^1.2.16", + "php": "^5.5.9|^7.0", + "symfony/console": "~2.7|~3.0|~4.0", + "symfony/dependency-injection": "~2.7|~3.0|~4.0", + "symfony/doctrine-bridge": "~2.7|~3.0|~4.0", + "symfony/framework-bundle": "^2.7.22|~3.0|~4.0" + }, + "conflict": { + "symfony/http-foundation": "<2.6" }, "require-dev": { - "doctrine/orm": "~2.3", - "phpunit/phpunit": "~4", - "satooshi/php-coveralls": "^1.0", - "symfony/phpunit-bridge": "~2.7|~3.0", - "symfony/property-info": "~2.8|~3.0", - "symfony/validator": "~2.7|~3.0", - "symfony/yaml": "~2.7|~3.0", - "twig/twig": "~1.10" + "doctrine/orm": "~2.4", + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^4.8.36|^5.7|^6.4", + "symfony/phpunit-bridge": "~2.7|~3.0|~4.0", + "symfony/property-info": "~2.8|~3.0|~4.0", + "symfony/validator": "~2.7|~3.0|~4.0", + "symfony/web-profiler-bundle": "~2.7|~3.0|~4.0", + "symfony/yaml": "~2.7|~3.0|~4.0", + "twig/twig": "~1.26|~2.0" }, "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", @@ -455,7 +540,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -493,7 +578,7 @@ "orm", "persistence" ], - "time": "2016-12-16T16:21:00+00:00" + "time": "2019-01-07T15:31:08+00:00" }, { "name": "doctrine/doctrine-cache-bundle", @@ -642,7 +727,7 @@ }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "dev-master", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", @@ -702,34 +787,108 @@ "time": "2016-12-05T18:36:37+00:00" }, { - "name": "doctrine/inflector", - "version": "dev-master", + "name": "doctrine/event-manager", + "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/doctrine/inflector.git", - "reference": "803a2ed9fea02f9ca47cd45395089fe78769a392" + "url": "https://github.com/doctrine/event-manager.git", + "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/803a2ed9fea02f9ca47cd45395089fe78769a392", - "reference": "803a2ed9fea02f9ca47cd45395089fe78769a392", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3", + "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^7.1" + }, + "conflict": { + "doctrine/common": "<2.9@dev" }, "require-dev": { - "phpunit/phpunit": "4.*" + "doctrine/coding-standard": "^4.0", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Inflector\\": "lib/" + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Doctrine Event Manager component", + "homepage": "https://www.doctrine-project.org/projects/event-manager.html", + "keywords": [ + "event", + "eventdispatcher", + "eventmanager" + ], + "time": "2018-06-11T11:59:03+00:00" + }, + { + "name": "doctrine/inflector", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^6.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -766,32 +925,31 @@ "singularize", "string" ], - "time": "2016-05-12T17:23:41+00:00" + "time": "2018-01-09T20:05:19+00:00" }, { "name": "doctrine/instantiator", - "version": "dev-master", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8c8c1afee0f929f17528fe1721de5d58e15f71c7" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8c8c1afee0f929f17528fe1721de5d58e15f71c7", - "reference": "8c8c1afee0f929f17528fe1721de5d58e15f71c7", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { "php": "^7.1" }, "require-dev": { - "doctrine/coding-standard": "^5.0", + "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13", - "phpstan/phpstan-shim": "^0.9.2", - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { @@ -816,16 +974,16 @@ } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "homepage": "https://github.com/doctrine/instantiator", "keywords": [ "constructor", "instantiate" ], - "time": "2018-10-15T11:30:00+00:00" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "doctrine/lexer", - "version": "dev-master", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", @@ -879,16 +1037,16 @@ }, { "name": "doctrine/migrations", - "version": "dev-master", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "2d24936ef18ac8fb57a3e97d2ca1d0a1663ad0fc" + "reference": "c81147c0f2938a6566594455367e095150547f72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/2d24936ef18ac8fb57a3e97d2ca1d0a1663ad0fc", - "reference": "2d24936ef18ac8fb57a3e97d2ca1d0a1663ad0fc", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/c81147c0f2938a6566594455367e095150547f72", + "reference": "c81147c0f2938a6566594455367e095150547f72", "shasum": "" }, "require": { @@ -917,7 +1075,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "v1.5.x-dev" + "dev-master": "v1.6.x-dev" } }, "autoload": { @@ -949,35 +1107,38 @@ "database", "migrations" ], - "time": "2016-12-12T04:34:06+00:00" + "time": "2016-12-25T22:54:00+00:00" }, { "name": "doctrine/orm", - "version": "dev-master", + "version": "v2.6.3", "source": { "type": "git", - "url": "https://github.com/doctrine/doctrine2.git", - "reference": "cd1a5fcadce6cd5fe3ee17360503d73e82852339" + "url": "https://github.com/doctrine/orm.git", + "reference": "434820973cadf2da2d66e7184be370084cc32ca8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/cd1a5fcadce6cd5fe3ee17360503d73e82852339", - "reference": "cd1a5fcadce6cd5fe3ee17360503d73e82852339", + "url": "https://api.github.com/repos/doctrine/orm/zipball/434820973cadf2da2d66e7184be370084cc32ca8", + "reference": "434820973cadf2da2d66e7184be370084cc32ca8", "shasum": "" }, "require": { - "doctrine/cache": "~1.4", - "doctrine/collections": "~1.2", + "doctrine/annotations": "~1.5", + "doctrine/cache": "~1.6", + "doctrine/collections": "^1.4", "doctrine/common": "^2.7.1", - "doctrine/dbal": ">=2.5-dev,<2.7-dev", - "doctrine/instantiator": "~1.0.1", + "doctrine/dbal": "^2.6", + "doctrine/instantiator": "~1.1", "ext-pdo": "*", - "php": "^5.6 || ^7.0", - "symfony/console": "~2.5|~3.0" + "php": "^7.1", + "symfony/console": "~3.0|~4.0" }, "require-dev": { - "phpunit/phpunit": "^5.4", - "symfony/yaml": "~2.3|~3.0" + "doctrine/coding-standard": "^1.0", + "phpunit/phpunit": "^6.5", + "squizlabs/php_codesniffer": "^3.2", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -1028,30 +1189,187 @@ "database", "orm" ], - "time": "2016-12-18T15:42:44+00:00" + "time": "2018-11-20T23:46:46+00:00" }, { - "name": "incenteev/composer-parameter-handler", - "version": "dev-master", + "name": "doctrine/persistence", + "version": "v1.1.0", "source": { "type": "git", - "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc" + "url": "https://github.com/doctrine/persistence.git", + "reference": "c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", - "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38", + "reference": "c0f1c17602afc18b4cbd8e1c8125f264c9cf7d38", + "shasum": "" + }, + "require": { + "doctrine/annotations": "^1.0", + "doctrine/cache": "^1.0", + "doctrine/collections": "^1.0", + "doctrine/event-manager": "^1.0", + "doctrine/reflection": "^1.0", + "php": "^7.1" + }, + "conflict": { + "doctrine/common": "<2.10@dev" + }, + "require-dev": { + "doctrine/coding-standard": "^5.0", + "phpstan/phpstan": "^0.8", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.", + "homepage": "https://doctrine-project.org/projects/persistence.html", + "keywords": [ + "mapper", + "object", + "odm", + "orm", + "persistence" + ], + "time": "2018-11-21T00:33:13+00:00" + }, + { + "name": "doctrine/reflection", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/reflection.git", + "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/reflection/zipball/02538d3f95e88eb397a5f86274deb2c6175c2ab6", + "reference": "02538d3f95e88eb397a5f86274deb2c6175c2ab6", + "shasum": "" + }, + "require": { + "doctrine/annotations": "^1.0", + "ext-tokenizer": "*", + "php": "^7.1" + }, + "require-dev": { + "doctrine/coding-standard": "^4.0", + "doctrine/common": "^2.8", + "phpstan/phpstan": "^0.9.2", + "phpstan/phpstan-phpunit": "^0.9.4", + "phpunit/phpunit": "^7.0", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Doctrine Reflection component", + "homepage": "https://www.doctrine-project.org/projects/reflection.html", + "keywords": [ + "reflection" + ], + "time": "2018-06-14T14:45:07+00:00" + }, + { + "name": "incenteev/composer-parameter-handler", + "version": "v2.1.3", + "source": { + "type": "git", + "url": "https://github.com/Incenteev/ParameterHandler.git", + "reference": "933c45a34814f27f2345c11c37d46b3ca7303550" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/933c45a34814f27f2345c11c37d46b3ca7303550", + "reference": "933c45a34814f27f2345c11c37d46b3ca7303550", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/yaml": "~2.3|~3.0" + "symfony/yaml": "^2.3 || ^3.0 || ^4.0" }, "require-dev": { - "composer/composer": "1.0.*@dev", - "phpspec/prophecy-phpunit": "~1.0", - "symfony/filesystem": "~2.2" + "composer/composer": "^1.0@dev", + "symfony/filesystem": "^2.3 || ^3 || ^4", + "symfony/phpunit-bridge": "^4.0" }, "type": "library", "extra": { @@ -1079,20 +1397,20 @@ "keywords": [ "parameters management" ], - "time": "2015-11-10T17:04:01+00:00" + "time": "2018-02-13T18:05:56+00:00" }, { "name": "jdorn/sql-formatter", - "version": "dev-master", + "version": "v1.2.17", "source": { "type": "git", "url": "https://github.com/jdorn/sql-formatter.git", - "reference": "7ef9b85961956aa572413693e1194b60f50ab9ab" + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/7ef9b85961956aa572413693e1194b60f50ab9ab", - "reference": "7ef9b85961956aa572413693e1194b60f50ab9ab", + "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc", + "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc", "shasum": "" }, "require": { @@ -1101,9 +1419,6 @@ "require-dev": { "phpunit/phpunit": "3.7.*" }, - "bin": [ - "bin/sql-formatter" - ], "type": "library", "extra": { "branch-alias": { @@ -1132,20 +1447,20 @@ "highlight", "sql" ], - "time": "2015-08-30T16:36:01+00:00" + "time": "2014-01-12T16:20:24+00:00" }, { "name": "monolog/monolog", - "version": "1.x-dev", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "b732364e70a615231f15944e015b31d0d77bf9f5" + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b732364e70a615231f15944e015b31d0d77bf9f5", - "reference": "b732364e70a615231f15944e015b31d0d77bf9f5", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", "shasum": "" }, "require": { @@ -1166,7 +1481,7 @@ "phpunit/phpunit-mock-objects": "2.3.0", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", - "swiftmailer/swiftmailer": "~5.3" + "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", @@ -1210,11 +1525,11 @@ "logging", "psr-3" ], - "time": "2016-12-13T14:25:55+00:00" + "time": "2018-11-05T09:00:11+00:00" }, { "name": "ocramius/proxy-manager", - "version": "1.0.x-dev", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/Ocramius/ProxyManager.git", @@ -1325,16 +1640,16 @@ }, { "name": "psr/cache", - "version": "dev-master", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/cache.git", - "reference": "78c5a01ddbf11cf731f1338a4f5aba23b14d5b47" + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/78c5a01ddbf11cf731f1338a4f5aba23b14d5b47", - "reference": "78c5a01ddbf11cf731f1338a4f5aba23b14d5b47", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", "shasum": "" }, "require": { @@ -1367,20 +1682,20 @@ "psr", "psr-6" ], - "time": "2016-10-13T14:48:10+00:00" + "time": "2016-08-06T20:24:11+00:00" }, { "name": "psr/log", - "version": "dev-master", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "shasum": "" }, "require": { @@ -1414,25 +1729,25 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2018-11-20T15:27:04+00:00" }, { "name": "sensio/distribution-bundle", - "version": "dev-master", + "version": "v5.0.24", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "d294b0665cf09c799e9c1993d5c776a5bf55cb85" + "reference": "59eac70f15f97ee945924948a6f5e2f6f86b7a4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/d294b0665cf09c799e9c1993d5c776a5bf55cb85", - "reference": "d294b0665cf09c799e9c1993d5c776a5bf55cb85", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/59eac70f15f97ee945924948a6f5e2f6f86b7a4b", + "reference": "59eac70f15f97ee945924948a6f5e2f6f86b7a4b", "shasum": "" }, "require": { "php": ">=5.3.9", - "sensiolabs/security-checker": "~3.0|~4.0", + "sensiolabs/security-checker": "~5.0", "symfony/class-loader": "~2.3|~3.0", "symfony/config": "~2.3|~3.0", "symfony/dependency-injection": "~2.3|~3.0", @@ -1466,41 +1781,43 @@ "configuration", "distribution" ], - "time": "2016-12-06T07:29:27+00:00" + "time": "2018-12-14T17:36:15+00:00" }, { "name": "sensio/framework-extra-bundle", - "version": "3.0.x-dev", + "version": "v3.0.29", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "c38bc608e12e81089d5d9dfbf72775ed553c61af" + "reference": "bb907234df776b68922eb4b25bfa061683597b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/c38bc608e12e81089d5d9dfbf72775ed553c61af", - "reference": "c38bc608e12e81089d5d9dfbf72775ed553c61af", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/bb907234df776b68922eb4b25bfa061683597b6a", + "reference": "bb907234df776b68922eb4b25bfa061683597b6a", "shasum": "" }, "require": { "doctrine/common": "~2.2", "symfony/dependency-injection": "~2.3|~3.0", - "symfony/framework-bundle": "~2.3|~3.0" + "symfony/framework-bundle": "~2.3|~3.0|~4.0" }, "require-dev": { - "symfony/asset": "~2.7|~3.0", - "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": "~3.2", - "symfony/psr-http-message-bridge": "^0.3", - "symfony/security-bundle": "~2.4|~3.0", - "symfony/templating": "~2.3|~3.0", - "symfony/translation": "~2.3|~3.0", - "symfony/twig-bundle": "~2.3|~3.0", - "symfony/yaml": "~2.3|~3.0", - "twig/twig": "~1.11|~2.0", + "doctrine/doctrine-bundle": "~1.5", + "doctrine/orm": "~2.4,>=2.4.5", + "symfony/asset": "~2.7|~3.0|~4.0", + "symfony/browser-kit": "~2.3|~3.0|~4.0", + "symfony/dom-crawler": "~2.3|~3.0|~4.0", + "symfony/expression-language": "~2.4|~3.0|~4.0", + "symfony/finder": "~2.3|~3.0|~4.0", + "symfony/phpunit-bridge": "~3.2|~4.0", + "symfony/psr-http-message-bridge": "^0.3|^1.0", + "symfony/security-bundle": "~2.4|~3.0|~4.0", + "symfony/templating": "~2.3|~3.0|~4.0", + "symfony/translation": "~2.3|~3.0|~4.0", + "symfony/twig-bundle": "~2.3|~3.0|~4.0", + "symfony/yaml": "~2.3|~3.0|~4.0", + "twig/twig": "~1.12|~2.0", "zendframework/zend-diactoros": "^1.3" }, "suggest": { @@ -1534,24 +1851,26 @@ "annotations", "controllers" ], - "time": "2016-12-14T08:30:06+00:00" + "time": "2017-12-14T19:03:23+00:00" }, { "name": "sensiolabs/security-checker", - "version": "dev-master", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "86cb2dada982c01b53726ea6ef66b2abe4200b22" + "reference": "46be3f58adac13084497961e10eed9a7fb4d44d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/86cb2dada982c01b53726ea6ef66b2abe4200b22", - "reference": "86cb2dada982c01b53726ea6ef66b2abe4200b22", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/46be3f58adac13084497961e10eed9a7fb4d44d1", + "reference": "46be3f58adac13084497961e10eed9a7fb4d44d1", "shasum": "" }, "require": { - "symfony/console": "~2.7|~3.0" + "composer/ca-bundle": "^1.0", + "php": ">=5.5.9", + "symfony/console": "~2.7|~3.0|~4.0" }, "bin": [ "security-checker" @@ -1559,12 +1878,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "5.0-dev" } }, "autoload": { - "psr-0": { - "SensioLabs\\Security": "" + "psr-4": { + "SensioLabs\\Security\\": "SensioLabs/Security" } }, "notification-url": "https://packagist.org/downloads/", @@ -1578,7 +1897,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2016-10-24T14:47:53+00:00" + "time": "2018-12-19T17:14:59+00:00" }, { "name": "symfony/monolog-bundle", @@ -1700,21 +2019,21 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "dev-master", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4" + "reference": "f22a90256d577c7ef7efad8df1f0201663d57644" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2d6e2b20d457603eefb6e614286c22efca30fdb4", - "reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/f22a90256d577c7ef7efad8df1f0201663d57644", + "reference": "f22a90256d577c7ef7efad8df1f0201663d57644", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/intl": "~2.3|~3.0" + "symfony/intl": "~2.3|~3.0|~4.0" }, "suggest": { "ext-intl": "For best performance" @@ -1722,7 +2041,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -1754,7 +2073,7 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1817,16 +2136,16 @@ }, { "name": "symfony/polyfill-php56", - "version": "dev-master", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c" + "reference": "ff208829fe1aa48ab9af356992bb7199fed551af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/1dd42b9b89556f18092f3d1ada22cb05ac85383c", - "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ff208829fe1aa48ab9af356992bb7199fed551af", + "reference": "ff208829fe1aa48ab9af356992bb7199fed551af", "shasum": "" }, "require": { @@ -1836,7 +2155,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -1869,30 +2188,30 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2018-09-21T06:26:08+00:00" }, { "name": "symfony/polyfill-php70", - "version": "dev-master", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "13ce343935f0f91ca89605a2f6ca6f5c2f3faac2" + "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/13ce343935f0f91ca89605a2f6ca6f5c2f3faac2", - "reference": "13ce343935f0f91ca89605a2f6ca6f5c2f3faac2", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224", + "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224", "shasum": "" }, "require": { - "paragonie/random_compat": "~1.0|~2.0", + "paragonie/random_compat": "~1.0|~2.0|~9.99", "php": ">=5.3.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -1928,20 +2247,20 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2018-09-21T06:26:08+00:00" }, { "name": "symfony/polyfill-util", - "version": "dev-master", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb" + "reference": "3b58903eae668d348a7126f999b0da0f2f93611c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/746bce0fca664ac0a575e465f65c6643faddf7fb", - "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/3b58903eae668d348a7126f999b0da0f2f93611c", + "reference": "3b58903eae668d348a7126f999b0da0f2f93611c", "shasum": "" }, "require": { @@ -1950,7 +2269,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -1980,24 +2299,25 @@ "polyfill", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2018-09-30T16:36:12+00:00" }, { "name": "symfony/symfony", - "version": "3.2.x-dev", + "version": "v3.2.14", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "cbf766bcc435bd388d1b0ba6e449ce966d03ddd4" + "reference": "fc9f9470e81e6fb59bd826d8040b961f7ed30f94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/cbf766bcc435bd388d1b0ba6e449ce966d03ddd4", - "reference": "cbf766bcc435bd388d1b0ba6e449ce966d03ddd4", + "url": "https://api.github.com/repos/symfony/symfony/zipball/fc9f9470e81e6fb59bd826d8040b961f7ed30f94", + "reference": "fc9f9470e81e6fb59bd826d8040b961f7ed30f94", "shasum": "" }, "require": { "doctrine/common": "~2.4", + "ext-xml": "*", "php": ">=5.5.9", "psr/cache": "~1.0", "psr/log": "~1.0", @@ -2006,11 +2326,12 @@ "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.0", "symfony/polyfill-util": "~1.0", - "twig/twig": "~1.28|~2.0" + "twig/twig": "~1.34|~2.4" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.0", - "phpdocumentor/type-resolver": "<0.2.0" + "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0", + "phpdocumentor/type-resolver": "<0.2.0", + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" }, "provide": { "psr/cache-implementation": "1.0" @@ -2076,6 +2397,7 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "phpdocumentor/reflection-docblock": "^3.0", "predis/predis": "~1.0", + "sensio/framework-extra-bundle": "^3.0.2", "symfony/phpunit-bridge": "~3.2", "symfony/polyfill-apcu": "~1.1", "symfony/security-acl": "~2.8|~3.0" @@ -2091,7 +2413,6 @@ "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/", "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/", - "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", "Symfony\\Bundle\\": "src/Symfony/Bundle/", "Symfony\\Component\\": "src/Symfony/Component/" @@ -2122,7 +2443,7 @@ "keywords": [ "framework" ], - "time": "2016-12-18T21:40:57+00:00" + "time": "2017-11-16T18:00:05+00:00" }, { "name": "theodordiaconu/geshi", @@ -2206,16 +2527,16 @@ }, { "name": "twig/twig", - "version": "2.x-dev", + "version": "v2.6.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "237c326c78c3bc0dda0639ebc9deab34539b7bf3" + "reference": "7d7342c8a4059fefb9b8d07db0cc14007021f9b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/237c326c78c3bc0dda0639ebc9deab34539b7bf3", - "reference": "237c326c78c3bc0dda0639ebc9deab34539b7bf3", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/7d7342c8a4059fefb9b8d07db0cc14007021f9b7", + "reference": "7d7342c8a4059fefb9b8d07db0cc14007021f9b7", "shasum": "" }, "require": { @@ -2269,7 +2590,7 @@ "keywords": [ "templating" ], - "time": "2019-01-14T15:01:20+00:00" + "time": "2019-01-14T15:00:48+00:00" }, { "name": "zendframework/zend-code", @@ -2325,26 +2646,26 @@ }, { "name": "zendframework/zend-eventmanager", - "version": "dev-develop", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "1a25a4742d736a904b639d3f7509d2a140bff0c9" + "reference": "a5e2583a211f73604691586b8406ff7296a946dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/1a25a4742d736a904b639d3f7509d2a140bff0c9", - "reference": "1a25a4742d736a904b639d3f7509d2a140bff0c9", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/a5e2583a211f73604691586b8406ff7296a946dd", + "reference": "a5e2583a211f73604691586b8406ff7296a946dd", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0" + "php": "^5.6 || ^7.0" }, "require-dev": { "athletic/athletic": "^0.1", "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-stdlib": "^2.7.3 || ^3.0" }, "suggest": { @@ -2354,8 +2675,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" } }, "autoload": { @@ -2375,12 +2696,12 @@ "events", "zf2" ], - "time": "2016-11-06T22:02:11+00:00" + "time": "2018-04-25T15:33:34+00:00" } ], "packages-dev": [], "aliases": [], - "minimum-stability": "dev", + "minimum-stability": "stable", "stability-flags": { "theodordiaconu/geshi": 20, "theodordiaconu/geshi-bundle": 20 From 843c6b154cc1a5249ede5689c14671b756316d2f Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 20:36:47 +0300 Subject: [PATCH 07/17] composer update --- composer.lock | 167 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 110 insertions(+), 57 deletions(-) diff --git a/composer.lock b/composer.lock index 0e04b72..7bddd9a 100644 --- a/composer.lock +++ b/composer.lock @@ -582,23 +582,23 @@ }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.3.0", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504" + "reference": "9baecbd6bfdd1123b0cf8c1b88fee0170a84ddd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/18c600a9b82f6454d2e81ca4957cdd56a1cf3504", - "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/9baecbd6bfdd1123b0cf8c1b88fee0170a84ddd1", + "reference": "9baecbd6bfdd1123b0cf8c1b88fee0170a84ddd1", "shasum": "" }, "require": { "doctrine/cache": "^1.4.2", "doctrine/inflector": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2|~3.0" + "symfony/doctrine-bridge": "~2.2|~3.0|~4.0" }, "require-dev": { "instaclick/coding-standard": "~1.1", @@ -606,15 +606,15 @@ "instaclick/symfony2-coding-standard": "dev-remaster", "phpunit/phpunit": "~4", "predis/predis": "~0.8", - "satooshi/php-coveralls": "~0.6.1", + "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "~1.5", - "symfony/console": "~2.2|~3.0", - "symfony/finder": "~2.2|~3.0", - "symfony/framework-bundle": "~2.2|~3.0", - "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/console": "~2.2|~3.0|~4.0", + "symfony/finder": "~2.2|~3.0|~4.0", + "symfony/framework-bundle": "~2.2|~3.0|~4.0", + "symfony/phpunit-bridge": "~2.7|~3.0|~4.0", "symfony/security-acl": "~2.3|~3.0", - "symfony/validator": "~2.2|~3.0", - "symfony/yaml": "~2.2|~3.0" + "symfony/validator": "~2.2|~3.0|~4.0", + "symfony/yaml": "~2.2|~3.0|~4.0" }, "suggest": { "symfony/security-acl": "For using this bundle to cache ACLs" @@ -622,7 +622,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -666,32 +666,32 @@ "cache", "caching" ], - "time": "2016-01-26T17:28:51+00:00" + "time": "2017-10-12T17:23:29+00:00" }, { "name": "doctrine/doctrine-fixtures-bundle", - "version": "2.3.0", + "version": "v2.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029" + "reference": "74b8cc70a4a25b774628ee59f4cdf3623a146273" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/0f1a2f91b349e10f5c343f75ab71d23aace5b029", - "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/74b8cc70a4a25b774628ee59f4cdf3623a146273", + "reference": "74b8cc70a4a25b774628ee59f4cdf3623a146273", "shasum": "" }, "require": { "doctrine/data-fixtures": "~1.0", "doctrine/doctrine-bundle": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.3|~3.0" + "symfony/doctrine-bridge": "~2.7|~3.0|~4.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.4.x-dev" } }, "autoload": { @@ -723,7 +723,7 @@ "Fixture", "persistence" ], - "time": "2015-11-04T21:23:23+00:00" + "time": "2017-10-30T19:26:42+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", @@ -1528,39 +1528,94 @@ "time": "2018-11-05T09:00:11+00:00" }, { - "name": "ocramius/proxy-manager", - "version": "1.0.2", + "name": "ocramius/package-versions", + "version": "1.3.0", "source": { "type": "git", - "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "57e9272ec0e8deccf09421596e0e2252df440e11" + "url": "https://github.com/Ocramius/PackageVersions.git", + "reference": "4489d5002c49d55576fa0ba786f42dbb009be46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/57e9272ec0e8deccf09421596e0e2252df440e11", - "reference": "57e9272ec0e8deccf09421596e0e2252df440e11", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/4489d5002c49d55576fa0ba786f42dbb009be46f", + "reference": "4489d5002c49d55576fa0ba786f42dbb009be46f", "shasum": "" }, "require": { - "php": ">=5.3.3", - "zendframework/zend-code": ">2.2.5,<3.0" + "composer-plugin-api": "^1.0.0", + "php": "^7.1.0" }, "require-dev": { + "composer/composer": "^1.6.3", + "ext-zip": "*", + "infection/infection": "^0.7.1", + "phpunit/phpunit": "^7.0.0" + }, + "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": "2018-02-05T13:05:30+00:00" + }, + { + "name": "ocramius/proxy-manager", + "version": "2.1.1", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/ProxyManager.git", + "reference": "e18ac876b2e4819c76349de8f78ccc8ef1554cd7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/e18ac876b2e4819c76349de8f78ccc8ef1554cd7", + "reference": "e18ac876b2e4819c76349de8f78ccc8ef1554cd7", + "shasum": "" + }, + "require": { + "ocramius/package-versions": "^1.1.1", + "php": "^7.1.0", + "zendframework/zend-code": "^3.1.0" + }, + "require-dev": { + "couscous/couscous": "^1.5.2", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "1.5.*" + "humbug/humbug": "dev-master@DEV", + "nikic/php-parser": "^3.0.4", + "phpbench/phpbench": "^0.12.2", + "phpstan/phpstan": "^0.6.4", + "phpunit/phpunit": "^5.6.4", + "phpunit/phpunit-mock-objects": "^3.4.1", + "squizlabs/php_codesniffer": "^2.7.0" }, "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" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -1576,7 +1631,7 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "homepage": "http://ocramius.github.io/" } ], "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", @@ -1588,37 +1643,33 @@ "proxy pattern", "service proxies" ], - "time": "2015-08-09T04:28:19+00:00" + "time": "2017-05-04T11:12:50+00:00" }, { "name": "paragonie/random_compat", - "version": "v2.0.4", + "version": "v9.99.99", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e" + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e", - "reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": "^7" }, "require-dev": { - "phpunit/phpunit": "4.*|5.*" + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" }, "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" @@ -1633,10 +1684,11 @@ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "keywords": [ "csprng", + "polyfill", "pseudorandom", "random" ], - "time": "2016-11-07T23:38:38+00:00" + "time": "2018-07-02T15:55:56+00:00" }, { "name": "psr/cache", @@ -2594,26 +2646,27 @@ }, { "name": "zendframework/zend-code", - "version": "2.6.3", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "95033f061b083e16cdee60530ec260d7d628b887" + "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/95033f061b083e16cdee60530ec260d7d628b887", - "reference": "95033f061b083e16cdee60530ec260d7d628b887", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c21db169075c6ec4b342149f446e7b7b724f95eb", + "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb", "shasum": "" }, "require": { - "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6", + "php": "^7.1", "zendframework/zend-eventmanager": "^2.6 || ^3.0" }, "require-dev": { "doctrine/annotations": "~1.0", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.8.21", + "ext-phar": "*", + "phpunit/phpunit": "^6.2.3", + "zendframework/zend-coding-standard": "^1.0.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { @@ -2623,8 +2676,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "3.3.x-dev", + "dev-develop": "3.4.x-dev" } }, "autoload": { @@ -2642,7 +2695,7 @@ "code", "zf2" ], - "time": "2016-04-20T17:26:42+00:00" + "time": "2018-08-13T20:36:59+00:00" }, { "name": "zendframework/zend-eventmanager", From 5713af046fb161f70b8c249a79c339a7d65ada5c Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 20:41:26 +0300 Subject: [PATCH 08/17] composer update symfony/symfony (v3.2.14 => v3.4.21), symfony/polyfill-apcu (v1.10.0), psr/simple-cache (1.0.1), psr/link (1.0.0), psr/container (1.0.0), fig/link-util (1.0.0), doctrine/migrations (v1.5.0 => v2.0.0), doctrine/doctrine-cache-bundle (1.3.2 => 1.3.5), doctrine/doctrine-migrations-bundle (v1.2.1 => v2.0.0), symfony/monolog-bundle (2.11.3 => v3.3.1). --- composer.json | 8 +- composer.lock | 455 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 374 insertions(+), 89 deletions(-) diff --git a/composer.json b/composer.json index ebfb320..714f87a 100644 --- a/composer.json +++ b/composer.json @@ -10,17 +10,17 @@ "minimum-stability": "stable", "require": { "php": ">=5.5.9", - "symfony/symfony": "3.2.*", + "symfony/symfony": "^3.4", "doctrine/orm": "^2.5", "doctrine/doctrine-bundle": "^1.4", - "symfony/monolog-bundle": "~2.11.3", + "symfony/monolog-bundle": "^3.1", "sensio/distribution-bundle": "^5.0", "sensio/framework-extra-bundle": "^3.0.2", - "incenteev/composer-parameter-handler": "~2.0", + "incenteev/composer-parameter-handler": "^2.0", "doctrine/doctrine-fixtures-bundle": "^2.2", "theodordiaconu/geshi": "dev-master", "theodordiaconu/geshi-bundle" : "dev-master", - "doctrine/doctrine-migrations-bundle": "^1.0", + "doctrine/doctrine-migrations-bundle": "^2.0", "doctrine/annotations": "^1.3" }, "scripts": { diff --git a/composer.lock b/composer.lock index 7bddd9a..78ff450 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": "75fb34a8c718eb17bd81a5d635065533", + "content-hash": "0fd5719d627e44d5448f01b2c5b4aaff", "packages": [ { "name": "composer/ca-bundle", @@ -582,39 +582,39 @@ }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.3.2", + "version": "1.3.5", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "9baecbd6bfdd1123b0cf8c1b88fee0170a84ddd1" + "reference": "5514c90d9fb595e1095e6d66ebb98ce9ef049927" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/9baecbd6bfdd1123b0cf8c1b88fee0170a84ddd1", - "reference": "9baecbd6bfdd1123b0cf8c1b88fee0170a84ddd1", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/5514c90d9fb595e1095e6d66ebb98ce9ef049927", + "reference": "5514c90d9fb595e1095e6d66ebb98ce9ef049927", "shasum": "" }, "require": { "doctrine/cache": "^1.4.2", "doctrine/inflector": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2|~3.0|~4.0" + "symfony/doctrine-bridge": "~2.7|~3.3|~4.0" }, "require-dev": { "instaclick/coding-standard": "~1.1", "instaclick/object-calisthenics-sniffs": "dev-master", "instaclick/symfony2-coding-standard": "dev-remaster", - "phpunit/phpunit": "~4", + "phpunit/phpunit": "~4.8.36|~5.6|~6.5|~7.0", "predis/predis": "~0.8", "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "~1.5", - "symfony/console": "~2.2|~3.0|~4.0", - "symfony/finder": "~2.2|~3.0|~4.0", - "symfony/framework-bundle": "~2.2|~3.0|~4.0", - "symfony/phpunit-bridge": "~2.7|~3.0|~4.0", - "symfony/security-acl": "~2.3|~3.0", - "symfony/validator": "~2.2|~3.0|~4.0", - "symfony/yaml": "~2.2|~3.0|~4.0" + "symfony/console": "~2.7|~3.3|~4.0", + "symfony/finder": "~2.7|~3.3|~4.0", + "symfony/framework-bundle": "~2.7|~3.3|~4.0", + "symfony/phpunit-bridge": "~2.7|~3.3|~4.0", + "symfony/security-acl": "~2.7|~3.3", + "symfony/validator": "~2.7|~3.3|~4.0", + "symfony/yaml": "~2.7|~3.3|~4.0" }, "suggest": { "symfony/security-acl": "For using this bundle to cache ACLs" @@ -628,7 +628,10 @@ "autoload": { "psr-4": { "Doctrine\\Bundle\\DoctrineCacheBundle\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -661,12 +664,12 @@ } ], "description": "Symfony Bundle for Doctrine Cache", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "cache", "caching" ], - "time": "2017-10-12T17:23:29+00:00" + "time": "2018-11-09T06:25:35+00:00" }, { "name": "doctrine/doctrine-fixtures-bundle", @@ -727,31 +730,35 @@ }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "v1.2.1", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "6276139e0b913a4e5120fc36bb5b0eae8ac549bc" + "reference": "4c9579e0e43df1fb3f0ca29b9c20871c824fac71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/6276139e0b913a4e5120fc36bb5b0eae8ac549bc", - "reference": "6276139e0b913a4e5120fc36bb5b0eae8ac549bc", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/4c9579e0e43df1fb3f0ca29b9c20871c824fac71", + "reference": "4c9579e0e43df1fb3f0ca29b9c20871c824fac71", "shasum": "" }, "require": { "doctrine/doctrine-bundle": "~1.0", - "doctrine/migrations": "^1.1", - "php": ">=5.4.0", - "symfony/framework-bundle": "~2.3|~3.0" + "doctrine/migrations": "^2.0", + "php": "^7.1", + "symfony/framework-bundle": "~3.4|~4.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "doctrine/coding-standard": "^5.0", + "mikey179/vfsstream": "^1.6", + "phpstan/phpstan": "^0.9.2", + "phpstan/phpstan-strict-rules": "^0.9", + "phpunit/phpunit": "^5.7|^6.4|^7.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -778,13 +785,13 @@ } ], "description": "Symfony DoctrineMigrationsBundle", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "dbal", "migrations", "schema" ], - "time": "2016-12-05T18:36:37+00:00" + "time": "2019-01-09T18:49:50+00:00" }, { "name": "doctrine/event-manager", @@ -1037,37 +1044,43 @@ }, { "name": "doctrine/migrations", - "version": "v1.5.0", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "c81147c0f2938a6566594455367e095150547f72" + "reference": "0101f5bd7f4e5043bf8630db2930f8fd7da552b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/c81147c0f2938a6566594455367e095150547f72", - "reference": "c81147c0f2938a6566594455367e095150547f72", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/0101f5bd7f4e5043bf8630db2930f8fd7da552b6", + "reference": "0101f5bd7f4e5043bf8630db2930f8fd7da552b6", "shasum": "" }, "require": { - "doctrine/dbal": "~2.2", - "ocramius/proxy-manager": "^1.0|^2.0", - "php": "^5.5|^7.0", - "symfony/console": "~2.3|~3.0", - "symfony/yaml": "~2.3|~3.0" + "doctrine/dbal": "^2.6", + "ocramius/package-versions": "^1.3", + "ocramius/proxy-manager": "^2.0.2", + "php": "^7.1", + "symfony/console": "^3.4||^4.0", + "symfony/stopwatch": "^3.4||^4.0" }, "require-dev": { - "doctrine/coding-standard": "dev-master", - "doctrine/orm": "2.*", - "jdorn/sql-formatter": "~1.1", - "johnkary/phpunit-speedtrap": "~1.0@dev", + "doctrine/coding-standard": "^5.0", + "doctrine/orm": "^2.6", + "ext-pdo_sqlite": "*", + "jdorn/sql-formatter": "^1.1", "mikey179/vfsstream": "^1.6", - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "~4.7", - "satooshi/php-coveralls": "^1.0" + "phpstan/phpstan": "^0.10", + "phpstan/phpstan-deprecation-rules": "^0.10", + "phpstan/phpstan-phpunit": "^0.10", + "phpstan/phpstan-strict-rules": "^0.10", + "phpunit/phpunit": "^7.0", + "symfony/process": "^3.4||^4.0", + "symfony/yaml": "^3.4||^4.0" }, "suggest": { - "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command." + "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command.", + "symfony/yaml": "Allows the use of yaml for migration configuration files." }, "bin": [ "bin/doctrine-migrations" @@ -1075,17 +1088,17 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "v1.6.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations" + "Doctrine\\Migrations\\": "lib/Doctrine/Migrations" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-2.1" + "MIT" ], "authors": [ { @@ -1101,13 +1114,15 @@ "email": "contact@mikesimonson.com" } ], - "description": "Database Schema migrations using Doctrine DBAL", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Migrations project offer additional functionality on top of the database abstraction layer (DBAL) for versioning your database schema and easily deploying changes to it. It is a very easy to use and a powerful tool.", + "homepage": "https://www.doctrine-project.org/projects/migrations.html", "keywords": [ "database", - "migrations" + "dbal", + "migrations", + "php" ], - "time": "2016-12-25T22:54:00+00:00" + "time": "2019-01-03T18:59:09+00:00" }, { "name": "doctrine/orm", @@ -1348,6 +1363,60 @@ ], "time": "2018-06-14T14:45:07+00:00" }, + { + "name": "fig/link-util", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/link-util.git", + "reference": "1a07821801a148be4add11ab0603e4af55a72fac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/link-util/zipball/1a07821801a148be4add11ab0603e4af55a72fac", + "reference": "1a07821801a148be4add11ab0603e4af55a72fac", + "shasum": "" + }, + "require": { + "php": ">=5.5.0", + "psr/link": "~1.0@dev" + }, + "require-dev": { + "phpunit/phpunit": "^5.1", + "squizlabs/php_codesniffer": "^2.3.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Fig\\Link\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common utility implementations for HTTP links", + "keywords": [ + "http", + "http-link", + "link", + "psr", + "psr-13", + "rest" + ], + "time": "2016-10-17T18:31:11+00:00" + }, { "name": "incenteev/composer-parameter-handler", "version": "v2.1.3", @@ -1736,6 +1805,104 @@ ], "time": "2016-08-06T20:24:11+00:00" }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, + { + "name": "psr/link", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/link.git", + "reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/link/zipball/eea8e8662d5cd3ae4517c9b864493f59fca95562", + "reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Link\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for HTTP links", + "keywords": [ + "http", + "http-link", + "link", + "psr", + "psr-13", + "rest" + ], + "time": "2016-10-28T16:06:13+00:00" + }, { "name": "psr/log", "version": "1.1.0", @@ -1783,6 +1950,54 @@ ], "time": "2018-11-20T15:27:04+00:00" }, + { + "name": "psr/simple-cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" + }, { "name": "sensio/distribution-bundle", "version": "v5.0.24", @@ -1953,41 +2168,44 @@ }, { "name": "symfony/monolog-bundle", - "version": "2.11.3", + "version": "v3.3.1", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "0b427134a6868050fd9a95cc5eae3df85e5c759b" + "reference": "572e143afc03419a75ab002c80a2fd99299195ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/0b427134a6868050fd9a95cc5eae3df85e5c759b", - "reference": "0b427134a6868050fd9a95cc5eae3df85e5c759b", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/572e143afc03419a75ab002c80a2fd99299195ff", + "reference": "572e143afc03419a75ab002c80a2fd99299195ff", "shasum": "" }, "require": { - "monolog/monolog": "~1.18", - "php": ">=5.3.2", - "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" + "monolog/monolog": "~1.22", + "php": ">=5.6", + "symfony/config": "~2.7|~3.3|~4.0", + "symfony/dependency-injection": "~2.7|~3.4.10|^4.0.10", + "symfony/http-kernel": "~2.7|~3.3|~4.0", + "symfony/monolog-bridge": "~2.7|~3.3|~4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "symfony/console": "~2.3|~3.0", - "symfony/yaml": "~2.3|~3.0" + "symfony/console": "~2.7|~3.3|~4.0", + "symfony/phpunit-bridge": "^3.3|^4.0", + "symfony/yaml": "~2.7|~3.3|~4.0" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { "Symfony\\Bundle\\MonologBundle\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2009,7 +2227,63 @@ "log", "logging" ], - "time": "2016-10-19T07:54:05+00:00" + "time": "2018-11-04T09:58:13+00:00" + }, + { + "name": "symfony/polyfill-apcu", + "version": "v1.10.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-apcu.git", + "reference": "19e1b73bf255265ad0b568f81766ae2a3266d8d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/19e1b73bf255265ad0b568f81766ae2a3266d8d2", + "reference": "19e1b73bf255265ad0b568f81766ae2a3266d8d2", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Apcu\\": "" + }, + "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": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/polyfill-ctype", @@ -2355,38 +2629,46 @@ }, { "name": "symfony/symfony", - "version": "v3.2.14", + "version": "v3.4.21", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "fc9f9470e81e6fb59bd826d8040b961f7ed30f94" + "reference": "c7a57e0bcc3c57ae697f072b3e862487b6fd0030" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/fc9f9470e81e6fb59bd826d8040b961f7ed30f94", - "reference": "fc9f9470e81e6fb59bd826d8040b961f7ed30f94", + "url": "https://api.github.com/repos/symfony/symfony/zipball/c7a57e0bcc3c57ae697f072b3e862487b6fd0030", + "reference": "c7a57e0bcc3c57ae697f072b3e862487b6fd0030", "shasum": "" }, "require": { "doctrine/common": "~2.4", "ext-xml": "*", - "php": ">=5.5.9", + "fig/link-util": "^1.0", + "php": "^5.5.9|>=7.0.8", "psr/cache": "~1.0", + "psr/container": "^1.0", + "psr/link": "^1.0", "psr/log": "~1.0", + "psr/simple-cache": "^1.0", + "symfony/polyfill-apcu": "~1.1", + "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-icu": "~1.0", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php56": "~1.0", - "symfony/polyfill-php70": "~1.0", - "symfony/polyfill-util": "~1.0", - "twig/twig": "~1.34|~2.4" + "symfony/polyfill-php70": "~1.6", + "twig/twig": "^1.35|^2.4.4" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0", - "phpdocumentor/type-resolver": "<0.2.0", + "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", + "phpdocumentor/type-resolver": "<0.3.0", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" }, "provide": { - "psr/cache-implementation": "1.0" + "psr/cache-implementation": "1.0", + "psr/container-implementation": "1.0", + "psr/log-implementation": "1.0", + "psr/simple-cache-implementation": "1.0" }, "replace": { "symfony/asset": "self.version", @@ -2401,6 +2683,7 @@ "symfony/dependency-injection": "self.version", "symfony/doctrine-bridge": "self.version", "symfony/dom-crawler": "self.version", + "symfony/dotenv": "self.version", "symfony/event-dispatcher": "self.version", "symfony/expression-language": "self.version", "symfony/filesystem": "self.version", @@ -2412,6 +2695,7 @@ "symfony/inflector": "self.version", "symfony/intl": "self.version", "symfony/ldap": "self.version", + "symfony/lock": "self.version", "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", @@ -2433,12 +2717,15 @@ "symfony/twig-bundle": "self.version", "symfony/validator": "self.version", "symfony/var-dumper": "self.version", + "symfony/web-link": "self.version", "symfony/web-profiler-bundle": "self.version", + "symfony/web-server-bundle": "self.version", "symfony/workflow": "self.version", "symfony/yaml": "self.version" }, "require-dev": { "cache/integration-tests": "dev-master", + "doctrine/annotations": "~1.0", "doctrine/cache": "~1.6", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", @@ -2447,17 +2734,15 @@ "egulias/email-validator": "~1.2,>=1.2.8|~2.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0|~2.0", - "phpdocumentor/reflection-docblock": "^3.0", + "phpdocumentor/reflection-docblock": "^3.0|^4.0", "predis/predis": "~1.0", - "sensio/framework-extra-bundle": "^3.0.2", - "symfony/phpunit-bridge": "~3.2", - "symfony/polyfill-apcu": "~1.1", + "symfony/phpunit-bridge": "~3.4|~4.0", "symfony/security-acl": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2495,7 +2780,7 @@ "keywords": [ "framework" ], - "time": "2017-11-16T18:00:05+00:00" + "time": "2019-01-06T15:54:26+00:00" }, { "name": "theodordiaconu/geshi", From 9bdc423af264f5dae247bf52e2472abb573adab5 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 20:52:35 +0300 Subject: [PATCH 09/17] composer require symfony/web-server-bundle ^3.4 --dev --- app/AppKernel.php | 1 + composer.json | 2 ++ composer.lock | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index e87f6cb..3653692 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -23,6 +23,7 @@ class AppKernel extends Kernel if (in_array($this->getEnvironment(), array('dev', 'test'))) { $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); + $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); } diff --git a/composer.json b/composer.json index 714f87a..8275094 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,8 @@ "theodordiaconu/geshi-bundle" : "dev-master", "doctrine/doctrine-migrations-bundle": "^2.0", "doctrine/annotations": "^1.3" + },"require-dev": { + "symfony/web-server-bundle": "^3.4" }, "scripts": { "symfony-scripts": [ diff --git a/composer.lock b/composer.lock index 78ff450..90e9470 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": "0fd5719d627e44d5448f01b2c5b4aaff", + "content-hash": "dbd7fba6087be4cdbef515a94ab5b0b0", "packages": [ { "name": "composer/ca-bundle", From 7f58d127067c4a33bc7319fa57dc81ccfe5a7813 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 20:59:09 +0300 Subject: [PATCH 10/17] CopypasteController removed to PasteController. --- app/Resources/views/base.html.twig | 2 +- .../{CopypasteController.php => PasteController.php} | 6 +----- .../Resources/config/routing/copypaste.yml | 8 ++++---- 3 files changed, 6 insertions(+), 10 deletions(-) rename src/Skobkin/Bundle/CopyPasteBundle/Controller/{CopypasteController.php => PasteController.php} (98%) diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 54bb649..2116932 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -46,7 +46,7 @@ {%- endblock -%} {%- block sidebar -%} - {{ render(controller('SkobkinCopyPasteBundle:CopyPaste:sidebar')) }} + {{ render(controller('SkobkinCopyPasteBundle:Paste:sidebar')) }} {%- endblock -%} {% block content %}{% endblock %} diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Controller/CopypasteController.php b/src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php similarity index 98% rename from src/Skobkin/Bundle/CopyPasteBundle/Controller/CopypasteController.php rename to src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php index dcabd8a..049f311 100644 --- a/src/Skobkin/Bundle/CopyPasteBundle/Controller/CopypasteController.php +++ b/src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php @@ -12,11 +12,7 @@ use Skobkin\Bundle\CopyPasteBundle\Form\CopypasteType; use DT\Bundle\GeshiBundle\Highlighter\GeshiHighlighter; use \GeSHi\GeSHi; -/** - * Copypaste controller. - * - */ -class CopypasteController extends Controller +class PasteController extends Controller { /** diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml b/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml index 45938d3..c26de88 100644 --- a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml +++ b/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml @@ -1,21 +1,21 @@ copypaste_show_public: path: /{id} - defaults: { _controller: "SkobkinCopyPasteBundle:Copypaste:show", secret: null } + defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::showAction', secret: null } requirements: id: \d+ copypaste_show_private: path: /{id}/{secret} - defaults: { _controller: "SkobkinCopyPasteBundle:Copypaste:show" } + defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::showAction' } requirements: id: \d+ secret: \w{16} copypaste_new: path: / - defaults: { _controller: "SkobkinCopyPasteBundle:Copypaste:new" } + defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::newAction' } copypaste_create: path: /create - defaults: { _controller: "SkobkinCopyPasteBundle:Copypaste:create" } + defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::createAction' } methods: POST \ No newline at end of file From 83ac9fda67251b4fb9a07e736c898b5100225c78 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 21:01:34 +0300 Subject: [PATCH 11/17] composer require php version updated to 7.1.0. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8275094..fc15d01 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ }, "minimum-stability": "stable", "require": { - "php": ">=5.5.9", + "php": ">=7.1.0", "symfony/symfony": "^3.4", "doctrine/orm": "^2.5", "doctrine/doctrine-bundle": "^1.4", From ba788e77461c20f313220b2156d16483e4d18333 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 21:26:28 +0300 Subject: [PATCH 12/17] Many upgrade changes. Templating system refactored. Routing cleaned out. Many thingls simplified. --- .../Resources/views/Form/fields.html.twig | 0 .../views/Form/form_paste_create.html.twig | 0 app/Resources/views/Paste/new.html.twig | 6 +++++ .../Resources/views/Paste}/show.html.twig | 4 +-- app/Resources/views/base.html.twig | 8 +++--- app/Resources/views/sidebar.html.twig | 2 +- app/config/config.yml | 16 ++++++----- app/config/routing.yml | 23 +++++++++++++--- app/config/services.yml | 27 ++++++++++++++++--- .../Controller/PasteController.php | 25 +++++++---------- .../SkobkinCopyPasteExtension.php | 1 - .../Resources/config/routing.yml | 3 --- .../Resources/config/routing/copypaste.yml | 21 --------------- .../Resources/config/services.yml | 1 - .../CopyPasteBundle/Resources/doc/index.rst | 0 .../Resources/views/Copypaste/new.html.twig | 6 ----- 16 files changed, 77 insertions(+), 66 deletions(-) rename {src/Skobkin/Bundle/CopyPasteBundle => app}/Resources/views/Form/fields.html.twig (100%) rename {src/Skobkin/Bundle/CopyPasteBundle => app}/Resources/views/Form/form_paste_create.html.twig (100%) create mode 100644 app/Resources/views/Paste/new.html.twig rename {src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Copypaste => app/Resources/views/Paste}/show.html.twig (96%) delete mode 100644 src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing.yml delete mode 100644 src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml delete mode 100644 src/Skobkin/Bundle/CopyPasteBundle/Resources/config/services.yml delete mode 100644 src/Skobkin/Bundle/CopyPasteBundle/Resources/doc/index.rst delete mode 100644 src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Copypaste/new.html.twig diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Form/fields.html.twig b/app/Resources/views/Form/fields.html.twig similarity index 100% rename from src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Form/fields.html.twig rename to app/Resources/views/Form/fields.html.twig diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Form/form_paste_create.html.twig b/app/Resources/views/Form/form_paste_create.html.twig similarity index 100% rename from src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Form/form_paste_create.html.twig rename to app/Resources/views/Form/form_paste_create.html.twig diff --git a/app/Resources/views/Paste/new.html.twig b/app/Resources/views/Paste/new.html.twig new file mode 100644 index 0000000..d9e1999 --- /dev/null +++ b/app/Resources/views/Paste/new.html.twig @@ -0,0 +1,6 @@ +{% extends 'base.html.twig' %} + +{% block content %} + {# This form recieves form_create object from current context #} + {% include 'Form/form_paste_create.html.twig' %} +{% endblock %} diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Copypaste/show.html.twig b/app/Resources/views/Paste/show.html.twig similarity index 96% rename from src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Copypaste/show.html.twig rename to app/Resources/views/Paste/show.html.twig index dff9048..41c03f0 100644 --- a/src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Copypaste/show.html.twig +++ b/app/Resources/views/Paste/show.html.twig @@ -1,4 +1,4 @@ -{% extends '::base.html.twig' %} +{% extends 'base.html.twig' %} {% block content %}
@@ -66,7 +66,7 @@
{# This form recieves form_create object from current context #} - {% include 'SkobkinCopyPasteBundle:Form:form_paste_create.html.twig' %} + {% include 'Form/form_paste_create.html.twig' %}
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 2116932..2a70c27 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -1,4 +1,4 @@ -{% extends '::layout.html.twig' -%} +{% extends 'layout.html.twig' -%} {%- block css -%} {{- parent() -}} @@ -20,7 +20,7 @@ - {{ 'header_title' | trans }} + {{ 'header_title' | trans }} @@ -28,7 +28,7 @@
    {% block header_menu_left_items %} - {{ 'header_menu_add' | trans }} + {{ 'header_menu_add' | trans }}
  • {{ 'header_menu_about' | trans }} @@ -46,7 +46,7 @@ {%- endblock -%} {%- block sidebar -%} - {{ render(controller('SkobkinCopyPasteBundle:Paste:sidebar')) }} + {{ render(controller('Skobkin\\Bundle\\CopyPasteBundle\\Controller\\PasteController::sidebarAction')) }} {%- endblock -%} {% block content %}{% endblock %} diff --git a/app/Resources/views/sidebar.html.twig b/app/Resources/views/sidebar.html.twig index 9be9cee..408b2c4 100644 --- a/app/Resources/views/sidebar.html.twig +++ b/app/Resources/views/sidebar.html.twig @@ -3,7 +3,7 @@
    {{ 'sidebar_title' | trans() }}
      {% for paste in pastes %} - + #{{ paste.id }} - {% if paste.author %}{{ paste.author }}{% else %}anonymous{% endif %} {% endfor %} diff --git a/app/config/config.yml b/app/config/config.yml index b405ade..a33bf1e 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -13,17 +13,21 @@ framework: form: ~ csrf_protection: ~ validation: { enable_annotations: true } - templating: - engines: ['twig'] - #assets_version: SomeVersionScheme - default_locale: "%locale%" + #serializer: { enable_annotations: true } + default_locale: '%locale%' trusted_hosts: ~ - trusted_proxies: ~ session: # handler_id set to null will use default session handler from php.ini handler_id: ~ fragments: ~ http_method_override: true + assets: ~ + php_errors: + log: true + +sensio_framework_extra: + router: + annotations: false # Twig Configuration twig: @@ -31,7 +35,7 @@ twig: strict_variables: "%kernel.debug%" form_themes: - 'bootstrap_3_layout.html.twig' - - 'SkobkinCopyPasteBundle:Form:fields.html.twig' + - 'Form/fields.html.twig' # Doctrine Configuration doctrine: diff --git a/app/config/routing.yml b/app/config/routing.yml index b2e7d2c..36812d1 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,4 +1,21 @@ -skobkin_copy_paste: - resource: "@SkobkinCopyPasteBundle/Resources/config/routing.yml" - prefix: / +paste_show_public: + path: /{id} + defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::showAction', secret: null } + requirements: + id: \d+ +paste_show_private: + path: /{id}/{secret} + defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::showAction' } + requirements: + id: \d+ + secret: \w{16} + +paste_new: + path: / + defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::newAction' } + +paste_create: + path: /create + defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::createAction' } + methods: POST \ No newline at end of file diff --git a/app/config/services.yml b/app/config/services.yml index 5c76fc5..718e7c3 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -4,6 +4,27 @@ parameters: # parameter_name: value services: -# service_name: -# class: AppBundle\Directory\ClassName -# arguments: ["@another_service_name", "plain_value", "%parameter_name%"] + # default configuration for services in *this* file + _defaults: + # automatically injects dependencies in your services + autowire: true + # automatically registers your services as commands, event subscribers, etc. + autoconfigure: true + # this means you cannot fetch services directly from the container via $container->get() + # if you need to do this, you can override this setting on individual services + public: false + + # makes classes in src/AppBundle available to be used as services + # this creates a service per class whose id is the fully-qualified class name + Skobkin\Bundle\CopyPasteBundle\: + resource: '../../src/Skobkin/Bundle/CopyPasteBundle/*' + # you can exclude directories or files + # but if a service is unused, it's removed anyway + exclude: '../../src/Skobkin/Bundle/CopyPasteBundle/{DataFixtures,DependencyInjection,Entity,Repository,Tests}' + + # controllers are imported separately to make sure they're public + # and have a tag that allows actions to type-hint services + Skobkin\Bundle\CopyPasteBundle\Controller\: + resource: '../../src/Skobkin/Bundle/CopyPasteBundle/Controller' + public: true + tags: ['controller.service_arguments'] diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php b/src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php index 049f311..d94c3c2 100644 --- a/src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php +++ b/src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php @@ -2,6 +2,7 @@ namespace Skobkin\Bundle\CopyPasteBundle\Controller; +use DT\Bundle\GeshiBundle\Highlighter\HighlighterInterface; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -9,7 +10,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; use \Symfony\Component\Form\Form; use Skobkin\Bundle\CopyPasteBundle\Entity\Copypaste; use Skobkin\Bundle\CopyPasteBundle\Form\CopypasteType; -use DT\Bundle\GeshiBundle\Highlighter\GeshiHighlighter; use \GeSHi\GeSHi; class PasteController extends Controller @@ -54,9 +54,9 @@ class PasteController extends Controller $em->flush(); if ($paste->isPrivate()) { - return $this->redirect($this->generateUrl('copypaste_show_private', ['id' => $paste->getId(), 'secret' => $paste->getSecret()])); + return $this->redirect($this->generateUrl('paste_show_private', ['id' => $paste->getId(), 'secret' => $paste->getSecret()])); } else { - return $this->redirect($this->generateUrl('copypaste_show_public', ['id' => $paste->getId()])); + return $this->redirect($this->generateUrl('paste_show_public', ['id' => $paste->getId()])); } } @@ -73,7 +73,7 @@ class PasteController extends Controller private function createCreateForm(Copypaste $entity) { $form = $this->createForm(CopypasteType::class, $entity, [ - 'action' => $this->generateUrl('copypaste_create'), + 'action' => $this->generateUrl('paste_create'), 'method' => 'POST', ]); @@ -92,7 +92,7 @@ class PasteController extends Controller $paste = new Copypaste(); $createForm = $this->createCreateForm($paste); - return $this->render('SkobkinCopyPasteBundle:Copypaste:new.html.twig', [ + return $this->render('Paste/new.html.twig', [ 'entity' => $paste, 'form_create' => $createForm->createView(), ]); @@ -103,12 +103,12 @@ class PasteController extends Controller * * @return Response */ - public function showAction($id, $secret) + public function showAction(int $id, ?string $secret, HighlighterInterface $highlighter) { $em = $this->getDoctrine()->getManager(); /* @var $paste Copypaste */ - $paste = $em->getRepository('SkobkinCopyPasteBundle:Copypaste')->findOneBy([ + $paste = $em->getRepository(Copypaste::class)->findOneBy([ 'id' =>$id, 'secret' => $secret ]); @@ -119,15 +119,12 @@ class PasteController extends Controller $editForm = $this->createCreateForm($paste); - /* @var $highlighter GeshiHighlighter */ - $highlighter = $this->get('dt_geshi.highlighter'); - $highlightedCode = $highlighter->highlight($paste->getText(), $paste->getLanguage()->getCode(), function(GeSHi $geshi) { $geshi->set_header_type(GESHI_HEADER_PRE); $geshi->enable_line_numbers(GESHI_NO_LINE_NUMBERS); }); - return $this->render('SkobkinCopyPasteBundle:Copypaste:show.html.twig', [ + return $this->render('Paste/show.html.twig', [ 'paste' => $paste, 'highlighted_text' => $highlightedCode, 'form_create' => $editForm->createView(), @@ -143,15 +140,13 @@ class PasteController extends Controller { $em = $this->getDoctrine()->getManager(); - $pastes = $em->getRepository('SkobkinCopyPasteBundle:Copypaste')->findBy( + $pastes = $em->getRepository(Copypaste::class)->findBy( ['secret' => null], ['id' => 'DESC'], // @todo move to the config 15 ); - return $this->render('::sidebar.html.twig', ['pastes' => $pastes]); + return $this->render('sidebar.html.twig', ['pastes' => $pastes]); } - - } diff --git a/src/Skobkin/Bundle/CopyPasteBundle/DependencyInjection/SkobkinCopyPasteExtension.php b/src/Skobkin/Bundle/CopyPasteBundle/DependencyInjection/SkobkinCopyPasteExtension.php index 903d455..8728e2a 100644 --- a/src/Skobkin/Bundle/CopyPasteBundle/DependencyInjection/SkobkinCopyPasteExtension.php +++ b/src/Skobkin/Bundle/CopyPasteBundle/DependencyInjection/SkobkinCopyPasteExtension.php @@ -23,6 +23,5 @@ class SkobkinCopyPasteExtension extends Extension $config = $this->processConfiguration($configuration, $configs); $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); - $loader->load('services.yml'); } } diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing.yml b/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing.yml deleted file mode 100644 index 8e4a1d7..0000000 --- a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing.yml +++ /dev/null @@ -1,3 +0,0 @@ -skobkin_copy_paste: - resource: "@SkobkinCopyPasteBundle/Resources/config/routing/copypaste.yml" - prefix: / diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml b/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml deleted file mode 100644 index c26de88..0000000 --- a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml +++ /dev/null @@ -1,21 +0,0 @@ -copypaste_show_public: - path: /{id} - defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::showAction', secret: null } - requirements: - id: \d+ - -copypaste_show_private: - path: /{id}/{secret} - defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::showAction' } - requirements: - id: \d+ - secret: \w{16} - -copypaste_new: - path: / - defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::newAction' } - -copypaste_create: - path: /create - defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::createAction' } - methods: POST \ No newline at end of file diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/services.yml b/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/services.yml deleted file mode 100644 index 0baad47..0000000 --- a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/services.yml +++ /dev/null @@ -1 +0,0 @@ -services: diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/doc/index.rst b/src/Skobkin/Bundle/CopyPasteBundle/Resources/doc/index.rst deleted file mode 100644 index e69de29..0000000 diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Copypaste/new.html.twig b/src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Copypaste/new.html.twig deleted file mode 100644 index 69f87c5..0000000 --- a/src/Skobkin/Bundle/CopyPasteBundle/Resources/views/Copypaste/new.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% extends '::base.html.twig' %} - -{% block content %} - {# This form recieves form_create object from current context #} - {% include 'SkobkinCopyPasteBundle:Form:form_paste_create.html.twig' %} -{% endblock %} From b3094fe2cb9f0b277ad63b3e87604e46163cc353 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 21:28:59 +0300 Subject: [PATCH 13/17] Swiftmailer config removed from config_dev.yml and config_test.yml. --- app/config/config_dev.yml | 3 --- app/config/config_test.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 2988f4f..b30a818 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -40,6 +40,3 @@ monolog: #chromephp: # type: chromephp # level: info - -#swiftmailer: -# delivery_address: me@example.com diff --git a/app/config/config_test.yml b/app/config/config_test.yml index f2404dd..0d900f7 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -18,6 +18,3 @@ framework: web_profiler: toolbar: false intercept_redirects: false - -swiftmailer: - disable_delivery: true From 6c2da98b59122091ae61eb2ac4c72576914f3619 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 21:32:32 +0300 Subject: [PATCH 14/17] Entrypoints updated according to symfony 3.4 state. --- app/console | 9 ++++----- web/app.php | 5 ++--- web/app_dev.php | 17 +++++++---------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/app/console b/app/console index f76d471..f14e052 100644 --- a/app/console +++ b/app/console @@ -4,15 +4,14 @@ use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Debug\Debug; // if you don't want to setup permissions the proper way, just uncomment the following PHP line -// read http://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup +// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup // for more information umask(0002); set_time_limit(0); -/** @var Composer\Autoload\ClassLoader $loader */ -$loader = require __DIR__.'/../app/autoload.php'; +require __DIR__.'/../vendor/autoload.php'; $input = new ArgvInput(); -$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod'; +$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev', true); +$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption('--no-debug', true) && $env !== 'prod'; if ($debug) { Debug::enable(); } diff --git a/web/app.php b/web/app.php index 105669e..433163b 100644 --- a/web/app.php +++ b/web/app.php @@ -1,9 +1,8 @@ loadClassCache(); +if (PHP_VERSION_ID < 70000) { + $kernel->loadClassCache(); +} $request = Request::createFromGlobals(); $response = $kernel->handle($request); $response->send(); From 6d7cc2c05d1a6af4dea563aee5ddeb7a7cef2beb Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 21:35:36 +0300 Subject: [PATCH 15/17] Migrations fixed due to 2.0.0 changes. --- app/DoctrineMigrations/Version20150302205121.php | 2 +- app/DoctrineMigrations/Version20150302213116.php | 2 +- app/DoctrineMigrations/Version20150302223210.php | 2 +- app/DoctrineMigrations/Version20150303224825.php | 2 +- app/DoctrineMigrations/Version20150305184842.php | 2 +- app/DoctrineMigrations/Version20150316014139.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/DoctrineMigrations/Version20150302205121.php b/app/DoctrineMigrations/Version20150302205121.php index 7f4d312..9df48c7 100644 --- a/app/DoctrineMigrations/Version20150302205121.php +++ b/app/DoctrineMigrations/Version20150302205121.php @@ -2,7 +2,7 @@ namespace Application\Migrations; -use Doctrine\DBAL\Migrations\AbstractMigration; +use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; /** diff --git a/app/DoctrineMigrations/Version20150302213116.php b/app/DoctrineMigrations/Version20150302213116.php index b7a8634..2fe5a74 100644 --- a/app/DoctrineMigrations/Version20150302213116.php +++ b/app/DoctrineMigrations/Version20150302213116.php @@ -2,7 +2,7 @@ namespace Application\Migrations; -use Doctrine\DBAL\Migrations\AbstractMigration; +use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; /** diff --git a/app/DoctrineMigrations/Version20150302223210.php b/app/DoctrineMigrations/Version20150302223210.php index eaaef21..5b73d56 100644 --- a/app/DoctrineMigrations/Version20150302223210.php +++ b/app/DoctrineMigrations/Version20150302223210.php @@ -2,7 +2,7 @@ namespace Application\Migrations; -use Doctrine\DBAL\Migrations\AbstractMigration; +use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; /** diff --git a/app/DoctrineMigrations/Version20150303224825.php b/app/DoctrineMigrations/Version20150303224825.php index 4460679..afd851d 100644 --- a/app/DoctrineMigrations/Version20150303224825.php +++ b/app/DoctrineMigrations/Version20150303224825.php @@ -2,7 +2,7 @@ namespace Application\Migrations; -use Doctrine\DBAL\Migrations\AbstractMigration; +use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; /** diff --git a/app/DoctrineMigrations/Version20150305184842.php b/app/DoctrineMigrations/Version20150305184842.php index 4eac22a..5e3468c 100644 --- a/app/DoctrineMigrations/Version20150305184842.php +++ b/app/DoctrineMigrations/Version20150305184842.php @@ -2,7 +2,7 @@ namespace Application\Migrations; -use Doctrine\DBAL\Migrations\AbstractMigration; +use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; /** diff --git a/app/DoctrineMigrations/Version20150316014139.php b/app/DoctrineMigrations/Version20150316014139.php index d28ba5c..e475f82 100644 --- a/app/DoctrineMigrations/Version20150316014139.php +++ b/app/DoctrineMigrations/Version20150316014139.php @@ -2,7 +2,7 @@ namespace Application\Migrations; -use Doctrine\DBAL\Migrations\AbstractMigration; +use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; /** From d1e7b360e999cbf6392b3cbc14dfe620ed87f292 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 21:38:41 +0300 Subject: [PATCH 16/17] Migrations up() and down() signatures fixed according to 2.0.0 changes. --- app/DoctrineMigrations/Version20150302205121.php | 4 ++-- app/DoctrineMigrations/Version20150302213116.php | 4 ++-- app/DoctrineMigrations/Version20150302223210.php | 4 ++-- app/DoctrineMigrations/Version20150303224825.php | 4 ++-- app/DoctrineMigrations/Version20150305184842.php | 4 ++-- app/DoctrineMigrations/Version20150316014139.php | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/DoctrineMigrations/Version20150302205121.php b/app/DoctrineMigrations/Version20150302205121.php index 9df48c7..637c634 100644 --- a/app/DoctrineMigrations/Version20150302205121.php +++ b/app/DoctrineMigrations/Version20150302205121.php @@ -10,7 +10,7 @@ use Doctrine\DBAL\Schema\Schema; */ class Version20150302205121 extends AbstractMigration { - public function up(Schema $schema) + public function up(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); @@ -50,7 +50,7 @@ class Version20150302205121 extends AbstractMigration } } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); diff --git a/app/DoctrineMigrations/Version20150302213116.php b/app/DoctrineMigrations/Version20150302213116.php index 2fe5a74..93a0525 100644 --- a/app/DoctrineMigrations/Version20150302213116.php +++ b/app/DoctrineMigrations/Version20150302213116.php @@ -10,7 +10,7 @@ use Doctrine\DBAL\Schema\Schema; */ class Version20150302213116 extends AbstractMigration { - public function up(Schema $schema) + public function up(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); @@ -46,7 +46,7 @@ class Version20150302213116 extends AbstractMigration $this->addSql('RENAME TABLE paste TO copypastes'); } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); diff --git a/app/DoctrineMigrations/Version20150302223210.php b/app/DoctrineMigrations/Version20150302223210.php index 5b73d56..5d4a75c 100644 --- a/app/DoctrineMigrations/Version20150302223210.php +++ b/app/DoctrineMigrations/Version20150302223210.php @@ -10,7 +10,7 @@ use Doctrine\DBAL\Schema\Schema; */ class Version20150302223210 extends AbstractMigration { - public function up(Schema $schema) + public function up(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); @@ -24,7 +24,7 @@ class Version20150302223210 extends AbstractMigration $this->addSql('CREATE INDEX IDX_DBA4BEBE82F1BAF4 ON copypastes (language_id)'); } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); diff --git a/app/DoctrineMigrations/Version20150303224825.php b/app/DoctrineMigrations/Version20150303224825.php index afd851d..25712e1 100644 --- a/app/DoctrineMigrations/Version20150303224825.php +++ b/app/DoctrineMigrations/Version20150303224825.php @@ -10,12 +10,12 @@ use Doctrine\DBAL\Schema\Schema; */ class Version20150303224825 extends AbstractMigration { - public function up(Schema $schema) + public function up(Schema $schema): void { $this->addSql('UPDATE copypastes SET secret=NULL WHERE secret=\'\''); } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->addSql('UPDATE copypastes SET secret=\'\' WHERE secret=NULL'); } diff --git a/app/DoctrineMigrations/Version20150305184842.php b/app/DoctrineMigrations/Version20150305184842.php index 5e3468c..56d0292 100644 --- a/app/DoctrineMigrations/Version20150305184842.php +++ b/app/DoctrineMigrations/Version20150305184842.php @@ -10,13 +10,13 @@ use Doctrine\DBAL\Schema\Schema; */ class Version20150305184842 extends AbstractMigration { - public function up(Schema $schema) + public function up(Schema $schema): void { $this->addSql('UPDATE copypastes SET date_expire=NULL WHERE date_expire=\'0000-00-00 00:00:00\''); } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->addSql('UPDATE copypastes SET date_expire=\'0000-00-00 00:00:00\' WHERE date_expire=NULL'); } diff --git a/app/DoctrineMigrations/Version20150316014139.php b/app/DoctrineMigrations/Version20150316014139.php index e475f82..e49e2ef 100644 --- a/app/DoctrineMigrations/Version20150316014139.php +++ b/app/DoctrineMigrations/Version20150316014139.php @@ -12,7 +12,7 @@ use Doctrine\DBAL\Schema\Schema; */ class Version20150316014139 extends AbstractMigration { - public function up(Schema $schema) + public function up(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); @@ -21,7 +21,7 @@ class Version20150316014139 extends AbstractMigration $this->addSql('CREATE INDEX idx_preferred ON languages (is_preferred)'); } - public function down(Schema $schema) + public function down(Schema $schema): void { $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on \'mysql\'.'); From a5af1ac1f77cb7efc5cb41000b810aee72633b2b Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 21:45:22 +0300 Subject: [PATCH 17/17] Fix LoadLanguages fixture. Language entity refactored. --- .../DataFixtures/ORM/LoadLanguages.php | 4 +- .../CopyPasteBundle/Entity/Language.php | 72 +++---------------- 2 files changed, 12 insertions(+), 64 deletions(-) diff --git a/src/Skobkin/Bundle/CopyPasteBundle/DataFixtures/ORM/LoadLanguages.php b/src/Skobkin/Bundle/CopyPasteBundle/DataFixtures/ORM/LoadLanguages.php index bb8b8b9..905492e 100644 --- a/src/Skobkin/Bundle/CopyPasteBundle/DataFixtures/ORM/LoadLanguages.php +++ b/src/Skobkin/Bundle/CopyPasteBundle/DataFixtures/ORM/LoadLanguages.php @@ -78,13 +78,13 @@ class LoadLanguages implements FixtureInterface, ContainerAwareInterface foreach ($finder as $file) { $output->writeln($file->getRelativePathname() . ' found. Parsing...'); - include $geshiPath . DIRECTORY_SEPARATOR .$file->getRelativePathname(); + include $geshiPath.DIRECTORY_SEPARATOR.$file->getRelativePathname(); $language = new Language(); $language ->setName($language_data['LANG_NAME']) ->setCode(basename($file->getRelativePathname(), '.php')) - ->setEnabled(true) + ->setIsEnabled(true) ; $output->write('---> "' . $language->getName() . '"'); diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Entity/Language.php b/src/Skobkin/Bundle/CopyPasteBundle/Entity/Language.php index 8eaa8b0..75f3cf9 100644 --- a/src/Skobkin/Bundle/CopyPasteBundle/Entity/Language.php +++ b/src/Skobkin/Bundle/CopyPasteBundle/Entity/Language.php @@ -5,8 +5,6 @@ namespace Skobkin\Bundle\CopyPasteBundle\Entity; use Doctrine\ORM\Mapping as ORM; /** - * Language - * * @ORM\Table(name="languages", indexes={ * @ORM\Index(name="idx_enabled", columns={"is_enabled"}), * @ORM\Index(name="idx_preferred", columns={"is_preferred"}), @@ -53,14 +51,7 @@ class Language */ private $isEnabled; - - - /** - * Get id - * - * @return integer - */ - public function getId() + public function getId(): int { return $this->id; } @@ -70,91 +61,48 @@ class Language return $this->name; } - /** - * Set name - * - * @param string $name - * @return Lang - */ - public function setName($name) + public function setName(string $name): self { $this->name = $name; return $this; } - /** - * Get name - * - * @return string - */ - public function getName() + public function getName(): string { return $this->name; } - /** - * Set code - * - * @param string $code - * @return Lang - */ - public function setCode($code) + public function setCode($code): self { $this->code = $code; return $this; } - /** - * Get code - * - * @return string - */ - public function getCode() + public function getCode(): string { return $this->code; } - /** - * Set isEnabled - * - * @param boolean $isEnabled - * @return Lang - */ - public function setIsEnabled($isEnabled) + public function setIsEnabled($isEnabled): self { $this->isEnabled = $isEnabled; return $this; } - /** - * Get isEnabled - * - * @return boolean - */ - public function getIsEnabled() + public function getIsEnabled(): bool { return $this->isEnabled; } - - /** - * Get isPreferred - * - * @return boolean - */ - function getIsPreferred() + + function getIsPreferred(): bool { return $this->isPreferred; } - /** - * Set isPreferred - * - * @param boolean $isPreferred - */ - function setIsPreferred($isPreferred) + function setIsPreferred(bool $isPreferred): self { $this->isPreferred = $isPreferred;