From 630145d07926e8327ef6c3903d074a14898f24be Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Tue, 30 Oct 2018 11:36:27 +0100 Subject: [PATCH 01/10] upgrade shopsys packages to v7.0.0-beta2 --- composer.json | 20 +- composer.lock | 498 ++++++++++++++++++++++++++++++---------------- package-lock.json | 10 +- 3 files changed, 345 insertions(+), 183 deletions(-) diff --git a/composer.json b/composer.json index 0544d0472..1d056cb79 100644 --- a/composer.json +++ b/composer.json @@ -83,14 +83,14 @@ "sensio/distribution-bundle": "^5.0.21", "sensio/framework-extra-bundle": "^3.0.29", "sensio/generator-bundle": "^3.1.7", - "shopsys/migrations": "v7.0.0-beta1", - "shopsys/form-types-bundle": "v7.0.0-beta1", - "shopsys/framework": "v7.0.0-beta1", - "shopsys/plugin-interface": "v7.0.0-beta1", - "shopsys/product-feed-heureka": "v7.0.0-beta1", - "shopsys/product-feed-heureka-delivery": "v7.0.0-beta1", - "shopsys/product-feed-zbozi": "v7.0.0-beta1", - "shopsys/product-feed-google": "v7.0.0-beta1", + "shopsys/migrations": "v7.0.0-beta2", + "shopsys/form-types-bundle": "v7.0.0-beta2", + "shopsys/framework": "v7.0.0-beta2", + "shopsys/plugin-interface": "v7.0.0-beta2", + "shopsys/product-feed-heureka": "v7.0.0-beta2", + "shopsys/product-feed-heureka-delivery": "v7.0.0-beta2", + "shopsys/product-feed-zbozi": "v7.0.0-beta2", + "shopsys/product-feed-google": "v7.0.0-beta2", "snc/redis-bundle": "2.1.4", "stof/doctrine-extensions-bundle": "^1.3.0", "symfony/assetic-bundle": "^2.8.2", @@ -111,8 +111,8 @@ "codeception/codeception": "^2.5.0", "phpstan/phpstan": "^0.7", "phpunit/phpunit": "^7.0", - "shopsys/coding-standards": "v7.0.0-beta1", - "shopsys/http-smoke-testing": "v7.0.0-beta1" + "shopsys/coding-standards": "v7.0.0-beta2", + "shopsys/http-smoke-testing": "v7.0.0-beta2" }, "conflict": { "codeception/stub": ">=2.0.2", diff --git a/composer.lock b/composer.lock index 76d5a8b70..497936f31 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": "76154ab0423fe3da4b3324e39249734e", + "content-hash": "88cdf711ea86064ec16e599881c2a5dc", "packages": [ { "name": "arvenil/ninja-mutex", @@ -544,16 +544,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0" + "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0", - "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660", + "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660", "shasum": "" }, "require": { @@ -596,7 +596,7 @@ "ssl", "tls" ], - "time": "2018-08-08T08:57:40+00:00" + "time": "2018-10-18T06:09:13+00:00" }, { "name": "composer/composer", @@ -3216,16 +3216,16 @@ }, { "name": "jms/metadata", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab" + "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/6a06970a10e0a532fb52d3959547123b84a3b3ab", - "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8", + "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8", "shasum": "" }, "require": { @@ -3248,9 +3248,13 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "MIT" ], "authors": [ + { + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + }, { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com" @@ -3263,7 +3267,7 @@ "xml", "yaml" ], - "time": "2016-12-05T10:18:33+00:00" + "time": "2018-10-26T12:40:10+00:00" }, { "name": "jms/translation-bundle", @@ -3661,16 +3665,16 @@ }, { "name": "league/flysystem", - "version": "1.0.47", + "version": "1.0.48", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "a11e4a75f256bdacf99d20780ce42d3b8272975c" + "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a11e4a75f256bdacf99d20780ce42d3b8272975c", - "reference": "a11e4a75f256bdacf99d20780ce42d3b8272975c", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", + "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa", "shasum": "" }, "require": { @@ -3741,7 +3745,7 @@ "sftp", "storage" ], - "time": "2018-09-14T15:30:29+00:00" + "time": "2018-10-15T13:53:10+00:00" }, { "name": "league/flysystem-cached-adapter", @@ -4877,21 +4881,21 @@ }, { "name": "sensio/distribution-bundle", - "version": "v5.0.22", + "version": "v5.0.23", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "209b11f8cee5bf71986dd703e45e27d3ed7a6d15" + "reference": "088b116a0e27faa0e1a7384dd4f3f6a9d5a8a3b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/209b11f8cee5bf71986dd703e45e27d3ed7a6d15", - "reference": "209b11f8cee5bf71986dd703e45e27d3ed7a6d15", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/088b116a0e27faa0e1a7384dd4f3f6a9d5a8a3b6", + "reference": "088b116a0e27faa0e1a7384dd4f3f6a9d5a8a3b6", "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", @@ -4925,7 +4929,7 @@ "configuration", "distribution" ], - "time": "2018-06-07T06:22:12+00:00" + "time": "2018-10-25T15:26:23+00:00" }, { "name": "sensio/framework-extra-bundle", @@ -5053,20 +5057,21 @@ }, { "name": "sensiolabs/security-checker", - "version": "v4.1.8", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "dc270d5fec418cc6ac983671dba5d80ffaffb142" + "reference": "9ea927417c949039a9cfb0d92af76fd1c538d9e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/dc270d5fec418cc6ac983671dba5d80ffaffb142", - "reference": "dc270d5fec418cc6ac983671dba5d80ffaffb142", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/9ea927417c949039a9cfb0d92af76fd1c538d9e9", + "reference": "9ea927417c949039a9cfb0d92af76fd1c538d9e9", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", + "php": ">=5.5.9", "symfony/console": "~2.7|~3.0|~4.0" }, "bin": [ @@ -5075,12 +5080,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { - "psr-0": { - "SensioLabs\\Security": "" + "psr-4": { + "SensioLabs\\Security\\": "SensioLabs/Security" } }, "notification-url": "https://packagist.org/downloads/", @@ -5094,20 +5099,105 @@ } ], "description": "A security checker for your composer.lock", - "time": "2018-02-28T22:10:01+00:00" + "time": "2018-10-16T10:30:44+00:00" + }, + { + "name": "shopsys/doctrine-orm", + "version": "v2.6.2", + "source": { + "type": "git", + "url": "https://github.com/shopsys/doctrine-orm.git", + "reference": "4d1dfc8a3b10748929f23248d6af4dd2f9571ef3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/shopsys/doctrine-orm/zipball/4d1dfc8a3b10748929f23248d6af4dd2f9571ef3", + "reference": "4d1dfc8a3b10748929f23248d6af4dd2f9571ef3", + "shasum": "" + }, + "require": { + "doctrine/annotations": "~1.5", + "doctrine/cache": "~1.6", + "doctrine/collections": "^1.4", + "doctrine/common": "^2.7.1", + "doctrine/dbal": "^2.6", + "doctrine/instantiator": "~1.1", + "ext-pdo": "*", + "php": "^7.1", + "symfony/console": "~3.0|~4.0" + }, + "replace": { + "doctrine/orm": "2.6.2" + }, + "require-dev": { + "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" + }, + "bin": [ + "bin/doctrine" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\ORM\\": "lib/Doctrine/ORM" + } + }, + "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": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Object-Relational-Mapper for PHP", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "orm" + ], + "time": "2018-10-11T05:57:20+00:00" }, { "name": "shopsys/form-types-bundle", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/form-types-bundle.git", - "reference": "ef8f9939892c99eaaa4d41d7a4268da5fd7c9d55" + "reference": "9adef4126744c00a73c87ea17bbc89e414406d29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/form-types-bundle/zipball/ef8f9939892c99eaaa4d41d7a4268da5fd7c9d55", - "reference": "ef8f9939892c99eaaa4d41d7a4268da5fd7c9d55", + "url": "https://api.github.com/repos/shopsys/form-types-bundle/zipball/9adef4126744c00a73c87ea17bbc89e414406d29", + "reference": "9adef4126744c00a73c87ea17bbc89e414406d29", "shasum": "" }, "require": { @@ -5121,10 +5211,10 @@ "symfony/translation": "^3.4" }, "conflict": { - "symfony/dependency-injection": ">=3.4.15" + "symfony/dependency-injection": "3.4.15|3.4.16" }, "require-dev": { - "shopsys/coding-standards": "7.0.0-beta1" + "shopsys/coding-standards": "7.0.0-beta2" }, "type": "library", "autoload": { @@ -5149,20 +5239,20 @@ "Shopsys Framework", "form" ], - "time": "2018-09-18T11:47:42+00:00" + "time": "2018-10-19T06:40:57+00:00" }, { "name": "shopsys/framework", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/framework.git", - "reference": "480da5f9f2fe941521ce1a7c8458864264154612" + "reference": "88d5cecf9627e5aa78cd7cd547740cdda49b0fe4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/framework/zipball/480da5f9f2fe941521ce1a7c8458864264154612", - "reference": "480da5f9f2fe941521ce1a7c8458864264154612", + "url": "https://api.github.com/repos/shopsys/framework/zipball/88d5cecf9627e5aa78cd7cd547740cdda49b0fe4", + "reference": "88d5cecf9627e5aa78cd7cd547740cdda49b0fe4", "shasum": "" }, "require": { @@ -5179,7 +5269,6 @@ "doctrine/dbal": "^2.7", "doctrine/doctrine-bundle": "^1.8.1", "doctrine/doctrine-fixtures-bundle": "^3.0.2", - "doctrine/orm": "dev-doctrine-260-with-ddc1960-hotfix-and-ddc4005-hotfix as 2.6.0", "egeloen/ckeditor-bundle": "^4.0.6", "ext-bcmath": "*", "ext-ctype": "*", @@ -5201,7 +5290,6 @@ "guzzlehttp/guzzle": "^6.3", "helios-ag/fm-elfinder-bundle": "^6.2.1", "heureka/overeno-zakazniky": "^2.0.6", - "intaro/postgres-search-bundle": "dev-master#06625bdc1d", "intervention/image": "^2.3.14", "jms/metadata": "^1.6", "jms/translation-bundle": "^1.4.1", @@ -5217,9 +5305,12 @@ "psr/log": "^1.0", "sensio/distribution-bundle": "^5.0.21", "sensio/framework-extra-bundle": "^3.0.29", - "shopsys/form-types-bundle": "7.0.0-beta1", - "shopsys/migrations": "7.0.0-beta1", - "shopsys/plugin-interface": "7.0.0-beta1", + "shopsys/doctrine-orm": "2.6.2", + "shopsys/form-types-bundle": "7.0.0-beta2", + "shopsys/jparser": "0.1", + "shopsys/migrations": "7.0.0-beta2", + "shopsys/plugin-interface": "7.0.0-beta2", + "shopsys/postgres-search-bundle": "0.1", "snc/redis-bundle": "2.1.4", "stof/doctrine-extensions-bundle": "^1.3.0", "swiftmailer/swiftmailer": "^6.0", @@ -5229,17 +5320,16 @@ "symfony/monolog-bundle": "^3.1.2", "symfony/swiftmailer-bundle": "^3.2.2", "symfony/symfony": "^3.4.8", - "timwhitlock/jparser": "dev-get-rid-of-import#c37f4c6", "twig/extensions": "^1.5.1", "twig/twig": "^2.4.8" }, "conflict": { - "symfony/dependency-injection": ">=3.4.15" + "symfony/dependency-injection": "3.4.15|3.4.16" }, "require-dev": { "phpstan/phpstan": "^0.7", "phpunit/phpunit": "^7.0", - "shopsys/coding-standards": "7.0.0-beta1" + "shopsys/coding-standards": "7.0.0-beta2" }, "suggest": { "ext-pgsql": "Required for dumping the Postgres database in shopsys:database:dump command" @@ -5259,20 +5349,60 @@ "proprietary" ], "description": "Core of Shopsys Framework - open source framework for building large, scalable, fast-growing e-commerce projects based on Symfony", - "time": "2018-09-18T11:47:42+00:00" + "time": "2018-10-19T06:40:57+00:00" + }, + { + "name": "shopsys/jparser", + "version": "0.1", + "source": { + "type": "git", + "url": "https://github.com/shopsys/jparser.git", + "reference": "36ac67d7ec78bd5d9635e55dd71c6d3a1ac36ece" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/shopsys/jparser/zipball/36ac67d7ec78bd5d9635e55dd71c6d3a1ac36ece", + "reference": "36ac67d7ec78bd5d9635e55dd71c6d3a1ac36ece", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "PLUG\\": "PLUG/" + }, + "files": [ + "conf.dist/PLUG.conf.php", + "PLUG/core/PLUGTool.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tim Whitlock", + "email": "info@timwhitlock.info" + } + ], + "description": "A JavaScript parsing library for PHP", + "time": "2018-09-19T05:17:54+00:00" }, { "name": "shopsys/migrations", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/migrations.git", - "reference": "5d782db1482093a2884b1ac2792ba6ef2ae889d2" + "reference": "5732c5a0b6638593630970d88e68c5c705614f40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/migrations/zipball/5d782db1482093a2884b1ac2792ba6ef2ae889d2", - "reference": "5d782db1482093a2884b1ac2792ba6ef2ae889d2", + "url": "https://api.github.com/repos/shopsys/migrations/zipball/5732c5a0b6638593630970d88e68c5c705614f40", + "reference": "5732c5a0b6638593630970d88e68c5c705614f40", "shasum": "" }, "require": { @@ -5291,11 +5421,11 @@ "symfony/templating": "^2.7.3|^3.0" }, "conflict": { - "symfony/dependency-injection": ">=3.4.15" + "symfony/dependency-injection": "3.4.15|3.4.16" }, "require-dev": { "phpunit/phpunit": "^5.7|^6.0|^7.0", - "shopsys/coding-standards": "7.0.0-beta1" + "shopsys/coding-standards": "7.0.0-beta2" }, "type": "library", "autoload": { @@ -5322,20 +5452,20 @@ "orm", "schema" ], - "time": "2018-09-18T11:47:42+00:00" + "time": "2018-10-19T06:40:57+00:00" }, { "name": "shopsys/plugin-interface", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/plugin-interface.git", - "reference": "eb498cb5f5a1eb62e90ff24941df5504bc136ceb" + "reference": "a0ab73e8d22b413bb90189562046f172e5dd197c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/plugin-interface/zipball/eb498cb5f5a1eb62e90ff24941df5504bc136ceb", - "reference": "eb498cb5f5a1eb62e90ff24941df5504bc136ceb", + "url": "https://api.github.com/repos/shopsys/plugin-interface/zipball/a0ab73e8d22b413bb90189562046f172e5dd197c", + "reference": "a0ab73e8d22b413bb90189562046f172e5dd197c", "shasum": "" }, "require": { @@ -5343,7 +5473,7 @@ "symfony/monolog-bridge": "^3.0.0" }, "require-dev": { - "shopsys/coding-standards": "7.0.0-beta1" + "shopsys/coding-standards": "7.0.0-beta2" }, "type": "library", "autoload": { @@ -5367,43 +5497,87 @@ "Shopsys Framework", "plugin" ], - "time": "2018-09-18T11:47:42+00:00" + "time": "2018-10-19T06:40:57+00:00" + }, + { + "name": "shopsys/postgres-search-bundle", + "version": "0.1", + "target-dir": "Intaro/PostgresSearchBundle", + "source": { + "type": "git", + "url": "https://github.com/shopsys/PostgreSearchBundle.git", + "reference": "cdd790d8966c4cac434fcf046074bc86031eaf30" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/shopsys/PostgreSearchBundle/zipball/cdd790d8966c4cac434fcf046074bc86031eaf30", + "reference": "cdd790d8966c4cac434fcf046074bc86031eaf30", + "shasum": "" + }, + "require": { + "doctrine/orm": ">=2.2.3", + "php": ">=5.3.3", + "symfony/framework-bundle": ">=2.1" + }, + "type": "symfony-bundle", + "autoload": { + "psr-0": { + "Intaro\\PostgresSearchBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gruzd Sergey", + "homepage": "https://github.com/ddmaster" + } + ], + "description": "Tools to use full-text search PostgreSQL in Doctrine.", + "homepage": "https://github.com/ddmaster/PostgresSearchBundle", + "keywords": [ + "Symfony2", + "doctrine2", + "postgresql", + "search" + ], + "time": "2018-09-19T08:52:48+00:00" }, { "name": "shopsys/product-feed-google", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/product-feed-google.git", - "reference": "51d603e6736809d9d181603797e7bd2570f2acf4" + "reference": "fa0197e6b9227175fcb7952b1c48482125753a45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/product-feed-google/zipball/51d603e6736809d9d181603797e7bd2570f2acf4", - "reference": "51d603e6736809d9d181603797e7bd2570f2acf4", + "url": "https://api.github.com/repos/shopsys/product-feed-google/zipball/fa0197e6b9227175fcb7952b1c48482125753a45", + "reference": "fa0197e6b9227175fcb7952b1c48482125753a45", "shasum": "" }, "require": { "doctrine/dbal": "^2.7", "doctrine/doctrine-bundle": "^1.8", - "doctrine/orm": "dev-doctrine-260-with-ddc1960-hotfix-and-ddc4005-hotfix as 2.6.0", "ext-json": "*", "ext-pdo": "*", - "intaro/postgres-search-bundle": "@dev", "php": "^7.1", - "shopsys/form-types-bundle": "7.0.0-beta1", - "shopsys/framework": "7.0.0-beta1", - "shopsys/migrations": "7.0.0-beta1", - "shopsys/plugin-interface": "7.0.0-beta1", - "symfony/symfony": "^3.4.8", - "timwhitlock/jparser": "@dev" + "shopsys/doctrine-orm": "2.6.2", + "shopsys/form-types-bundle": "7.0.0-beta2", + "shopsys/framework": "7.0.0-beta2", + "shopsys/migrations": "7.0.0-beta2", + "shopsys/plugin-interface": "7.0.0-beta2", + "symfony/symfony": "^3.4.8" }, "conflict": { - "symfony/dependency-injection": ">=3.4.15" + "symfony/dependency-injection": "3.4.15|3.4.16" }, "require-dev": { "phpunit/phpunit": "^6.0|^7.0", - "shopsys/coding-standards": "7.0.0-beta1", + "shopsys/coding-standards": "7.0.0-beta2", "twig/extensions": "^1.5.1", "twig/twig": "^2.4.8" }, @@ -5432,46 +5606,44 @@ "plugin", "product feed" ], - "time": "2018-09-18T11:47:42+00:00" + "time": "2018-10-19T06:40:57+00:00" }, { "name": "shopsys/product-feed-heureka", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/product-feed-heureka.git", - "reference": "34f7ad4e020ec0e3f365551753831195064208d3" + "reference": "7940715dbb800a18215ac9a375013580a55c67a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/product-feed-heureka/zipball/34f7ad4e020ec0e3f365551753831195064208d3", - "reference": "34f7ad4e020ec0e3f365551753831195064208d3", + "url": "https://api.github.com/repos/shopsys/product-feed-heureka/zipball/7940715dbb800a18215ac9a375013580a55c67a3", + "reference": "7940715dbb800a18215ac9a375013580a55c67a3", "shasum": "" }, "require": { "doctrine/collections": "^1.5", "doctrine/dbal": "^2.7", "doctrine/doctrine-bundle": "^1.8", - "doctrine/orm": "dev-doctrine-260-with-ddc1960-hotfix-and-ddc4005-hotfix as 2.6.0", "ext-json": "*", "ext-libxml": "*", "ext-pdo": "*", "ext-simplexml": "*", - "intaro/postgres-search-bundle": "@dev", "php": "^7.1", - "shopsys/form-types-bundle": "7.0.0-beta1", - "shopsys/framework": "7.0.0-beta1", - "shopsys/migrations": "7.0.0-beta1", - "shopsys/plugin-interface": "7.0.0-beta1", - "symfony/symfony": "^3.4.8", - "timwhitlock/jparser": "@dev" + "shopsys/doctrine-orm": "2.6.2", + "shopsys/form-types-bundle": "7.0.0-beta2", + "shopsys/framework": "7.0.0-beta2", + "shopsys/migrations": "7.0.0-beta2", + "shopsys/plugin-interface": "7.0.0-beta2", + "symfony/symfony": "^3.4.8" }, "conflict": { - "symfony/dependency-injection": ">=3.4.15" + "symfony/dependency-injection": "3.4.15|3.4.16" }, "require-dev": { "phpunit/phpunit": "^6.0|^7.0", - "shopsys/coding-standards": "7.0.0-beta1", + "shopsys/coding-standards": "7.0.0-beta2", "twig/extensions": "^1.5.1", "twig/twig": "^2.4.8" }, @@ -5500,42 +5672,40 @@ "plugin", "product feed" ], - "time": "2018-09-18T11:47:42+00:00" + "time": "2018-10-19T06:40:57+00:00" }, { "name": "shopsys/product-feed-heureka-delivery", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/product-feed-heureka-delivery.git", - "reference": "88d263658cd23e0d6c5880b492a10440b99c6843" + "reference": "e5633990cae0de9fa983963659440c356f624cd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/product-feed-heureka-delivery/zipball/88d263658cd23e0d6c5880b492a10440b99c6843", - "reference": "88d263658cd23e0d6c5880b492a10440b99c6843", + "url": "https://api.github.com/repos/shopsys/product-feed-heureka-delivery/zipball/e5633990cae0de9fa983963659440c356f624cd6", + "reference": "e5633990cae0de9fa983963659440c356f624cd6", "shasum": "" }, "require": { - "doctrine/orm": "dev-doctrine-260-with-ddc1960-hotfix-and-ddc4005-hotfix as 2.6.0", - "intaro/postgres-search-bundle": "@dev", "php": "^7.1", - "shopsys/form-types-bundle": "7.0.0-beta1", - "shopsys/framework": "7.0.0-beta1", - "shopsys/migrations": "7.0.0-beta1", - "shopsys/plugin-interface": "7.0.0-beta1", + "shopsys/doctrine-orm": "2.6.2", + "shopsys/form-types-bundle": "7.0.0-beta2", + "shopsys/framework": "7.0.0-beta2", + "shopsys/migrations": "7.0.0-beta2", + "shopsys/plugin-interface": "7.0.0-beta2", "symfony/config": "^3.4", "symfony/dependency-injection": "^3.4", "symfony/framework-bundle": "^3.4", - "symfony/http-kernel": "^3.4", - "timwhitlock/jparser": "@dev" + "symfony/http-kernel": "^3.4" }, "conflict": { - "symfony/dependency-injection": ">=3.4.15" + "symfony/dependency-injection": "3.4.15|3.4.16" }, "require-dev": { "phpunit/phpunit": "^6.0|^7.0", - "shopsys/coding-standards": "7.0.0-beta1", + "shopsys/coding-standards": "7.0.0-beta2", "twig/extensions": "^1.5.1", "twig/twig": "^2.4.8" }, @@ -5564,43 +5734,41 @@ "plugin", "product delivery feed" ], - "time": "2018-09-18T11:47:42+00:00" + "time": "2018-10-19T06:40:57+00:00" }, { "name": "shopsys/product-feed-zbozi", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/product-feed-zbozi.git", - "reference": "82a5f5a45218cc9ec389c50c93186cd111b2c7b5" + "reference": "a86874c9c2a2b0e932890ea8d9727780cea8df77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/product-feed-zbozi/zipball/82a5f5a45218cc9ec389c50c93186cd111b2c7b5", - "reference": "82a5f5a45218cc9ec389c50c93186cd111b2c7b5", + "url": "https://api.github.com/repos/shopsys/product-feed-zbozi/zipball/a86874c9c2a2b0e932890ea8d9727780cea8df77", + "reference": "a86874c9c2a2b0e932890ea8d9727780cea8df77", "shasum": "" }, "require": { "doctrine/dbal": "^2.7", "doctrine/doctrine-bundle": "^1.8", - "doctrine/orm": "dev-doctrine-260-with-ddc1960-hotfix-and-ddc4005-hotfix as 2.6.0", "ext-json": "*", "ext-pdo": "*", - "intaro/postgres-search-bundle": "@dev", "php": "^7.1", - "shopsys/form-types-bundle": "7.0.0-beta1", - "shopsys/framework": "7.0.0-beta1", - "shopsys/migrations": "7.0.0-beta1", - "shopsys/plugin-interface": "7.0.0-beta1", - "symfony/symfony": "^3.4.8", - "timwhitlock/jparser": "@dev" + "shopsys/doctrine-orm": "2.6.2", + "shopsys/form-types-bundle": "7.0.0-beta2", + "shopsys/framework": "7.0.0-beta2", + "shopsys/migrations": "7.0.0-beta2", + "shopsys/plugin-interface": "7.0.0-beta2", + "symfony/symfony": "^3.4.8" }, "conflict": { - "symfony/dependency-injection": ">=3.4.15" + "symfony/dependency-injection": "3.4.15|3.4.16" }, "require-dev": { "phpunit/phpunit": "^6.0|^7.0", - "shopsys/coding-standards": "7.0.0-beta1", + "shopsys/coding-standards": "7.0.0-beta2", "twig/extensions": "^1.5.1", "twig/twig": "^2.4.8" }, @@ -5629,7 +5797,7 @@ "product feed", "zbozi" ], - "time": "2018-09-18T11:47:42+00:00" + "time": "2018-10-19T06:40:57+00:00" }, { "name": "snc/redis-bundle", @@ -6539,16 +6707,16 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v3.2.3", + "version": "v3.2.4", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "7bd5de67552ee3f7e04df89d662d41eba346dc83" + "reference": "bd47db86d0b8415f6317c2be149bbacfab11a9cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/7bd5de67552ee3f7e04df89d662d41eba346dc83", - "reference": "7bd5de67552ee3f7e04df89d662d41eba346dc83", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/bd47db86d0b8415f6317c2be149bbacfab11a9cf", + "reference": "bd47db86d0b8415f6317c2be149bbacfab11a9cf", "shasum": "" }, "require": { @@ -6597,7 +6765,7 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2018-08-29T08:49:17+00:00" + "time": "2018-10-27T16:17:38+00:00" }, { "name": "symfony/symfony", @@ -6756,26 +6924,20 @@ }, { "name": "timwhitlock/jparser", - "version": "dev-get-rid-of-import", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/shopsys/jparser.git", - "reference": "c37f4c6300fccdd2658c737fafecc0da7ef7ed7d" + "reference": "f839f8322c4dbbf0a0796a5994e9a7454a34c44a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/jparser/zipball/c37f4c6300fccdd2658c737fafecc0da7ef7ed7d", - "reference": "c37f4c6300fccdd2658c737fafecc0da7ef7ed7d", + "url": "https://api.github.com/repos/shopsys/jparser/zipball/f839f8322c4dbbf0a0796a5994e9a7454a34c44a", + "reference": "f839f8322c4dbbf0a0796a5994e9a7454a34c44a", "shasum": "" }, - "require": { - "php": ">=5.6" - }, "type": "library", "autoload": { - "psr-4": { - "PLUG\\": "PLUG/" - }, "files": [ "conf.dist/PLUG.conf.php", "PLUG/core/PLUGTool.php" @@ -6789,9 +6951,9 @@ ], "description": "A JavaScript parsing library for PHP", "support": { - "source": "https://github.com/shopsys/jparser/tree/get-rid-of-import" + "source": "https://github.com/shopsys/jparser/tree/master" }, - "time": "2015-10-17T12:17:30+00:00" + "time": "2013-02-15T12:33:15+00:00" }, { "name": "tracy/tracy", @@ -7211,16 +7373,16 @@ }, { "name": "codeception/codeception", - "version": "2.5.0", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "dee493561daf644134c95cf176fd2c25aff59ea9" + "reference": "e0a658c64e98811a6fd4f6aa7c3222e0609066a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/dee493561daf644134c95cf176fd2c25aff59ea9", - "reference": "dee493561daf644134c95cf176fd2c25aff59ea9", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/e0a658c64e98811a6fd4f6aa7c3222e0609066a9", + "reference": "e0a658c64e98811a6fd4f6aa7c3222e0609066a9", "shasum": "" }, "require": { @@ -7299,20 +7461,20 @@ "functional testing", "unit testing" ], - "time": "2018-09-24T09:33:01+00:00" + "time": "2018-10-29T21:23:19+00:00" }, { "name": "codeception/phpunit-wrapper", - "version": "7.3.1", + "version": "7.3.2", "source": { "type": "git", "url": "https://github.com/Codeception/phpunit-wrapper.git", - "reference": "1967be130082effb3c30510cf8f8397fbd9d8b84" + "reference": "a5633c736e0e0022bc5065b27c63f2d1aa97b69f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/1967be130082effb3c30510cf8f8397fbd9d8b84", - "reference": "1967be130082effb3c30510cf8f8397fbd9d8b84", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/a5633c736e0e0022bc5065b27c63f2d1aa97b69f", + "reference": "a5633c736e0e0022bc5065b27c63f2d1aa97b69f", "shasum": "" }, "require": { @@ -7342,7 +7504,7 @@ } ], "description": "PHPUnit classes used by Codeception", - "time": "2018-09-28T15:36:26+00:00" + "time": "2018-10-07T21:30:01+00:00" }, { "name": "codeception/stub", @@ -8941,16 +9103,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace" + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace", - "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18", + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18", "shasum": "" }, "require": { @@ -8986,7 +9148,7 @@ "keywords": [ "tokenizer" ], - "time": "2018-02-01T13:16:43+00:00" + "time": "2018-10-30T05:52:18+00:00" }, { "name": "phpunit/phpunit", @@ -9689,7 +9851,7 @@ }, { "name": "shopsys/coding-standards", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/coding-standards.git", @@ -9743,16 +9905,16 @@ }, { "name": "shopsys/http-smoke-testing", - "version": "v7.0.0-beta1", + "version": "v7.0.0-beta2", "source": { "type": "git", "url": "https://github.com/shopsys/http-smoke-testing.git", - "reference": "126f6dfdf514ff8c477c36a72781eaef83579863" + "reference": "330ff3311c3857fc3508187ddac278eefcbe1746" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shopsys/http-smoke-testing/zipball/126f6dfdf514ff8c477c36a72781eaef83579863", - "reference": "126f6dfdf514ff8c477c36a72781eaef83579863", + "url": "https://api.github.com/repos/shopsys/http-smoke-testing/zipball/330ff3311c3857fc3508187ddac278eefcbe1746", + "reference": "330ff3311c3857fc3508187ddac278eefcbe1746", "shasum": "" }, "require": { @@ -9764,7 +9926,7 @@ "symfony/routing": "^2.5|^3.0|^4.0" }, "conflict": { - "symfony/dependency-injection": ">=3.4.15" + "symfony/dependency-injection": "3.4.15|3.4.16" }, "require-dev": { "phpunit/phpunit": "^5.4.3|^6.0|^7.0", @@ -9794,7 +9956,7 @@ "symfony", "testing" ], - "time": "2018-09-10T10:12:29+00:00" + "time": "2018-10-19T06:40:57+00:00" }, { "name": "slam/php-cs-fixer-extensions", @@ -9845,16 +10007,16 @@ }, { "name": "slevomat/coding-standard", - "version": "4.8.4", + "version": "4.8.5", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "bc8a02f25e03eb5481c4976cc615621cdd75aef9" + "reference": "057f3f154cf4888b60eb4cdffadc509a3ae9dccd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/bc8a02f25e03eb5481c4976cc615621cdd75aef9", - "reference": "bc8a02f25e03eb5481c4976cc615621cdd75aef9", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/057f3f154cf4888b60eb4cdffadc509a3ae9dccd", + "reference": "057f3f154cf4888b60eb4cdffadc509a3ae9dccd", "shasum": "" }, "require": { @@ -9880,7 +10042,7 @@ "MIT" ], "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", - "time": "2018-10-01T20:16:49+00:00" + "time": "2018-10-05T12:10:21+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/package-lock.json b/package-lock.json index 915c59842..9b9c1ada4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -610,7 +610,7 @@ }, "css": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/css/-/css-1.6.0.tgz", + "resolved": "http://registry.npmjs.org/css/-/css-1.6.0.tgz", "integrity": "sha1-wG//CvuzE/zlvOBw12UxpsjTAKo=", "dev": true, "requires": { @@ -1784,7 +1784,7 @@ }, "chalk": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", "dev": true, "requires": { @@ -1795,7 +1795,7 @@ }, "strip-ansi": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", + "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", "dev": true } @@ -2584,7 +2584,7 @@ }, "chalk": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", + "resolved": "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", "dev": true, "requires": { @@ -2595,7 +2595,7 @@ }, "strip-ansi": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", + "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", "dev": true } From 1b53ee9af98aba0e9720eaa77eae1538b81ed270 Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Tue, 30 Oct 2018 11:39:29 +0100 Subject: [PATCH 02/10] PR497 - adding php.ini is done via dockerfile --- docker/conf/docker-compose-mac.yml.dist | 1 - docker/conf/docker-compose-win.yml.dist | 1 - docker/conf/docker-compose.yml.dist | 1 - docker/php-fpm/Dockerfile | 3 +++ 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/conf/docker-compose-mac.yml.dist b/docker/conf/docker-compose-mac.yml.dist index 49bea9221..2a8ef3f72 100644 --- a/docker/conf/docker-compose-mac.yml.dist +++ b/docker/conf/docker-compose-mac.yml.dist @@ -31,7 +31,6 @@ services: container_name: shopsys-framework-php-fpm volumes: - shopsys-framework-sync:/var/www/html - - ./docker/php-fpm/php-ini-overrides.ini:/usr/local/etc/php/php.ini links: - postgres - redis diff --git a/docker/conf/docker-compose-win.yml.dist b/docker/conf/docker-compose-win.yml.dist index ef67b405a..9409a2649 100644 --- a/docker/conf/docker-compose-win.yml.dist +++ b/docker/conf/docker-compose-win.yml.dist @@ -32,7 +32,6 @@ services: container_name: shopsys-framework-php-fpm volumes: - .:/var/www/html - - ./docker/php-fpm/php-ini-overrides.ini:/usr/local/etc/php/php.ini links: - postgres - redis diff --git a/docker/conf/docker-compose.yml.dist b/docker/conf/docker-compose.yml.dist index 7d81ffa29..fb8a1d112 100644 --- a/docker/conf/docker-compose.yml.dist +++ b/docker/conf/docker-compose.yml.dist @@ -34,7 +34,6 @@ services: container_name: shopsys-framework-php-fpm volumes: - .:/var/www/html - - ./docker/php-fpm/php-ini-overrides.ini:/usr/local/etc/php/php.ini links: - postgres - redis diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile index 125e92f86..46197b900 100644 --- a/docker/php-fpm/Dockerfile +++ b/docker/php-fpm/Dockerfile @@ -60,6 +60,9 @@ ENV LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US.utf8 # overwrite the original entry-point from the PHP Docker image with our own COPY docker-php-entrypoint /usr/local/bin/ +# copy php.ini configuration +COPY php-ini-overrides.ini /usr/local/etc/php/php.ini + # allow overwriting UID and GID o the user "www-data" to help solve issues with permissions in mounted volumes # if the GID is already in use, we will assign GID 82 instead (82 is the standard uid/gid for "www-data" in Alpine) ARG www_data_uid From 2b461df5bb67c663cbd7ad0b65f8fb371b14d5d5 Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Fri, 9 Nov 2018 09:34:23 +0100 Subject: [PATCH 03/10] PR494 - changed url of microservices --- app/config/parameters.yml.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index f371871e3..6c9e63add 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -19,5 +19,5 @@ parameters: secret: ThisTokenIsNotSoSecretChangeIt - microservice_product_search_url: 'http://microservice-product-search:8000' - microservice_product_search_export_url: 'http://microservice-product-search-export:8000' + microservice_product_search_url: 'http://microservice-product-search' + microservice_product_search_export_url: 'http://microservice-product-search-export' From 8bc3d028f6b00428145bc959d7302d1825a01be7 Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Fri, 9 Nov 2018 09:34:35 +0100 Subject: [PATCH 04/10] use shopsys repositories instead of forks --- composer.json | 19 +---- composer.lock | 199 +------------------------------------------------- 2 files changed, 4 insertions(+), 214 deletions(-) diff --git a/composer.json b/composer.json index 1d056cb79..af28c0aa7 100644 --- a/composer.json +++ b/composer.json @@ -22,20 +22,6 @@ "Tests\\": "tests/" } }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/molaux/PostgreSearchBundle.git" - }, - { - "type": "vcs", - "url": "https://github.com/shopsys/doctrine2.git" - }, - { - "type": "vcs", - "url": "https://github.com/shopsys/jparser.git" - } - ], "require": { "php": "^7.1", "ext-bcmath": "*", @@ -64,14 +50,12 @@ "doctrine/doctrine-bundle": "^1.8.1", "doctrine/doctrine-fixtures-bundle": "^3.0.2", "doctrine/doctrine-migrations-bundle": "^1.3.0", - "doctrine/orm": "dev-doctrine-260-with-ddc1960-hotfix-and-ddc4005-hotfix as 2.6.0", "egeloen/ckeditor-bundle": "^4.0.6", "fp/jsformvalidator-bundle": "^1.5.1", "fzaninotto/faker": "^1.7.1", "helios-ag/fm-elfinder-bundle": "^6.2.1", "heureka/overeno-zakazniky": "^2.0.6", "incenteev/composer-parameter-handler": "^2.1.3", - "intaro/postgres-search-bundle": "@dev", "intervention/image": "^2.3.14", "jms/translation-bundle": "^1.4.1", "joschi127/doctrine-entity-override-bundle": "^0.5.0", @@ -83,10 +67,12 @@ "sensio/distribution-bundle": "^5.0.21", "sensio/framework-extra-bundle": "^3.0.29", "sensio/generator-bundle": "^3.1.7", + "shopsys/doctrine-orm": "2.6.2", "shopsys/migrations": "v7.0.0-beta2", "shopsys/form-types-bundle": "v7.0.0-beta2", "shopsys/framework": "v7.0.0-beta2", "shopsys/plugin-interface": "v7.0.0-beta2", + "shopsys/postgres-search-bundle": "0.1", "shopsys/product-feed-heureka": "v7.0.0-beta2", "shopsys/product-feed-heureka-delivery": "v7.0.0-beta2", "shopsys/product-feed-zbozi": "v7.0.0-beta2", @@ -99,7 +85,6 @@ "symfony/symfony": "^3.4.8", "symfony-cmf/routing": "^2.0.3", "symfony-cmf/routing-bundle": "^2.0.3", - "timwhitlock/jparser": "@dev", "tracy/tracy": "^2.4.13", "twig/extensions": "^1.5.1", "twig/twig": "^2.4.8", diff --git a/composer.lock b/composer.lock index 497936f31..55fd16709 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": "88cdf711ea86064ec16e599881c2a5dc", + "content-hash": "88e139f29c5f296e8eac2e8c2914944e", "packages": [ { "name": "arvenil/ninja-mutex", @@ -1961,110 +1961,6 @@ ], "time": "2018-06-06T21:00:30+00:00" }, - { - "name": "doctrine/orm", - "version": "dev-doctrine-260-with-ddc1960-hotfix-and-ddc4005-hotfix", - "source": { - "type": "git", - "url": "https://github.com/shopsys/doctrine2.git", - "reference": "374e7ace49d864dad8cddbc55346447c8a6a2083" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/shopsys/doctrine2/zipball/374e7ace49d864dad8cddbc55346447c8a6a2083", - "reference": "374e7ace49d864dad8cddbc55346447c8a6a2083", - "shasum": "" - }, - "archive": { - "exclude": [ - "!vendor", - "tests", - "*phpunit.xml", - ".travis.yml", - "build.xml", - "build.properties", - "composer.phar", - "vendor/satooshi", - "lib/vendor", - "*.swp" - ] - }, - "require": { - "doctrine/annotations": "~1.5", - "doctrine/cache": "~1.6", - "doctrine/collections": "^1.4", - "doctrine/common": "^2.7.1", - "doctrine/dbal": "^2.6", - "doctrine/instantiator": "~1.1", - "ext-pdo": "*", - "php": "^7.1", - "symfony/console": "~3.0|~4.0" - }, - "require-dev": { - "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" - }, - "bin": [ - "bin/doctrine" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\ORM\\": "lib/Doctrine/ORM" - } - }, - "autoload-dev": { - "psr-4": { - "Doctrine\\Tests\\": "tests/Doctrine/Tests", - "Doctrine\\Performance\\": "tests/Doctrine/Performance" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - } - ], - "description": "Object-Relational-Mapper for PHP", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "database", - "orm" - ], - "support": { - "source": "https://github.com/shopsys/doctrine2/tree/dev-doctrine-260-with-ddc1960-hotfix-and-ddc4005-hotfix" - }, - "time": "2017-12-20T00:38:15+00:00" - }, { "name": "doctrine/persistence", "version": "v1.0.1", @@ -3046,54 +2942,6 @@ ], "time": "2018-02-13T18:05:56+00:00" }, - { - "name": "intaro/postgres-search-bundle", - "version": "dev-master", - "target-dir": "Intaro/PostgresSearchBundle", - "source": { - "type": "git", - "url": "https://github.com/molaux/PostgreSearchBundle.git", - "reference": "06625bdc1d07e05965a89447990583b77d89f494" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/molaux/PostgreSearchBundle/zipball/06625bdc1d07e05965a89447990583b77d89f494", - "reference": "06625bdc1d07e05965a89447990583b77d89f494", - "shasum": "" - }, - "require": { - "doctrine/orm": ">=2.2.3", - "php": ">=5.3.3", - "symfony/framework-bundle": ">=2.1" - }, - "type": "symfony-bundle", - "autoload": { - "psr-0": { - "Intaro\\PostgresSearchBundle\\": "" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gruzd Sergey", - "homepage": "https://github.com/ddmaster" - } - ], - "description": "Tools to use full-text search PostgreSQL in Doctrine.", - "homepage": "https://github.com/ddmaster/PostgresSearchBundle", - "keywords": [ - "doctrine2", - "postgresql", - "search", - "symfony2" - ], - "support": { - "source": "https://github.com/molaux/PostgreSearchBundle/tree/master" - }, - "time": "2016-04-11T10:34:23+00:00" - }, { "name": "intervention/image", "version": "2.4.2", @@ -6922,39 +6770,6 @@ ], "time": "2018-08-01T14:48:04+00:00" }, - { - "name": "timwhitlock/jparser", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/shopsys/jparser.git", - "reference": "f839f8322c4dbbf0a0796a5994e9a7454a34c44a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/shopsys/jparser/zipball/f839f8322c4dbbf0a0796a5994e9a7454a34c44a", - "reference": "f839f8322c4dbbf0a0796a5994e9a7454a34c44a", - "shasum": "" - }, - "type": "library", - "autoload": { - "files": [ - "conf.dist/PLUG.conf.php", - "PLUG/core/PLUGTool.php" - ] - }, - "authors": [ - { - "name": "Tim Whitlock", - "email": "info@timwhitlock.info" - } - ], - "description": "A JavaScript parsing library for PHP", - "support": { - "source": "https://github.com/shopsys/jparser/tree/master" - }, - "time": "2013-02-15T12:33:15+00:00" - }, { "name": "tracy/tracy", "version": "v2.5.3", @@ -10617,18 +10432,9 @@ "time": "2018-01-29T19:49:41+00:00" } ], - "aliases": [ - { - "alias": "2.6.0", - "alias_normalized": "2.6.0.0", - "version": "dev-doctrine-260-with-ddc1960-hotfix-and-ddc4005-hotfix", - "package": "doctrine/orm" - } - ], + "aliases": [], "minimum-stability": "stable", "stability-flags": { - "doctrine/orm": 20, - "intaro/postgres-search-bundle": 20, "shopsys/migrations": 10, "shopsys/form-types-bundle": 10, "shopsys/framework": 10, @@ -10637,7 +10443,6 @@ "shopsys/product-feed-heureka-delivery": 10, "shopsys/product-feed-zbozi": 10, "shopsys/product-feed-google": 10, - "timwhitlock/jparser": 20, "shopsys/coding-standards": 10, "shopsys/http-smoke-testing": 10 }, From 42d82b79f85584c61c33c64c174ce5980fbb29f3 Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Tue, 30 Oct 2018 12:24:31 +0100 Subject: [PATCH 05/10] conflicts with composer update --- composer.json | 3 +- composer.lock | 217 +++++++++++++++++++------------------------------- 2 files changed, 81 insertions(+), 139 deletions(-) diff --git a/composer.json b/composer.json index af28c0aa7..12b539b33 100644 --- a/composer.json +++ b/composer.json @@ -100,8 +100,7 @@ "shopsys/http-smoke-testing": "v7.0.0-beta2" }, "conflict": { - "codeception/stub": ">=2.0.2", - "symfony/dependency-injection": ">=3.4.15" + "symfony/dependency-injection": "3.4.15|3.4.16" }, "scripts": { "post-install-cmd": [ diff --git a/composer.lock b/composer.lock index 55fd16709..18c15e70b 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": "88e139f29c5f296e8eac2e8c2914944e", + "content-hash": "11528a4e46054f0cbf0e8837f5b86da1", "packages": [ { "name": "arvenil/ninja-mutex", @@ -6617,20 +6617,20 @@ }, { "name": "symfony/symfony", - "version": "v3.4.14", + "version": "v3.4.17", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "f50e17fa4edd6216f7fe5b908f04e64ba1d19a9e" + "reference": "de239d25e0bb3be451a17b627705a5970c6c59e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/f50e17fa4edd6216f7fe5b908f04e64ba1d19a9e", - "reference": "f50e17fa4edd6216f7fe5b908f04e64ba1d19a9e", + "url": "https://api.github.com/repos/symfony/symfony/zipball/de239d25e0bb3be451a17b627705a5970c6c59e6", + "reference": "de239d25e0bb3be451a17b627705a5970c6c59e6", "shasum": "" }, "require": { - "doctrine/common": "~2.4@stable", + "doctrine/common": "~2.4", "ext-xml": "*", "fig/link-util": "^1.0", "php": "^5.5.9|>=7.0.8", @@ -6718,7 +6718,7 @@ "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.4", "doctrine/doctrine-bundle": "~1.4", - "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0", + "doctrine/orm": "~2.4,>=2.4.5", "egulias/email-validator": "~1.2,>=1.2.8|~2.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0|~2.0", @@ -6768,7 +6768,7 @@ "keywords": [ "framework" ], - "time": "2018-08-01T14:48:04+00:00" + "time": "2018-10-03T12:03:55+00:00" }, { "name": "tracy/tracy", @@ -7280,21 +7280,21 @@ }, { "name": "codeception/phpunit-wrapper", - "version": "7.3.2", + "version": "7.1.4", "source": { "type": "git", "url": "https://github.com/Codeception/phpunit-wrapper.git", - "reference": "a5633c736e0e0022bc5065b27c63f2d1aa97b69f" + "reference": "f18ed631f1eddbb603d72219f577d223b23a1f89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/a5633c736e0e0022bc5065b27c63f2d1aa97b69f", - "reference": "a5633c736e0e0022bc5065b27c63f2d1aa97b69f", + "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/f18ed631f1eddbb603d72219f577d223b23a1f89", + "reference": "f18ed631f1eddbb603d72219f577d223b23a1f89", "shasum": "" }, "require": { "phpunit/php-code-coverage": "^6.0", - "phpunit/phpunit": "~7.1.0|~7.2.0|~7.3.0", + "phpunit/phpunit": "^7.1", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0" }, @@ -7319,26 +7319,23 @@ } ], "description": "PHPUnit classes used by Codeception", - "time": "2018-10-07T21:30:01+00:00" + "time": "2018-06-20T20:07:21+00:00" }, { "name": "codeception/stub", - "version": "2.0.1", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/Codeception/Stub.git", - "reference": "b2eff325d8ff0b824ff659048be7be4e5767d7d0" + "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Stub/zipball/b2eff325d8ff0b824ff659048be7be4e5767d7d0", - "reference": "b2eff325d8ff0b824ff659048be7be4e5767d7d0", + "url": "https://api.github.com/repos/Codeception/Stub/zipball/f50bc271f392a2836ff80690ce0c058efe1ae03e", + "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e", "shasum": "" }, "require": { - "phpunit/phpunit-mock-objects": ">2.3 <7.0" - }, - "require-dev": { "phpunit/phpunit": ">=4.8 <8.0" }, "type": "library", @@ -7352,7 +7349,7 @@ "MIT" ], "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", - "time": "2018-05-18T14:33:08+00:00" + "time": "2018-07-26T11:55:37+00:00" }, { "name": "facebook/webdriver", @@ -7416,16 +7413,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.13.0", + "version": "v2.13.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "7136aa4e0c5f912e8af82383775460d906168a10" + "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/7136aa4e0c5f912e8af82383775460d906168a10", - "reference": "7136aa4e0c5f912e8af82383775460d906168a10", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/54814c62d5beef3ba55297b9b3186ed8b8a1b161", + "reference": "54814c62d5beef3ba55297b9b3186ed8b8a1b161", "shasum": "" }, "require": { @@ -7436,7 +7433,7 @@ "ext-tokenizer": "*", "php": "^5.6 || >=7.0 <7.3", "php-cs-fixer/diff": "^1.3", - "symfony/console": "^3.2 || ^4.0", + "symfony/console": "^3.4.17 || ^4.1.6", "symfony/event-dispatcher": "^3.0 || ^4.0", "symfony/filesystem": "^3.0 || ^4.0", "symfony/finder": "^3.0 || ^4.0", @@ -7472,11 +7469,6 @@ "php-cs-fixer" ], "type": "application", - "extra": { - "branch-alias": { - "dev-master": "2.13-dev" - } - }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -7508,7 +7500,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2018-08-23T13:15:44+00:00" + "time": "2018-10-21T00:32:10+00:00" }, { "name": "jakub-onderka/php-parallel-lint", @@ -8250,22 +8242,22 @@ }, { "name": "phar-io/manifest", - "version": "1.0.1", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", "shasum": "" }, "require": { "ext-dom": "*", "ext-phar": "*", - "phar-io/version": "^1.0.1", + "phar-io/version": "^2.0", "php": "^5.6 || ^7.0" }, "type": "library", @@ -8301,20 +8293,20 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05T18:14:27+00:00" + "time": "2018-07-08T19:23:20+00:00" }, { "name": "phar-io/version", - "version": "1.0.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", + "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", "shasum": "" }, "require": { @@ -8348,7 +8340,7 @@ } ], "description": "Library for handling version information and constraints", - "time": "2017-03-05T17:38:23+00:00" + "time": "2018-07-08T19:19:57+00:00" }, { "name": "php-cs-fixer/diff", @@ -8718,27 +8710,27 @@ }, { "name": "phpunit/php-code-coverage", - "version": "6.0.5", + "version": "6.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "4cab20a326d14de7575a8e235c70d879b569a57a" + "reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4cab20a326d14de7575a8e235c70d879b569a57a", - "reference": "4cab20a326d14de7575a8e235c70d879b569a57a", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4d3ae9b21a7d7e440bd0cf65565533117976859f", + "reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", "php": "^7.1", - "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-file-iterator": "^2.0", "phpunit/php-text-template": "^1.2.1", "phpunit/php-token-stream": "^3.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1", + "sebastian/environment": "^3.1 || ^4.0", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, @@ -8751,7 +8743,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.0-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -8777,29 +8769,32 @@ "testing", "xunit" ], - "time": "2018-05-28T11:49:20+00:00" + "time": "2018-10-23T05:59:32+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.5", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + "reference": "050bedf145a257b1ff02746c31894800e5122946" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", + "reference": "050bedf145a257b1ff02746c31894800e5122946", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -8814,7 +8809,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -8824,7 +8819,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2018-09-13T20:33:42+00:00" }, { "name": "phpunit/php-text-template", @@ -8967,47 +8962,51 @@ }, { "name": "phpunit/phpunit", - "version": "7.1.5", + "version": "7.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "ca64dba53b88aba6af32aebc6b388068db95c435" + "reference": "c151651fb6ed264038d486ea262e243af72e5e64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ca64dba53b88aba6af32aebc6b388068db95c435", - "reference": "ca64dba53b88aba6af32aebc6b388068db95c435", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c151651fb6ed264038d486ea262e243af72e5e64", + "reference": "c151651fb6ed264038d486ea262e243af72e5e64", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.6.1", - "phar-io/manifest": "^1.0.1", - "phar-io/version": "^1.0", + "myclabs/deep-copy": "^1.7", + "phar-io/manifest": "^1.0.2", + "phar-io/version": "^2.0", "php": "^7.1", "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.1", - "phpunit/php-file-iterator": "^1.4.3", + "phpunit/php-code-coverage": "^6.0.7", + "phpunit/php-file-iterator": "^2.0.1", "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^2.0", - "phpunit/phpunit-mock-objects": "^6.1.1", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", - "sebastian/environment": "^3.1", + "sebastian/environment": "^3.1 || ^4.0", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^1.0", + "sebastian/resource-operations": "^2.0", "sebastian/version": "^2.0.1" }, + "conflict": { + "phpunit/phpunit-mock-objects": "*" + }, "require-dev": { "ext-pdo": "*" }, "suggest": { + "ext-soap": "*", "ext-xdebug": "*", "phpunit/php-invoker": "^2.0" }, @@ -9017,7 +9016,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.1-dev" + "dev-master": "7.4-dev" } }, "autoload": { @@ -9043,63 +9042,7 @@ "testing", "xunit" ], - "time": "2018-04-29T15:09:19+00:00" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "6.1.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "f9756fd4f43f014cb2dca98deeaaa8ce5500a36e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/f9756fd4f43f014cb2dca98deeaaa8ce5500a36e", - "reference": "f9756fd4f43f014cb2dca98deeaaa8ce5500a36e", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.5", - "php": "^7.1", - "phpunit/php-text-template": "^1.2.1", - "sebastian/exporter": "^3.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.0" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.1-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": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "time": "2018-05-29T13:54:20+00:00" + "time": "2018-10-23T05:57:41+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -9581,25 +9524,25 @@ }, { "name": "sebastian/resource-operations", - "version": "1.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", "shasum": "" }, "require": { - "php": ">=5.6.0" + "php": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -9619,7 +9562,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" + "time": "2018-10-04T04:07:39+00:00" }, { "name": "sebastian/version", From 7d142d0535a1a7f33d7fcb5614bfc491a365116d Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Tue, 30 Oct 2018 12:24:51 +0100 Subject: [PATCH 06/10] prestisimo used for faster composer installation --- docker/php-fpm/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile index 46197b900..4eababa9d 100644 --- a/docker/php-fpm/Dockerfile +++ b/docker/php-fpm/Dockerfile @@ -73,3 +73,6 @@ USER www-data # allow configuring the GitHub OAuth token ARG github_oauth_token RUN if [ -n "$github_oauth_token" ]; then composer config -g github-oauth.github.com $github_oauth_token; fi + +# hirak/prestissimo makes the install of Composer dependencies faster by parallel downloading +RUN composer global require hirak/prestissimo From ff4ff909a8ac2abe300c1da6fb26996aea8599b7 Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Tue, 30 Oct 2018 12:25:04 +0100 Subject: [PATCH 07/10] domains phing target updated --- build-dev.xml | 10 +++++++++- build.xml | 13 ++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/build-dev.xml b/build-dev.xml index 7f98daf25..1f7749dac 100644 --- a/build-dev.xml +++ b/build-dev.xml @@ -16,7 +16,7 @@ - + @@ -529,6 +529,14 @@ + + + + + + + + diff --git a/build.xml b/build.xml index 1b3659994..a79545d0d 100644 --- a/build.xml +++ b/build.xml @@ -56,7 +56,7 @@ - + @@ -117,6 +117,17 @@ + + + + + + + + + + + From 3f7dbf19866773dbb94a563fee3eadc762443a10 Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Tue, 30 Oct 2018 12:25:10 +0100 Subject: [PATCH 08/10] enable logging --- docker/php-fpm/php-ini-overrides.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/php-fpm/php-ini-overrides.ini b/docker/php-fpm/php-ini-overrides.ini index 62a040909..0b9774b89 100644 --- a/docker/php-fpm/php-ini-overrides.ini +++ b/docker/php-fpm/php-ini-overrides.ini @@ -47,3 +47,4 @@ opcache.use_cwd=1 ; nescessary for file uploads upload_max_filesize = 32M post_max_size = 32M +log_errors = true From 60475b71bc88d53af1fd454147fd51f1b75d334c Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Tue, 30 Oct 2018 12:25:17 +0100 Subject: [PATCH 09/10] migrations executed --- migrations-lock.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/migrations-lock.yml b/migrations-lock.yml index 626bd2e27..b973dcc39 100644 --- a/migrations-lock.yml +++ b/migrations-lock.yml @@ -283,3 +283,6 @@ 20180830121204: class: Shopsys\FrameworkBundle\Migrations\Version20180830121204 skip: false +20181008000001: + class: Shopsys\FrameworkBundle\Migrations\Version20181008000001 + skip: false From 284f592c0e9f6f9b184588b3a49618a62e688ead Mon Sep 17 00:00:00 2001 From: Mathew Czerner Date: Fri, 9 Nov 2018 10:44:12 +0100 Subject: [PATCH 10/10] mac and windows docker-composes now conains microservices - microservices updated to version v.7.0.0-beta2 --- composer.lock | 167 ++++++++++++------------ docker/conf/docker-compose-mac.yml.dist | 16 +++ docker/conf/docker-compose-win.yml.dist | 17 +++ docker/conf/docker-compose.yml.dist | 4 +- 4 files changed, 120 insertions(+), 84 deletions(-) diff --git a/composer.lock b/composer.lock index 18c15e70b..ea9383cef 100644 --- a/composer.lock +++ b/composer.lock @@ -600,16 +600,16 @@ }, { "name": "composer/composer", - "version": "1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2" + "reference": "e965b9aaa8854c3067f1ed2ae45f436572d73eb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/576aab9b5abb2ed11a1c52353a759363216a4ad2", - "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2", + "url": "https://api.github.com/repos/composer/composer/zipball/e965b9aaa8854c3067f1ed2ae45f436572d73eb7", + "reference": "e965b9aaa8854c3067f1ed2ae45f436572d73eb7", "shasum": "" }, "require": { @@ -676,7 +676,7 @@ "dependency", "package" ], - "time": "2018-08-16T14:57:12+00:00" + "time": "2018-11-01T09:05:06+00:00" }, { "name": "composer/semver", @@ -742,16 +742,16 @@ }, { "name": "composer/spdx-licenses", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b" + "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b", - "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2", + "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2", "shasum": "" }, "require": { @@ -799,7 +799,7 @@ "spdx", "validator" ], - "time": "2018-04-30T10:33:04+00:00" + "time": "2018-11-01T09:45:54+00:00" }, { "name": "composer/xdebug-handler", @@ -1430,16 +1430,16 @@ }, { "name": "doctrine/doctrine-cache-bundle", - "version": "1.3.3", + "version": "1.3.5", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "4c8e363f96427924e7e519c5b5119b4f54512697" + "reference": "5514c90d9fb595e1095e6d66ebb98ce9ef049927" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/4c8e363f96427924e7e519c5b5119b4f54512697", - "reference": "4c8e363f96427924e7e519c5b5119b4f54512697", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/5514c90d9fb595e1095e6d66ebb98ce9ef049927", + "reference": "5514c90d9fb595e1095e6d66ebb98ce9ef049927", "shasum": "" }, "require": { @@ -1452,7 +1452,7 @@ "instaclick/coding-standard": "~1.1", "instaclick/object-calisthenics-sniffs": "dev-master", "instaclick/symfony2-coding-standard": "dev-remaster", - "phpunit/phpunit": "~4|~5", + "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", @@ -1476,7 +1476,10 @@ "autoload": { "psr-4": { "Doctrine\\Bundle\\DoctrineCacheBundle\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1509,12 +1512,12 @@ } ], "description": "Symfony Bundle for Doctrine Cache", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "cache", "caching" ], - "time": "2018-03-27T09:22:12+00:00" + "time": "2018-11-09T06:25:35+00:00" }, { "name": "doctrine/doctrine-fixtures-bundle", @@ -3644,16 +3647,16 @@ }, { "name": "monolog/monolog", - "version": "1.23.0", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", "shasum": "" }, "require": { @@ -3718,7 +3721,7 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2018-11-05T09:00:11+00:00" }, { "name": "nikic/php-parser", @@ -6094,16 +6097,16 @@ }, { "name": "symfony/monolog-bundle", - "version": "v3.3.0", + "version": "v3.3.1", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "8204f3cd7c1bd6a6e2955c0a34475243a7bd9802" + "reference": "572e143afc03419a75ab002c80a2fd99299195ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/8204f3cd7c1bd6a6e2955c0a34475243a7bd9802", - "reference": "8204f3cd7c1bd6a6e2955c0a34475243a7bd9802", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/572e143afc03419a75ab002c80a2fd99299195ff", + "reference": "572e143afc03419a75ab002c80a2fd99299195ff", "shasum": "" }, "require": { @@ -6153,11 +6156,11 @@ "log", "logging" ], - "time": "2018-06-04T05:55:43+00:00" + "time": "2018-11-04T09:58:13+00:00" }, { "name": "symfony/polyfill-apcu", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", @@ -6213,7 +6216,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -6271,7 +6274,7 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", @@ -6329,16 +6332,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", "shasum": "" }, "require": { @@ -6384,20 +6387,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "7b4fc009172cc0196535b0328bd1226284a28000" + "reference": "ff208829fe1aa48ab9af356992bb7199fed551af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/7b4fc009172cc0196535b0328bd1226284a28000", - "reference": "7b4fc009172cc0196535b0328bd1226284a28000", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ff208829fe1aa48ab9af356992bb7199fed551af", + "reference": "ff208829fe1aa48ab9af356992bb7199fed551af", "shasum": "" }, "require": { @@ -6440,20 +6443,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T06:26:08+00:00" }, { "name": "symfony/polyfill-php70", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934" + "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934", - "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224", + "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224", "shasum": "" }, "require": { @@ -6499,20 +6502,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T06:26:08+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "8e15d04ba3440984d23e7964b2ee1d25c8de1581" + "reference": "3b58903eae668d348a7126f999b0da0f2f93611c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8e15d04ba3440984d23e7964b2ee1d25c8de1581", - "reference": "8e15d04ba3440984d23e7964b2ee1d25c8de1581", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/3b58903eae668d348a7126f999b0da0f2f93611c", + "reference": "3b58903eae668d348a7126f999b0da0f2f93611c", "shasum": "" }, "require": { @@ -6551,7 +6554,7 @@ "polyfill", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-30T16:36:12+00:00" }, { "name": "symfony/swiftmailer-bundle", @@ -6617,16 +6620,16 @@ }, { "name": "symfony/symfony", - "version": "v3.4.17", + "version": "v3.4.18", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "de239d25e0bb3be451a17b627705a5970c6c59e6" + "reference": "ee054aa62e535b7905c5b8e90cb49a1ad65dbfd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/de239d25e0bb3be451a17b627705a5970c6c59e6", - "reference": "de239d25e0bb3be451a17b627705a5970c6c59e6", + "url": "https://api.github.com/repos/symfony/symfony/zipball/ee054aa62e535b7905c5b8e90cb49a1ad65dbfd8", + "reference": "ee054aa62e535b7905c5b8e90cb49a1ad65dbfd8", "shasum": "" }, "require": { @@ -6768,20 +6771,20 @@ "keywords": [ "framework" ], - "time": "2018-10-03T12:03:55+00:00" + "time": "2018-11-03T10:03:29+00:00" }, { "name": "tracy/tracy", - "version": "v2.5.3", + "version": "v2.5.5", "source": { "type": "git", "url": "https://github.com/nette/tracy.git", - "reference": "7f670b08a7f4ed0243373f9d003d139196273861" + "reference": "35fa649b483b28e16f61de07110ea0585fc8d6ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/tracy/zipball/7f670b08a7f4ed0243373f9d003d139196273861", - "reference": "7f670b08a7f4ed0243373f9d003d139196273861", + "url": "https://api.github.com/repos/nette/tracy/zipball/35fa649b483b28e16f61de07110ea0585fc8d6ea", + "reference": "35fa649b483b28e16f61de07110ea0585fc8d6ea", "shasum": "" }, "require": { @@ -6834,7 +6837,7 @@ "nette", "profiler" ], - "time": "2018-09-24T22:35:07+00:00" + "time": "2018-11-05T15:10:59+00:00" }, { "name": "twig/extensions", @@ -8710,16 +8713,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "6.1.3", + "version": "6.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f" + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4d3ae9b21a7d7e440bd0cf65565533117976859f", - "reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", "shasum": "" }, "require": { @@ -8769,7 +8772,7 @@ "testing", "xunit" ], - "time": "2018-10-23T05:59:32+00:00" + "time": "2018-10-31T16:06:48+00:00" }, { "name": "phpunit/php-file-iterator", @@ -9765,21 +9768,21 @@ }, { "name": "slevomat/coding-standard", - "version": "4.8.5", + "version": "4.8.6", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "057f3f154cf4888b60eb4cdffadc509a3ae9dccd" + "reference": "af0c0c99e84106525484ef25f15144b9831522bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/057f3f154cf4888b60eb4cdffadc509a3ae9dccd", - "reference": "057f3f154cf4888b60eb4cdffadc509a3ae9dccd", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/af0c0c99e84106525484ef25f15144b9831522bb", + "reference": "af0c0c99e84106525484ef25f15144b9831522bb", "shasum": "" }, "require": { "php": "^7.1", - "squizlabs/php_codesniffer": "^3.3.0" + "squizlabs/php_codesniffer": "^3.3.1" }, "require-dev": { "jakub-onderka/php-parallel-lint": "1.0.0", @@ -9800,7 +9803,7 @@ "MIT" ], "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", - "time": "2018-10-05T12:10:21+00:00" + "time": "2018-11-03T21:28:29+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -9855,16 +9858,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae" + "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae", - "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631", + "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631", "shasum": "" }, "require": { @@ -9906,7 +9909,7 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symplify/better-phpdoc-parser", @@ -10156,16 +10159,16 @@ }, { "name": "thecodingmachine/safe", - "version": "v0.1.5", + "version": "v0.1.7", "source": { "type": "git", "url": "https://github.com/thecodingmachine/safe.git", - "reference": "56fcae888155f6ae0070545c5f80505c511598d5" + "reference": "70cdfb7732ab22b1bd82c6c4a3f8650a45759c5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/56fcae888155f6ae0070545c5f80505c511598d5", - "reference": "56fcae888155f6ae0070545c5f80505c511598d5", + "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/70cdfb7732ab22b1bd82c6c4a3f8650a45759c5e", + "reference": "70cdfb7732ab22b1bd82c6c4a3f8650a45759c5e", "shasum": "" }, "require": { @@ -10282,7 +10285,7 @@ "MIT" ], "description": "PHP core functions that throw exceptions instead of returning FALSE on error", - "time": "2018-09-24T20:24:12+00:00" + "time": "2018-11-08T14:45:50+00:00" }, { "name": "theseer/tokenizer", diff --git a/docker/conf/docker-compose-mac.yml.dist b/docker/conf/docker-compose-mac.yml.dist index 2a8ef3f72..d2625d9c6 100644 --- a/docker/conf/docker-compose-mac.yml.dist +++ b/docker/conf/docker-compose-mac.yml.dist @@ -96,6 +96,22 @@ services: environment: - discovery.type=single-node + microservice-product-search: + image: shopsys/microservice-product-search:v7.0.0-beta2 + container_name: shopsys-framework-microservice-product-search + links: + - elasticsearch + depends_on: + - elasticsearch + + microservice-product-search-export: + image: shopsys/microservice-product-search-export:v7.0.0-beta2 + container_name: shopsys-framework-microservice-product-search-export + links: + - elasticsearch + depends_on: + - elasticsearch + volumes: shopsys-framework-sync: external: true diff --git a/docker/conf/docker-compose-win.yml.dist b/docker/conf/docker-compose-win.yml.dist index 9409a2649..01e05dd82 100644 --- a/docker/conf/docker-compose-win.yml.dist +++ b/docker/conf/docker-compose-win.yml.dist @@ -97,6 +97,23 @@ services: environment: - discovery.type=single-node + + microservice-product-search: + image: shopsys/microservice-product-search:v7.0.0-beta2 + container_name: shopsys-framework-microservice-product-search + links: + - elasticsearch + depends_on: + - elasticsearch + + microservice-product-search-export: + image: shopsys/microservice-product-search-export:v7.0.0-beta2 + container_name: shopsys-framework-microservice-product-search-export + links: + - elasticsearch + depends_on: + - elasticsearch + volumes: pgdata: driver: local diff --git a/docker/conf/docker-compose.yml.dist b/docker/conf/docker-compose.yml.dist index fb8a1d112..2f3a52ca2 100644 --- a/docker/conf/docker-compose.yml.dist +++ b/docker/conf/docker-compose.yml.dist @@ -102,7 +102,7 @@ services: - discovery.type=single-node microservice-product-search: - image: shopsys/microservice-product-search:v7.0.0-beta1 + image: shopsys/microservice-product-search:v7.0.0-beta2 container_name: shopsys-framework-microservice-product-search links: - elasticsearch @@ -110,7 +110,7 @@ services: - elasticsearch microservice-product-search-export: - image: shopsys/microservice-product-search-export:v7.0.0-beta1 + image: shopsys/microservice-product-search-export:v7.0.0-beta2 container_name: shopsys-framework-microservice-product-search-export links: - elasticsearch