Upgrade demoshop to beta4 version

.dockerignore

@@ -0,0 +1,24 @@
+# ignore .git (can be volume-mounted in development environment)
+.git
+
+# ignore directories with meta-data
+.idea
+nbproject
+
+# ignore directories that should be created and filled during the image build
+node_modules
+var
+!var/.gitkeep
+web/assets/scripts
+web/bundles
+web/components
+web/content
+vendor
+
+# ignore kubernetes manifests
+kubernetes
+
+# ignore docker configs for other images than php-fpm, and the php-fpm's Dockerfile itself
+docker
+!docker/php-fpm
+docker/php-fpm/Dockerfile

CHANGELOG.md

@@ -26,9 +26,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [#19 - Table tags and inline styles can be used in ckEditor for email templates](https://github.com/shopsys/demoshop/pull/19)
     - `ivory_ck_editor.yml` is updated so email templates wysiwyg can parse table tags and inline styles for all elements
     - datafixtures for email templates are added so demoshop has now customized emails
+- [#27 - Upgrade to shopsys framework 7.0.0-beta4](https://github.com/shopsys/demoshop/pull/27)
+    - renamed Database tests to Functional tests
+    - content-test directory is used instead of content during the test
+    - updated coding standards and applied
+    - registered new form types (OrderItemsType, DisplayOnlyCustomerType)
+    - OrderFormType in Admin is extended on a class level. No need to extend twig template anymore
+    - block loading of original data fixtures, if overridden
+    - Shopsys\FrameworkBundle\DataFixtures\Demo\MailTemplateDataFixture blocked from loading, because its overridden in ShopBundle 
+    - Shopsys\FrameworkBundle\DataFixtures\Demo\MultidomainMailTemplateDataFixture blocked from loading, because its overridden in ShopBundle
+    - fixed wrong links in mail template data fixtures
 
 ### Fixed
 - [#8 - Category now has second description attribute that is displayed on the product list page above the product list](https://github.com/shopsys/demoshop/pull/8)
     - GoogleFeedItemFactory: removed unused imports
 
-[@LukasHeinz]:(https://github.com/LukasHeinz)
+[@LukasHeinz]:(https://github.com/LukasHeinz)

app/Environment.php

@@ -22,12 +22,11 @@ public static function checkEnvironment(Event $event)
         $io = $event->getIO();
         /* @var $io \Composer\IO\IOInterface */
         $environmentFileSetting = self::getEnvironmentFileSetting();
-        if ($io->isInteractive() && !$environmentFileSetting->isAnyEnvironmentSet()) {
-            if ($io->askConfirmation('Build in production environment? (Y/n): ', true)) {
-                $environmentFileSetting->createFileForEnvironment(EnvironmentType::PRODUCTION);
-            } else {
-                $environmentFileSetting->createFileForEnvironment(EnvironmentType::DEVELOPMENT);
-            }
+        if (!$environmentFileSetting->isAnyEnvironmentSet()) {
+            $environment = $event->isDevMode() ? EnvironmentType::DEVELOPMENT : EnvironmentType::PRODUCTION;
+            $environmentFileSetting->createFileForEnvironment($environment);
+            $environmentFilePath = $environmentFileSetting->getEnvironmentFilePath($environment);
+            $io->write(sprintf('Created a file "%s" to set the application environment!', $environmentFilePath));
         }
         self::printEnvironmentInfo($io);
     }

app/config/packages/twig.yml

@@ -7,7 +7,9 @@ twig:
         - '@ShopsysFramework/Admin/Form/fileuploadFields.html.twig'
         - '@ShopsysFramework/Admin/Form/imageuploadFields.html.twig'
         - '@ShopsysFramework/Admin/Form/pricetableFields.html.twig'
+        - '@ShopsysFramework/Admin/Form/orderItems.html.twig'
         - '@ShopsysFramework/Admin/Form/orderlistFields.html.twig'
+        - '@ShopsysShop/Admin/Form/displayOnlyCustomer.html.twig'
         - '@ShopsysFramework/Admin/Form/displayOnlyDomainIconFields.html.twig'
         - '@ShopsysFramework/Admin/Form/displayOnlyFields.html.twig'
         - '@ShopsysShop/Admin/Form/companyUsers.html.twig'

app/config/parameters_test.yml.dist

@@ -13,3 +13,5 @@ parameters:
     test_mailer_host: smtp-server
     test_mailer_user: ~
     test_mailer_password: ~
+
+    shopsys.content_dir_name: 'content-test'

app/config/paths.yml

@@ -1,33 +1,34 @@
 parameters:
+    shopsys.content_dir_name: 'content'
     shopsys.css_version_filepath: '%shopsys.web_dir%/assets/cssVersion'
     shopsys.data_fixtures.resource_customers_filepath: '%shopsys.data_fixtures.resources_dir%/demo-data-customers.csv'
     shopsys.data_fixtures.resource_products_filepath: '%shopsys.data_fixtures.resources_dir%/demo-data-products.csv'
     shopsys.data_fixtures.resources_dir: '%shopsys.framework.root_dir%/src/DataFixtures/resources'
     shopsys.default_db_schema_filepath: '%shopsys.framework.resources_dir%/database/schema.sql'
     shopsys.domain_config_filepath: '%kernel.root_dir%/config/domains.yml'
     shopsys.domain_images_dir: '/web%shopsys.domain_images_url_prefix%'
-    shopsys.domain_images_url_prefix: /content/admin/images/domain
+    shopsys.domain_images_url_prefix: '/%shopsys.content_dir_name%/admin/images/domain'
     shopsys.domain_urls_config_filepath: '%kernel.root_dir%/config/domains_urls.yml'
     shopsys.error_pages_dir: '%shopsys.root_dir%/var/errorPages/'
     shopsys.feed_dir: '/web%shopsys.feed_url_prefix%'
-    shopsys.feed_url_prefix: /content/feeds/
+    shopsys.feed_url_prefix: '/%shopsys.content_dir_name%/feeds/'
     shopsys.filemanager_upload_dir: '%shopsys.web_dir%/%shopsys.filemanager_upload_web_dir%'
-    shopsys.filemanager_upload_web_dir: content/wysiwyg
+    shopsys.filemanager_upload_web_dir: '%shopsys.content_dir_name%/wysiwyg'
     shopsys.framework.root_dir: '%shopsys.root_dir%/vendor/shopsys/framework'
-    shopsys.front_design_image_url_prefix: /assets/frontend/images/
+    shopsys.front_design_image_url_prefix: '/assets/frontend/images/'
     shopsys.image_config_filepath: '%shopsys.root_dir%/src/Shopsys/ShopBundle/Resources/config/images.yml'
     shopsys.image_dir: '/web%shopsys.image_url_prefix%'
-    shopsys.image_url_prefix: /content/images/
+    shopsys.image_url_prefix: '/%shopsys.content_dir_name%/images/'
     shopsys.javascript_sources_dir: '%shopsys.resources_dir%/scripts'
-    shopsys.javascript_url_prefix: /assets/scripts/
-    shopsys.log_stream: /tmp/log-pipe
+    shopsys.javascript_url_prefix: '/assets/scripts/'
+    shopsys.log_stream: '/tmp/log-pipe'
     shopsys.resources_dir: '%shopsys.root_dir%/src/Shopsys/ShopBundle/Resources'
     shopsys.root_dir: '%kernel.root_dir%/..'
     shopsys.sitemaps_dir: '/web%shopsys.sitemaps_url_prefix%'
-    shopsys.sitemaps_url_prefix: /content/sitemaps
+    shopsys.sitemaps_url_prefix: '/%shopsys.content_dir_name%/sitemaps'
     shopsys.uploaded_file_config_filepath: '%shopsys.root_dir%/src/Shopsys/ShopBundle/Resources/config/uploaded_files.yml'
     shopsys.uploaded_file_dir: '/web%shopsys.uploaded_file_url_prefix%'
-    shopsys.uploaded_file_url_prefix: /content/uploadedFiles/
+    shopsys.uploaded_file_url_prefix: '/%shopsys.content_dir_name%/uploadedFiles/'
     shopsys.web_dir: '%shopsys.root_dir%/web'
     shopsys.vendor_dir: '%kernel.root_dir%/../vendor'
     shopsys.js_form_validator_output_vendor_dir: '../vendor'