Revert "[BUGFIX] Fix HttpRequest instantiation"

Without something like '"minimum-stability": "dev"' distribution
packages depending on "typo3/cms" cannot have its dependencies
resolved by Composer.

Releases: master
Reverts: #67838

Change-Id: Id7446239d47ea72b63740a38f1f60a1187dc85c7
Reviewed-on: http://review.typo3.org/42130
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>

diff --git a/composer.json b/composer.json
index 1d2608a..6ea5135 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
                "ext-session": "*",
                "ext-xml": "*",
                "psr/log": "1.0.*@dev",
-               "pear/http_request2": "dev-trunk#674ca38c44e0da062799bde776751424f754d0bc",
+               "pear/http_request2": "~2.2.1",
                "phpwhois/idna-convert": "~0.8.2",
                "swiftmailer/swiftmailer": "~5.4.1",
                "symfony/console": "~2.5.11",

diff --git a/composer.lock b/composer.lock
index a60e51c..44227dc 100644 (file)
--- a/composer.lock
+++ b/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"
     ],
-    "hash": "6caf13fd33cb4b362af8e5742039110e",
+    "hash": "c09697f76edc6e21f5e7ba1157a9fabc",
     "packages": [
         {
             "name": "doctrine/instantiator",
@@ -114,20 +114,20 @@
         },
         {
             "name": "pear/http_request2",
-            "version": "dev-trunk",
+            "version": "v2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/HTTP_Request2.git",
-                "reference": "674ca38c44e0da062799bde776751424f754d0bc"
+                "reference": "d6c81670c504045248c1afdf896bb9a3288158de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/HTTP_Request2/zipball/f36670a10bb9586d0e5f9d291f979cb6c8f94bfc",
-                "reference": "674ca38c44e0da062799bde776751424f754d0bc",
+                "url": "https://api.github.com/repos/pear/HTTP_Request2/zipball/d6c81670c504045248c1afdf896bb9a3288158de",
+                "reference": "d6c81670c504045248c1afdf896bb9a3288158de",
                 "shasum": ""
             },
             "require": {
-                "pear/net_url2": "~2.2.0",
+                "pear/net_url2": ">=2.0.0",
                 "pear/pear_exception": "*",
                 "php": ">=5.2.0"
             },
@@ -144,16 +144,14 @@
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "./"
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
             "authors": [
                 {
                     "name": "Alexey Borzov",
-                    "email": "avb@php.net"
+                    "email": "avb@php.net",
+                    "role": "Developer HTML_Common2"
                 }
             ],
             "description": "Provides an easy way to perform HTTP requests.",
@@ -164,7 +162,7 @@
                 "http",
                 "request"
             ],
-            "time": "2015-06-20 11:45:01"
+            "time": "2014-01-16 17:27:21"
         },
         {
             "name": "pear/net_url2",
@@ -2099,7 +2097,6 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "psr/log": 20,
-        "pear/http_request2": 20,
         "mikey179/vfsstream": 20
     },
     "prefer-stable": false,

diff --git a/typo3/sysext/core/Tests/Unit/Http/HttpRequestTest.php b/typo3/sysext/core/Tests/Unit/Http/HttpRequestTest.php
deleted file mode 100644 (file)
index bdb1acb..0000000
--- a/typo3/sysext/core/Tests/Unit/Http/HttpRequestTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-namespace TYPO3\CMS\Core\Tests\Unit\Html;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Tests\UnitTestCase;
-
-/**
- * Testcase for \TYPO3\CMS\Core\Http\HttpRequest
- */
-class HttpRequestTest extends UnitTestCase {
-
-       /**
-        * @test
-        */
-       public function canBeInstantiated() {
-               $this->getMockBuilder('TYPO3\CMS\Core\Http\HttpRequest')
-                       ->disableOriginalConstructor()
-                       ->getMock();
-       }
-}