Switch to composer/installers 1.4

.gitignore

@@ -17,29 +17,35 @@
 # More details about excluding specific file on your local environment can be found
 # in the official GitHub article: https://help.github.com/articles/ignoring-files/
 
+/.web-server-pid
+/app/config/parameters.yml
+/build/
+/phpunit.xml
+/var/*
+!/var/cache
+/var/cache/*
+!var/cache/.gitkeep
+!/var/logs
+/var/logs/*
+!var/logs/.gitkeep
+!/var/sessions
+/var/sessions/*
+!var/sessions/.gitkeep
+!var/SymfonyRequirements.php
 /vendor/
+/web/bundles/
+
 .php~
-/bin/behat
-/bin/phpunit
-/app/check.php
-/app/SymfonyRequirements.php
-/app/cache/
-/app/logs/
-/ezpublish_legacy
-/app/config/parameters.yml
-/app/bootstrap.php.cache
 /doc/docker-compose/entrypoint/*/*.sql
-/web/index_treemenu.php
-/web/index_rest.php
-/web/index_cluster.php
-/web/bundles/
+
 /web/css/
 /web/js/
 /web/design
 /web/extension
 /web/share
 /web/var
 /web/.htaccess
+
 composer.phar
 composer.lock
 .buildpath

.travis.yml

@@ -22,7 +22,8 @@ env:
     - TEST_CMD="bin/behat -vv --profile=rest --suite=fullXml --tags=~@broken"
     - TEST_CMD="bin/behat -vv --profile=core --tags=~@broken"
     - TEST_CMD="bin/phpunit -v vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishRestBundle/Tests/Functional"
-    - TEST_CMD="bin/behat -vv --profile=platformui --tags='@common'"
+    - TEST_CMD="bin/behat -v --profile=repository-forms --tags=~@broken"
+    - TEST_CMD="bin/behat -v --profile=behat --tags=~@broken"
 
 # test only master (+ Pull requests)
 branches:

COPYRIGHT

@@ -1,4 +1,4 @@
-COPYRIGHT NOTICE: Copyright (C) 1999-2016 eZ Systems AS
+COPYRIGHT NOTICE: Copyright (C) 1999-2017 eZ Systems AS
 SOFTWARE LICENSE: GNU General Public License v2.0
 NOTICE: >
   This program is free software; you can redistribute it and/or

Dockerfile

@@ -16,11 +16,11 @@ RUN if [ -d .git ]; then echo "ERROR: .dockerignore folders detected, exiting" &
 RUN mkdir -p web/var \
     && composer install --optimize-autoloader --no-progress --no-interaction --no-suggest --prefer-dist \
 # Clear cache again so env variables are taken into account on startup
-    && rm -Rf app/logs/* app/cache/*/* \
+    && rm -Rf var/logs/* var/cache/*/* \
 # Fix permissions for www-data
-    && chown -R www-data:www-data app/cache app/logs web/var \
-    && find app/cache app/logs web/var -type d -print0 | xargs -0 chmod -R 775 \
-    && find app/cache app/logs web/var -type f -print0 | xargs -0 chmod -R 664 \
+    && chown -R www-data:www-data var web/var \
+    && find var web/var -type d -print0 | xargs -0 chmod -R 775 \
+    && find var web/var -type f -print0 | xargs -0 chmod -R 664 \
 # Remove composer cache to avoid it taking space in image
     && rm -rf ~/.composer/*/* \
     && [ "$REMOVE_AUTH" = "1" ] && rm -f auth.json

app/AppCache.php

@@ -6,14 +6,14 @@
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  * @version //autogentag//
  */
-use eZ\Bundle\EzPublishCoreBundle\HttpCache;
+use EzSystems\PlatformHttpCacheBundle\AppCache as PlatformHttpCacheBundleAppCache;
 
 /**
  * Class AppCache.
  *
  * For easier upgrade do not change this file, as of 2015.01 possible to extend
  * cleanly via SYMFONY_HTTP_CACHE_CLASS & SYMFONY_CLASSLOADER_FILE env variables!
  */
-class AppCache extends HttpCache
+class AppCache extends PlatformHttpCacheBundleAppCache
 {
 }

app/AppKernel.php

