Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	app/AppKernel.php
#	app/config/routing.yml
#	composer.json

.travis.yml

@@ -16,7 +16,7 @@ env:
     - SYMFONY_DEBUG=1
   # list of behat arguments to test
   matrix:
-    # Disabled until failures on BD tests with redis is solved / figured out
+    # Disabled until failures on BDD tests with redis is solved / figured out
     #- TEST_CMD="bin/behat -vv --profile=rest --suite=fullJson --tags=~@broken" COMPOSE_FILE="doc/docker-compose/base-prod.yml:doc/docker-compose/redis.yml:doc/docker-compose/selenium.yml"
     - TEST_CMD="bin/behat -vv --profile=rest --suite=fullJson --tags=~@broken" COMPOSE_FILE="doc/docker-compose/base-prod.yml:doc/docker-compose/selenium.yml"
     - TEST_CMD="bin/behat -vv --profile=rest --suite=fullXml --tags=~@broken"
@@ -30,9 +30,6 @@ branches:
     - master
     - /^\d.\d+$/
 
-# Update Docker and Docker Compose
-before_install: ./bin/.travis/trusty/update_docker.sh
-
 before_script:
   # Internal auth token dedicated to testing with travis+composer on ezsystems repos, not for reuse!
   - echo "{\"github-oauth\":{\"github.com\":\"d0285ed5c8644f30547572ead2ed897431c1fc09\"}}" > auth.json
@@ -47,6 +44,12 @@ before_script:
 # Behat will use behat.yml which is a copy of behat.yml.dist with hostnames update by doc/docker-compose/selenium.yml
 script: docker-compose exec --user www-data app sh -c "php /scripts/wait_for_db.php; php $TEST_CMD"
 
+after_failure:
+  # Will show us the full log of container's main processes (not counting shell process above running php and behat)
+  - docker-compose logs -t --tail="all"
+  # Will show us what is up, and how long it's been up
+  - docker ps -s
+
 # disable mail notifications
 notifications:
   email: false

Dockerfile

@@ -14,7 +14,7 @@ RUN if [ -d .git ]; then echo "ERROR: .dockerignore folders detected, exiting" &
 
 # Install and prepare install
 RUN mkdir -p web/var \
-    && composer install --optimize-autoloader --no-progress --no-interaction --prefer-dist \
+    && 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/*/* \
 # Fix permissions for www-data

app/AppKernel.php

@@ -53,7 +53,9 @@ public function registerBundles()
             new EzSystems\EzPlatformSolrSearchEngineBundle\EzSystemsEzPlatformSolrSearchEngineBundle(),
             new EzSystems\StudioInstallerBundle\EzSystemsStudioInstallerBundle(),
             new Bazinga\Bundle\JsTranslationBundle\BazingaJsTranslationBundle(),
+            new JMS\TranslationBundle\JMSTranslationBundle(),
             new EzSystems\DateBasedPublisherBundle\EzSystemsDateBasedPublisherBundle(),
+            new EzSystems\EzContentOnTheFlyBundle\EzSystemsEzContentOnTheFlyBundle(),
             new AppBundle\AppBundle(),
         );
 

app/config/routing.yml

@@ -45,3 +45,8 @@ _ezStudioFormBuilder:
 _ezpublishDateBasedPublisher:
     resource: "@EzSystemsDateBasedPublisherBundle/Resources/config/routing.yml"
     prefix: "%ez_systems_date_based_publisher_rest_prefix%"
+
+_contentOnTheFly:
+    resource: "@ContentOnTheFlyBundle/Resources/config/routing.yml"
+    prefix:   '%ezpublish_rest.path_prefix%'
+

bin/.travis/trusty/update_docker.sh

@@ -11,9 +11,9 @@
 # http://apt.dockerproject.org/repo/dists/debian-jessie/main/binary-amd64/Packages
 
 
-DOCKER_COMPOSE_VERSION="1.8.0"
-echo "\nUpdating Docker Compose to ${DOCKER_COMPOSE_VERSION}"
-sudo rm -f /usr/local/bin/docker-compose
-curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-chmod +x docker-compose
-sudo mv docker-compose /usr/local/bin
+#DOCKER_COMPOSE_VERSION="1.8.0"
+#echo "\nUpdating Docker Compose to ${DOCKER_COMPOSE_VERSION}"
+#sudo rm -f /usr/local/bin/docker-compose
+#curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+#chmod +x docker-compose
+#sudo mv docker-compose /usr/local/bin

composer.json

@@ -30,7 +30,7 @@
         "sensio/generator-bundle": "~2.3",
         "incenteev/composer-parameter-handler": "~2.0",
         "tedivm/stash-bundle": "~0.4",
-        "ezsystems/ezpublish-kernel": "^6.5@dev",
+        "ezsystems/ezpublish-kernel": "^6.7@dev",
         "ezsystems/repository-forms": "^1.4@dev",
         "ezsystems/ezplatform-solr-search-engine": "^1.1@dev",
         "ezsystems/platform-ui-bundle": "^1.5@dev",
@@ -50,7 +50,8 @@
         "willdurand/js-translation-bundle": "^2.6",
         "ramsey/uuid": "^3.5",
         "ezsystems/ezstudio-cron": "^1.0@dev",
-        "ezsystems/date-based-publisher": "^1.0@dev"
+        "ezsystems/date-based-publisher": "^1.0@dev",
+        "ezsystems/content-on-the-fly-prototype": "~0.1.7"
     },
     "require-dev": {
         "behat/behat": "~3.0",

doc/docker-compose/install.yml

@@ -30,7 +30,7 @@ services:
     # Second chown line:  For dev and behat tests we give a bit extra rights, never do this for prod.
     command: >
       /bin/sh -c "
-      composer install --no-progress --no-interaction --prefer-dist;
+      composer install --no-progress --no-interaction --prefer-dist --no-suggest;
       mkdir -p web/var;
       php /scripts/wait_for_db.php;
       php app/console ezplatform:install ${INSTALL_EZ_INSTALL_TYPE};