Bump psr/log and psr/http-client

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Dec 30, 2020 · dd66098 · dd66098
1 parent 7fd440b
commit dd66098
Show file tree

Hide file tree

Showing 14 changed files with 101 additions and 365 deletions.
diff --git a/.gitignore b/.gitignore
@@ -195,6 +195,8 @@ pimple/pimple/src/Pimple/Tests
 psr/http-client/CHANGELOG.md
 psr/http-client/README.md
 
+psr/log/Psr/Log/Test/
+
 rackspace/php-opencloud/tests
 rackspace/php-opencloud/doc
 rackspace/php-opencloud/docs

diff --git a/composer.lock b/composer.lock
diff --git a/composer/InstalledVersions.php b/composer/InstalledVersions.php
@@ -24,12 +24,12 @@ class InstalledVersions
 private static $installed = array (
   'root' => 
   array (
-    'pretty_version' => 'v21.0.0beta4',
-    'version' => '21.0.0.0-beta4',
+    'pretty_version' => 'dev-master',
+    'version' => 'dev-master',
     'aliases' => 
     array (
     ),
-    'reference' => 'fbe551895d32ce5b1f0323be79044c6af755c666',
+    'reference' => '7fd440b16ef3dc16447e4565246c00e981ab9298',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -279,12 +279,12 @@ class InstalledVersions
     ),
     'nextcloud/3rdparty' => 
     array (
-      'pretty_version' => 'v21.0.0beta4',
-      'version' => '21.0.0.0-beta4',
+      'pretty_version' => 'dev-master',
+      'version' => 'dev-master',
       'aliases' => 
       array (
       ),
-      'reference' => 'fbe551895d32ce5b1f0323be79044c6af755c666',
+      'reference' => '7fd440b16ef3dc16447e4565246c00e981ab9298',
     ),
     'nextcloud/lognormalizer' => 
     array (
@@ -471,12 +471,12 @@ class InstalledVersions
     ),
     'psr/http-client' => 
     array (
-      'pretty_version' => '1.0.0',
-      'version' => '1.0.0.0',
+      'pretty_version' => '1.0.1',
+      'version' => '1.0.1.0',
       'aliases' => 
       array (
       ),
-      'reference' => '496a823ef742b632934724bf769560c2a5c7c44e',
+      'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621',
     ),
     'psr/http-client-implementation' => 
     array (
@@ -512,12 +512,12 @@ class InstalledVersions
     ),
     'psr/log' => 
     array (
-      'pretty_version' => '1.1.0',
-      'version' => '1.1.0.0',
+      'pretty_version' => '1.1.3',
+      'version' => '1.1.3.0',
       'aliases' => 
       array (
       ),
-      'reference' => '6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd',
+      'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc',
     ),
     'psr/log-implementation' => 
     array (

diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
@@ -2042,8 +2042,6 @@
     'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
     'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
     'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
-    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
     'Punic\\Calendar' => $vendorDir . '/punic/punic/code/Calendar.php',
     'Punic\\Comparer' => $vendorDir . '/punic/punic/code/Comparer.php',
     'Punic\\Currency' => $vendorDir . '/punic/punic/code/Currency.php',

diff --git a/composer/autoload_static.php b/composer/autoload_static.php
@@ -2544,8 +2544,6 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
         'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
         'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
-        'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-        'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
         'Punic\\Calendar' => __DIR__ . '/..' . '/punic/punic/code/Calendar.php',
         'Punic\\Comparer' => __DIR__ . '/..' . '/punic/punic/code/Comparer.php',
         'Punic\\Currency' => __DIR__ . '/..' . '/punic/punic/code/Currency.php',

diff --git a/composer/installed.json b/composer/installed.json
@@ -2887,24 +2887,24 @@
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.0",
-            "version_normalized": "1.0.0.0",
+            "version": "1.0.1",
+            "version_normalized": "1.0.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "496a823ef742b632934724bf769560c2a5c7c44e"
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/496a823ef742b632934724bf769560c2a5c7c44e",
-                "reference": "496a823ef742b632934724bf769560c2a5c7c44e",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
+                "php": "^7.0 || ^8.0",
                 "psr/http-message": "^1.0"
             },
-            "time": "2018-10-30T23:29:13+00:00",
+            "time": "2020-06-29T06:28:15+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -2935,6 +2935,9 @@
                 "psr",
                 "psr-18"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client/tree/master"
+            },
             "install-path": "../psr/http-client"
         },
         {
@@ -3047,27 +3050,27 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.0",
-            "version_normalized": "1.1.0.0",
+            "version": "1.1.3",
+            "version_normalized": "1.1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "2018-11-20T15:27:04+00:00",
+            "time": "2020-03-23T09:12:05+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "installation-source": "dist",
@@ -3093,6 +3096,9 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.3"
+            },
             "install-path": "../psr/log"
         },
         {

diff --git a/composer/installed.php b/composer/installed.php
@@ -1,12 +1,12 @@
 <?php return array (
   'root' => 
   array (
-    'pretty_version' => 'v21.0.0beta4',
-    'version' => '21.0.0.0-beta4',
+    'pretty_version' => 'dev-master',
+    'version' => 'dev-master',
     'aliases' => 
     array (
     ),
-    'reference' => 'fbe551895d32ce5b1f0323be79044c6af755c666',
+    'reference' => '7fd440b16ef3dc16447e4565246c00e981ab9298',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -256,12 +256,12 @@
     ),
     'nextcloud/3rdparty' => 
     array (
-      'pretty_version' => 'v21.0.0beta4',
-      'version' => '21.0.0.0-beta4',
+      'pretty_version' => 'dev-master',
+      'version' => 'dev-master',
       'aliases' => 
       array (
       ),
-      'reference' => 'fbe551895d32ce5b1f0323be79044c6af755c666',
+      'reference' => '7fd440b16ef3dc16447e4565246c00e981ab9298',
     ),
     'nextcloud/lognormalizer' => 
     array (
@@ -448,12 +448,12 @@
     ),
     'psr/http-client' => 
     array (
-      'pretty_version' => '1.0.0',
-      'version' => '1.0.0.0',
+      'pretty_version' => '1.0.1',
+      'version' => '1.0.1.0',
       'aliases' => 
       array (
       ),
-      'reference' => '496a823ef742b632934724bf769560c2a5c7c44e',
+      'reference' => '2dfb5f6c5eff0e91e20e913f8c5452ed95b86621',
     ),
     'psr/http-client-implementation' => 
     array (
@@ -489,12 +489,12 @@
     ),
     'psr/log' => 
     array (
-      'pretty_version' => '1.1.0',
-      'version' => '1.1.0.0',
+      'pretty_version' => '1.1.3',
+      'version' => '1.1.3.0',
       'aliases' => 
       array (
       ),
-      'reference' => '6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd',
+      'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc',
     ),
     'psr/log-implementation' => 
     array (

diff --git a/psr/http-client/composer.json b/psr/http-client/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": "^7.0",
+        "php": "^7.0 || ^8.0",
         "psr/http-message": "^1.0"
     },
     "autoload": {