Merge pull request #369 from nextcloud/composer/upgrade

[stable29] upgrade packages
nextcloud-releases · May 14, 2024 · b934e8b · b934e8b
2 parents 548342f + 18b3da3
commit b934e8b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -90,7 +90,6 @@ appstore: clean composer
 	--exclude=/issue_template.md \
 	--exclude=/README.md \
 	--exclude=/composer.json \
-	--exclude=/vendor \
 	--exclude=/vendor-bin \
 	--exclude=/lib-vendor-organizer.php \
 	--exclude=/scoper.inc.php \

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Vendor/Psr/Http/Message/UploadedFileFactoryInterface.php b/lib/Vendor/Psr/Http/Message/UploadedFileFactoryInterface.php
@@ -15,14 +15,14 @@ interface UploadedFileFactoryInterface
      *
      * @param StreamInterface $stream Underlying stream representing the
      *     uploaded file content.
-     * @param int $size in bytes
+     * @param int|null $size in bytes
      * @param int $error PHP file upload error
-     * @param string $clientFilename Filename as provided by the client, if any.
-     * @param string $clientMediaType Media type as provided by the client, if any.
+     * @param string|null $clientFilename Filename as provided by the client, if any.
+     * @param string|null $clientMediaType Media type as provided by the client, if any.
      *
      * @return UploadedFileInterface
      *
      * @throws \InvalidArgumentException If the file resource is not readable.
      */
-    public function createUploadedFile(StreamInterface $stream, int $size = null, int $error = \UPLOAD_ERR_OK, string $clientFilename = null, string $clientMediaType = null) : UploadedFileInterface;
+    public function createUploadedFile(StreamInterface $stream, ?int $size = null, int $error = \UPLOAD_ERR_OK, ?string $clientFilename = null, ?string $clientMediaType = null) : UploadedFileInterface;
 }
diff --git a/vendor-bin/php-scoper/vendor/composer/installed.php b/vendor-bin/php-scoper/vendor/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '2cc1891d51acbffc59367d8d35db5e7ed7125167',
+        'reference' => '548342ff025b2910152ae9b6eaa03fae1741d8ea',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '2cc1891d51acbffc59367d8d35db5e7ed7125167',
+            'reference' => '548342ff025b2910152ae9b6eaa03fae1741d8ea',
             'dev_requirement' => false,
         ),
         'composer/package-versions-deprecated' => array(