upgraded to latest dev-master shopsys dependencies (#91)

shopsys · Dec 4, 2019 · d7edefb · d7edefb
2 parents 2f5a3d3 + 1f02354
commit d7edefb
Show file tree

Hide file tree

Showing 295 changed files with 20,746 additions and 9,211 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,6 +1,7 @@
 src/Shopsys/ShopBundle/Resources/scripts/frontend/plugins/**
+src/Shopsys/ShopBundle/Resources/scripts/styleguide
 
 node_modules/**
 
 # eslint-check-diff runs check with provided files that could contain even javascripts from tests folder
-tests/**
+tests/**
diff --git a/app/Bootstrap.php b/app/Bootstrap.php
@@ -15,6 +15,7 @@
 require_once __DIR__ . '/autoload.php';
 
 setlocale(LC_CTYPE, 'en_US.utf8');
+setlocale(LC_NUMERIC, 'en_US.utf8');
 
 class Bootstrap
 {

diff --git a/app/Resources/ShopsysFrameworkBundle/views/Admin/Layout/base.html.twig b/app/Resources/ShopsysFrameworkBundle/views/Admin/Layout/base.html.twig
@@ -1,18 +1,11 @@
 <!DOCTYPE html>
-<!--[if IE 7 ]>    <html lang="{{ app.request.locale }}" class="ie7 no-js"> <![endif]-->
-<!--[if IE 8 ]>    <html lang="{{ app.request.locale }}" class="ie8 no-js"> <![endif]-->
-<!--[if IE 9 ]>    <html lang="{{ app.request.locale }}" class="ie9 no-js"> <![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!--> <html lang="{{ app.request.locale }}" class="no-js"> <!--<![endif]-->
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="robots" content="noindex, nofollow">
 
         <link rel="stylesheet" type="text/css" href="{{ asset('assets/admin/styles/index_' ~ getCssVersion() ~ '.css') }}" media="screen, projection">
         <link rel="stylesheet" type="text/css" href="{{ asset('bundles/bmatznerjqueryui/css/flick/jquery-ui.css') }}">
-        <!--[if IE 8 ]>
-            <link rel="stylesheet" type="text/css" href="{{ asset('assets/admin/styles/index_' ~ getCssVersion() ~ '-ie8.css') }}" media="screen, projection">
-        <![endif]-->
 
         {# bootstrap/tooltip.js must be imported before bootstrap/popover.js #}
         {{ importJavascripts([

diff --git a/app/config/packages/security.yml b/app/config/packages/security.yml
@@ -18,6 +18,7 @@ security:
         # see Shopsys\FrameworkBundle\Model\Administrator\Security\AdministratorFrontSecurityFacade
         administration:
             pattern: ^/(%admin_url%/|efconnect|elfinder)
+            user_checker: Shopsys\FrameworkBundle\Model\Security\AdministratorChecker
             anonymous: ~
             provider: administrators
             logout_on_user_change: true

diff --git a/app/config/packages/test/prezent_doctrine_translatable.yml b/app/config/packages/test/prezent_doctrine_translatable.yml
@@ -1,3 +1,3 @@
 prezent_doctrine_translatable:
     # in tests there is no default locale set
-    fallback_locale: en
+    fallback_locale: "%locale%"
diff --git a/app/config/paths.yml b/app/config/paths.yml
@@ -1,8 +1,6 @@
 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.root_dir%/src/Shopsys/ShopBundle/DataFixtures/resources'
     shopsys.default_db_schema_filepath: '%shopsys.framework.resources_dir%/database/schema.sql'
     shopsys.domain_config_filepath: '%kernel.root_dir%/config/domains.yml'

diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml
@@ -8,3 +8,7 @@ _profiler:
 
 _main:
     resource: routing.yml
+
+_styleguide:
+    path: /_styleguide/
+    defaults: { _controller: ShopsysShopBundle:Styleguide\Styleguide:styleguide }
diff --git a/build.xml b/build.xml
@@ -7,9 +7,8 @@
     <property name="path.vendor" value="${path.root}/vendor"/>
     <property name="path.framework" value="${path.vendor}/shopsys/framework"/>
 
-    <property name="is-multidomain" value="true"/>
     <property name="phpstan.level" value="1"/>
-    <property name="translations.dump.locales" value="en cs de"/>
+    <property name="check-and-fix-annotations" value="true"/>
 
     <import file="${path.framework}/build.xml"/>
 

diff --git a/composer.json b/composer.json
@@ -66,20 +66,20 @@
         "sensio/framework-extra-bundle": "^3.0.29",
         "sensio/generator-bundle": "^3.1.7",
         "shopsys/doctrine-orm": "^2.6.3",
-        "shopsys/migrations": "^8.0",
-        "shopsys/form-types-bundle": "^8.0",
-        "shopsys/framework": "^8.0",
-        "shopsys/plugin-interface": "^8.0",
+        "shopsys/migrations": "dev-master",
+        "shopsys/form-types-bundle": "dev-master",
+        "shopsys/framework": "dev-master",
+        "shopsys/plugin-interface": "dev-master",
         "shopsys/postgres-search-bundle": "0.1",
-        "shopsys/product-feed-heureka": "^8.0",
-        "shopsys/product-feed-heureka-delivery": "^8.0",
-        "shopsys/product-feed-zbozi": "^8.0",
-        "shopsys/product-feed-google": "^8.0",
-        "shopsys/read-model": "^8.0",
+        "shopsys/product-feed-heureka": "dev-master",
+        "shopsys/product-feed-heureka-delivery": "dev-master",
+        "shopsys/product-feed-zbozi": "dev-master",
+        "shopsys/product-feed-google": "dev-master",
+        "shopsys/read-model": "dev-master",
         "snc/redis-bundle": "^2.1.8",
         "stof/doctrine-extensions-bundle": "^1.3.0",
         "symfony/assetic-bundle": "^2.8.2",
-        "symfony/monolog-bundle": "^3.1.2",
+        "symfony/monolog-bundle": "~3.4.0",
         "symfony/swiftmailer-bundle": "^3.2.2",
         "symfony/symfony": "^3.4.8",
         "symfony-cmf/routing": "^2.0.3",
@@ -95,11 +95,12 @@
         "codeception/codeception": "^2.5.0",
         "phpstan/phpstan": "^0.11",
         "phpunit/phpunit": "^7.0",
-        "shopsys/coding-standards": "^8.0",
-        "shopsys/http-smoke-testing": "^8.0",
+        "shopsys/coding-standards": "dev-master",
+        "shopsys/http-smoke-testing": "dev-master",
         "sspooky13/yaml-standards": "^4.2.5",
         "phpstan/phpstan-doctrine": "^0.11.2",
-        "phpstan/phpstan-phpunit": "^0.11.2"
+        "phpstan/phpstan-phpunit": "^0.11.2",
+        "zalas/phpunit-injector": "^1.2"
     },
     "conflict": {
         "symfony/dependency-injection": "3.4.15|3.4.16"