Symfony upgraded to 3.4.x-dev. Small refactoring.
This commit is contained in:
parent
52f6d766a5
commit
d018c94a7a
|
@ -12,7 +12,7 @@
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.1.0",
|
"php": ">=7.1.0",
|
||||||
"symfony/symfony": "3.3.*",
|
"symfony/symfony": "3.4.x-dev",
|
||||||
"doctrine/orm": "^2.5",
|
"doctrine/orm": "^2.5",
|
||||||
"doctrine/annotations": "^1.3.0",
|
"doctrine/annotations": "^1.3.0",
|
||||||
"doctrine/doctrine-bundle": "^1.6",
|
"doctrine/doctrine-bundle": "^1.6",
|
||||||
|
@ -20,10 +20,10 @@
|
||||||
"doctrine/doctrine-migrations-bundle": "^1.0",
|
"doctrine/doctrine-migrations-bundle": "^1.0",
|
||||||
"twig/twig": "^2.0",
|
"twig/twig": "^2.0",
|
||||||
"twig/extensions": "~1.0",
|
"twig/extensions": "~1.0",
|
||||||
"symfony/swiftmailer-bundle": "^2.3.10",
|
"symfony/swiftmailer-bundle": "^2.6.4",
|
||||||
"symfony/monolog-bundle": "^3.1.0",
|
"symfony/monolog-bundle": "^3.1.0",
|
||||||
"sensio/distribution-bundle": "^5.0.19",
|
"sensio/distribution-bundle": "^5.0.19",
|
||||||
"sensio/framework-extra-bundle": "^3.0.2",
|
"sensio/framework-extra-bundle": "^5.0.0",
|
||||||
"incenteev/composer-parameter-handler": "^2.0",
|
"incenteev/composer-parameter-handler": "^2.0",
|
||||||
"ob/highcharts-bundle": "^1.2",
|
"ob/highcharts-bundle": "^1.2",
|
||||||
"jms/serializer-bundle": "^1.1",
|
"jms/serializer-bundle": "^1.1",
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
"file": "app/config/parameters.yml"
|
"file": "app/config/parameters.yml"
|
||||||
},
|
},
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.3-dev"
|
"dev-master": "3.4-dev"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
73
composer.lock
generated
73
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"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#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "367c0ce55806513e80bf06d51b0085c1",
|
"content-hash": "b7bd97fb38754e5cebb09b72951f19cd",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "composer/ca-bundle",
|
"name": "composer/ca-bundle",
|
||||||
|
@ -2600,38 +2600,37 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sensio/framework-extra-bundle",
|
"name": "sensio/framework-extra-bundle",
|
||||||
"version": "v3.0.28",
|
"version": "v5.0.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
|
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
|
||||||
"reference": "65eadf9e3fd5c47eee7986b306a5aed8affe6496"
|
"reference": "9e3fa14aa959f703961bc9e4ab00110d617bcfdd"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/65eadf9e3fd5c47eee7986b306a5aed8affe6496",
|
"url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/9e3fa14aa959f703961bc9e4ab00110d617bcfdd",
|
||||||
"reference": "65eadf9e3fd5c47eee7986b306a5aed8affe6496",
|
"reference": "9e3fa14aa959f703961bc9e4ab00110d617bcfdd",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"doctrine/common": "~2.2",
|
"doctrine/common": "^2.2",
|
||||||
"symfony/dependency-injection": "~2.3|~3.0",
|
"symfony/config": "^3.3|^4.0",
|
||||||
"symfony/framework-bundle": "~2.3|~3.0|~4.0"
|
"symfony/dependency-injection": "^3.3|^4.0",
|
||||||
|
"symfony/framework-bundle": "^3.3|^4.0",
|
||||||
|
"symfony/http-kernel": "^3.3|^4.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/doctrine-bundle": "~1.5",
|
"doctrine/doctrine-bundle": "^1.6",
|
||||||
"doctrine/orm": "~2.4,>=2.4.5",
|
"doctrine/orm": "^2.5",
|
||||||
"symfony/asset": "~2.7|~3.0|~4.0",
|
"symfony/browser-kit": "^3.3|^4.0",
|
||||||
"symfony/browser-kit": "~2.3|~3.0|~4.0",
|
"symfony/dom-crawler": "^3.3|^4.0",
|
||||||
"symfony/dom-crawler": "~2.3|~3.0|~4.0",
|
"symfony/expression-language": "^3.3|^4.0",
|
||||||
"symfony/expression-language": "~2.4|~3.0|~4.0",
|
"symfony/finder": "^3.3|^4.0",
|
||||||
"symfony/finder": "~2.3|~3.0|~4.0",
|
"symfony/phpunit-bridge": "^3.3|^4.0",
|
||||||
"symfony/phpunit-bridge": "~3.2|~4.0",
|
"symfony/psr-http-message-bridge": "^0.3",
|
||||||
"symfony/psr-http-message-bridge": "^0.3|^1.0",
|
"symfony/security-bundle": "^3.3|^4.0",
|
||||||
"symfony/security-bundle": "~2.4|~3.0|~4.0",
|
"symfony/twig-bundle": "^3.3|^4.0",
|
||||||
"symfony/templating": "~2.3|~3.0|~4.0",
|
"symfony/yaml": "^3.3|^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",
|
"twig/twig": "~1.12|~2.0",
|
||||||
"zendframework/zend-diactoros": "^1.3"
|
"zendframework/zend-diactoros": "^1.3"
|
||||||
},
|
},
|
||||||
|
@ -2643,7 +2642,7 @@
|
||||||
"type": "symfony-bundle",
|
"type": "symfony-bundle",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.0.x-dev"
|
"dev-master": "4.0.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -2666,7 +2665,7 @@
|
||||||
"annotations",
|
"annotations",
|
||||||
"controllers"
|
"controllers"
|
||||||
],
|
],
|
||||||
"time": "2017-10-12T17:37:20+00:00"
|
"time": "2017-10-12T17:37:44+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sensiolabs/security-checker",
|
"name": "sensiolabs/security-checker",
|
||||||
|
@ -3228,16 +3227,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/symfony",
|
"name": "symfony/symfony",
|
||||||
"version": "v3.3.10",
|
"version": "3.4.x-dev",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/symfony.git",
|
"url": "https://github.com/symfony/symfony.git",
|
||||||
"reference": "cfef3b2d505ae4375b17032bd03ed9a3da4b7b43"
|
"reference": "e973c247c8acd032a5ee72418452c3a255d5e321"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/symfony/zipball/cfef3b2d505ae4375b17032bd03ed9a3da4b7b43",
|
"url": "https://api.github.com/repos/symfony/symfony/zipball/e973c247c8acd032a5ee72418452c3a255d5e321",
|
||||||
"reference": "cfef3b2d505ae4375b17032bd03ed9a3da4b7b43",
|
"reference": "e973c247c8acd032a5ee72418452c3a255d5e321",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -3254,18 +3253,19 @@
|
||||||
"symfony/polyfill-intl-icu": "~1.0",
|
"symfony/polyfill-intl-icu": "~1.0",
|
||||||
"symfony/polyfill-mbstring": "~1.0",
|
"symfony/polyfill-mbstring": "~1.0",
|
||||||
"symfony/polyfill-php56": "~1.0",
|
"symfony/polyfill-php56": "~1.0",
|
||||||
"symfony/polyfill-php70": "~1.0",
|
"symfony/polyfill-php70": "~1.6",
|
||||||
"symfony/polyfill-util": "~1.0",
|
"symfony/polyfill-util": "~1.0",
|
||||||
"twig/twig": "~1.34|~2.4"
|
"twig/twig": "^1.35|^2.4.4"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
|
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
|
||||||
"phpdocumentor/type-resolver": "<0.2.0",
|
"phpdocumentor/type-resolver": "<0.2.1",
|
||||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||||
},
|
},
|
||||||
"provide": {
|
"provide": {
|
||||||
"psr/cache-implementation": "1.0",
|
"psr/cache-implementation": "1.0",
|
||||||
"psr/container-implementation": "1.0",
|
"psr/container-implementation": "1.0",
|
||||||
|
"psr/log-implementation": "1.0",
|
||||||
"psr/simple-cache-implementation": "1.0"
|
"psr/simple-cache-implementation": "1.0"
|
||||||
},
|
},
|
||||||
"replace": {
|
"replace": {
|
||||||
|
@ -3293,6 +3293,7 @@
|
||||||
"symfony/inflector": "self.version",
|
"symfony/inflector": "self.version",
|
||||||
"symfony/intl": "self.version",
|
"symfony/intl": "self.version",
|
||||||
"symfony/ldap": "self.version",
|
"symfony/ldap": "self.version",
|
||||||
|
"symfony/lock": "self.version",
|
||||||
"symfony/monolog-bridge": "self.version",
|
"symfony/monolog-bridge": "self.version",
|
||||||
"symfony/options-resolver": "self.version",
|
"symfony/options-resolver": "self.version",
|
||||||
"symfony/process": "self.version",
|
"symfony/process": "self.version",
|
||||||
|
@ -3322,6 +3323,7 @@
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"cache/integration-tests": "dev-master",
|
"cache/integration-tests": "dev-master",
|
||||||
|
"doctrine/annotations": "~1.0",
|
||||||
"doctrine/cache": "~1.6",
|
"doctrine/cache": "~1.6",
|
||||||
"doctrine/data-fixtures": "1.0.*",
|
"doctrine/data-fixtures": "1.0.*",
|
||||||
"doctrine/dbal": "~2.4",
|
"doctrine/dbal": "~2.4",
|
||||||
|
@ -3332,14 +3334,13 @@
|
||||||
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
|
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
|
||||||
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
|
"phpdocumentor/reflection-docblock": "^3.0|^4.0",
|
||||||
"predis/predis": "~1.0",
|
"predis/predis": "~1.0",
|
||||||
"sensio/framework-extra-bundle": "^3.0.2",
|
|
||||||
"symfony/phpunit-bridge": "~3.2",
|
"symfony/phpunit-bridge": "~3.2",
|
||||||
"symfony/security-acl": "~2.8|~3.0"
|
"symfony/security-acl": "~2.8|~3.0"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.3-dev"
|
"dev-master": "3.4-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -3377,7 +3378,7 @@
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"framework"
|
"framework"
|
||||||
],
|
],
|
||||||
"time": "2017-10-05T23:40:32+00:00"
|
"time": "2017-11-03T14:14:19+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "twig/extensions",
|
"name": "twig/extensions",
|
||||||
|
@ -5203,7 +5204,9 @@
|
||||||
],
|
],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
"minimum-stability": "stable",
|
"minimum-stability": "stable",
|
||||||
"stability-flags": [],
|
"stability-flags": {
|
||||||
|
"symfony/symfony": 20
|
||||||
|
},
|
||||||
"prefer-stable": false,
|
"prefer-stable": false,
|
||||||
"prefer-lowest": false,
|
"prefer-lowest": false,
|
||||||
"platform": {
|
"platform": {
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
|
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
|
||||||
backupGlobals="false"
|
backupGlobals="false"
|
||||||
colors="true"
|
colors="true"
|
||||||
bootstrap="app/autoload.php"
|
bootstrap="vendor/autoload.php"
|
||||||
>
|
>
|
||||||
<php>
|
<php>
|
||||||
<ini name="error_reporting" value="-1" />
|
<ini name="error_reporting" value="-1" />
|
||||||
<server name="KERNEL_DIR" value="app/" />
|
<server name="KERNEL_CLASS" value="AppKernel" />
|
||||||
</php>
|
</php>
|
||||||
|
|
||||||
<testsuites>
|
<testsuites>
|
||||||
|
|
|
@ -50,6 +50,7 @@ services:
|
||||||
|
|
||||||
|
|
||||||
# Console commands
|
# Console commands
|
||||||
|
# @todo https://github.com/symfony/symfony/blob/3.4/UPGRADE-3.4.md#httpkernel
|
||||||
# Subsribers update
|
# Subsribers update
|
||||||
app.point.update_subscribers_command:
|
app.point.update_subscribers_command:
|
||||||
class: Skobkin\Bundle\PointToolsBundle\Command\UpdateSubscriptionsCommand
|
class: Skobkin\Bundle\PointToolsBundle\Command\UpdateSubscriptionsCommand
|
||||||
|
|
Loading…
Reference in a new issue