Merge branch 'clean-composer-json' into 'develop'

Clean composer.json file

See merge request t3o/ter!358

.ddev/config.yaml

@@ -13,8 +13,8 @@ hooks:
   - 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: ../vendor/bin/typo3cms install:generatepackagestates
+  - exec: ../vendor/bin/typo3cms install:extensionsetupifpossible
   - exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php
 
 

.gitlab-ci.yml

@@ -27,11 +27,12 @@ test:
       - apk add git --update
       - export TYPO3_PATH_WEB="$PWD/html"
       - export COMPOSER_CACHE_DIR=.cache/composer
-      - php -r "copy('https://getcomposer.org/composer.phar', 'composer.phar');"
-      - php composer.phar install
+      - curl https://getcomposer.org/composer.phar -o composer.phar --silent
+      - chmod +x composer.phar
+      - ./composer.phar install
       - mkdir $TYPO3_PATH_WEB/fileadmin/ && touch $TYPO3_PATH_WEB/fileadmin/currentcoredata.json
   script:
-      - php composer.phar test:unit
+      - ./composer.phar test:unit
 
 
 build:
@@ -48,7 +49,7 @@ build:
     script:
         - ./composer.phar config store-auths false
         - ./composer.phar config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
-        - ./composer.phar install --no-interaction --no-progress
+        - ./composer.phar install --no-interaction --no-progress --no-dev
     artifacts:
         paths:
             - ./

.gitlab-ci/deployer/deploy.php

@@ -4,7 +4,6 @@ namespace Deployer;
 
 require_once '/composer/vendor/deployer/deployer/recipe/common.php';
 require_once '/composer/vendor/deployer/recipes/rsync.php';
-require_once '/composer/vendor/deployer/recipes/cachetool.php';
 
 $sharedDirectories = [
     'html/fileadmin',

composer.json

@@ -12,10 +12,6 @@
     "issues": "https://git-t3o.typo3.org/t3o/ter/issues"
   },
   "repositories": [
-    {
-      "type": "composer",
-      "url": "https://composer.typo3.org"
-    },
     {
       "type": "vcs",
       "url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
@@ -27,7 +23,7 @@
   ],
   "require": {
     "php": ">=7.0",
-    "typo3/cms": "^8.7",
+    "typo3/cms-core": "^8.7",
     "helhum/typo3-console": "^5.0",
     "dmitryd/typo3-realurl": "^2.2",
     "apache-solr-for-typo3/solr": "^7.0",
@@ -39,17 +35,15 @@
     "nimut/testing-framework": "^2.0"
   },
   "config": {
-    "bin-dir": "bin",
-    "store-auths": false
+    "store-auths": false,
+    "platform": {
+      "php": "7.0.30"
+    }
   },
   "extra": {
     "typo3/cms": {
       "web-dir": "html",
       "cms-package-dir": "{$vendor-dir}/typo3/cms"
-    },
-    "helhum/typo3-console": {
-      "install-binary": true,
-      "install-extension-dummy": false
     }
   },
   "autoload": {
@@ -64,8 +58,7 @@
   },
   "scripts": {
     "test:unit": [
-      "[ -e bin/phpunit ] || composer install",
-      "./bin/phpunit -c .gitlab-ci/Tests/UnitTests.xml"
+      "./vendor/bin/phpunit -c .gitlab-ci/Tests/UnitTests.xml"
     ]
   }
 }

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": "9fbd3964ec2220fd451bc8bbb8ee002f",
+    "content-hash": "cfecbc0909fc8f9a5d9c2e0b156acde2",
     "packages": [
         {
             "name": "adoy/fastcgi-client",
@@ -2191,16 +2191,16 @@
         },
         {
             "name": "typo3/cms",
-            "version": "v8.7.15",
+            "version": "v8.7.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/TYPO3.CMS.git",
-                "reference": "799725362be3d260d9b214dcdd8faa2525003724"
+                "reference": "f02a014e16881b0271dda9a4a1a63ec9748b0210"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/799725362be3d260d9b214dcdd8faa2525003724",
-                "reference": "799725362be3d260d9b214dcdd8faa2525003724",
+                "url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/f02a014e16881b0271dda9a4a1a63ec9748b0210",
+                "reference": "f02a014e16881b0271dda9a4a1a63ec9748b0210",
                 "shasum": ""
             },
             "require": {
@@ -2392,7 +2392,7 @@
                 "extbase",
                 "typo3"
             ],
-            "time": "2018-05-23T11:31:21+00:00"
+            "time": "2018-06-11T17:18:14+00:00"
         },
         {
             "name": "typo3/cms-composer-installers",
@@ -3791,6 +3791,55 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "time": "2016-10-03T07:35:21+00:00"
         },
+        {
+            "name": "typo3/minimal",
+            "version": "v8.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/TYPO3/minimal.git",
+                "reference": "41dcd9882b564bd6ea516cf0df11799c96033345"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/TYPO3/minimal/zipball/41dcd9882b564bd6ea516cf0df11799c96033345",
+                "reference": "41dcd9882b564bd6ea516cf0df11799c96033345",
+                "shasum": ""
+            },
+            "require": {
+                "typo3/cms-backend": "^8.7.9",
+                "typo3/cms-core": "^8.7.9",
+                "typo3/cms-cshmanual": "^8.7.9",
+                "typo3/cms-extbase": "^8.7.9",
+                "typo3/cms-extensionmanager": "^8.7.9",
+                "typo3/cms-filelist": "^8.7.9",
+                "typo3/cms-fluid": "^8.7.9",
+                "typo3/cms-frontend": "^8.7.9",
+                "typo3/cms-install": "^8.7.9",
+                "typo3/cms-lang": "^8.7.9",
+                "typo3/cms-recordlist": "^8.7.9",
+                "typo3/cms-saltedpasswords": "^8.7.9",
+                "typo3/cms-sv": "^8.7.9"
+            },
+            "type": "metapackage",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "The TYPO3 Community",
+                    "homepage": "https://typo3.org/community/",
+                    "role": "Contributor"
+                },
+                {
+                    "name": "TYPO3 CMS Core Team",
+                    "homepage": "https://forge.typo3.org/projects/typo3cms-core",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Minimal required set of TYPO3 extensions",
+            "time": "2017-12-31T14:28:41+00:00"
+        },
         {
             "name": "webmozart/assert",
             "version": "1.2.0",
@@ -3850,5 +3899,8 @@
     "platform": {
         "php": ">=7.0"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.0.30"
+    }
 }