Merge branch 'develop' into '19-roadmap-extension-migrate'

# Conflicts:
#   composer.json

.gitlab-ci/deployer/deploy.php

@@ -53,6 +53,7 @@ set('keep_releases', 10);
 serverList('/src/.gitlab-ci/deployer/servers.yml');
 
 task('typo3', function () {
+    run('cd {{release_path}} && /opt/php/php70/bin/php bin/typo3cms install:generatepackagestates 0 1');
     run('cd {{release_path}} && /opt/php/php70/bin/php bin/typo3cms database:updateschema');
     run('cd {{release_path}} && /opt/php/php70/bin/php bin/typo3cms language:update');
     run('cd {{release_path}} && /opt/php/php70/bin/php bin/typo3cms install:fixfolderstructure');

composer.json

@@ -25,10 +25,14 @@
     {
       "type": "vcs",
       "url": "https://git-t3o.typo3.org/t3o/typo3_roadmap.git"
+    },
+    {
+      "type": "vcs",
+      "url": "https://git-t3o.typo3.org/t3o/t3o_membership.git"
     }
   ],
   "require": {
-    "typo3/cms": "8.7.1",
+    "typo3/cms": "^8.7",
     "helhum/typo3-console": "^4.2",
     "dmitryd/typo3-realurl": "^2.1",
     "t3o/t3olayout": "dev-develop",
@@ -37,7 +41,8 @@
     "apache-solr-for-typo3/solr": "^6.1",
     "reelworx/rx-shariff": "^10.0",
     "derhansen/sf_event_mgt": "^2.0",
-    "t3o/typo3_roadmap": "dev-master"
+    "t3o/typo3_roadmap": "dev-master",
+    "t3o/t3o_membership": "dev-master"
   },
   "config": {
     "bin-dir": "bin"