Merge remote-tracking branch 'remotes/dev/master'

Author: orocrmdeployer

.gitignore

@@ -9,32 +9,29 @@ behat.yml
 /var/
 !var/cache/.gitkeep
 !var/logs/.gitkeep
+!var/attachment/.gitkeep
+!var/import_export/.gitkeep
 /build/logs/*
 /vendor
 node_modules/
 /cov
-/web/bundles
-/web/css
-/web/images
-/web/js
-/web/uploads/users/*
-/web/media/cache
-/web/media/js
-/web/build.js
-/web/tracking.php
-/app/phpunit.xml
-/app/karma.conf.js
-/app/config/parameters.yml
-/app/config/parameters_test.yml
-/app/cache/*
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
+/public/bundles
+/public/css
+/public/images
+/public/js
+/public/uploads/users/*
+/public/media/cache
+/public/media/js
+/public/build.js
+/public/tracking.php
+/config/parameters.yml
+/config/parameters_test.yml
 phpunit.xml
 *~
 bin/*
 !bin/console
-
-/app/SymfonyRequirements.php
-/web/sitemaps
-/web/uploads/behat
+!bin/dist
+/var/SymfonyRequirements.php
+/public/sitemaps
+/public/uploads/behat
+/.web-server-pid

app/.gitignore

@@ -1,20 +1,29 @@
 #!/usr/bin/env php
 <?php
 
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
-// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
+// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
+// for more information
 //umask(0000);
 
 set_time_limit(0);
 
-require __DIR__.'/../app/autoload.php';
-
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
+require __DIR__.'/../vendor/autoload.php';
 
 $input = new ArgvInput();
-$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
-$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev', true);
+if ($env === 'dev' && !isset($_ENV['APP_FRONT_CONTROLLER'])) {
+    $_ENV['APP_FRONT_CONTROLLER'] = 'index_dev.php';
+}
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption('--no-debug', true) && $env !== 'prod';
+
+if ($debug) {
+    Debug::enable();
+}
 
 $kernel = new AppKernel($env, $debug);
 $application = new Application($kernel);

app/.htaccess

@@ -7,15 +7,17 @@
 
 set_time_limit(0);
 
-//require_once __DIR__.'/bootstrap.php.cache';
-require_once __DIR__.'/autoload.php';
-require_once __DIR__.'/DistributionKernel.php';
+require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__.'/../src/DistributionKernel.php';
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 
 $input = new ArgvInput();
 $env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
+if ($env === 'dev' && !isset($_ENV['APP_FRONT_CONTROLLER'])) {
+    $_ENV['APP_FRONT_CONTROLLER'] = 'index_dev.php';
+}
 $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
 
 $kernel = new DistributionKernel($env, $debug);

app/Resources/translations/install.en.yml

@@ -10,7 +10,7 @@
   ],
   "autoload": {
     "psr-4": {"": "src/"},
-    "files": ["app/AppKernel.php"],
+    "files": ["src/AppKernel.php"],
     "exclude-from-classmap": ["**/Tests/"]
   },
   "repositories": {
@@ -43,7 +43,6 @@
     "behat/symfony2-extension": "2.1.1",
     "nelmio/alice": "2.2.*",
     "phpunit/phpunit": "5.7.*",
-    "phpunit/phpunit-selenium": "3.0.*",
     "johnkary/phpunit-speedtrap": "1.0.*",
     "mybuilder/phpunit-accelerator": "1.2.*",
     "squizlabs/php_codesniffer": "2.8.*",
@@ -57,7 +56,7 @@
     "platform": {
       "php": "7.1"
     },
-    "component-dir": "web/bundles/components",
+    "component-dir": "public/bundles/components",
     "bin-dir": "bin",
     "fxp-asset": {
       "enabled": false
@@ -84,13 +83,12 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "extra": {
-    "symfony-app-dir": "app",
-    "symfony-web-dir": "web",
+    "symfony-web-dir": "public",
     "symfony-var-dir": "var",
     "symfony-bin-dir": "bin",
     "symfony-tests-dir": "tests",
     "incenteev-parameters": {
-      "file": "app/config/parameters.yml"
+      "file": "config/parameters.yml"
     }
   }
 }

app/autoload.php

@@ -4,24 +4,28 @@ imports:
 
 framework:
     #esi:             ~
-    translator:      { fallback: en }
+    translator:
+        paths:
+            - '%kernel.project_dir%/translations'
+        fallback: en
     secret:          "%secret%"
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
+        resource: "%kernel.project_dir%/config/routing.yml"
         strict_requirements: "%kernel.debug%"
     form:            true
     csrf_protection: true
     validation:      { enable_annotations: true }
     templating:
         engines: ['twig', 'php']
-        assets_version: %assets_version%
-        assets_version_format: %%s?version=%%s
+    assets:
+        version: %assets_version%
+        version_format: %%s?version=%%s
     default_locale:           "%locale%"
     trusted_proxies:          ~
     session:
         name:                 BAPID
         handler_id:           %session_handler%
-        save_path:            '%kernel.root_dir%/../var/sessions/%kernel.environment%'
+        save_path:            '%kernel.project_dir%/var/sessions/%kernel.environment%'
         gc_maxlifetime:       3600
         cookie_httponly:      true
     fragments:
@@ -34,19 +38,20 @@ framework:
 twig:
     debug:                    "%kernel.debug%"
     strict_variables:         "%kernel.debug%"
-    exception_controller:     "FOS\\RestBundle\\Controller\\ExceptionController::showAction"
+    exception_controller:     "Oro\\Bundle\\UIBundle\\Controller\\ExceptionController::showAction"
     globals:
         bap:
-            layout:           ::base.html.twig  # default layout across all Oro bundles
+            layout:           base.html.twig  # default layout across all Oro bundles
 
 # Assetic Configuration
 assetic:
     debug:                    false
     use_controller:           false
+    read_from:                %kernel.project_dir%/public
     filters:
         cssrewrite: ~
         cssmin:
-            file: %kernel.root_dir%/Resources/php/cssmin-v3.0.1.php
+            file: %kernel.project_dir%/var/php/cssmin-v3.0.1.php
 
 # Swiftmailer Configuration
 swiftmailer:
@@ -110,7 +115,17 @@ lexik_maintenance:
     driver:
         class:                Lexik\Bundle\MaintenanceBundle\Drivers\FileDriver
         options:
-            file_path:        %kernel.root_dir%/../var/cache/maintenance_lock
+            file_path:        %kernel.project_dir%/var/cache/maintenance_lock
+
+liip_imagine:
+    loaders:
+        default:
+            filesystem:
+                data_root: %kernel.project_dir%/public
+    resolvers:
+        default:
+            web_path:
+                web_root: %kernel.project_dir%/public
 
 #
 # ORO Bundles config

bin/console

@@ -2,7 +2,7 @@ imports:
     - { resource: config.yml }
 
 framework:
-    router:   { resource: "%kernel.root_dir%/config/routing_dev.yml" }
+    router:   { resource: "%kernel.project_dir%/config/routing_dev.yml" }
     profiler: { only_exceptions: false }
 
 web_profiler:

app/dist bin/dist

@@ -4,10 +4,13 @@ imports:
 
 framework:
     #esi:             ~
-    translator:      { fallback: en }
+    translator:
+        paths:
+            - '%kernel.project_dir%/translations'
+        fallback: en
     secret:          "%secret%"
     router:
-        resource: "%kernel.root_dir%/config/dist/routing.yml"
+        resource: "%kernel.project_dir%/config/dist/routing.yml"
         strict_requirements: "%kernel.debug%"
     form:            true
     csrf_protection: true
@@ -18,7 +21,7 @@ framework:
     session:
         name:                 BAPID_DIST
         handler_id:           %session_handler%
-        save_path:            %kernel.root_dir%/cache/sessions
+        save_path:            %kernel.project_dir%/var/cache/sessions
         gc_maxlifetime:       3600
         cookie_httponly:      true
     fragments:
@@ -29,10 +32,11 @@ framework:
 assetic:
     debug:                    false
     use_controller:           false
+    read_from:                %kernel.project_dir%/public
     filters:
         cssrewrite: ~
         cssmin:
-            file: %kernel.root_dir%/Resources/php/cssmin-v3.0.1.php
+            file: %kernel.project_dir%/var/php/cssmin-v3.0.1.php
 
 # Doctrine Configuration
 doctrine:
@@ -60,7 +64,7 @@ lexik_maintenance:
     driver:
         class:                Lexik\Bundle\MaintenanceBundle\Drivers\FileDriver
         options:
-            file_path:        %kernel.root_dir%/cache/maintenance_lock
+            file_path:        %kernel.project_dir%/var/cache/maintenance_lock
 
 services:
     oro.cache.abstract:

composer.json

@@ -2,7 +2,7 @@ imports:
     - { resource: config.yml }
 
 framework:
-    router:   { resource: "%kernel.root_dir%/config/dist/routing_dev.yml" }
+    router:   { resource: "%kernel.project_dir%/config/dist/routing_dev.yml" }
     profiler: { only_exceptions: false }
 
 web_profiler:

app/config/.gitignore config/.gitignore

@@ -4,7 +4,8 @@ security:
         cache:
             id: security.acl.cache.doctrine
             prefix: sf2_acl_
-
+    access_decision_manager:
+        strategy: unanimous
     firewalls:
         main:
             pattern: ^%web_backend_prefix%/