diff --git a/composer.json b/composer.json index c255ddb1..7377f01e 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,6 @@ "php-http/curl-client": "^2.0", "php-http/guzzle6-adapter": "^2.0", "php-http/message": "^1.8", - "php-translation/symfony-bundle": "^0.8.1", "s9e/text-formatter": "^2.0", "sensio/framework-extra-bundle": "^5.1", "shivas/versioning-bundle": "^3.1", diff --git a/composer.lock b/composer.lock index 2e38819d..4535aad3 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": "a10f4a3cafdc520a3c6286e2e6c3b84a", + "content-hash": "f66e6f1196a0dbebea3453e306b7e58f", "packages": [ { "name": "clue/stream-filter", @@ -1261,16 +1261,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.10", + "version": "2.1.11", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec" + "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec", - "reference": "a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/92dd169c32f6f55ba570c309d83f5209cefb5e23", + "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23", "shasum": "" }, "require": { @@ -1289,7 +1289,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -1315,7 +1315,7 @@ "validation", "validator" ], - "time": "2019-07-19T20:52:08+00:00" + "time": "2019-08-13T17:33:27+00:00" }, { "name": "fig/link-util", @@ -1933,57 +1933,6 @@ ], "time": "2018-11-05T09:00:11+00:00" }, - { - "name": "nikic/php-parser", - "version": "v4.2.3", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "e612609022e935f3d0337c1295176505b41188c8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e612609022e935f3d0337c1295176505b41188c8", - "reference": "e612609022e935f3d0337c1295176505b41188c8", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.2-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "time": "2019-08-12T20:17:41+00:00" - }, { "name": "nikolaposa/version", "version": "3.2.0", @@ -2037,53 +1986,6 @@ ], "time": "2019-08-11T08:31:54+00:00" }, - { - "name": "nyholm/nsa", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/Nyholm/NSA.git", - "reference": "213a70dee2dd04433d31a187e24e92c8b59d1655" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Nyholm/NSA/zipball/213a70dee2dd04433d31a187e24e92c8b59d1655", - "reference": "213a70dee2dd04433d31a187e24e92c8b59d1655", - "shasum": "" - }, - "require": { - "php": "^5.3 || ^7.0", - "webmozart/assert": "^1.1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Nyholm\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - } - ], - "description": "See everything and do whatever you want. No privacy rule will stop us. Used in tests, debugging and fixtures to access properties and methods.", - "homepage": "http://tnyholm.se", - "keywords": [ - "Fixture", - "debug", - "reflection", - "test" - ], - "time": "2017-04-13T17:21:01+00:00" - }, { "name": "nyholm/psr7", "version": "1.1.0", @@ -2773,214 +2675,6 @@ ], "time": "2016-01-26T13:27:02+00:00" }, - { - "name": "php-translation/common", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-translation/common.git", - "reference": "ceac357a7ad0582d0a6be7b7f2db178c87f229fd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-translation/common/zipball/ceac357a7ad0582d0a6be7b7f2db178c87f229fd", - "reference": "ceac357a7ad0582d0a6be7b7f2db178c87f229fd", - "shasum": "" - }, - "require": { - "php": "^5.4 || ^7.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^3.4 || ^4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Translation\\Common\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - } - ], - "description": "Common translation stuff", - "time": "2018-06-14T16:18:37+00:00" - }, - { - "name": "php-translation/extractor", - "version": "1.7.1", - "source": { - "type": "git", - "url": "https://github.com/php-translation/extractor.git", - "reference": "82fc51a07fb626c0bfb31fb3f041baa88fee6acb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-translation/extractor/zipball/82fc51a07fb626c0bfb31fb3f041baa88fee6acb", - "reference": "82fc51a07fb626c0bfb31fb3f041baa88fee6acb", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1.2", - "nikic/php-parser": "^3.0 || ^4.0", - "php": "^5.5 || ^7.0", - "symfony/finder": "^2.7 || ^3.0 || ^4.0", - "twig/twig": "^1.27 || ^2.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^3.4 || ^4.0", - "symfony/translation": "^3.0 || ^4.0", - "symfony/twig-bridge": "^3.0 || ^4.0", - "symfony/validator": "^3.0 || ^4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "Translation\\Extractor\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - } - ], - "description": "Extract translations form the source code", - "time": "2018-07-09T17:05:17+00:00" - }, - { - "name": "php-translation/symfony-bundle", - "version": "0.8.1", - "source": { - "type": "git", - "url": "https://github.com/php-translation/symfony-bundle.git", - "reference": "fe29aeff419c311672c7d3dc72d9423eefc3ca5c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-translation/symfony-bundle/zipball/fe29aeff419c311672c7d3dc72d9423eefc3ca5c", - "reference": "fe29aeff419c311672c7d3dc72d9423eefc3ca5c", - "shasum": "" - }, - "require": { - "nyholm/nsa": "^1.1", - "php": "^5.5 || ^7.0", - "php-translation/common": "^1.0", - "php-translation/extractor": "^1.3", - "php-translation/symfony-storage": "^1.0", - "symfony/finder": "^2.7 || ^3.0 || ^4.0", - "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0", - "symfony/intl": "^2.7 || ^3.0 || ^4.0", - "symfony/translation": "^2.7 || ^3.0 || ^4.0", - "symfony/twig-bundle": "^2.7 || ^3.0 || ^4.0", - "symfony/validator": "^2.7 || ^3.0 || ^4.0" - }, - "require-dev": { - "guzzlehttp/psr7": "^1.4", - "matthiasnoback/symfony-config-test": "^2.2 || ^3.1", - "matthiasnoback/symfony-dependency-injection-test": "^1.2 || ^2.3", - "nyholm/symfony-bundle-test": "^1.2.3", - "php-http/curl-client": "^1.7", - "php-http/message": "^1.6", - "php-http/message-factory": "^1.0.2", - "php-translation/translator": "^1.0", - "symfony/asset": "^2.7 || ^3.0 || ^4.0", - "symfony/console": "^2.7 || ^3.0 || ^4.0", - "symfony/dependency-injection": "^2.7 || ^3.0 || ^4.0", - "symfony/phpunit-bridge": "^3.4 || ^4.0", - "symfony/templating": "^2.7 || ^3.0 || ^4.0", - "symfony/twig-bridge": "^2.7 || ^3.0 || ^4.0", - "symfony/web-profiler-bundle": "^2.7 || ^3.0 || ^4.0" - }, - "suggest": { - "php-http/httplug-bundle": "To easier configure your httplug clients." - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "0.7-dev" - } - }, - "autoload": { - "psr-4": { - "Translation\\Bundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - } - ], - "time": "2018-10-02T10:05:24+00:00" - }, - { - "name": "php-translation/symfony-storage", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-translation/symfony-storage.git", - "reference": "8d7b1ea6bf22bee0c7dc9b228cf9437312373a27" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-translation/symfony-storage/zipball/8d7b1ea6bf22bee0c7dc9b228cf9437312373a27", - "reference": "8d7b1ea6bf22bee0c7dc9b228cf9437312373a27", - "shasum": "" - }, - "require": { - "nyholm/nsa": "^1.1", - "php": "^5.5 || ^7.0", - "php-translation/common": "^1.0", - "symfony/translation": "^2.7 || ^3.0 || ^4.0" - }, - "require-dev": { - "symfony/framework-bundle": "^2.7.39 || ^3.0 || ^4.0", - "symfony/phpunit-bridge": "^3.4 || ^4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.3-dev" - } - }, - "autoload": { - "psr-4": { - "Translation\\SymfonyStorage\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - } - ], - "description": "A translation file storage using Symfony translation component.", - "time": "2018-07-10T10:32:01+00:00" - }, { "name": "phpdocumentor/reflection-common", "version": "1.0.1", @@ -7840,6 +7534,57 @@ ], "time": "2018-07-27T15:41:37+00:00" }, + { + "name": "nikic/php-parser", + "version": "v4.2.3", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "e612609022e935f3d0337c1295176505b41188c8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e612609022e935f3d0337c1295176505b41188c8", + "reference": "e612609022e935f3d0337c1295176505b41188c8", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2019-08-12T20:17:41+00:00" + }, { "name": "roave/security-advisories", "version": "dev-master", diff --git a/config/bundles.php b/config/bundles.php index 1cb665bc..a653a57a 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -18,6 +18,5 @@ return [ Omines\DataTablesBundle\DataTablesBundle::class => ['all' => true], Shivas\VersioningBundle\ShivasVersioningBundle::class => ['all' => true], FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true], - Translation\Bundle\TranslationBundle::class => ['all' => true], Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true], ]; diff --git a/config/packages/dev/php_translation.yaml b/config/packages/dev/php_translation.yaml deleted file mode 100644 index 53398fbc..00000000 --- a/config/packages/dev/php_translation.yaml +++ /dev/null @@ -1,5 +0,0 @@ -translation: - symfony_profiler: - enabled: true - webui: - enabled: true diff --git a/config/packages/php_translation.yaml b/config/packages/php_translation.yaml deleted file mode 100644 index 7c4f6ad9..00000000 --- a/config/packages/php_translation.yaml +++ /dev/null @@ -1,11 +0,0 @@ -translation: - locales: ["en", "de"] - edit_in_place: - enabled: false - config_name: app - configs: - app: - dirs: ["%kernel.project_dir%/templates", "%kernel.project_dir%/src"] - output_dir: "%kernel.project_dir%/translations" - excluded_names: ["*TestCase.php", "*Test.php"] - excluded_dirs: [cache, data, logs] diff --git a/config/routes/dev/php_translation.yaml b/config/routes/dev/php_translation.yaml deleted file mode 100644 index cde43b84..00000000 --- a/config/routes/dev/php_translation.yaml +++ /dev/null @@ -1,6 +0,0 @@ -_translation_webui: - resource: "@TranslationBundle/Resources/config/routing_webui.yml" - prefix: /admin - -_translation_profiler: - resource: '@TranslationBundle/Resources/config/routing_symfony_profiler.yml' diff --git a/config/routes/php_translation.yaml b/config/routes/php_translation.yaml deleted file mode 100644 index 142c4496..00000000 --- a/config/routes/php_translation.yaml +++ /dev/null @@ -1,3 +0,0 @@ -_translation_edit_in_place: - resource: '@TranslationBundle/Resources/config/routing_edit_in_place.yml' - prefix: /admin diff --git a/symfony.lock b/symfony.lock index fa1c9d2b..eb11f259 100644 --- a/symfony.lock +++ b/symfony.lock @@ -141,9 +141,6 @@ "nikolaposa/version": { "version": "2.2.2" }, - "nyholm/nsa": { - "version": "1.1.0" - }, "nyholm/psr7": { "version": "1.0", "recipe": { @@ -192,30 +189,6 @@ "php-http/promise": { "version": "v1.0.0" }, - "php-translation/common": { - "version": "1.0.0" - }, - "php-translation/extractor": { - "version": "1.7.1" - }, - "php-translation/symfony-bundle": { - "version": "0.4", - "recipe": { - "repo": "github.com/symfony/recipes-contrib", - "branch": "master", - "version": "0.4", - "ref": "ee15ad002114fba7b694a7fe429419b518d43bc4" - }, - "files": [ - "./config/packages/dev/php_translation.yaml", - "./config/packages/php_translation.yaml", - "./config/routes/dev/php_translation.yaml", - "./config/routes/php_translation.yaml" - ] - }, - "php-translation/symfony-storage": { - "version": "1.0.1" - }, "phpdocumentor/reflection-common": { "version": "1.0.1" },