Merge branch 'update-ddev-to-0-19' into 'develop'

Update ddev to 0.19.0 and t3olayout to v3

See merge request t3o/ter!348

.ddev/config.yaml

-APIVersion: v0.18.0
+APIVersion: v0.19.0
 name: ter
 type: typo3
 docroot: html
 php_version: "7.0"
 router_http_port: "80"
 router_https_port: "443"
+xdebug_enabled: false
+additional_hostnames: []
 provider: default
 hooks:
   post-start:
-    - exec: "composer install -d /var/www/html"
-    - exec: "npm --prefix typo3conf/ext/t3olayout/Build install"
-    - exec: "npm --prefix typo3conf/ext/t3olayout/Build run-script build"
-    - exec: "../bin/typo3cms install:generatepackagestates"
-    - exec: "../bin/typo3cms install:extensionsetupifpossible"
-    - exec: "cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php"
+  - exec: composer install -d /var/www/html
+  - exec: npm --prefix typo3conf/ext/t3olayout/Build install
+  - exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build
+  - exec: ../bin/typo3cms install:generatepackagestates
+  - exec: ../bin/typo3cms install:extensionsetupifpossible
+  - exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php
+
+
+# This config.yaml was created with ddev version v0.19.0 
+# webimage: drud/nginx-php-fpm-local:v0.19.0
+# dbimage: drud/mariadb-local:v0.19.0
+# dbaimage: drud/phpmyadmin:v0.19.0
+# However we do not recommend explicitly wiring these images into the
+# config.yaml as they may break future versions of ddev.
+# You can update this config.yaml using 'ddev config'.
+
+# Key features of ddev's config.yaml:
+
+# name: <projectname> # Name of the project, automatically provides 
+#   http://projectname.ddev.local and https://projectname.ddev.local
+
+# type: <projecttype>  # drupal6/7/8, backdrop, typo3, wordpress, php
+
+# docroot: <relative_path> # Relative path to the directory containing index.php.
+
+# php_version: "7.1"  # PHP version to use, "5.6", "7.0", "7.1", "7.2"
+
+# You can explicitly specify the webimage, dbimage, dbaimage lines but this 
+# is not recommended, as the images are often closely tied to ddev's' behavior,
+# so this can break upgrades.
+
+# webimage: <docker_image>  # nginx/php docker image. 
+# dbimage: <docker_image>  # mariadb docker image. 
+# dbaimage: <docker_image>
+
+# router_http_port: <port>  # Port to be used for http (defaults to port 80)
+# router_https_port: <port> # Port for https (defaults to 443)
+
+# xdebug_enabled: false  # Set to true to enable xdebug and "ddev start" or "ddev restart"
+
+#additional_hostnames:
+# - somename
+# - someothername
+# would provide http and https URLs for "somename.ddev.local"
+# and "someothername.ddev.local".
+
+# provider: default # Currently either "default" or "pantheon"
+#
+# Many ddev commands can be extended to run tasks after the ddev command is
+# executed.
+# See https://ddev.readthedocs.io/en/latest/users/extending-commands/ for more
+# information on the commands that can be extended and the tasks you can define
+# for them. Example:
+#hooks:
+#  post-start:
+#    - exec: "composer install -d /var/www/html"
\ No newline at end of file

.ddev/docker-compose.yaml

@@ -64,6 +64,7 @@ services:
       com.ddev.app-type: typo3
       com.ddev.approot: $DDEV_APPROOT
       com.ddev.app-url: $DDEV_URL
+    extra_hosts: ["unneeded:127.0.0.1"]
   dba:
     container_name: ddev-${DDEV_SITENAME}-dba
     image: $DDEV_DBAIMAGE

composer.json

@@ -31,7 +31,7 @@
     "helhum/typo3-console": "^5.0",
     "dmitryd/typo3-realurl": "^2.2",
     "apache-solr-for-typo3/solr": "^7.0",
-    "t3o/t3olayout": "^2.2",
+    "t3o/t3olayout": "^3.0",
     "nikic/php-parser": "^3.1",
     "gordalina/cachetool": "^3.2"
   },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "0187f3cb8d239363a83cf75066ad993a",
+    "content-hash": "9fbd3964ec2220fd451bc8bbb8ee002f",
     "packages": [
         {
             "name": "adoy/fastcgi-client",
@@ -2043,11 +2043,11 @@
         },
         {
             "name": "t3o/t3olayout",
-            "version": "2.2.3",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://git-t3o.typo3.org/t3o/t3olayout.git",
-                "reference": "ee9ab502edf4d3359eabadf1665c0b8c8294351f"
+                "reference": "380166330ac366be2467bee002b481f102103345"
             },
             "require": {
                 "gridelementsteam/gridelements": "^8.0",
@@ -2095,7 +2095,7 @@
             "keywords": [
                 "TYPO3 CMS"
             ],
-            "time": "2018-04-18T21:20:23+00:00"
+            "time": "2018-06-06T18:52:47+00:00"
         },
         {
             "name": "typo3-ter/ig-ldap-sso-auth",

html/typo3conf/AdditionalConfiguration.ddev.php

@@ -20,3 +20,5 @@ $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['password'] = 'db';
 $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['host'] = 'db';
 $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['port'] = '3306';
 $GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] = '$P$CZqeoYBTHC0kXKny4tpTvBSzzV5wVY0'; /* joh316 */
+
+$GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['ter'] = serialize(['repositoryDir' => '/var/www/html/html/fileadmin/ter/']);