Upgrade demoshop to beta2 version (#26)

shopsys · Nov 14, 2018 · c4d3dcc · c4d3dcc
2 parents 5dc620a + 284f592
commit c4d3dcc
Show file tree

Hide file tree

Showing 12 changed files with 555 additions and 599 deletions.
diff --git 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'
diff --git a/build-dev.xml b/build-dev.xml
@@ -16,7 +16,7 @@
     <target name="standards" depends="phplint,ecs,phpstan,twig-lint,yaml-lint,eslint-check" description="Checks coding standards."/>
     <target name="standards-diff" depends="phplint-diff,ecs-diff,phpstan,twig-lint-diff,yaml-lint,eslint-check-diff" description="Checks coding standards on changed files."/>
 
-    <target name="test-db-demo" depends="test-db-wipe-public-schema,test-db-import-basic-structure,test-db-migrations,test-db-fixtures-demo-singledomain,test-create-domains-data,test-generate-friendly-urls,test-db-fixtures-demo-multidomain,test-load-plugin-demo-data,test-replace-domains-urls" description="Drops all data in test database and creates a new one with demo data."/>
+    <target name="test-db-demo" depends="clean,test-db-wipe-public-schema,test-db-import-basic-structure,test-db-migrations,test-create-domains-db-functions,test-db-fixtures-demo-singledomain,test-create-domains-data,test-generate-friendly-urls,test-db-fixtures-demo-multidomain,test-load-plugin-demo-data,test-replace-domains-urls" description="Drops all data in test database and creates a new one with demo data."/>
     <target name="test-db-performance" depends="test-db-demo,test-db-fixtures-performance" description="Drops all data in test database and creates a new one with performance data."/>
     <target name="tests" depends="test-db-demo,tests-unit,tests-db,tests-smoke" description="Runs unit, database and smoke tests on a newly built test database."/>
 
@@ -529,6 +529,14 @@
         </exec>
     </target>
 
+    <target name="test-create-domains-db-functions" description="Creates new domains DB functions in test database.">
+        <exec executable="${path.php.executable}" passthru="true" checkreturn="true">
+            <arg value="${path.bin-console}" />
+            <arg value="shopsys:domains-db-functions:create" />
+            <arg value="--env=test" />
+        </exec>
+    </target>
+
     <target name="test-create-domains-data" description="Creates domains data in tests DB for newly configured domains.">
         <exec executable="${path.php.executable}" passthru="true" checkreturn="true">
             <arg value="${path.bin-console}" />

diff --git a/build.xml b/build.xml
@@ -56,7 +56,7 @@
     <target name="build-deploy-part-2-db-dependent" depends="db-migrations,create-domains-data,generate-friendly-urls,replace-domains-urls,grunt,error-pages-generate,warmup" description="Second part of application build for production preserving your DB (must be run with maintenance page when containing DB migrations)."/>
     <target name="build-new" depends="wipe,composer,npm,dirs-create,domains-urls-check,assets,db-rebuild,grunt,error-pages-generate,warmup,microservice-product-search-create-structure" description="Builds application for production with clean DB (with base data only)."/>
     <target name="build-demo" depends="wipe,composer,npm,dirs-create,domains-urls-check,assets,db-demo,grunt,error-pages-generate,warmup,microservice-product-search-recreate-structure" description="Builds application for production with clean demo DB."/>
-    <target name="db-demo" depends="db-wipe-public-schema,db-import-basic-structure,db-migrations,db-fixtures-demo-singledomain,create-domains-data,db-fixtures-demo-multidomain,load-plugin-demo-data,generate-friendly-urls,replace-domains-urls" description="Creates DB and fills it with demo data"/>
+    <target name="db-demo" depends="db-wipe-public-schema,db-import-basic-structure,db-migrations,create-domains-db-functions,db-fixtures-demo-singledomain,create-domains-data,db-fixtures-demo-multidomain,load-plugin-demo-data,generate-friendly-urls,replace-domains-urls" description="Creates DB and fills it with demo data"/>
     <target name="db-rebuild" depends="db-wipe-public-schema,db-import-basic-structure,db-migrations,create-domains-data,generate-friendly-urls,replace-domains-urls" description="Drops all data in database and creates a new one with base data only."/>
     <target name="microservice-product-search-recreate-structure" depends="microservice-product-search-delete-structure,microservice-product-search-create-structure" description="Recreates Elasticsearch indexes structure (deletes existing structure and creates new one)" />
 
@@ -117,6 +117,17 @@
             <arg value="${path.bin-console}" />
             <arg value="shopsys:domains-data:create" />
         </exec>
+        <exec executable="${path.php.executable}" passthru="true" checkreturn="true">
+            <arg value="${path.bin-console}" />
+            <arg value="shopsys:recalculations" />
+        </exec>
+    </target>
+
+    <target name="create-domains-db-functions" description="Creates new domains DB functions.">
+        <exec executable="${path.php.executable}" passthru="true" checkreturn="true">
+            <arg value="${path.bin-console}" />
+            <arg value="shopsys:domains-db-functions:create" />
+        </exec>
     </target>
 
     <target name="microservice-product-search-create-structure" description="Creates Elasticsearch indexes structure.">

diff --git 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,14 +67,16 @@
         "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/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",
+        "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",
@@ -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",
@@ -111,12 +96,11 @@
         "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",
-        "symfony/dependency-injection": ">=3.4.15"
+        "symfony/dependency-injection": "3.4.15|3.4.16"
     },
     "scripts": {
         "post-install-cmd": [