@@ -20,7 +20,7 @@ class AppKernel extends Kernel
      */
     public function registerBundles()
     {
-        $bundles = array(
+        $bundles = [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
@@ -29,14 +29,13 @@ public function registerBundles()
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
-            new Tedivm\StashBundle\TedivmStashBundle(),
             new Hautelook\TemplatedUriBundle\HautelookTemplatedUriBundle(),
             new Liip\ImagineBundle\LiipImagineBundle(),
             new FOS\HttpCacheBundle\FOSHttpCacheBundle(),
+            new EzSystems\PlatformHttpCacheBundle\EzSystemsPlatformHttpCacheBundle(),
             new eZ\Bundle\EzPublishCoreBundle\EzPublishCoreBundle(),
             new eZ\Bundle\EzPublishLegacySearchEngineBundle\EzPublishLegacySearchEngineBundle(),
             new eZ\Bundle\EzPublishIOBundle\EzPublishIOBundle(),
-            new EzSystems\MultiFileUploadBundle\EzSystemsMultiFileUploadBundle(),
             new eZ\Bundle\EzPublishRestBundle\EzPublishRestBundle(),
             new EzSystems\PlatformUIAssetsBundle\EzSystemsPlatformUIAssetsBundle(),
             new EzSystems\PlatformUIBundle\EzSystemsPlatformUIBundle(),
@@ -47,12 +46,13 @@ public function registerBundles()
             new EzSystems\PlatformInstallerBundle\EzSystemsPlatformInstallerBundle(),
             new EzSystems\RepositoryFormsBundle\EzSystemsRepositoryFormsBundle(),
             new EzSystems\EzPlatformSolrSearchEngineBundle\EzSystemsEzPlatformSolrSearchEngineBundle(),
-            new EzSystems\EzContentOnTheFlyBundle\EzSystemsEzContentOnTheFlyBundle(),
             new EzSystems\EzPlatformDesignEngineBundle\EzPlatformDesignEngineBundle(),
             new Bazinga\Bundle\JsTranslationBundle\BazingaJsTranslationBundle(),
             new JMS\TranslationBundle\JMSTranslationBundle(),
+            new EzSystems\HybridPlatformUiBundle\EzSystemsHybridPlatformUiBundle(),
+            new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
             new AppBundle\AppBundle(),
-        );
+        ];
 
         switch ($this->getEnvironment()) {
             case 'test':
@@ -66,12 +66,36 @@ public function registerBundles()
                 $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
                 $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
                 $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+                $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
                 $bundles[] = new Egulias\ListenersDebugCommandBundle\EguliasListenersDebugCommandBundle();
         }
 
         return $bundles;
     }
 
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        if (!empty($_SERVER['SYMFONY_TMP_DIR'])) {
+            return dirname($_SERVER['SYMFONY_TMP_DIR']) . '/var/cache/' . $this->getEnvironment();
+        }
+
+        return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
+    }
+
+    public function getLogDir()
+    {
+        if (!empty($_SERVER['SYMFONY_TMP_DIR'])) {
+            return dirname($_SERVER['SYMFONY_TMP_DIR']) . '/var/logs';
+        }
+
+        return dirname(__DIR__) . '/var/logs';
+    }
+
     /**
      * Loads the container configuration.
      *

app/config/config.yml

@@ -2,28 +2,27 @@ imports:
     - { resource: default_parameters.yml }
     - { resource: parameters.yml }
     - { resource: security.yml }
-    - { resource: env/docker.php }
     - { resource: env/platformsh.php }
 
 # Configuration for Database connection, can have several connections used by eZ Repositories in ezplatform.yml
 doctrine:
     dbal:
         connections:
             default:
-                driver: "%database_driver%"
-                host: "%database_host%"
-                port: "%database_port%"
-                user: "%database_user%"
-                password: "%database_password%"
-                dbname: "%database_name%"
+                driver: '%env(DATABASE_DRIVER)%'
+                host: '%env(DATABASE_HOST)%'
+                port: '%env(DATABASE_PORT)%'
+                dbname: '%env(DATABASE_NAME)%'
+                user: '%env(DATABASE_USER)%'
+                password: '%env(DATABASE_PASSWORD)%'
                 charset: UTF8
 
 # Base configuration for Solr, for more options see: https://doc.ez.no/display/EZP/Solr+Search+Engine+Bundle
 # Can have several connections used by each eZ Repositories in ezplatform.yml
 ez_search_engine_solr:
     endpoints:
         endpoint0:
-            dsn: "%solr_dsn%"
+            dsn: '%env(SOLR_DSN)%'
             core: collection1
     connections:
         default:
@@ -32,76 +31,56 @@ ez_search_engine_solr:
             mapping:
                 default: endpoint0
 
-# Stash is used for persistence cache in eZ Repository
-# Can have several caches used by different eZ Repositories in ezplatform.yml, must be one per database
-stash:
-    caches:
-        default:
-            drivers:
-                # When using multiple webservers, you must use Memcache or Redis to share the cache
-                # For single web server Apc, Memcached and Redis will give you better performance under editing load
-                - FileSystem
-            inMemory: true
-            registerDoctrineAdapter: false
-            # On Windows, using FileSystem, to avoid hitting filesystem limitations
-            # you need to change the keyHashFunction used to generate cache directories to "crc32"
-            # FileSystem:
-            #    keyHashFunction: crc32
-    # Disable tracking of cache values to avoid large disk use when using web profiler
-    tracking_values: false
-
 framework:
-    esi:             ~
-    translator:      { fallback: "%locale_fallback%" }
-    secret:          "%secret%"
+    esi: ~
+    translator: { fallback: "%locale_fallback%" }
+    secret: '%env(SYMFONY_SECRET)%'
     router:
-        resource: "%kernel.root_dir%/config/routing.yml"
+        resource: '%kernel.project_dir%/app/config/routing.yml'
         strict_requirements: ~
     csrf_protection: ~
-    form:
-        csrf_protection:
-            enabled: true
-            # Note: changing this will break legacy extensions that rely on the default name to alter AJAX requests
-            # See https://jira.ez.no/browse/EZP-20783
-            field_name: ezxform_token
-    validation:      { enable_annotations: true }
-    # Place "eztpl" engine first intentionnally.
-    # This is to avoid template name parsing with Twig engine, refusing specific characters
-    # which are valid with legacy tpl files.
-    templating:      { engines: ['twig'] } #assets_version: SomeVersionScheme
-    default_locale:  "%locale_fallback%"
-    trusted_hosts:   ~
+    form: ~
+    validation: { enable_annotations: true }
+    #serializer: { enable_annotations: true }
+    templating:
+        engines: ['twig']
+        #assets_version: SomeVersionScheme
+    default_locale: '%locale_fallback%'
+    trusted_hosts: ~
     session:
-        # handler_id set to null will use default session handler from php.ini
-        handler_id:  ~
+        # https://symfony.com/doc/current/reference/configuration/framework.html#handler-id
+        handler_id: session.handler.native_file
+        save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%'
         # Note: eZ Publish also allows session name and session cookie configuration to be per SiteAccess, by
         #       default session name will be set to "eZSESSID{siteaccess_hash}" (unique session name per siteaccess)
-        #       Further reading on sessions: https://doc.ez.no/display/EZP/Session
-    fragments:       ~
+        #       Further reading on sessions: https://doc.ez.no/display/DEVELOPER/Sessions
+    fragments: ~
     http_method_override: true
+    assets: true
+    php_errors:
+        log: true
 
 # Twig Configuration
 twig:
-    debug:            "%kernel.debug%"
-    strict_variables: "%kernel.debug%"
+    debug: '%kernel.debug%'
+    strict_variables: '%kernel.debug%'
 
 # Assetic Configuration
 assetic:
-    debug:          "%kernel.debug%"
-    use_controller: false
-    bundles:        []
+    debug: '%kernel.debug%'
+    use_controller: '%kernel.debug%'
+    bundles: []
     #java: /usr/bin/java
     filters:
         cssrewrite: ~
-        #closure:
-        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
-        #yui_css:
-        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
 
 # Swiftmailer Configuration
 swiftmailer:
-    transport: "%mailer_transport%"
-    host:      "%mailer_host%"
-    username:  "%mailer_user%"
-    password:  "%mailer_password%"
-    spool:     { type: memory }
+    transport: '%mailer_transport%'
+    host: '%env(MAILER_HOST)%'
+    username: '%env(MAILER_USER)%'
+    password: '%env(MAILER_PASSWORD)%'
+    spool: { type: memory }
+
+fos_js_routing:
+    routes_to_expose: [_ez_content_view]