diff --git a/composer.json b/composer.json index af3802a5..89f7cf07 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ocramius/proxy-manager": "2.2.*", "omines/datatables-bundle": "^0.4.0", "r/u2f-two-factor-bundle": "dev-u2f-api", - "php-translation/symfony-bundle": "^0.10.0", + "php-translation/symfony-bundle": "^0.12.0", "s9e/text-formatter": "^2.1", "scheb/two-factor-bundle": "^4.11", "sensio/framework-extra-bundle": "^5.1", diff --git a/composer.lock b/composer.lock index 7b6fd3eb..3fe0cb66 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": "ac7d81adf72ec1f7b8e9c51876584a5f", + "content-hash": "ef069d33ff96f4e5e05b11f1d2189dfc", "packages": [ { "name": "beberlei/assert", @@ -968,16 +968,16 @@ }, { "name": "doctrine/orm", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "4d763ca4c925f647b248b9fa01b5f47aa3685d62" + "reference": "445796af0e873d9bd04f2502d322a7d5009b6846" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/4d763ca4c925f647b248b9fa01b5f47aa3685d62", - "reference": "4d763ca4c925f647b248b9fa01b5f47aa3685d62", + "url": "https://api.github.com/repos/doctrine/orm/zipball/445796af0e873d9bd04f2502d322a7d5009b6846", + "reference": "445796af0e873d9bd04f2502d322a7d5009b6846", "shasum": "" }, "require": { @@ -990,6 +990,7 @@ "doctrine/instantiator": "^1.3", "doctrine/persistence": "^1.2", "ext-pdo": "*", + "ocramius/package-versions": "^1.2", "php": "^7.1", "symfony/console": "^3.0|^4.0|^5.0" }, @@ -1047,7 +1048,7 @@ "database", "orm" ], - "time": "2019-11-19T08:38:05+00:00" + "time": "2020-02-15T14:35:56+00:00" }, { "name": "doctrine/persistence", @@ -1212,16 +1213,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.16", + "version": "2.1.17", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "5065fafc8c29d229ff207f2a89b02175f479a909" + "reference": "ade6887fd9bd74177769645ab5c474824f8a418a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/5065fafc8c29d229ff207f2a89b02175f479a909", - "reference": "5065fafc8c29d229ff207f2a89b02175f479a909", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ade6887fd9bd74177769645ab5c474824f8a418a", + "reference": "ade6887fd9bd74177769645ab5c474824f8a418a", "shasum": "" }, "require": { @@ -1266,7 +1267,7 @@ "validation", "validator" ], - "time": "2020-02-12T22:28:28+00:00" + "time": "2020-02-13T22:36:52+00:00" }, { "name": "florianv/exchanger", @@ -2370,20 +2371,21 @@ }, { "name": "omines/datatables-bundle", - "version": "0.4.0", + "version": "0.4.1", "source": { "type": "git", "url": "https://github.com/omines/datatables-bundle.git", - "reference": "e338f9b4a9e7ce9f6945aceb573b31418f457f44" + "reference": "4a1cd573551606b856b1158185fa87aa5a4a25f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/omines/datatables-bundle/zipball/e338f9b4a9e7ce9f6945aceb573b31418f457f44", - "reference": "e338f9b4a9e7ce9f6945aceb573b31418f457f44", + "url": "https://api.github.com/repos/omines/datatables-bundle/zipball/4a1cd573551606b856b1158185fa87aa5a4a25f9", + "reference": "4a1cd573551606b856b1158185fa87aa5a4a25f9", "shasum": "" }, "require": { "php": "^7.2", + "symfony/contracts": "^1.1|^2.0", "symfony/framework-bundle": "^4.1|^5.0", "symfony/property-access": "^4.1|^5.0", "symfony/translation": "^4.1|^5.0" @@ -2453,7 +2455,7 @@ "orm", "symfony" ], - "time": "2019-12-23T13:22:50+00:00" + "time": "2020-02-21T10:12:22+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -2834,23 +2836,23 @@ }, { "name": "php-translation/symfony-bundle", - "version": "0.10.0", + "version": "0.12", "source": { "type": "git", "url": "https://github.com/php-translation/symfony-bundle.git", - "reference": "e32091bd8bfd971b0f455b7489903e08b18b5887" + "reference": "fe181a2fb0eaa3b37002c2f0d4484cf46eb73256" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-translation/symfony-bundle/zipball/e32091bd8bfd971b0f455b7489903e08b18b5887", - "reference": "e32091bd8bfd971b0f455b7489903e08b18b5887", + "url": "https://api.github.com/repos/php-translation/symfony-bundle/zipball/fe181a2fb0eaa3b37002c2f0d4484cf46eb73256", + "reference": "fe181a2fb0eaa3b37002c2f0d4484cf46eb73256", "shasum": "" }, "require": { "nyholm/nsa": "^1.1", "php": "^7.1", "php-translation/extractor": "^2.0", - "php-translation/symfony-storage": "^2.0", + "php-translation/symfony-storage": "^2.1", "symfony/finder": "^3.4 || ^4.3 || ^5.0", "symfony/framework-bundle": "^3.4 || ^4.3 || ^5.0", "symfony/intl": "^3.4 || ^4.3 || ^5.0", @@ -2885,7 +2887,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "0.10-dev" + "dev-master": "0.11-dev" } }, "autoload": { @@ -2906,7 +2908,7 @@ "email": "tobias.nyholm@gmail.com" } ], - "time": "2019-12-26T15:54:38+00:00" + "time": "2020-02-21T16:31:38+00:00" }, { "name": "php-translation/symfony-storage", @@ -3602,16 +3604,16 @@ }, { "name": "s9e/text-formatter", - "version": "2.3.3", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "d958fd32471905fbecd2337b2e92ae131e45be94" + "reference": "2e1fcc28af2131802d4a99f98840279f27f8a34f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/d958fd32471905fbecd2337b2e92ae131e45be94", - "reference": "d958fd32471905fbecd2337b2e92ae131e45be94", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/2e1fcc28af2131802d4a99f98840279f27f8a34f", + "reference": "2e1fcc28af2131802d4a99f98840279f27f8a34f", "shasum": "" }, "require": { @@ -3623,7 +3625,8 @@ }, "require-dev": { "matthiasmullie/minify": "*", - "phpunit/phpunit": "*" + "phpunit/phpunit": "*", + "sami/sami": "4.*" }, "suggest": { "ext-curl": "Improves the performance of the MediaEmbed plugin and some JavaScript minifiers", @@ -3636,7 +3639,7 @@ }, "type": "library", "extra": { - "version": "2.3.3" + "version": "2.3.4" }, "autoload": { "psr-4": { @@ -3666,20 +3669,20 @@ "parser", "shortcodes" ], - "time": "2020-01-23T19:31:06+00:00" + "time": "2020-02-18T15:07:13+00:00" }, { "name": "scheb/two-factor-bundle", - "version": "v4.13.0", + "version": "v4.14.0", "source": { "type": "git", "url": "https://github.com/scheb/two-factor-bundle.git", - "reference": "ebbd21a767b21e62272a67d50e4265a0dccd87c4" + "reference": "6393d304ee51a703711e5f5cc3e76f04ce4e238c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/ebbd21a767b21e62272a67d50e4265a0dccd87c4", - "reference": "ebbd21a767b21e62272a67d50e4265a0dccd87c4", + "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/6393d304ee51a703711e5f5cc3e76f04ce4e238c", + "reference": "6393d304ee51a703711e5f5cc3e76f04ce4e238c", "shasum": "" }, "require": { @@ -3734,7 +3737,7 @@ "two-factor", "two-step" ], - "time": "2020-02-02T19:54:11+00:00" + "time": "2020-02-15T13:01:16+00:00" }, { "name": "sensio/framework-extra-bundle", @@ -3917,16 +3920,16 @@ }, { "name": "spomky-labs/otphp", - "version": "v10.0.0", + "version": "v10.0.1", "source": { "type": "git", "url": "https://github.com/Spomky-Labs/otphp.git", - "reference": "7c4e59c6a1cfe7798e5bf33cca6e5e5cdc5df9ff" + "reference": "f44cce5a9db4b8da410215d992110482c931232f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/7c4e59c6a1cfe7798e5bf33cca6e5e5cdc5df9ff", - "reference": "7c4e59c6a1cfe7798e5bf33cca6e5e5cdc5df9ff", + "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/f44cce5a9db4b8da410215d992110482c931232f", + "reference": "f44cce5a9db4b8da410215d992110482c931232f", "shasum": "" }, "require": { @@ -3934,17 +3937,17 @@ "ext-mbstring": "*", "paragonie/constant_time_encoding": "^2.0", "php": "^7.2|^8.0", - "thecodingmachine/safe": "^0.1.14" + "thecodingmachine/safe": "^0.1.14|^1.0" }, "require-dev": { "php-coveralls/php-coveralls": "^2.0", - "phpstan/phpstan": "^0.11", - "phpstan/phpstan-beberlei-assert": "^0.11.0", - "phpstan/phpstan-deprecation-rules": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-strict-rules": "^0.11", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-beberlei-assert": "^0.12", + "phpstan/phpstan-deprecation-rules": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", "phpunit/phpunit": "^8.0", - "thecodingmachine/phpstan-safe-rule": "^0.1.0" + "thecodingmachine/phpstan-safe-rule": "^1.0" }, "type": "library", "extra": { @@ -3984,7 +3987,7 @@ "otp", "totp" ], - "time": "2019-07-30T14:43:55+00:00" + "time": "2020-01-28T09:24:19+00:00" }, { "name": "symfony/apache-pack", @@ -4341,6 +4344,77 @@ "homepage": "https://symfony.com", "time": "2020-01-25T12:44:29+00:00" }, + { + "name": "symfony/contracts", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/contracts.git", + "reference": "d3636025e8253c6144358ec0a62773cae588395b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/contracts/zipball/d3636025e8253c6144358ec0a62773cae588395b", + "reference": "d3636025e8253c6144358ec0a62773cae588395b", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "require-dev": { + "psr/cache": "^1.0", + "psr/container": "^1.0", + "symfony/polyfill-intl-idn": "^1.10" + }, + "suggest": { + "psr/cache": "When using the Cache contracts", + "psr/container": "When using the Service contracts", + "symfony/cache-contracts-implementation": "", + "symfony/event-dispatcher-implementation": "", + "symfony/http-client-contracts-implementation": "", + "symfony/service-contracts-implementation": "", + "symfony/translation-contracts-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\": "" + }, + "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": "A set of abstractions extracted out of the Symfony components", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-04-27T14:29:50+00:00" + }, { "name": "symfony/css-selector", "version": "v4.4.4", @@ -7915,25 +7989,25 @@ }, { "name": "thecodingmachine/safe", - "version": "v0.1.16", + "version": "v1.0.3", "source": { "type": "git", "url": "https://github.com/thecodingmachine/safe.git", - "reference": "4e8f840f0a0a2ea167813c3994a7fc527c3c2182" + "reference": "6662d0bef91fe5d44178cb2c38d51c5d16b65d23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/4e8f840f0a0a2ea167813c3994a7fc527c3c2182", - "reference": "4e8f840f0a0a2ea167813c3994a7fc527c3c2182", + "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/6662d0bef91fe5d44178cb2c38d51c5d16b65d23", + "reference": "6662d0bef91fe5d44178cb2c38d51c5d16b65d23", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "require-dev": { - "phpstan/phpstan": "^0.10.3", + "phpstan/phpstan": "^0.12", "squizlabs/php_codesniffer": "^3.2", - "thecodingmachine/phpstan-strict-rules": "^0.10.3" + "thecodingmachine/phpstan-strict-rules": "^0.12" }, "type": "library", "extra": { @@ -8043,7 +8117,7 @@ "MIT" ], "description": "PHP core functions that throw exceptions instead of returning FALSE on error", - "time": "2019-06-25T08:45:33+00:00" + "time": "2020-01-20T08:44:36+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8436,16 +8510,16 @@ }, { "name": "webmozart/assert", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "573381c0a64f155a0d9a23f4b0c797194805b925" + "reference": "aed98a490f9a8f78468232db345ab9cf606cf598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925", - "reference": "573381c0a64f155a0d9a23f4b0c797194805b925", + "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598", + "reference": "aed98a490f9a8f78468232db345ab9cf606cf598", "shasum": "" }, "require": { @@ -8480,7 +8554,7 @@ "check", "validate" ], - "time": "2019-11-24T13:36:37+00:00" + "time": "2020-02-14T12:15:55+00:00" }, { "name": "yubico/u2flib-server", @@ -8636,16 +8710,16 @@ "packages-dev": [ { "name": "amphp/amp", - "version": "v2.4.0", + "version": "v2.4.1", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "13930a582947831bb66ff1aeac28672fd91c38ea" + "reference": "2ac3b550c4997f2ec304faa63c8b2885079a2dc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/13930a582947831bb66ff1aeac28672fd91c38ea", - "reference": "13930a582947831bb66ff1aeac28672fd91c38ea", + "url": "https://api.github.com/repos/amphp/amp/zipball/2ac3b550c4997f2ec304faa63c8b2885079a2dc4", + "reference": "2ac3b550c4997f2ec304faa63c8b2885079a2dc4", "shasum": "" }, "require": { @@ -8709,7 +8783,7 @@ "non-blocking", "promise" ], - "time": "2019-11-11T19:32:05+00:00" + "time": "2020-02-10T18:10:57+00:00" }, { "name": "amphp/byte-stream", @@ -9670,16 +9744,16 @@ }, { "name": "nette/robot-loader", - "version": "v3.2.1", + "version": "v3.2.2", "source": { "type": "git", "url": "https://github.com/nette/robot-loader.git", - "reference": "d2a100e1f5cab390c78bc88709abbc91249c3993" + "reference": "38e8a270567a4ad9fe716b40fcda5a6580afa3c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/robot-loader/zipball/d2a100e1f5cab390c78bc88709abbc91249c3993", - "reference": "d2a100e1f5cab390c78bc88709abbc91249c3993", + "url": "https://api.github.com/repos/nette/robot-loader/zipball/38e8a270567a4ad9fe716b40fcda5a6580afa3c0", + "reference": "38e8a270567a4ad9fe716b40fcda5a6580afa3c0", "shasum": "" }, "require": { @@ -9707,8 +9781,8 @@ "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "GPL-2.0-only", + "GPL-3.0-only" ], "authors": [ { @@ -9729,7 +9803,7 @@ "nette", "trait" ], - "time": "2019-12-26T22:32:02+00:00" + "time": "2020-02-20T22:17:50+00:00" }, { "name": "nette/routing", @@ -10061,16 +10135,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.10", + "version": "0.12.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "39004edc7fc308752f625b89b70ad1710708f45e" + "reference": "ca5f2b7cf81c6d8fba74f9576970399c5817e03b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/39004edc7fc308752f625b89b70ad1710708f45e", - "reference": "39004edc7fc308752f625b89b70ad1710708f45e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ca5f2b7cf81c6d8fba74f9576970399c5817e03b", + "reference": "ca5f2b7cf81c6d8fba74f9576970399c5817e03b", "shasum": "" }, "require": { @@ -10096,7 +10170,7 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "time": "2020-02-12T22:03:42+00:00" + "time": "2020-02-16T14:00:29+00:00" }, { "name": "phpstan/phpstan-doctrine", @@ -10238,12 +10312,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "0365bf26eddd4a8be9980d7dabf05ceb2aba2f02" + "reference": "1df6b9d09d2b074fd3f0f10a7696d9f797d4772c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0365bf26eddd4a8be9980d7dabf05ceb2aba2f02", - "reference": "0365bf26eddd4a8be9980d7dabf05ceb2aba2f02", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/1df6b9d09d2b074fd3f0f10a7696d9f797d4772c", + "reference": "1df6b9d09d2b074fd3f0f10a7696d9f797d4772c", "shasum": "" }, "conflict": { @@ -10262,6 +10336,7 @@ "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.5.18|>=3.6,<3.6.15|>=3.7,<3.7.7", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<=2.1.6", + "centreon/centreon": "<18.10.8|>=19,<19.4.5", "cesnet/simplesamlphp-module-proxystatistics": "<3.1", "codeigniter/framework": "<=3.0.6", "composer/composer": "<=1-alpha.11", @@ -10328,7 +10403,7 @@ "monolog/monolog": ">=1.8,<1.12", "namshi/jose": "<2.2", "onelogin/php-saml": "<2.10.4", - "oneup/uploader-bundle": ">=1,<1.9.3|>=2,<2.1.5", + "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", "openid/php-openid": "<2.3", "oro/crm": ">=1.7,<1.7.4", "oro/platform": ">=1.7,<1.7.4", @@ -10364,7 +10439,7 @@ "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": "<4.4.4", + "silverstripe/framework": "<4.4.5|>=4.5,<4.5.2", "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.1.2", "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", @@ -10488,7 +10563,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2020-02-10T16:13:40+00:00" + "time": "2020-02-19T06:23:50+00:00" }, { "name": "sebastian/diff", @@ -11445,16 +11520,16 @@ }, { "name": "vimeo/psalm", - "version": "3.8.5", + "version": "3.9.3", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "e6ec5fa22a7b9e61670a24d07b3119aff80dcd89" + "reference": "2e4154d76e24d1b4e59e6cc2bebef7790cb9e550" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/e6ec5fa22a7b9e61670a24d07b3119aff80dcd89", - "reference": "e6ec5fa22a7b9e61670a24d07b3119aff80dcd89", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/2e4154d76e24d1b4e59e6cc2bebef7790cb9e550", + "reference": "2e4154d76e24d1b4e59e6cc2bebef7790cb9e550", "shasum": "" }, "require": { @@ -11485,10 +11560,10 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.2", "ext-curl": "*", - "phpmyadmin/sql-parser": "^5.0", + "phpmyadmin/sql-parser": "5.1.0", "phpspec/prophecy": ">=1.9.0", "phpunit/phpunit": "^7.5.16 || ^8.0", - "psalm/plugin-phpunit": "^0.6", + "psalm/plugin-phpunit": "^0.9", "slevomat/coding-standard": "^5.0", "squizlabs/php_codesniffer": "^3.5", "symfony/process": "^4.3" @@ -11536,7 +11611,7 @@ "inspection", "php" ], - "time": "2020-02-07T17:15:50+00:00" + "time": "2020-02-19T01:30:37+00:00" }, { "name": "webmozart/glob", diff --git a/symfony.lock b/symfony.lock index 476133da..812896ed 100644 --- a/symfony.lock +++ b/symfony.lock @@ -477,6 +477,9 @@ "./config/bootstrap.php" ] }, + "symfony/contracts": { + "version": "v1.1.0" + }, "symfony/css-selector": { "version": "v4.2.3" },